| Message ID | 82f2c2cc2bfb9f30a65869202785c01aec3f591f.1725285495.git.hverkuil-cisco@xs4all.nl (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | media: vb2: prepare for vb2_ops_wait_prepare/finish removal | expand |
Hi Hans, Thank you for the patch. On Mon, Sep 02, 2024 at 04:04:50PM +0200, Hans Verkuil wrote: > The vb2_queue_init() will expect the vb2_queue lock pointer to be set in > the future. So for those drivers that set the lock later, move it up to > before the vb2_queue_init() call. > > Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> > --- > drivers/media/usb/hackrf/hackrf.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/usb/hackrf/hackrf.c b/drivers/media/usb/hackrf/hackrf.c > index 9c0ecd5f056c..a1a7690a344a 100644 > --- a/drivers/media/usb/hackrf/hackrf.c > +++ b/drivers/media/usb/hackrf/hackrf.c > @@ -1398,6 +1398,7 @@ static int hackrf_probe(struct usb_interface *intf, > dev->rx_vb2_queue.drv_priv = dev; > dev->rx_vb2_queue.buf_struct_size = sizeof(struct hackrf_buffer); > dev->rx_vb2_queue.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; > + dev->rx_vb2_queue.lock = &dev->vb_queue_lock; > ret = vb2_queue_init(&dev->rx_vb2_queue); > if (ret) { > dev_err(dev->dev, "Could not initialize rx vb2 queue\n"); > @@ -1413,6 +1414,7 @@ static int hackrf_probe(struct usb_interface *intf, > dev->tx_vb2_queue.drv_priv = dev; > dev->tx_vb2_queue.buf_struct_size = sizeof(struct hackrf_buffer); > dev->tx_vb2_queue.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; > + dev->tx_vb2_queue.lock = &dev->vb_queue_lock; I'm not sure if setting the same lock for both video queues is desired, but that's unrelated to this patch. Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > ret = vb2_queue_init(&dev->tx_vb2_queue); > if (ret) { > dev_err(dev->dev, "Could not initialize tx vb2 queue\n"); > @@ -1474,7 +1476,6 @@ static int hackrf_probe(struct usb_interface *intf, > /* Init video_device structure for receiver */ > dev->rx_vdev = hackrf_template; > dev->rx_vdev.queue = &dev->rx_vb2_queue; > - dev->rx_vdev.queue->lock = &dev->vb_queue_lock; > dev->rx_vdev.v4l2_dev = &dev->v4l2_dev; > dev->rx_vdev.ctrl_handler = &dev->rx_ctrl_handler; > dev->rx_vdev.lock = &dev->v4l2_lock; > @@ -1494,7 +1495,6 @@ static int hackrf_probe(struct usb_interface *intf, > /* Init video_device structure for transmitter */ > dev->tx_vdev = hackrf_template; > dev->tx_vdev.queue = &dev->tx_vb2_queue; > - dev->tx_vdev.queue->lock = &dev->vb_queue_lock; > dev->tx_vdev.v4l2_dev = &dev->v4l2_dev; > dev->tx_vdev.ctrl_handler = &dev->tx_ctrl_handler; > dev->tx_vdev.lock = &dev->v4l2_lock;
diff --git a/drivers/media/usb/hackrf/hackrf.c b/drivers/media/usb/hackrf/hackrf.c index 9c0ecd5f056c..a1a7690a344a 100644 --- a/drivers/media/usb/hackrf/hackrf.c +++ b/drivers/media/usb/hackrf/hackrf.c @@ -1398,6 +1398,7 @@ static int hackrf_probe(struct usb_interface *intf, dev->rx_vb2_queue.drv_priv = dev; dev->rx_vb2_queue.buf_struct_size = sizeof(struct hackrf_buffer); dev->rx_vb2_queue.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; + dev->rx_vb2_queue.lock = &dev->vb_queue_lock; ret = vb2_queue_init(&dev->rx_vb2_queue); if (ret) { dev_err(dev->dev, "Could not initialize rx vb2 queue\n"); @@ -1413,6 +1414,7 @@ static int hackrf_probe(struct usb_interface *intf, dev->tx_vb2_queue.drv_priv = dev; dev->tx_vb2_queue.buf_struct_size = sizeof(struct hackrf_buffer); dev->tx_vb2_queue.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; + dev->tx_vb2_queue.lock = &dev->vb_queue_lock; ret = vb2_queue_init(&dev->tx_vb2_queue); if (ret) { dev_err(dev->dev, "Could not initialize tx vb2 queue\n"); @@ -1474,7 +1476,6 @@ static int hackrf_probe(struct usb_interface *intf, /* Init video_device structure for receiver */ dev->rx_vdev = hackrf_template; dev->rx_vdev.queue = &dev->rx_vb2_queue; - dev->rx_vdev.queue->lock = &dev->vb_queue_lock; dev->rx_vdev.v4l2_dev = &dev->v4l2_dev; dev->rx_vdev.ctrl_handler = &dev->rx_ctrl_handler; dev->rx_vdev.lock = &dev->v4l2_lock; @@ -1494,7 +1495,6 @@ static int hackrf_probe(struct usb_interface *intf, /* Init video_device structure for transmitter */ dev->tx_vdev = hackrf_template; dev->tx_vdev.queue = &dev->tx_vb2_queue; - dev->tx_vdev.queue->lock = &dev->vb_queue_lock; dev->tx_vdev.v4l2_dev = &dev->v4l2_dev; dev->tx_vdev.ctrl_handler = &dev->tx_ctrl_handler; dev->tx_vdev.lock = &dev->v4l2_lock;
The vb2_queue_init() will expect the vb2_queue lock pointer to be set in the future. So for those drivers that set the lock later, move it up to before the vb2_queue_init() call. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> --- drivers/media/usb/hackrf/hackrf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)