drop another drm patch

diff --git a/queue-5.15/drm-drm-bridge-drop-conditionals-around-of_node-poin.patch b/queue-5.15/drm-drm-bridge-drop-conditionals-around-of_node-poin.patch
deleted file mode 100644 (file)
index 54e2623..0000000
--- a/queue-5.15/drm-drm-bridge-drop-conditionals-around-of_node-poin.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 94cb9d558173ecebcbee756b0f2f0fb89a3cf7bc Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 8 May 2024 02:00:00 +0800
-Subject: drm/drm-bridge: Drop conditionals around of_node pointers
-
-From: Sui Jingfeng <sui.jingfeng@linux.dev>
-
-[ Upstream commit ad3323a6ccb7d43bbeeaa46d5311c43d5d361fc7 ]
-
-Having conditional around the of_node pointer of the drm_bridge structure
-is not necessary, since drm_bridge structure always has the of_node as its
-member.
-
-Let's drop the conditional to get a better looks, please also note that
-this is following the already accepted commitments. see commit d8dfccde2709
-("drm/bridge: Drop conditionals around of_node pointers") for reference.
-
-Signed-off-by: Sui Jingfeng <sui.jingfeng@linux.dev>
-Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
-Signed-off-by: Robert Foss <rfoss@kernel.org>
-Link: https://patchwork.freedesktop.org/patch/msgid/20240507180001.1358816-1-sui.jingfeng@linux.dev
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/drm_bridge.c | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c
-index 78bc315b0b73..08bee5fc2c5d 100644
---- a/drivers/gpu/drm/drm_bridge.c
-+++ b/drivers/gpu/drm/drm_bridge.c
-@@ -226,13 +226,8 @@ int drm_bridge_attach(struct drm_encoder *encoder, struct drm_bridge *bridge,
-       bridge->encoder = NULL;
-       list_del(&bridge->chain_node);
- 
--#ifdef CONFIG_OF
-       DRM_ERROR("failed to attach bridge %pOF to encoder %s: %d\n",
-                 bridge->of_node, encoder->name, ret);
--#else
--      DRM_ERROR("failed to attach bridge to encoder %s: %d\n",
--                encoder->name, ret);
--#endif
- 
-       return ret;
- }
--- 
-2.43.0
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 7d993dad28722c5d9bd51bab8c18997cce5fe449..0aa9c4e664e82b9a10dfaa864668893e7b6ef3e9 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -21,7 +21,6 @@ drm-amd-display-check-num_valid_sets-before-accessin.patch
 drm-amd-display-check-msg_id-before-processing-trans.patch
 drm-amd-display-fix-coverity-integer_overflow-within.patch
 drm-amd-amdgpu-check-tbo-resource-pointer.patch
-drm-drm-bridge-drop-conditionals-around-of_node-poin.patch
 drm-amdgpu-pm-fix-uninitialized-variable-warning-for.patch
 drm-amdgpu-pm-fix-uninitialized-variable-agc_btc_res.patch
 drm-amdgpu-fix-out-of-bounds-write-warning.patch

diff --git a/queue-6.1/drm-drm-bridge-drop-conditionals-around-of_node-poin.patch b/queue-6.1/drm-drm-bridge-drop-conditionals-around-of_node-poin.patch
deleted file mode 100644 (file)
index 15ceb35..0000000
--- a/queue-6.1/drm-drm-bridge-drop-conditionals-around-of_node-poin.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 46087ee8c25f3cec49067d257628b22df7c30851 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 8 May 2024 02:00:00 +0800
-Subject: drm/drm-bridge: Drop conditionals around of_node pointers
-
-From: Sui Jingfeng <sui.jingfeng@linux.dev>
-
-[ Upstream commit ad3323a6ccb7d43bbeeaa46d5311c43d5d361fc7 ]
-
-Having conditional around the of_node pointer of the drm_bridge structure
-is not necessary, since drm_bridge structure always has the of_node as its
-member.
-
-Let's drop the conditional to get a better looks, please also note that
-this is following the already accepted commitments. see commit d8dfccde2709
-("drm/bridge: Drop conditionals around of_node pointers") for reference.
-
-Signed-off-by: Sui Jingfeng <sui.jingfeng@linux.dev>
-Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
-Signed-off-by: Robert Foss <rfoss@kernel.org>
-Link: https://patchwork.freedesktop.org/patch/msgid/20240507180001.1358816-1-sui.jingfeng@linux.dev
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/drm_bridge.c | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c
-index f80254879804..0692a10874bc 100644
---- a/drivers/gpu/drm/drm_bridge.c
-+++ b/drivers/gpu/drm/drm_bridge.c
-@@ -311,13 +311,8 @@ int drm_bridge_attach(struct drm_encoder *encoder, struct drm_bridge *bridge,
-       bridge->encoder = NULL;
-       list_del(&bridge->chain_node);
- 
--#ifdef CONFIG_OF
-       DRM_ERROR("failed to attach bridge %pOF to encoder %s: %d\n",
-                 bridge->of_node, encoder->name, ret);
--#else
--      DRM_ERROR("failed to attach bridge to encoder %s: %d\n",
--                encoder->name, ret);
--#endif
- 
-       return ret;
- }
--- 
-2.43.0
-

