shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 02:50:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

usb: gadget: uvc: fix uvc buffer not getting Scatter-Gather descriptor

Browse Source 
Commit 000cbb7d4b ("UPSTREAM: usb: gadget: uvc: add scatter gather
support") use scatter gather transfers for uvc isoc. However, the patch
conflicts with rockchip's zero-copy code.

Fixes: 5452a06eed ("usb: gadget: uvc: support zero copy with rockchip encoder")
Signed-off-by: Bin Yang <yangbin@rock-chips.com>
Change-Id: I515d79610a9bba74bbf28b0be974b5081a4b3c76
This commit is contained in:
Bin Yang
2023-08-07 10:53:51 +08:00
committed by Tao Huang
parent 761bb33401
commit 6c909bfa2f
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/usb/gadget/function/uvc_queue.c
View File

@@ -162,18 +162,18 @@ static int uvc_buffer_prepare(struct vb2_buffer *vb)
return -ENODEV;
buf->state = UVC_BUF_STATE_QUEUED;
#if defined(CONFIG_ARCH_ROCKCHIP) && defined(CONFIG_NO_GKI)
buf->mem = uvc_buffer_mem_prepare(vb, queue);
if (IS_ERR(buf->mem))
return -ENOMEM;
#else
if (queue->use_sg) {
buf->sgt = vb2_dma_sg_plane_desc(vb, 0);
buf->sg = buf->sgt->sgl;
} else {
#if defined(CONFIG_ARCH_ROCKCHIP) && defined(CONFIG_NO_GKI)
buf->mem = uvc_buffer_mem_prepare(vb, queue);
if (IS_ERR(buf->mem))
return -ENOMEM;
#else
buf->mem = vb2_plane_vaddr(vb, 0);
}
#endif
}
buf->length = vb2_plane_size(vb, 0);
if (vb->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
buf->bytesused = 0;
@@ -219,6 +219,10 @@ int uvcg_queue_init(struct uvc_video_queue *queue, struct device *dev, enum v4l2
{
struct uvc_video *video = container_of(queue, struct uvc_video, queue);
struct usb_composite_dev *cdev = video->uvc->func.config->cdev;
#if defined(CONFIG_ARCH_ROCKCHIP) && defined(CONFIG_NO_GKI)
struct uvc_device *uvc = container_of(video, struct uvc_device, video);
struct f_uvc_opts *opts = fi_to_f_uvc_opts(uvc->func.fi);
#endif
int ret;
queue->queue.type = type;
@@ -227,7 +231,11 @@ int uvcg_queue_init(struct uvc_video_queue *queue, struct device *dev, enum v4l2
queue->queue.buf_struct_size = sizeof(struct uvc_buffer);
queue->queue.ops = &uvc_queue_qops;
queue->queue.lock = lock;
#if defined(CONFIG_ARCH_ROCKCHIP) && defined(CONFIG_NO_GKI)
if (cdev->gadget->sg_supported && !opts->uvc_zero_copy) {
#else
if (cdev->gadget->sg_supported) {
#endif
queue->queue.mem_ops = &vb2_dma_sg_memops;
queue->use_sg = 1;
} else {