From dd696168dad584560000bba8e5ef940cf748a4b5 Mon Sep 17 00:00:00 2001 From: Jan200101 Date: Sun, 7 Apr 2024 01:14:55 +0200 Subject: kernel 6.8.4 --- SOURCES/linux-surface.patch | 78 --------------------------------------------- 1 file changed, 78 deletions(-) (limited to 'SOURCES/linux-surface.patch') diff --git a/SOURCES/linux-surface.patch b/SOURCES/linux-surface.patch index 1a80ad4..ac7daa5 100644 --- a/SOURCES/linux-surface.patch +++ b/SOURCES/linux-surface.patch @@ -8748,84 +8748,6 @@ index 000000000000..35aeb5db89c8 -- 2.44.0 -From b7e66758c1bd493c7140c17d0f00f727f8fefb32 Mon Sep 17 00:00:00 2001 -From: Hidenori Kobayashi -Date: Tue, 9 Jan 2024 17:09:09 +0900 -Subject: [PATCH] media: staging: ipu3-imgu: Set fields before - media_entity_pads_init() - -The imgu driver fails to probe with the following message because it -does not set the pad's flags before calling media_entity_pads_init(). - -[ 14.596315] ipu3-imgu 0000:00:05.0: failed initialize subdev media entity (-22) -[ 14.596322] ipu3-imgu 0000:00:05.0: failed to register subdev0 ret (-22) -[ 14.596327] ipu3-imgu 0000:00:05.0: failed to register pipes (-22) -[ 14.596331] ipu3-imgu 0000:00:05.0: failed to create V4L2 devices (-22) - -Fix the initialization order so that the driver probe succeeds. The ops -initialization is also moved together for readability. - -Fixes: a0ca1627b450 ("media: staging/intel-ipu3: Add v4l2 driver based on media framework") -Cc: # 6.7 -Cc: Dan Carpenter -Signed-off-by: Hidenori Kobayashi -Signed-off-by: Sakari Ailus -Signed-off-by: Hans Verkuil -Patchset: cameras ---- - drivers/staging/media/ipu3/ipu3-v4l2.c | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/drivers/staging/media/ipu3/ipu3-v4l2.c b/drivers/staging/media/ipu3/ipu3-v4l2.c -index a66f034380c0..3df58eb3e882 100644 ---- a/drivers/staging/media/ipu3/ipu3-v4l2.c -+++ b/drivers/staging/media/ipu3/ipu3-v4l2.c -@@ -1069,6 +1069,11 @@ static int imgu_v4l2_subdev_register(struct imgu_device *imgu, - struct imgu_media_pipe *imgu_pipe = &imgu->imgu_pipe[pipe]; - - /* Initialize subdev media entity */ -+ imgu_sd->subdev.entity.ops = &imgu_media_ops; -+ for (i = 0; i < IMGU_NODE_NUM; i++) { -+ imgu_sd->subdev_pads[i].flags = imgu_pipe->nodes[i].output ? -+ MEDIA_PAD_FL_SINK : MEDIA_PAD_FL_SOURCE; -+ } - r = media_entity_pads_init(&imgu_sd->subdev.entity, IMGU_NODE_NUM, - imgu_sd->subdev_pads); - if (r) { -@@ -1076,11 +1081,6 @@ static int imgu_v4l2_subdev_register(struct imgu_device *imgu, - "failed initialize subdev media entity (%d)\n", r); - return r; - } -- imgu_sd->subdev.entity.ops = &imgu_media_ops; -- for (i = 0; i < IMGU_NODE_NUM; i++) { -- imgu_sd->subdev_pads[i].flags = imgu_pipe->nodes[i].output ? -- MEDIA_PAD_FL_SINK : MEDIA_PAD_FL_SOURCE; -- } - - /* Initialize subdev */ - v4l2_subdev_init(&imgu_sd->subdev, &imgu_subdev_ops); -@@ -1177,15 +1177,15 @@ static int imgu_v4l2_node_setup(struct imgu_device *imgu, unsigned int pipe, - } - - /* Initialize media entities */ -+ node->vdev_pad.flags = node->output ? -+ MEDIA_PAD_FL_SOURCE : MEDIA_PAD_FL_SINK; -+ vdev->entity.ops = NULL; - r = media_entity_pads_init(&vdev->entity, 1, &node->vdev_pad); - if (r) { - dev_err(dev, "failed initialize media entity (%d)\n", r); - mutex_destroy(&node->lock); - return r; - } -- node->vdev_pad.flags = node->output ? -- MEDIA_PAD_FL_SOURCE : MEDIA_PAD_FL_SINK; -- vdev->entity.ops = NULL; - - /* Initialize vbq */ - vbq->type = node->vdev_fmt.type; --- -2.44.0 - From 87ebc160cb35a068acfaf59847c84656cb52b1b7 Mon Sep 17 00:00:00 2001 From: Sakari Ailus Date: Thu, 25 May 2023 14:12:04 +0300 -- cgit v1.2.3