From: Daniel Vetter <daniel.vetter@ffwll.ch> To: DRI Development <dri-devel@lists.freedesktop.org> Cc: "Daniel Vetter" <daniel.vetter@ffwll.ch>, "Michel Dänzer" <michel@daenzer.net>, "Kazlauskas, Nicholas" <nicholas.kazlauskas@amd.com>, "Maxime Ripard" <maxime@cerno.tech>, "Dmitry Osipenko" <dmitry.osipenko@collabora.com>, "Daniel Vetter" <daniel.vetter@intel.com>, mikita.lipski@amd.com, "Intel Graphics Development" <intel-gfx@lists.freedesktop.org> Subject: [PATCH] drm/atomic-helpers: remove legacy_cursor_update hacks Date: Thu, 31 Mar 2022 17:20:21 +0200 [thread overview] Message-ID: <20220331152021.2671937-1-daniel.vetter@ffwll.ch> (raw) The stuff never really worked, and leads to lots of fun because it out-of-order frees atomic states. Which upsets KASAN, among other things. For async updates we now have a more solid solution with the ->atomic_async_check and ->atomic_async_commit hooks. Support for that for msm and vc4 landed. nouveau and i915 have their own commit routines, doing something similar. For everyone else it's probably better to remove the use-after-free bug, and encourage folks to use the async support instead. The affected drivers which register a legacy cursor plane and don't either use the new async stuff or their own commit routine are: amdgpu, atmel, mediatek, qxl, rockchip, sti, sun4i, tegra, virtio, and vmwgfx. Inspired by an amdgpu bug report. v2: Drop RFC, I think with amdgpu converted over to use atomic_async_check/commit done in commit 674e78acae0dfb4beb56132e41cbae5b60f7d662 Author: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> Date: Wed Dec 5 14:59:07 2018 -0500 drm/amd/display: Add fast path for cursor plane updates we don't have any driver anymore where we have userspace expecting solid legacy cursor support _and_ they are using the atomic helpers in their fully glory. So we can retire this. v3: Paper over msm and i915 regression. The complete_all is the only thing missing afaict. v4: Fixup i915 fixup ... References: https://bugzilla.kernel.org/show_bug.cgi?id=199425 References: https://lore.kernel.org/all/20220221134155.125447-9-maxime@cerno.tech/ References: https://bugzilla.kernel.org/show_bug.cgi?id=199425 Cc: Maxime Ripard <maxime@cerno.tech> Tested-by: Maxime Ripard <maxime@cerno.tech> Cc: mikita.lipski@amd.com Cc: Michel Dänzer <michel@daenzer.net> Cc: harry.wentland@amd.com Cc: Rob Clark <robdclark@gmail.com> Cc: "Kazlauskas, Nicholas" <nicholas.kazlauskas@amd.com> Cc: Dmitry Osipenko <dmitry.osipenko@collabora.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- drivers/gpu/drm/drm_atomic_helper.c | 13 ------------- drivers/gpu/drm/i915/display/intel_display.c | 14 ++++++++++++++ drivers/gpu/drm/msm/msm_atomic.c | 2 ++ 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 9603193d2fa1..a2899af82b4a 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -1498,13 +1498,6 @@ drm_atomic_helper_wait_for_vblanks(struct drm_device *dev, int i, ret; unsigned int crtc_mask = 0; - /* - * Legacy cursor ioctls are completely unsynced, and userspace - * relies on that (by doing tons of cursor updates). - */ - if (old_state->legacy_cursor_update) - return; - for_each_oldnew_crtc_in_state(old_state, crtc, old_crtc_state, new_crtc_state, i) { if (!new_crtc_state->active) continue; @@ -2135,12 +2128,6 @@ int drm_atomic_helper_setup_commit(struct drm_atomic_state *state, continue; } - /* Legacy cursor updates are fully unsynced. */ - if (state->legacy_cursor_update) { - complete_all(&commit->flip_done); - continue; - } - if (!new_crtc_state->event) { commit->event = kzalloc(sizeof(*commit->event), GFP_KERNEL); diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index d2abe0e430bf..6ca5a6e7703b 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -8799,6 +8799,20 @@ static int intel_atomic_commit(struct drm_device *dev, intel_runtime_pm_put(&dev_priv->runtime_pm, state->wakeref); return ret; } + + /* + * FIXME: Cut over to (async) commit helpers instead of hand-rolling + * everything. + */ + if (state->base.legacy_cursor_update) { + struct intel_crtc_state *new_crtc_state; + struct intel_crtc *crtc; + int i; + + for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) + complete_all(&new_crtc_state->uapi.commit->flip_done); + } + intel_shared_dpll_swap_state(state); intel_atomic_track_fbs(state); diff --git a/drivers/gpu/drm/msm/msm_atomic.c b/drivers/gpu/drm/msm/msm_atomic.c index 1686fbb611fd..b3cfabebe5d6 100644 --- a/drivers/gpu/drm/msm/msm_atomic.c +++ b/drivers/gpu/drm/msm/msm_atomic.c @@ -222,6 +222,8 @@ void msm_atomic_commit_tail(struct drm_atomic_state *state) /* async updates are limited to single-crtc updates: */ WARN_ON(crtc_mask != drm_crtc_mask(async_crtc)); + complete_all(&async_crtc->state->commit->flip_done); + /* * Start timer if we don't already have an update pending * on this crtc: -- 2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Vetter <daniel.vetter@ffwll.ch> To: DRI Development <dri-devel@lists.freedesktop.org> Cc: "Daniel Vetter" <daniel.vetter@ffwll.ch>, "Michel Dänzer" <michel@daenzer.net>, "Kazlauskas, Nicholas" <nicholas.kazlauskas@amd.com>, "Maxime Ripard" <maxime@cerno.tech>, "Dmitry Osipenko" <dmitry.osipenko@collabora.com>, "Daniel Vetter" <daniel.vetter@intel.com>, mikita.lipski@amd.com, harry.wentland@amd.com, "Intel Graphics Development" <intel-gfx@lists.freedesktop.org> Subject: [Intel-gfx] [PATCH] drm/atomic-helpers: remove legacy_cursor_update hacks Date: Thu, 31 Mar 2022 17:20:21 +0200 [thread overview] Message-ID: <20220331152021.2671937-1-daniel.vetter@ffwll.ch> (raw) The stuff never really worked, and leads to lots of fun because it out-of-order frees atomic states. Which upsets KASAN, among other things. For async updates we now have a more solid solution with the ->atomic_async_check and ->atomic_async_commit hooks. Support for that for msm and vc4 landed. nouveau and i915 have their own commit routines, doing something similar. For everyone else it's probably better to remove the use-after-free bug, and encourage folks to use the async support instead. The affected drivers which register a legacy cursor plane and don't either use the new async stuff or their own commit routine are: amdgpu, atmel, mediatek, qxl, rockchip, sti, sun4i, tegra, virtio, and vmwgfx. Inspired by an amdgpu bug report. v2: Drop RFC, I think with amdgpu converted over to use atomic_async_check/commit done in commit 674e78acae0dfb4beb56132e41cbae5b60f7d662 Author: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> Date: Wed Dec 5 14:59:07 2018 -0500 drm/amd/display: Add fast path for cursor plane updates we don't have any driver anymore where we have userspace expecting solid legacy cursor support _and_ they are using the atomic helpers in their fully glory. So we can retire this. v3: Paper over msm and i915 regression. The complete_all is the only thing missing afaict. v4: Fixup i915 fixup ... References: https://bugzilla.kernel.org/show_bug.cgi?id=199425 References: https://lore.kernel.org/all/20220221134155.125447-9-maxime@cerno.tech/ References: https://bugzilla.kernel.org/show_bug.cgi?id=199425 Cc: Maxime Ripard <maxime@cerno.tech> Tested-by: Maxime Ripard <maxime@cerno.tech> Cc: mikita.lipski@amd.com Cc: Michel Dänzer <michel@daenzer.net> Cc: harry.wentland@amd.com Cc: Rob Clark <robdclark@gmail.com> Cc: "Kazlauskas, Nicholas" <nicholas.kazlauskas@amd.com> Cc: Dmitry Osipenko <dmitry.osipenko@collabora.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- drivers/gpu/drm/drm_atomic_helper.c | 13 ------------- drivers/gpu/drm/i915/display/intel_display.c | 14 ++++++++++++++ drivers/gpu/drm/msm/msm_atomic.c | 2 ++ 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 9603193d2fa1..a2899af82b4a 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -1498,13 +1498,6 @@ drm_atomic_helper_wait_for_vblanks(struct drm_device *dev, int i, ret; unsigned int crtc_mask = 0; - /* - * Legacy cursor ioctls are completely unsynced, and userspace - * relies on that (by doing tons of cursor updates). - */ - if (old_state->legacy_cursor_update) - return; - for_each_oldnew_crtc_in_state(old_state, crtc, old_crtc_state, new_crtc_state, i) { if (!new_crtc_state->active) continue; @@ -2135,12 +2128,6 @@ int drm_atomic_helper_setup_commit(struct drm_atomic_state *state, continue; } - /* Legacy cursor updates are fully unsynced. */ - if (state->legacy_cursor_update) { - complete_all(&commit->flip_done); - continue; - } - if (!new_crtc_state->event) { commit->event = kzalloc(sizeof(*commit->event), GFP_KERNEL); diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index d2abe0e430bf..6ca5a6e7703b 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -8799,6 +8799,20 @@ static int intel_atomic_commit(struct drm_device *dev, intel_runtime_pm_put(&dev_priv->runtime_pm, state->wakeref); return ret; } + + /* + * FIXME: Cut over to (async) commit helpers instead of hand-rolling + * everything. + */ + if (state->base.legacy_cursor_update) { + struct intel_crtc_state *new_crtc_state; + struct intel_crtc *crtc; + int i; + + for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) + complete_all(&new_crtc_state->uapi.commit->flip_done); + } + intel_shared_dpll_swap_state(state); intel_atomic_track_fbs(state); diff --git a/drivers/gpu/drm/msm/msm_atomic.c b/drivers/gpu/drm/msm/msm_atomic.c index 1686fbb611fd..b3cfabebe5d6 100644 --- a/drivers/gpu/drm/msm/msm_atomic.c +++ b/drivers/gpu/drm/msm/msm_atomic.c @@ -222,6 +222,8 @@ void msm_atomic_commit_tail(struct drm_atomic_state *state) /* async updates are limited to single-crtc updates: */ WARN_ON(crtc_mask != drm_crtc_mask(async_crtc)); + complete_all(&async_crtc->state->commit->flip_done); + /* * Start timer if we don't already have an update pending * on this crtc: -- 2.34.1
next reply other threads:[~2022-03-31 15:20 UTC|newest] Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-03-31 15:20 Daniel Vetter [this message] 2022-03-31 15:20 ` [Intel-gfx] [PATCH] drm/atomic-helpers: remove legacy_cursor_update hacks Daniel Vetter 2022-03-31 19:35 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork 2022-03-31 20:10 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork 2022-04-01 8:39 ` [PATCH] " Maxime Ripard 2022-04-01 8:39 ` [Intel-gfx] " Maxime Ripard 2022-04-06 21:57 ` Rob Clark 2022-04-06 21:57 ` [Intel-gfx] " Rob Clark 2022-04-07 1:27 ` Jessica Zhang 2022-04-07 1:27 ` [Intel-gfx] " Jessica Zhang 2022-04-07 9:33 ` Daniel Vetter 2022-04-07 9:33 ` [Intel-gfx] " Daniel Vetter 2022-04-07 22:51 ` Rob Clark 2022-04-07 22:51 ` [Intel-gfx] " Rob Clark 2022-04-07 22:59 ` Abhinav Kumar 2022-04-07 22:59 ` [Intel-gfx] " Abhinav Kumar 2022-04-07 23:12 ` Rob Clark 2022-04-07 23:12 ` [Intel-gfx] " Rob Clark 2022-04-09 4:04 ` Abhinav Kumar 2022-04-09 4:04 ` [Intel-gfx] " Abhinav Kumar 2022-04-12 23:36 ` Abhinav Kumar 2022-04-12 23:36 ` [Intel-gfx] " Abhinav Kumar 2022-04-13 11:20 ` Daniel Vetter 2022-04-13 11:20 ` [Intel-gfx] " Daniel Vetter 2022-04-28 8:08 ` Maxime Ripard 2022-04-28 8:08 ` Maxime Ripard 2022-04-28 12:09 ` Daniel Vetter 2022-04-28 12:09 ` [Intel-gfx] " Daniel Vetter 2022-05-12 8:08 ` Maxime Ripard 2022-05-12 8:08 ` [Intel-gfx] " Maxime Ripard 2022-09-26 15:06 ` Melissa Wen 2022-09-26 15:06 ` [Intel-gfx] " Melissa Wen 2022-04-07 7:49 ` Thomas Zimmermann 2022-04-07 7:49 ` Thomas Zimmermann 2022-04-07 9:30 ` Daniel Vetter 2022-04-07 9:30 ` [Intel-gfx] " Daniel Vetter 2022-04-07 12:32 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/atomic-helpers: remove legacy_cursor_update hacks (rev2) Patchwork 2022-04-07 13:04 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2022-04-07 18:35 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork -- strict thread matches above, loose matches on Subject: below -- 2023-02-16 11:12 [PATCH] drm/atomic-helpers: remove legacy_cursor_update hacks Daniel Vetter 2023-02-16 11:12 ` Daniel Vetter 2023-02-16 11:12 ` Daniel Vetter 2023-02-22 23:14 ` Rob Clark 2023-02-22 23:14 ` Rob Clark 2023-02-22 23:14 ` Rob Clark 2023-02-22 23:21 ` Rob Clark 2023-02-22 23:21 ` Rob Clark 2023-02-22 23:21 ` Rob Clark 2023-03-07 14:56 ` Maxime Ripard 2023-03-07 14:56 ` Maxime Ripard 2023-03-07 14:56 ` Maxime Ripard 2024-01-23 6:09 ` Jason-JH Lin (林睿祥) 2024-01-23 6:09 ` Jason-JH Lin (林睿祥) 2024-01-23 6:09 ` Jason-JH Lin (林睿祥) 2024-01-23 6:09 ` Jason-JH Lin (林睿祥) 2024-01-23 6:09 ` Jason-JH Lin (林睿祥) 2024-01-25 18:17 ` Daniel Vetter 2024-01-25 18:17 ` Daniel Vetter 2024-01-25 18:17 ` Daniel Vetter 2024-01-25 18:17 ` Daniel Vetter 2024-01-25 18:17 ` Daniel Vetter 2024-01-31 5:17 ` Jason-JH Lin (林睿祥) 2024-01-31 5:17 ` Jason-JH Lin (林睿祥) 2024-01-31 5:17 ` Jason-JH Lin (林睿祥) 2024-01-31 5:17 ` Jason-JH Lin (林睿祥) 2024-01-31 5:17 ` Jason-JH Lin (林睿祥) 2024-01-31 9:11 ` Daniel Vetter 2024-01-31 9:11 ` Daniel Vetter 2024-01-31 9:11 ` Daniel Vetter 2024-01-31 9:11 ` Daniel Vetter 2024-01-31 9:11 ` Daniel Vetter 2024-01-31 10:26 ` Dmitry Baryshkov 2024-01-31 10:26 ` Dmitry Baryshkov 2024-01-31 10:26 ` Dmitry Baryshkov 2024-01-31 11:28 ` Daniel Vetter 2024-01-31 11:28 ` Daniel Vetter 2024-01-31 11:28 ` Daniel Vetter 2024-01-31 11:28 ` Daniel Vetter 2024-01-31 11:28 ` Daniel Vetter 2020-10-21 16:32 [PATCH 1/3] " Daniel Vetter 2020-10-23 12:26 ` [PATCH] " Daniel Vetter
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220331152021.2671937-1-daniel.vetter@ffwll.ch \ --to=daniel.vetter@ffwll.ch \ --cc=daniel.vetter@intel.com \ --cc=dmitry.osipenko@collabora.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=maxime@cerno.tech \ --cc=michel@daenzer.net \ --cc=mikita.lipski@amd.com \ --cc=nicholas.kazlauskas@amd.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.