The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.14.y git checkout FETCH_HEAD git cherry-pick -x 724ff68e968b19d786870d333f9952bdd6b119cb # <resolve conflicts, build, test, etc.> git commit -s git send-email --to 'stable@vger.kernel.org' --in-reply-to '2023112434-await-simple-b4f3@gregkh' --subject-prefix 'PATCH 4.14.y' HEAD^..
Possible dependencies:
724ff68e968b ("media: ccs: Correctly initialise try compose rectangle") b24cc2a18c50 ("media: smiapp: Rename as "ccs"") 161cc847370a ("media: smiapp: Internal rename to CCS") 47ff2ff267ee ("media: smiapp: Rename register access functions") 235ac9a4b36c ("media: smiapp: Remove quirk function for writing a single 8-bit register") 42aab58f456a ("media: smiapp: Use CCS registers") 3e158e1f1ec2 ("media: smiapp: Switch to CCS limits") ca296a11156a ("media: smiapp: Read CCS limit values") 503a88422fb0 ("media: smiapp: Use MIPI CCS version and manufacturer ID information") e66a7c849086 ("media: smiapp: Add macros for accessing CCS registers") cb50351be662 ("media: smiapp: Remove macros for defining registers, merge definitions") ab47d5cd8253 ("media: smiapp: Calculate CCS limit offsets and limit buffer size") 82731a194fc1 ("media: smiapp: Use CCS register flags") 6493c4b777c2 ("media: smiapp: Import CCS definitions") 1ec0b899c2b7 ("media: ccs: Add the generator for CCS register definitions and limits") b5783c4d1fbe ("media: i2c: smiapp: simplify getting state container") 1771e9fb67e2 ("media: Use fallthrough pseudo-keyword") a98f670e41a9 ("Merge tag 'media/v5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 724ff68e968b19d786870d333f9952bdd6b119cb Mon Sep 17 00:00:00 2001 From: Sakari Ailus sakari.ailus@linux.intel.com Date: Mon, 4 Sep 2023 15:57:37 +0300 Subject: [PATCH] media: ccs: Correctly initialise try compose rectangle
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
diff --git a/drivers/media/i2c/ccs/ccs-core.c b/drivers/media/i2c/ccs/ccs-core.c index 6a8116454f87..022e8712d48e 100644 --- a/drivers/media/i2c/ccs/ccs-core.c +++ b/drivers/media/i2c/ccs/ccs-core.c @@ -3097,7 +3097,7 @@ static int ccs_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->state, i);