Drop media-atomisp-fix-vidioc_try_fmt.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.15/media-atomisp-fix-vidioc_try_fmt.patch b/queue-5.15/media-atomisp-fix-vidioc_try_fmt.patch
deleted file mode 100644 (file)
index a07dbec..0000000
--- a/queue-5.15/media-atomisp-fix-vidioc_try_fmt.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 96b3a660a7ae5e37b1ec9d685447e9f04188521a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sat, 13 Aug 2022 16:53:00 +0200
-Subject: media: atomisp: Fix VIDIOC_TRY_FMT
-
-From: Hans de Goede <hdegoede@redhat.com>
-
-[ Upstream commit 4d3aafb9c9bba59c9b6f6df8ea6c89483bfed8d4 ]
-
-atomisp_try_fmt() calls the sensor's try_fmt handler but it does
-not copy the result back to the passed in v4l2_pix_format under
-some circumstances.
-
-Potentially returning an unsupported resolution to userspace,
-which VIDIOC_TRY_FMT is not supposed to do.
-
-atomisp_set_fmt() also uses atomisp_try_fmt() and relies
-on this wrong behavior. The VIDIOC_TRY_FMT call passes NULL for
-the res_overflow argument where as the atomisp_set_fmt() call
-passes non NULL.
-
-Use the res_overflow argument to differentiate between the 2 callers
-and always propagate the sensors result in the VIDIOC_TRY_FMT case.
-
-This fixes the resolution list in camorama showing resolutions like e.g.
-1584x1184 instead of 1600x1200.
-
-Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/staging/media/atomisp/pci/atomisp_cmd.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/staging/media/atomisp/pci/atomisp_cmd.c b/drivers/staging/media/atomisp/pci/atomisp_cmd.c
-index 88db9818e083..1c36e0108b1d 100644
---- a/drivers/staging/media/atomisp/pci/atomisp_cmd.c
-+++ b/drivers/staging/media/atomisp/pci/atomisp_cmd.c
-@@ -4954,8 +4954,8 @@ int atomisp_try_fmt(struct video_device *vdev, struct v4l2_pix_format *f,
-               return 0;
-       }
- 
--      if (snr_mbus_fmt->width < f->width
--          && snr_mbus_fmt->height < f->height) {
-+      if (!res_overflow || (snr_mbus_fmt->width < f->width &&
-+                            snr_mbus_fmt->height < f->height)) {
-               f->width = snr_mbus_fmt->width;
-               f->height = snr_mbus_fmt->height;
-               /* Set the flag when resolution requested is
--- 
-2.35.1
-

diff --git a/queue-5.15/series b/queue-5.15/series
index ea3980af8f09c00dfb2e46936b05b0a8d8afecc5..f89963655b755dc5bd01fe6a6f21cb5958bee315 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -77,7 +77,6 @@ media-cros-ec-cec-limit-msg.len-to-cec_max_msg_size.patch
 media-dvb-frontends-drxk-initialize-err-to-0.patch
 media-meson-vdec-fix-possible-refcount-leak-in-vdec_.patch
 media-v4l-subdev-fail-graciously-when-getting-try-da.patch
-media-atomisp-fix-vidioc_try_fmt.patch
 acpi-apei-fix-integer-overflow-in-ghes_estatus_pool_.patch
 scsi-core-restrict-legal-sdev_state-transitions-via-.patch
 hid-saitek-add-madcatz-variant-of-mmo7-mouse-device-.patch

diff --git a/queue-6.0/media-atomisp-fix-vidioc_try_fmt.patch b/queue-6.0/media-atomisp-fix-vidioc_try_fmt.patch
deleted file mode 100644 (file)
index 9ac3171..0000000
--- a/queue-6.0/media-atomisp-fix-vidioc_try_fmt.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 579ea43747a24b499839720fc73d45addbcf48a6 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sat, 13 Aug 2022 16:53:00 +0200
-Subject: media: atomisp: Fix VIDIOC_TRY_FMT
-
-From: Hans de Goede <hdegoede@redhat.com>
-
-[ Upstream commit 4d3aafb9c9bba59c9b6f6df8ea6c89483bfed8d4 ]
-
-atomisp_try_fmt() calls the sensor's try_fmt handler but it does
-not copy the result back to the passed in v4l2_pix_format under
-some circumstances.
-
-Potentially returning an unsupported resolution to userspace,
-which VIDIOC_TRY_FMT is not supposed to do.
-
-atomisp_set_fmt() also uses atomisp_try_fmt() and relies
-on this wrong behavior. The VIDIOC_TRY_FMT call passes NULL for
-the res_overflow argument where as the atomisp_set_fmt() call
-passes non NULL.
-
-Use the res_overflow argument to differentiate between the 2 callers
-and always propagate the sensors result in the VIDIOC_TRY_FMT case.
-
-This fixes the resolution list in camorama showing resolutions like e.g.
-1584x1184 instead of 1600x1200.
-
-Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/staging/media/atomisp/pci/atomisp_cmd.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/staging/media/atomisp/pci/atomisp_cmd.c b/drivers/staging/media/atomisp/pci/atomisp_cmd.c
-index c932f340068f..db6465756e49 100644
---- a/drivers/staging/media/atomisp/pci/atomisp_cmd.c
-+++ b/drivers/staging/media/atomisp/pci/atomisp_cmd.c
-@@ -4886,8 +4886,8 @@ int atomisp_try_fmt(struct video_device *vdev, struct v4l2_pix_format *f,
-               return 0;
-       }
- 
--      if (snr_mbus_fmt->width < f->width
--          && snr_mbus_fmt->height < f->height) {
-+      if (!res_overflow || (snr_mbus_fmt->width < f->width &&
-+                            snr_mbus_fmt->height < f->height)) {
-               f->width = snr_mbus_fmt->width;
-               f->height = snr_mbus_fmt->height;
-               /* Set the flag when resolution requested is
--- 
-2.35.1
-

diff --git a/queue-6.0/series b/queue-6.0/series
index 156350302fac0edbb55f2d6f72b16db0b164b4cd..dffe77458818cdd4dc1e70b7d427c09ae5e8fb60 100644 (file)
--- a/queue-6.0/series
+++ b/queue-6.0/series
@@ -77,7 +77,6 @@ media-hantro-store-hevc-bit-depth-in-context.patch
 media-hantro-hevc-fix-auxilary-buffer-size-calculati.patch
 media-hantro-hevc-fix-chroma-offset-computation.patch
 media-v4l-subdev-fail-graciously-when-getting-try-da.patch
-media-atomisp-fix-vidioc_try_fmt.patch
 drm-vc4-hdmi-check-the-hsm-rate-at-runtime_resume.patch
 acpi-apei-fix-integer-overflow-in-ghes_estatus_pool_.patch
 hwrng-bcm2835-use-hwrng_msleep-instead-of-cpu_relax.patch