On Wed, Feb 26, 2020 at 11:51:39AM +0100, gregkh@linuxfoundation.org wrote:
The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From f287d3d19769b1d22cba4e51fa0487f2697713c9 Mon Sep 17 00:00:00 2001 From: Lyude Paul lyude@redhat.com Date: Wed, 12 Feb 2020 18:11:49 -0500 Subject: [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@redhat.com Fixes: facaed62b4cb ("drm/nouveau/kms/gv100: initial support") Cc: stable@vger.kernel.org # v4.18+ Signed-off-by: Ben Skeggs bskeggs@redhat.com
We don't have 88b703527ba7 ("drm/nouveau/kms/gf119-: add ctm property support") in 4.19. I've fixed it and queued up.