drop 2 5.15 drm patches that did not apply:

 queue-5.15/drm-msm-dp-fix-double-free-on-error-in-msm_dp_bridge.patch
 queue-5.15/drm-msm-properly-add-and-remove-internal-bridges.patch
were removed

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/queue-5.15/drm-msm-dp-fix-double-free-on-error-in-msm_dp_bridge.patch b/queue-5.15/drm-msm-dp-fix-double-free-on-error-in-msm_dp_bridge.patch
deleted file mode 100644 (file)
index 13c2175..0000000
--- a/queue-5.15/drm-msm-dp-fix-double-free-on-error-in-msm_dp_bridge.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 02b01b0eb6742bbee218228fbb73181219902938 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 15 Dec 2021 14:49:01 +0300
-Subject: drm/msm/dp: Fix double free on error in msm_dp_bridge_init()
-
-From: Dan Carpenter <dan.carpenter@oracle.com>
-
-[ Upstream commit 48d0cf4a7cf2d5447f997e232c6378bb02434655 ]
-
-The "dp_bridge" pointer is allocated with devm_kzalloc() so it will be
-freed automatically.  Kfreeing it here will only lead to a double free.
-
-Fixes: 8a3b4c17f863 ("drm/msm/dp: employ bridge mechanism for display enable and disable")
-Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
-Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Link: https://lore.kernel.org/r/20211215114900.GD14552@kili
-Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Signed-off-by: Rob Clark <robdclark@chromium.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/msm/dp/dp_drm.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_drm.c
-index 6ab19a7ea57e..d0ca4d0d5689 100644
---- a/drivers/gpu/drm/msm/dp/dp_drm.c
-+++ b/drivers/gpu/drm/msm/dp/dp_drm.c
-@@ -232,7 +232,6 @@ struct drm_bridge *msm_dp_bridge_init(struct msm_dp *dp_display, struct drm_devi
-       rc = drm_bridge_attach(encoder, bridge, NULL, DRM_BRIDGE_ATTACH_NO_CONNECTOR);
-       if (rc) {
-               DRM_ERROR("failed to attach bridge, rc=%d\n", rc);
--              kfree(dp_bridge);
-               return ERR_PTR(rc);
-       }
- 
--- 
-2.35.1
-

diff --git a/queue-5.15/drm-msm-properly-add-and-remove-internal-bridges.patch b/queue-5.15/drm-msm-properly-add-and-remove-internal-bridges.patch
deleted file mode 100644 (file)
index 20ca588..0000000
--- a/queue-5.15/drm-msm-properly-add-and-remove-internal-bridges.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-From 79c275aa4cfcd00b68b97e68774b4b731bd493e9 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 12 Apr 2022 02:49:53 +0300
-Subject: drm/msm: properly add and remove internal bridges
-
-From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-
-[ Upstream commit d28ea556267c4f2ec7264ab49f1b1296834321ec ]
-
-Add calls to drm_bridge_add()/drm_bridge_remove() DRM bridges created by
-the driver. This fixes the following warning.
-
-WARNING: CPU: 0 PID: 1 at kernel/locking/mutex.c:579 __mutex_lock+0x840/0x9f4
-DEBUG_LOCKS_WARN_ON(lock->magic != lock)
-Modules linked in:
-CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.18.0-rc1-00002-g3054695a0d27-dirty #55
-Hardware name: Generic DT based system
- unwind_backtrace from show_stack+0x10/0x14
- show_stack from dump_stack_lvl+0x58/0x70
- dump_stack_lvl from __warn+0xc8/0x1e8
- __warn from warn_slowpath_fmt+0x78/0xa8
- warn_slowpath_fmt from __mutex_lock+0x840/0x9f4
- __mutex_lock from mutex_lock_nested+0x1c/0x24
- mutex_lock_nested from drm_bridge_hpd_enable+0x2c/0x84
- drm_bridge_hpd_enable from msm_hdmi_modeset_init+0xc0/0x21c
- msm_hdmi_modeset_init from mdp4_kms_init+0x53c/0x90c
- mdp4_kms_init from msm_drm_bind+0x514/0x698
- msm_drm_bind from try_to_bring_up_aggregate_device+0x160/0x1bc
- try_to_bring_up_aggregate_device from component_master_add_with_match+0xc4/0xf8
- component_master_add_with_match from msm_pdev_probe+0x274/0x350
- msm_pdev_probe from platform_probe+0x5c/0xbc
- platform_probe from really_probe.part.0+0x9c/0x290
- really_probe.part.0 from __driver_probe_device+0xa8/0x13c
- __driver_probe_device from driver_probe_device+0x34/0x10c
- driver_probe_device from __driver_attach+0xbc/0x178
- __driver_attach from bus_for_each_dev+0x74/0xc0
- bus_for_each_dev from bus_add_driver+0x160/0x1e4
- bus_add_driver from driver_register+0x88/0x118
- driver_register from do_one_initcall+0x6c/0x334
- do_one_initcall from kernel_init_freeable+0x1bc/0x220
- kernel_init_freeable from kernel_init+0x18/0x12c
- kernel_init from ret_from_fork+0x14/0x2c
-
-Fixes: 3d3f8b1f8b62 ("drm/bridge: make bridge registration independent of drm flow")
-Reported-by: kernel test robot <lkp@intel.com>
-Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Reviewed-by: Stephen Boyd <swboyd@chromium.org>
-Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
-Patchwork: https://patchwork.freedesktop.org/patch/481778/
-Link: https://lore.kernel.org/r/20220411234953.2425280-1-dmitry.baryshkov@linaro.org
-Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/msm/dp/dp_drm.c        | 4 ++++
- drivers/gpu/drm/msm/dsi/dsi_manager.c  | 3 +++
- drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 3 +++
- drivers/gpu/drm/msm/msm_drv.c          | 3 +++
- 4 files changed, 13 insertions(+)
-
-diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_drm.c
-index d0ca4d0d5689..52128edb8aeb 100644
---- a/drivers/gpu/drm/msm/dp/dp_drm.c
-+++ b/drivers/gpu/drm/msm/dp/dp_drm.c
-@@ -229,9 +229,13 @@ struct drm_bridge *msm_dp_bridge_init(struct msm_dp *dp_display, struct drm_devi
-       bridge->funcs = &dp_bridge_ops;
-       bridge->encoder = encoder;
- 
-+      drm_bridge_add(bridge);
-+
-       rc = drm_bridge_attach(encoder, bridge, NULL, DRM_BRIDGE_ATTACH_NO_CONNECTOR);
-       if (rc) {
-               DRM_ERROR("failed to attach bridge, rc=%d\n", rc);
-+              drm_bridge_remove(bridge);
-+
-               return ERR_PTR(rc);
-       }
- 
-diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c
-index 6e43672f5807..fb3375cfdc84 100644
---- a/drivers/gpu/drm/msm/dsi/dsi_manager.c
-+++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c
-@@ -670,6 +670,8 @@ struct drm_bridge *msm_dsi_manager_bridge_init(u8 id)
-       bridge = &dsi_bridge->base;
-       bridge->funcs = &dsi_mgr_bridge_funcs;
- 
-+      drm_bridge_add(bridge);
-+
-       ret = drm_bridge_attach(encoder, bridge, NULL, 0);
-       if (ret)
-               goto fail;
-@@ -718,6 +720,7 @@ struct drm_connector *msm_dsi_manager_ext_bridge_init(u8 id)
- 
- void msm_dsi_manager_bridge_destroy(struct drm_bridge *bridge)
- {
-+      drm_bridge_remove(bridge);
- }
- 
- int msm_dsi_manager_cmd_xfer(int id, const struct mipi_dsi_msg *msg)
-diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c b/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
-index efcfdd70a02e..0960c5642847 100644
---- a/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
-+++ b/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
-@@ -15,6 +15,7 @@ void msm_hdmi_bridge_destroy(struct drm_bridge *bridge)
-       struct hdmi_bridge *hdmi_bridge = to_hdmi_bridge(bridge);
- 
-       msm_hdmi_hpd_disable(hdmi_bridge);
-+      drm_bridge_remove(bridge);
- }
- 
- static void msm_hdmi_power_on(struct drm_bridge *bridge)
-@@ -354,6 +355,8 @@ struct drm_bridge *msm_hdmi_bridge_init(struct hdmi *hdmi)
-               DRM_BRIDGE_OP_DETECT |
-               DRM_BRIDGE_OP_EDID;
- 
-+      drm_bridge_add(bridge);
-+
-       ret = drm_bridge_attach(hdmi->encoder, bridge, NULL, DRM_BRIDGE_ATTACH_NO_CONNECTOR);
-       if (ret)
-               goto fail;
-diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
-index 916361c30d77..422507435498 100644
---- a/drivers/gpu/drm/msm/msm_drv.c
-+++ b/drivers/gpu/drm/msm/msm_drv.c
-@@ -363,6 +363,9 @@ static int msm_drm_uninit(struct device *dev)
- 
-       drm_mode_config_cleanup(ddev);
- 
-+      for (i = 0; i < priv->num_bridges; i++)
-+              drm_bridge_remove(priv->bridges[i]);
-+
-       pm_runtime_get_sync(dev);
-       msm_irq_uninstall(ddev);
-       pm_runtime_put_sync(dev);
--- 
-2.35.1
-

diff --git a/queue-5.15/series b/queue-5.15/series
index abfaee94095b9ffdb8f60f7fb84360acd9f10b45..9466092f04910695bc2374225d4c3a93af3b98b9 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -146,8 +146,6 @@ drm-mediatek-remove-the-pointer-of-struct-cmdq_clien.patch
 drm-mediatek-detect-cmdq-execution-timeout.patch
 drm-mediatek-add-cmdq_handle-in-mtk_crtc.patch
 drm-mediatek-add-vblank-register-unregister-callback.patch
-drm-msm-dp-fix-double-free-on-error-in-msm_dp_bridge.patch
-drm-msm-properly-add-and-remove-internal-bridges.patch
 bluetooth-protect-le-accept-and-resolv-lists-with-hd.patch
 bluetooth-btmtksdio-fix-use-after-free-at-btmtksdio_.patch
 io_uring-avoid-io-wq-eagain-looping-for-iopoll.patch