Skip to content

Commit f287d3d

Browse files
LyudeBen Skeggs
authored andcommitted
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 <[email protected]> Fixes: facaed6 ("drm/nouveau/kms/gv100: initial support") Cc: <[email protected]> # v4.18+ Signed-off-by: Ben Skeggs <[email protected]>
1 parent b99ef12 commit f287d3d

File tree

1 file changed

+2
-0
lines changed
  • drivers/gpu/drm/nouveau/dispnv50

1 file changed

+2
-0
lines changed

drivers/gpu/drm/nouveau/dispnv50/wndw.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,8 @@ nv50_wndw_atomic_check(struct drm_plane *plane, struct drm_plane_state *state)
458458
asyw->clr.ntfy = armw->ntfy.handle != 0;
459459
asyw->clr.sema = armw->sema.handle != 0;
460460
asyw->clr.xlut = armw->xlut.handle != 0;
461+
if (asyw->clr.xlut && asyw->visible)
462+
asyw->set.xlut = asyw->xlut.handle != 0;
461463
asyw->clr.csc = armw->csc.valid;
462464
if (wndw->func->image_clr)
463465
asyw->clr.image = armw->image.handle[0] != 0;

0 commit comments

Comments
 (0)