drop drm-msm-mdp5-fix-cursor-related-warnings.patch from 4.19 and 5.4

diff --git a/queue-4.19/drm-msm-mdp5-fix-cursor-related-warnings.patch b/queue-4.19/drm-msm-mdp5-fix-cursor-related-warnings.patch
deleted file mode 100644 (file)
index d96b4c3..0000000
--- a/queue-4.19/drm-msm-mdp5-fix-cursor-related-warnings.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From c491a0c7bbf3a64732cb8414021429d15ec08eec Mon Sep 17 00:00:00 2001
-From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Date: Sat, 25 Sep 2021 22:28:24 +0300
-Subject: drm/msm/mdp5: fix cursor-related warnings
-
-From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-
-commit c491a0c7bbf3a64732cb8414021429d15ec08eec upstream.
-
-Since f35a2a99100f ("drm/encoder: make encoder control functions
-optional") drm_mode_config_validate would print warnings if both cursor
-plane and cursor functions are provided. Restore separate set of
-drm_crtc_funcs to be used if separate cursor plane is provided.
-
-[    6.556046] ------------[ cut here ]------------
-[    6.556071] [CRTC:93:crtc-0] must not have both a cursor plane and a cursor_set func
-[    6.556091] WARNING: CPU: 1 PID: 76 at drivers/gpu/drm/drm_mode_config.c:648 drm_mode_config_validate+0x238/0x4d0
-[    6.567453] Modules linked in:
-[    6.577604] CPU: 1 PID: 76 Comm: kworker/u8:2 Not tainted 5.15.0-rc1-dirty #43
-[    6.580557] Hardware name: Qualcomm Technologies, Inc. DB820c (DT)
-[    6.587763] Workqueue: events_unbound deferred_probe_work_func
-[    6.593926] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--)
-[    6.599740] pc : drm_mode_config_validate+0x238/0x4d0
-[    6.606596] lr : drm_mode_config_validate+0x238/0x4d0
-[    6.611804] sp : ffff8000121b3980
-[    6.616838] x29: ffff8000121b3990 x28: 0000000000000000 x27: 0000000000000001
-[    6.620140] x26: ffff8000114cde50 x25: ffff8000114cdd40 x24: ffff0000987282d8
-[    6.627258] x23: 0000000000000000 x22: 0000000000000000 x21: 0000000000000001
-[    6.634376] x20: ffff000098728000 x19: ffff000080a39000 x18: ffffffffffffffff
-[    6.641494] x17: 3136564e3631564e x16: 0000000000000324 x15: ffff800011c78709
-[    6.648613] x14: 0000000000000000 x13: ffff800011a22850 x12: 00000000000009ab
-[    6.655730] x11: 0000000000000339 x10: ffff800011a22850 x9 : ffff800011a22850
-[    6.662848] x8 : 00000000ffffefff x7 : ffff800011a7a850 x6 : ffff800011a7a850
-[    6.669966] x5 : 000000000000bff4 x4 : 40000000fffff339 x3 : 0000000000000000
-[    6.677084] x2 : 0000000000000000 x1 : 0000000000000000 x0 : ffff00008093b800
-[    6.684205] Call trace:
-[    6.691319]  drm_mode_config_validate+0x238/0x4d0
-[    6.693577]  drm_dev_register+0x17c/0x210
-[    6.698435]  msm_drm_bind+0x4b4/0x694
-[    6.702429]  try_to_bring_up_master+0x164/0x1d0
-[    6.706075]  __component_add+0xa0/0x170
-[    6.710415]  component_add+0x14/0x20
-[    6.714234]  msm_hdmi_dev_probe+0x1c/0x2c
-[    6.718053]  platform_probe+0x68/0xe0
-[    6.721959]  really_probe.part.0+0x9c/0x30c
-[    6.725606]  __driver_probe_device+0x98/0x144
-[    6.729600]  driver_probe_device+0xc8/0x15c
-[    6.734114]  __device_attach_driver+0xb4/0x120
-[    6.738106]  bus_for_each_drv+0x78/0xd0
-[    6.742619]  __device_attach+0xdc/0x184
-[    6.746351]  device_initial_probe+0x14/0x20
-[    6.750172]  bus_probe_device+0x9c/0xa4
-[    6.754337]  deferred_probe_work_func+0x88/0xc0
-[    6.758158]  process_one_work+0x1d0/0x370
-[    6.762671]  worker_thread+0x2c8/0x470
-[    6.766839]  kthread+0x15c/0x170
-[    6.770483]  ret_from_fork+0x10/0x20
-[    6.773870] ---[ end trace 5884eb76cd26d274 ]---
-[    6.777500] ------------[ cut here ]------------
-[    6.782043] [CRTC:93:crtc-0] must not have both a cursor plane and a cursor_move func
-[    6.782063] WARNING: CPU: 1 PID: 76 at drivers/gpu/drm/drm_mode_config.c:654 drm_mode_config_validate+0x290/0x4d0
-[    6.794362] Modules linked in:
-[    6.804600] CPU: 1 PID: 76 Comm: kworker/u8:2 Tainted: G        W         5.15.0-rc1-dirty #43
-[    6.807555] Hardware name: Qualcomm Technologies, Inc. DB820c (DT)
-[    6.816148] Workqueue: events_unbound deferred_probe_work_func
-[    6.822311] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--)
-[    6.828126] pc : drm_mode_config_validate+0x290/0x4d0
-[    6.834981] lr : drm_mode_config_validate+0x290/0x4d0
-[    6.840189] sp : ffff8000121b3980
-[    6.845223] x29: ffff8000121b3990 x28: 0000000000000000 x27: 0000000000000001
-[    6.848525] x26: ffff8000114cde50 x25: ffff8000114cdd40 x24: ffff0000987282d8
-[    6.855643] x23: 0000000000000000 x22: 0000000000000000 x21: 0000000000000001
-[    6.862763] x20: ffff000098728000 x19: ffff000080a39000 x18: ffffffffffffffff
-[    6.869879] x17: 3136564e3631564e x16: 0000000000000324 x15: ffff800011c790c2
-[    6.876998] x14: 0000000000000000 x13: ffff800011a22850 x12: 0000000000000a2f
-[    6.884116] x11: 0000000000000365 x10: ffff800011a22850 x9 : ffff800011a22850
-[    6.891234] x8 : 00000000ffffefff x7 : ffff800011a7a850 x6 : ffff800011a7a850
-[    6.898351] x5 : 000000000000bff4 x4 : 40000000fffff365 x3 : 0000000000000000
-[    6.905470] x2 : 0000000000000000 x1 : 0000000000000000 x0 : ffff00008093b800
-[    6.912590] Call trace:
-[    6.919702]  drm_mode_config_validate+0x290/0x4d0
-[    6.921960]  drm_dev_register+0x17c/0x210
-[    6.926821]  msm_drm_bind+0x4b4/0x694
-[    6.930813]  try_to_bring_up_master+0x164/0x1d0
-[    6.934459]  __component_add+0xa0/0x170
-[    6.938799]  component_add+0x14/0x20
-[    6.942619]  msm_hdmi_dev_probe+0x1c/0x2c
-[    6.946438]  platform_probe+0x68/0xe0
-[    6.950345]  really_probe.part.0+0x9c/0x30c
-[    6.953991]  __driver_probe_device+0x98/0x144
-[    6.957984]  driver_probe_device+0xc8/0x15c
-[    6.962498]  __device_attach_driver+0xb4/0x120
-[    6.966492]  bus_for_each_drv+0x78/0xd0
-[    6.971004]  __device_attach+0xdc/0x184
-[    6.974737]  device_initial_probe+0x14/0x20
-[    6.978556]  bus_probe_device+0x9c/0xa4
-[    6.982722]  deferred_probe_work_func+0x88/0xc0
-[    6.986543]  process_one_work+0x1d0/0x370
-[    6.991057]  worker_thread+0x2c8/0x470
-[    6.995223]  kthread+0x15c/0x170
-[    6.998869]  ret_from_fork+0x10/0x20
-[    7.002255] ---[ end trace 5884eb76cd26d275 ]---
-
-Fixes: aa649e875daf ("drm/msm/mdp5: mdp5_crtc: Restore cursor state only if LM cursors are enabled")
-Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Link: https://lore.kernel.org/r/20210925192824.3416259-1-dmitry.baryshkov@linaro.org
-Signed-off-by: Rob Clark <robdclark@chromium.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c |   16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
---- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c
-+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c
-@@ -1053,6 +1053,20 @@ static void mdp5_crtc_destroy_state(stru
-       kfree(mdp5_cstate);
- }
- 
-+static const struct drm_crtc_funcs mdp5_crtc_no_lm_cursor_funcs = {
-+      .set_config = drm_atomic_helper_set_config,
-+      .destroy = mdp5_crtc_destroy,
-+      .page_flip = drm_atomic_helper_page_flip,
-+      .reset = mdp5_crtc_reset,
-+      .atomic_duplicate_state = mdp5_crtc_duplicate_state,
-+      .atomic_destroy_state = mdp5_crtc_destroy_state,
-+      .atomic_print_state = mdp5_crtc_atomic_print_state,
-+      .get_vblank_counter = mdp5_crtc_get_vblank_counter,
-+      .enable_vblank  = msm_crtc_enable_vblank,
-+      .disable_vblank = msm_crtc_disable_vblank,
-+      .get_vblank_timestamp = drm_crtc_vblank_helper_get_vblank_timestamp,
-+};
-+
- static const struct drm_crtc_funcs mdp5_crtc_funcs = {
-       .set_config = drm_atomic_helper_set_config,
-       .destroy = mdp5_crtc_destroy,
-@@ -1236,6 +1250,8 @@ struct drm_crtc *mdp5_crtc_init(struct d
-       mdp5_crtc->lm_cursor_enabled = cursor_plane ? false : true;
- 
-       drm_crtc_init_with_planes(dev, crtc, plane, cursor_plane,
-+                                cursor_plane ?
-+                                &mdp5_crtc_no_lm_cursor_funcs :
-                                 &mdp5_crtc_funcs, NULL);
- 
-       drm_flip_work_init(&mdp5_crtc->unref_cursor_work,

diff --git a/queue-4.19/series b/queue-4.19/series
index 37c4c6acb20575a792cb067bdf3c0eadf566abd5..3576f89f67f331bdee75efc261b9c6ba8254539e 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -41,7 +41,6 @@ nfc-digital-fix-possible-memory-leak-in-digital_in_send_sdd_req.patch
 pata_legacy-fix-a-couple-uninitialized-variable-bugs.patch
 platform-mellanox-mlxreg-io-fix-argument-base-in-kstrtou32-call.patch
 drm-msm-fix-null-pointer-dereference-on-pointer-edp.patch
-drm-msm-mdp5-fix-cursor-related-warnings.patch
 drm-msm-dsi-fix-an-error-code-in-msm_dsi_modeset_init.patch
 drm-msm-dsi-fix-off-by-one-in-dsi_bus_clk_enable-error-handling.patch
 acpi-arm64-fix-next_platform_timer-section-mismatch-error.patch

diff --git a/queue-5.4/drm-msm-mdp5-fix-cursor-related-warnings.patch b/queue-5.4/drm-msm-mdp5-fix-cursor-related-warnings.patch
deleted file mode 100644 (file)
index c9b28bb..0000000
--- a/queue-5.4/drm-msm-mdp5-fix-cursor-related-warnings.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From c491a0c7bbf3a64732cb8414021429d15ec08eec Mon Sep 17 00:00:00 2001
-From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Date: Sat, 25 Sep 2021 22:28:24 +0300
-Subject: drm/msm/mdp5: fix cursor-related warnings
-
-From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-
-commit c491a0c7bbf3a64732cb8414021429d15ec08eec upstream.
-
-Since f35a2a99100f ("drm/encoder: make encoder control functions
-optional") drm_mode_config_validate would print warnings if both cursor
-plane and cursor functions are provided. Restore separate set of
-drm_crtc_funcs to be used if separate cursor plane is provided.
-
-[    6.556046] ------------[ cut here ]------------
-[    6.556071] [CRTC:93:crtc-0] must not have both a cursor plane and a cursor_set func
-[    6.556091] WARNING: CPU: 1 PID: 76 at drivers/gpu/drm/drm_mode_config.c:648 drm_mode_config_validate+0x238/0x4d0
-[    6.567453] Modules linked in:
-[    6.577604] CPU: 1 PID: 76 Comm: kworker/u8:2 Not tainted 5.15.0-rc1-dirty #43
-[    6.580557] Hardware name: Qualcomm Technologies, Inc. DB820c (DT)
-[    6.587763] Workqueue: events_unbound deferred_probe_work_func
-[    6.593926] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--)
-[    6.599740] pc : drm_mode_config_validate+0x238/0x4d0
-[    6.606596] lr : drm_mode_config_validate+0x238/0x4d0
-[    6.611804] sp : ffff8000121b3980
-[    6.616838] x29: ffff8000121b3990 x28: 0000000000000000 x27: 0000000000000001
-[    6.620140] x26: ffff8000114cde50 x25: ffff8000114cdd40 x24: ffff0000987282d8
-[    6.627258] x23: 0000000000000000 x22: 0000000000000000 x21: 0000000000000001
-[    6.634376] x20: ffff000098728000 x19: ffff000080a39000 x18: ffffffffffffffff
-[    6.641494] x17: 3136564e3631564e x16: 0000000000000324 x15: ffff800011c78709
-[    6.648613] x14: 0000000000000000 x13: ffff800011a22850 x12: 00000000000009ab
-[    6.655730] x11: 0000000000000339 x10: ffff800011a22850 x9 : ffff800011a22850
-[    6.662848] x8 : 00000000ffffefff x7 : ffff800011a7a850 x6 : ffff800011a7a850
-[    6.669966] x5 : 000000000000bff4 x4 : 40000000fffff339 x3 : 0000000000000000
-[    6.677084] x2 : 0000000000000000 x1 : 0000000000000000 x0 : ffff00008093b800
-[    6.684205] Call trace:
-[    6.691319]  drm_mode_config_validate+0x238/0x4d0
-[    6.693577]  drm_dev_register+0x17c/0x210
-[    6.698435]  msm_drm_bind+0x4b4/0x694
-[    6.702429]  try_to_bring_up_master+0x164/0x1d0
-[    6.706075]  __component_add+0xa0/0x170
-[    6.710415]  component_add+0x14/0x20
-[    6.714234]  msm_hdmi_dev_probe+0x1c/0x2c
-[    6.718053]  platform_probe+0x68/0xe0
-[    6.721959]  really_probe.part.0+0x9c/0x30c
-[    6.725606]  __driver_probe_device+0x98/0x144
-[    6.729600]  driver_probe_device+0xc8/0x15c
-[    6.734114]  __device_attach_driver+0xb4/0x120
-[    6.738106]  bus_for_each_drv+0x78/0xd0
-[    6.742619]  __device_attach+0xdc/0x184
-[    6.746351]  device_initial_probe+0x14/0x20
-[    6.750172]  bus_probe_device+0x9c/0xa4
-[    6.754337]  deferred_probe_work_func+0x88/0xc0
-[    6.758158]  process_one_work+0x1d0/0x370
-[    6.762671]  worker_thread+0x2c8/0x470
-[    6.766839]  kthread+0x15c/0x170
-[    6.770483]  ret_from_fork+0x10/0x20
-[    6.773870] ---[ end trace 5884eb76cd26d274 ]---
-[    6.777500] ------------[ cut here ]------------
-[    6.782043] [CRTC:93:crtc-0] must not have both a cursor plane and a cursor_move func
-[    6.782063] WARNING: CPU: 1 PID: 76 at drivers/gpu/drm/drm_mode_config.c:654 drm_mode_config_validate+0x290/0x4d0
-[    6.794362] Modules linked in:
-[    6.804600] CPU: 1 PID: 76 Comm: kworker/u8:2 Tainted: G        W         5.15.0-rc1-dirty #43
-[    6.807555] Hardware name: Qualcomm Technologies, Inc. DB820c (DT)
-[    6.816148] Workqueue: events_unbound deferred_probe_work_func
-[    6.822311] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--)
-[    6.828126] pc : drm_mode_config_validate+0x290/0x4d0
-[    6.834981] lr : drm_mode_config_validate+0x290/0x4d0
-[    6.840189] sp : ffff8000121b3980
-[    6.845223] x29: ffff8000121b3990 x28: 0000000000000000 x27: 0000000000000001
-[    6.848525] x26: ffff8000114cde50 x25: ffff8000114cdd40 x24: ffff0000987282d8
-[    6.855643] x23: 0000000000000000 x22: 0000000000000000 x21: 0000000000000001
-[    6.862763] x20: ffff000098728000 x19: ffff000080a39000 x18: ffffffffffffffff
-[    6.869879] x17: 3136564e3631564e x16: 0000000000000324 x15: ffff800011c790c2
-[    6.876998] x14: 0000000000000000 x13: ffff800011a22850 x12: 0000000000000a2f
-[    6.884116] x11: 0000000000000365 x10: ffff800011a22850 x9 : ffff800011a22850
-[    6.891234] x8 : 00000000ffffefff x7 : ffff800011a7a850 x6 : ffff800011a7a850
-[    6.898351] x5 : 000000000000bff4 x4 : 40000000fffff365 x3 : 0000000000000000
-[    6.905470] x2 : 0000000000000000 x1 : 0000000000000000 x0 : ffff00008093b800
-[    6.912590] Call trace:
-[    6.919702]  drm_mode_config_validate+0x290/0x4d0
-[    6.921960]  drm_dev_register+0x17c/0x210
-[    6.926821]  msm_drm_bind+0x4b4/0x694
-[    6.930813]  try_to_bring_up_master+0x164/0x1d0
-[    6.934459]  __component_add+0xa0/0x170
-[    6.938799]  component_add+0x14/0x20
-[    6.942619]  msm_hdmi_dev_probe+0x1c/0x2c
-[    6.946438]  platform_probe+0x68/0xe0
-[    6.950345]  really_probe.part.0+0x9c/0x30c
-[    6.953991]  __driver_probe_device+0x98/0x144
-[    6.957984]  driver_probe_device+0xc8/0x15c
-[    6.962498]  __device_attach_driver+0xb4/0x120
-[    6.966492]  bus_for_each_drv+0x78/0xd0
-[    6.971004]  __device_attach+0xdc/0x184
-[    6.974737]  device_initial_probe+0x14/0x20
-[    6.978556]  bus_probe_device+0x9c/0xa4
-[    6.982722]  deferred_probe_work_func+0x88/0xc0
-[    6.986543]  process_one_work+0x1d0/0x370
-[    6.991057]  worker_thread+0x2c8/0x470
-[    6.995223]  kthread+0x15c/0x170
-[    6.998869]  ret_from_fork+0x10/0x20
-[    7.002255] ---[ end trace 5884eb76cd26d275 ]---
-
-Fixes: aa649e875daf ("drm/msm/mdp5: mdp5_crtc: Restore cursor state only if LM cursors are enabled")
-Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Link: https://lore.kernel.org/r/20210925192824.3416259-1-dmitry.baryshkov@linaro.org
-Signed-off-by: Rob Clark <robdclark@chromium.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c |   16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
---- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c
-+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c
-@@ -1047,6 +1047,20 @@ static void mdp5_crtc_reset(struct drm_c
-       drm_crtc_vblank_reset(crtc);
- }
- 
-+static const struct drm_crtc_funcs mdp5_crtc_no_lm_cursor_funcs = {
-+      .set_config = drm_atomic_helper_set_config,
-+      .destroy = mdp5_crtc_destroy,
-+      .page_flip = drm_atomic_helper_page_flip,
-+      .reset = mdp5_crtc_reset,
-+      .atomic_duplicate_state = mdp5_crtc_duplicate_state,
-+      .atomic_destroy_state = mdp5_crtc_destroy_state,
-+      .atomic_print_state = mdp5_crtc_atomic_print_state,
-+      .get_vblank_counter = mdp5_crtc_get_vblank_counter,
-+      .enable_vblank  = msm_crtc_enable_vblank,
-+      .disable_vblank = msm_crtc_disable_vblank,
-+      .get_vblank_timestamp = drm_crtc_vblank_helper_get_vblank_timestamp,
-+};
-+
- static const struct drm_crtc_funcs mdp5_crtc_funcs = {
-       .set_config = drm_atomic_helper_set_config,
-       .destroy = mdp5_crtc_destroy,
-@@ -1230,6 +1244,8 @@ struct drm_crtc *mdp5_crtc_init(struct d
-       mdp5_crtc->lm_cursor_enabled = cursor_plane ? false : true;
- 
-       drm_crtc_init_with_planes(dev, crtc, plane, cursor_plane,
-+                                cursor_plane ?
-+                                &mdp5_crtc_no_lm_cursor_funcs :
-                                 &mdp5_crtc_funcs, NULL);
- 
-       drm_flip_work_init(&mdp5_crtc->unref_cursor_work,

diff --git a/queue-5.4/series b/queue-5.4/series
index ef4d53690daa8143a60be7696f95d1f277310542..b528505921dfe0f3d949f1f39ea9f71b36319a55 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -59,7 +59,6 @@ mlxsw-thermal-fix-out-of-bounds-memory-accesses.patch
 platform-mellanox-mlxreg-io-fix-argument-base-in-kstrtou32-call.patch
 drm-panel-olimex-lcd-olinuxino-select-crc32.patch
 drm-msm-fix-null-pointer-dereference-on-pointer-edp.patch
-drm-msm-mdp5-fix-cursor-related-warnings.patch
 drm-msm-dsi-fix-an-error-code-in-msm_dsi_modeset_init.patch
 drm-msm-dsi-fix-off-by-one-in-dsi_bus_clk_enable-error-handling.patch
 acpi-arm64-fix-next_platform_timer-section-mismatch-error.patch