|
@@ -170,7 +170,6 @@ static void udl_free_urb_list(struct drm_device *dev)
|
|
|
struct list_head *node;
|
|
|
struct urb_node *unode;
|
|
|
struct urb *urb;
|
|
|
- unsigned long flags;
|
|
|
|
|
|
DRM_DEBUG("Waiting for completes and freeing all render urbs\n");
|
|
|
|
|
@@ -178,12 +177,12 @@ static void udl_free_urb_list(struct drm_device *dev)
|
|
|
while (count--) {
|
|
|
down(&udl->urbs.limit_sem);
|
|
|
|
|
|
- spin_lock_irqsave(&udl->urbs.lock, flags);
|
|
|
+ spin_lock_irq(&udl->urbs.lock);
|
|
|
|
|
|
node = udl->urbs.list.next; /* have reserved one with sem */
|
|
|
list_del_init(node);
|
|
|
|
|
|
- spin_unlock_irqrestore(&udl->urbs.lock, flags);
|
|
|
+ spin_unlock_irq(&udl->urbs.lock);
|
|
|
|
|
|
unode = list_entry(node, struct urb_node, entry);
|
|
|
urb = unode->urb;
|
|
@@ -268,7 +267,6 @@ struct urb *udl_get_urb(struct drm_device *dev)
|
|
|
struct list_head *entry;
|
|
|
struct urb_node *unode;
|
|
|
struct urb *urb = NULL;
|
|
|
- unsigned long flags;
|
|
|
|
|
|
/* Wait for an in-flight buffer to complete and get re-queued */
|
|
|
ret = down_timeout(&udl->urbs.limit_sem, GET_URB_TIMEOUT);
|
|
@@ -279,14 +277,14 @@ struct urb *udl_get_urb(struct drm_device *dev)
|
|
|
goto error;
|
|
|
}
|
|
|
|
|
|
- spin_lock_irqsave(&udl->urbs.lock, flags);
|
|
|
+ spin_lock_irq(&udl->urbs.lock);
|
|
|
|
|
|
BUG_ON(list_empty(&udl->urbs.list)); /* reserved one with limit_sem */
|
|
|
entry = udl->urbs.list.next;
|
|
|
list_del_init(entry);
|
|
|
udl->urbs.available--;
|
|
|
|
|
|
- spin_unlock_irqrestore(&udl->urbs.lock, flags);
|
|
|
+ spin_unlock_irq(&udl->urbs.lock);
|
|
|
|
|
|
unode = list_entry(entry, struct urb_node, entry);
|
|
|
urb = unode->urb;
|