From: Greg Kroah-Hartman Date: Fri, 6 Dec 2024 09:42:46 +0000 (+0100) Subject: 5.15-stable patches X-Git-Tag: v6.6.64~41 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3c7ffe100b5e7679492115539487691f52370b46;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: arm64-dts-allwinner-pinephone-add-mount-matrix-to-accelerometer.patch media-imx-jpeg-set-video-drvdata-before-register-video-device.patch --- diff --git a/queue-5.15/arm64-dts-allwinner-pinephone-add-mount-matrix-to-accelerometer.patch b/queue-5.15/arm64-dts-allwinner-pinephone-add-mount-matrix-to-accelerometer.patch new file mode 100644 index 00000000000..bfca113016c --- /dev/null +++ b/queue-5.15/arm64-dts-allwinner-pinephone-add-mount-matrix-to-accelerometer.patch @@ -0,0 +1,45 @@ +From 2496b2aaacf137250f4ca449f465e2cadaabb0e8 Mon Sep 17 00:00:00 2001 +From: Dragan Simic +Date: Thu, 19 Sep 2024 21:15:26 +0200 +Subject: arm64: dts: allwinner: pinephone: Add mount matrix to accelerometer + +From: Dragan Simic + +commit 2496b2aaacf137250f4ca449f465e2cadaabb0e8 upstream. + +The way InvenSense MPU-6050 accelerometer is mounted on the user-facing side +of the Pine64 PinePhone mainboard, which makes it rotated 90 degrees counter- +clockwise, [1] requires the accelerometer's x- and y-axis to be swapped, and +the direction of the accelerometer's y-axis to be inverted. + +Rectify this by adding a mount-matrix to the accelerometer definition in the +Pine64 PinePhone dtsi file. + +[1] https://files.pine64.org/doc/PinePhone/PinePhone%20mainboard%20bottom%20placement%20v1.1%2020191031.pdf + +Fixes: 91f480d40942 ("arm64: dts: allwinner: Add initial support for Pine64 PinePhone") +Cc: stable@vger.kernel.org +Suggested-by: Ondrej Jirman +Suggested-by: Andrey Skvortsov +Signed-off-by: Dragan Simic +Reviewed-by: Andrey Skvortsov +Link: https://patch.msgid.link/129f0c754d071cca1db5d207d9d4a7bd9831dff7.1726773282.git.dsimic@manjaro.org +[wens@csie.org: Replaced Helped-by with Suggested-by] +Signed-off-by: Chen-Yu Tsai +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi ++++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi +@@ -200,6 +200,9 @@ + interrupts = <7 5 IRQ_TYPE_EDGE_RISING>; /* PH5 */ + vdd-supply = <®_dldo1>; + vddio-supply = <®_dldo1>; ++ mount-matrix = "0", "1", "0", ++ "-1", "0", "0", ++ "0", "0", "1"; + }; + }; + diff --git a/queue-5.15/media-imx-jpeg-set-video-drvdata-before-register-video-device.patch b/queue-5.15/media-imx-jpeg-set-video-drvdata-before-register-video-device.patch new file mode 100644 index 00000000000..8bba3119316 --- /dev/null +++ b/queue-5.15/media-imx-jpeg-set-video-drvdata-before-register-video-device.patch @@ -0,0 +1,41 @@ +From d2b7ecc26bd5406d5ba927be1748aa99c568696c Mon Sep 17 00:00:00 2001 +From: Ming Qian +Date: Fri, 13 Sep 2024 15:21:44 +0900 +Subject: media: imx-jpeg: Set video drvdata before register video device + +From: Ming Qian + +commit d2b7ecc26bd5406d5ba927be1748aa99c568696c upstream. + +The video drvdata should be set before the video device is registered, +otherwise video_drvdata() may return NULL in the open() file ops, and led +to oops. + +Fixes: 2db16c6ed72c ("media: imx-jpeg: Add V4L2 driver for i.MX8 JPEG Encoder/Decoder") +Cc: +Signed-off-by: Ming Qian +Reviewed-by: TaoJiang +Signed-off-by: Hans Verkuil +Signed-off-by: Greg Kroah-Hartman +--- + drivers/media/platform/imx-jpeg/mxc-jpeg.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/media/platform/imx-jpeg/mxc-jpeg.c ++++ b/drivers/media/platform/imx-jpeg/mxc-jpeg.c +@@ -2155,6 +2155,7 @@ static int mxc_jpeg_probe(struct platfor + jpeg->dec_vdev->vfl_dir = VFL_DIR_M2M; + jpeg->dec_vdev->device_caps = V4L2_CAP_STREAMING | + V4L2_CAP_VIDEO_M2M_MPLANE; ++ video_set_drvdata(jpeg->dec_vdev, jpeg); + if (mode == MXC_JPEG_ENCODE) { + v4l2_disable_ioctl(jpeg->dec_vdev, VIDIOC_DECODER_CMD); + v4l2_disable_ioctl(jpeg->dec_vdev, VIDIOC_TRY_DECODER_CMD); +@@ -2167,7 +2168,6 @@ static int mxc_jpeg_probe(struct platfor + dev_err(dev, "failed to register video device\n"); + goto err_vdev_register; + } +- video_set_drvdata(jpeg->dec_vdev, jpeg); + if (mode == MXC_JPEG_ENCODE) + v4l2_info(&jpeg->v4l2_dev, + "encoder device registered as /dev/video%d (%d,%d)\n", diff --git a/queue-5.15/series b/queue-5.15/series index e2133318640..6587299f64f 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -1,3 +1,5 @@ +arm64-dts-allwinner-pinephone-add-mount-matrix-to-accelerometer.patch +media-imx-jpeg-set-video-drvdata-before-register-video-device.patch netlink-terminate-outstanding-dump-on-socket-close.patch drm-rockchip-vop-fix-a-dereferenced-before-check-war.patch net-mlx5-fs-lock-fte-when-checking-if-active.patch