From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: stable@vger.kernel.org, gregkh@linuxfoundation.org
Cc: hverkuil-cisco@xs4all.nl, laurent.pinchart@ideasonboard.com,
linux-media@vger.kernel.org
Subject: [PATCH 5.10 1/1] media: smiapp: Correctly initialise try compose rectangle
Date: Mon, 4 Dec 2023 14:33:48 +0200 [thread overview]
Message-ID: <20231204123348.873466-1-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <2023112431-footpath-exes-5997@gregkh>
commit 724ff68e968b19d786870d333f9952bdd6b119cb upstream.
Initialise the try sink compose rectangle size to the sink compose
rectangle for binner and scaler sub-devices. This was missed due to the
faulty condition that lead to the compose rectangles to be initialised for
the pixel array sub-device where it is not relevant.
Fixes: ccfc97bdb5ae ("[media] smiapp: Add driver")
Cc: stable@vger.kernel.org
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
[Sakari Ailus: Backport the change to the smiapp driver.]
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
Hi Greg,
Here's a backport of the ccs driver patch as in older kernels the driver
was called smiapp.
This patch also applies to all stable trees older than 5.10.
drivers/media/i2c/smiapp/smiapp-core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c
index 6fc0680a93d0..3bf96b047132 100644
--- a/drivers/media/i2c/smiapp/smiapp-core.c
+++ b/drivers/media/i2c/smiapp/smiapp-core.c
@@ -2647,7 +2647,7 @@ static int smiapp_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
try_fmt->code = sensor->internal_csi_format->code;
try_fmt->field = V4L2_FIELD_NONE;
- if (ssd != sensor->pixel_array)
+ if (ssd == sensor->pixel_array)
continue;
try_comp = v4l2_subdev_get_try_compose(sd, fh->pad, i);
--
2.39.2
prev parent reply other threads:[~2023-12-04 12:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-24 12:40 FAILED: patch "[PATCH] media: ccs: Correctly initialise try compose rectangle" failed to apply to 5.10-stable tree gregkh
2023-12-04 12:33 ` Sakari Ailus [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231204123348.873466-1-sakari.ailus@linux.intel.com \
--to=sakari.ailus@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox