Nouveau - Feb 2020 - [PATCH] drm/nouveau/kms/gv100-: Re-set LUT after clearing for modesets

While certain modeset operations on gv100+ need us to temporarily
disable the LUT, we make the mistake of sometimes neglecting to
reprogram the LUT after such modesets. In particular, moving a head from
one encoder to another seems to trigger this quite often. GV100+ is very
picky about having a LUT in most scenarios, so this causes the display
engine to hang with the following error code:

disp: chid 1 stat 00005080 reason 5 [INVALID_STATE] mthd 0200 data
00000001 code 0000002d)

So, fix this by always re-programming the LUT if we're clearing it in a
state where the wndw is still visible, and has a XLUT handle programmed.

Signed-off-by: Lyude Paul <lyude at redhat.com>
Fixes: facaed62b4cb ("drm/nouveau/kms/gv100: initial support")
Cc: <stable at vger.kernel.org> # v4.18+
---
 drivers/gpu/drm/nouveau/dispnv50/wndw.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndw.c
b/drivers/gpu/drm/nouveau/dispnv50/wndw.c
index 890315291b01..bb737f9281e6 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/wndw.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/wndw.c
@@ -458,6 +458,8 @@ nv50_wndw_atomic_check(struct drm_plane *plane, struct
drm_plane_state *state)
 		asyw->clr.ntfy = armw->ntfy.handle != 0;
 		asyw->clr.sema = armw->sema.handle != 0;
 		asyw->clr.xlut = armw->xlut.handle != 0;
+		if (asyw->clr.xlut && asyw->visible)
+			asyw->set.xlut = asyw->xlut.handle != 0;
 		asyw->clr.csc  = armw->csc.valid;
 		if (wndw->func->image_clr)
 			asyw->clr.image = armw->image.handle[0] != 0;
-- 
2.24.1

Hi,

[This is an automated email]

This commit has been processed because it contains a "Fixes:" tag,
fixing commit: facaed62b4cb ("drm/nouveau/kms/gv100: initial
support").

The bot has tested the following trees: v5.5.3, v5.4.19, v4.19.103.

v5.5.3: Build OK!
v5.4.19: Build OK!
v4.19.103: Failed to apply! Possible dependencies:
    88b703527ba7 ("drm/nouveau/kms/gf119-: add ctm property support")
    cb55cd0c66a1 ("drm/nouveau/kms/nv50-: allow more flexibility with lut
formats")


NOTE: The patch will not be queued to stable trees until it is upstream.

How should we proceed with this patch?

-- 
Thanks,
Sasha

On Thu, 2020-02-13 at 17:37 +0000, Sasha Levin wrote:
> Hi,
> 
> [This is an automated email]
> 
> This commit has been processed because it contains a "Fixes:"
tag,
> fixing commit: facaed62b4cb ("drm/nouveau/kms/gv100: initial
support").
> 
> The bot has tested the following trees: v5.5.3, v5.4.19, v4.19.103.
> 
> v5.5.3: Build OK!
> v5.4.19: Build OK!
> v4.19.103: Failed to apply! Possible dependencies:
>     88b703527ba7 ("drm/nouveau/kms/gf119-: add ctm property
support")
>     cb55cd0c66a1 ("drm/nouveau/kms/nv50-: allow more flexibility with
lut
> formats")
> 
> 
> NOTE: The patch will not be queued to stable trees until it is upstream.
> 
> How should we proceed with this patch?
Apply it to 5.5.3, 5.4.19. We can drop the rest
> 
-- 
Cheers,
	Lyude Paul (she/her)
	Associate Software Engineer at Red Hat