| From 5a0f9f68f5c1b76637b7ba2d8cc4aca04ebdabf4 Mon Sep 17 00:00:00 2001 |
| From: Ben Skeggs <bskeggs@redhat.com> |
| Date: Wed, 29 May 2019 16:39:53 +1000 |
| Subject: [PATCH] drm/nouveau/kms/nv50-: disable input lut harder |
| |
| commit ebf8ca6b3d6d7310646b092f3d5219abe2858e81 upstream. |
| |
| Under some circumstances, it could be left enabled when it shouldn't be. |
| |
| Signed-off-by: Ben Skeggs <bskeggs@redhat.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndw.c b/drivers/gpu/drm/nouveau/dispnv50/wndw.c |
| index 50303ec194bb..15c8e6c3d1e4 100644 |
| --- a/drivers/gpu/drm/nouveau/dispnv50/wndw.c |
| +++ b/drivers/gpu/drm/nouveau/dispnv50/wndw.c |
| @@ -334,6 +334,8 @@ nv50_wndw_atomic_check_lut(struct nv50_wndw *wndw, |
| asyw->xlut.handle = wndw->wndw.vram.handle; |
| asyw->xlut.i.buffer = !asyw->xlut.i.buffer; |
| asyw->set.xlut = true; |
| + } else { |
| + asyw->clr.xlut = armw->xlut.handle != 0; |
| } |
| |
| /* Handle setting base SET_OUTPUT_LUT_LO_ENABLE_USE_CORE_LUT. */ |
| -- |
| 2.7.4 |
| |