diff --git a/queue-6.1/series b/queue-6.1/series
index 5032530c22031ce57920c54315c7d9faae36fd3d..fe67d6246d38e65594a18aa349578e17919e7227 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -50,7 +50,6 @@ drm-amd-display-spinlock-before-reading-event.patch
 drm-amd-display-ensure-index-calculation-will-not-ov.patch
 drm-amd-display-skip-inactive-planes-within-modesupp.patch
 drm-amd-amdgpu-check-tbo-resource-pointer.patch
-drm-drm-bridge-drop-conditionals-around-of_node-poin.patch
 drm-amd-pm-fix-uninitialized-variable-warnings-for-v.patch-4175
 drm-amdgpu-pm-fix-uninitialized-variable-warning-for.patch
 drm-amdgpu-pm-fix-uninitialized-variable-agc_btc_res.patch

diff --git a/queue-6.6/drm-drm-bridge-drop-conditionals-around-of_node-poin.patch b/queue-6.6/drm-drm-bridge-drop-conditionals-around-of_node-poin.patch
deleted file mode 100644 (file)
index 22a0d94..0000000
--- a/queue-6.6/drm-drm-bridge-drop-conditionals-around-of_node-poin.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 74f5f42c35daf9aedbc96283321c30fc591c634f Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 8 May 2024 02:00:00 +0800
-Subject: drm/drm-bridge: Drop conditionals around of_node pointers
-
-From: Sui Jingfeng <sui.jingfeng@linux.dev>
-
-[ Upstream commit ad3323a6ccb7d43bbeeaa46d5311c43d5d361fc7 ]
-
-Having conditional around the of_node pointer of the drm_bridge structure
-is not necessary, since drm_bridge structure always has the of_node as its
-member.
-
-Let's drop the conditional to get a better looks, please also note that
-this is following the already accepted commitments. see commit d8dfccde2709
-("drm/bridge: Drop conditionals around of_node pointers") for reference.
-
-Signed-off-by: Sui Jingfeng <sui.jingfeng@linux.dev>
-Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
-Signed-off-by: Robert Foss <rfoss@kernel.org>
-Link: https://patchwork.freedesktop.org/patch/msgid/20240507180001.1358816-1-sui.jingfeng@linux.dev
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/drm_bridge.c | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c
-index 62d8a291c49c..70b05582e616 100644
---- a/drivers/gpu/drm/drm_bridge.c
-+++ b/drivers/gpu/drm/drm_bridge.c
-@@ -353,13 +353,8 @@ int drm_bridge_attach(struct drm_encoder *encoder, struct drm_bridge *bridge,
-       bridge->encoder = NULL;
-       list_del(&bridge->chain_node);
- 
--#ifdef CONFIG_OF
-       DRM_ERROR("failed to attach bridge %pOF to encoder %s: %d\n",
-                 bridge->of_node, encoder->name, ret);
--#else
--      DRM_ERROR("failed to attach bridge to encoder %s: %d\n",
--                encoder->name, ret);
--#endif
- 
-       return ret;
- }
--- 
-2.43.0
-

diff --git a/queue-6.6/series b/queue-6.6/series
index 81df24ba6a5a9a378d54f47635d171fda00a1534..597d4e7f7cfbc3b15feab751c0932c5a159b8082 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -62,7 +62,6 @@ drm-amd-display-ensure-index-calculation-will-not-ov.patch
 drm-amd-display-skip-inactive-planes-within-modesupp.patch
 drm-amd-display-fix-index-may-exceed-array-range-wit.patch
 drm-amd-amdgpu-check-tbo-resource-pointer.patch
-drm-drm-bridge-drop-conditionals-around-of_node-poin.patch
 drm-amd-pm-fix-uninitialized-variable-warnings-for-v.patch-16851
 drm-amdgpu-pm-fix-uninitialized-variable-warning-for.patch
 drm-amdgpu-pm-fix-uninitialized-variable-agc_btc_res.patch