Store the length of an URB's data buffer in the URB's instance of struct urb_node. Use the value for free'ing the buffer. Remove the obsolete size field from struct urb_list.
With the URB cache in place, all URBs have the same buffer size. At some point we want URBs to have an individual length for their allocated buffer. Hence, the buffer length needs to be stored separately. Signed-off-by: Thomas Zimmermann <[email protected]> --- drivers/gpu/drm/udl/udl_drv.h | 2 +- drivers/gpu/drm/udl/udl_main.c | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h index 68c5a5feb6f3..4736d83aec9a 100644 --- a/drivers/gpu/drm/udl/udl_drv.h +++ b/drivers/gpu/drm/udl/udl_drv.h @@ -37,6 +37,7 @@ struct urb_node { struct list_head entry; struct udl_device *dev; struct urb *urb; + size_t alloc_size; }; struct urb_list { @@ -45,7 +46,6 @@ struct urb_list { wait_queue_head_t sleep; int available; int count; - size_t size; }; struct udl_device { diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_main.c index 77b0bc560422..67da676f0f94 100644 --- a/drivers/gpu/drm/udl/udl_main.c +++ b/drivers/gpu/drm/udl/udl_main.c @@ -180,7 +180,7 @@ static void udl_free_urb_list(struct udl_device *udl) break; unode = urb->context; /* Free each separately allocated piece */ - usb_free_coherent(urb->dev, udl->urbs.size, + usb_free_coherent(urb->dev, unode->alloc_size, urb->transfer_buffer, urb->transfer_dma); usb_free_urb(urb); kfree(unode); @@ -204,8 +204,6 @@ static int udl_alloc_urb_list(struct udl_device *udl, int count, size_t size) udl->urbs.available = 0; retry: - udl->urbs.size = size; - while (udl->urbs.count * size < wanted_size) { unode = kzalloc_obj(struct urb_node); if (!unode) @@ -218,8 +216,9 @@ static int udl_alloc_urb_list(struct udl_device *udl, int count, size_t size) break; } unode->urb = urb; + unode->alloc_size = size; - buf = usb_alloc_coherent(udev, size, GFP_KERNEL, + buf = usb_alloc_coherent(udev, unode->alloc_size, GFP_KERNEL, &urb->transfer_dma); if (!buf) { kfree(unode); @@ -290,7 +289,7 @@ void udl_put_urb(struct urb *urb) struct udl_device *udl = unode->dev; unsigned long flags; - urb->transfer_buffer_length = udl->urbs.size; /* reset to actual */ + urb->transfer_buffer_length = unode->alloc_size; /* reset to actual */ spin_lock_irqsave(&udl->urbs.lock, flags); list_add_tail(&unode->entry, &udl->urbs.list); @@ -302,9 +301,11 @@ void udl_put_urb(struct urb *urb) int udl_submit_urb(struct udl_device *udl, struct urb *urb, size_t len) { + struct drm_device *drm = &udl->drm; + struct urb_node *unode = urb->context; int ret; - if (WARN_ON(len > udl->urbs.size)) { + if (drm_WARN_ON_ONCE(drm, len > unode->alloc_size)) { ret = -EINVAL; goto error; } -- 2.56.0
