Revert "drm/amd/display: Enable fast plane updates when state->allow_modeset = true"

Submitted by Kazlauskas, Nicholas on June 20, 2019, 12:34 p.m.

Details

Message ID 20190620123403.10252-1-nicholas.kazlauskas@amd.com
State Accepted
Commit 70a1efac712caf5c47fad1eed06353303860fe2d
Headers show
Series "Revert "drm/amd/display: Enable fast plane updates when state->allow_modeset = true"" ( rev: 1 ) in AMD X.Org drivers

Not browsing as part of any series.

Commit Message

Kazlauskas, Nicholas June 20, 2019, 12:34 p.m.
This reverts commit ebc8c6f18322ad54275997a888ca1731d74b711f.

There are still missing corner cases with cursor interaction and these
fast plane updates on Picasso and Raven2 leading to endless PSTATE
warnings for typical desktop usage depending on the userspace.

This change should be reverted until these issues have been resolved.

Cc: David Francis <david.francis@amd.com>
Cc: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 ++++++++
 1 file changed, 8 insertions(+)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 33dcd4187157..d6acbcfa570c 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -6471,6 +6471,14 @@  static bool should_reset_plane(struct drm_atomic_state *state,
 	struct drm_crtc_state *new_crtc_state;
 	int i;
 
+	/*
+	 * TODO: Remove this hack once the checks below are sufficient
+	 * enough to determine when we need to reset all the planes on
+	 * the stream.
+	 */
+	if (state->allow_modeset)
+		return true;
+
 	/* Exit early if we know that we're adding or removing the plane. */
 	if (old_plane_state->crtc != new_plane_state->crtc)
 		return true;

Comments

Just FYI my system was Raven1 not Raven2

On Thu, 20 Jun 2019 at 13:34, Nicholas Kazlauskas
<nicholas.kazlauskas@amd.com> wrote:
>
> This reverts commit ebc8c6f18322ad54275997a888ca1731d74b711f.
>
> There are still missing corner cases with cursor interaction and these
> fast plane updates on Picasso and Raven2 leading to endless PSTATE
> warnings for typical desktop usage depending on the userspace.
>
> This change should be reverted until these issues have been resolved.
>
> Cc: David Francis <david.francis@amd.com>
> Cc: Harry Wentland <harry.wentland@amd.com>
> Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
> ---
>  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index 33dcd4187157..d6acbcfa570c 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -6471,6 +6471,14 @@ static bool should_reset_plane(struct drm_atomic_state *state,
>         struct drm_crtc_state *new_crtc_state;
>         int i;
>
> +       /*
> +        * TODO: Remove this hack once the checks below are sufficient
> +        * enough to determine when we need to reset all the planes on
> +        * the stream.
> +        */
> +       if (state->allow_modeset)
> +               return true;
> +
>         /* Exit early if we know that we're adding or removing the plane. */
>         if (old_plane_state->crtc != new_plane_state->crtc)
>                 return true;
> --
> 2.17.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx