drm/nouveau/kms/nv50: use INTERPOLATE_257_UNITY_RANGE LUT on newer chipsets
authorBen Skeggs <bskeggs@redhat.com>
Fri, 12 Jan 2018 09:02:05 +0000 (19:02 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Fri, 2 Feb 2018 05:24:07 +0000 (15:24 +1000)
For some reason forgotten by history, we've been using a 1025-entry LUT
mode, and sparsely filling it with the 256-entry LUT we're handed.

Until we land support for the full atomic colour management properties,
this commit switches to using the 257-entry mode to fix colour mapping
with depth 30 framebuffers.

Reported-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nv50_display.c

index f4daf8c55de11e09f7026f26346ca6fbe8185e98..973a4126213902c1924f225f3854e05bc65fc546 100644 (file)
@@ -1818,7 +1818,7 @@ nv50_head_lut_set(struct nv50_head *head, struct nv50_head_atom *asyh)
                        evo_data(push, asyh->lut.handle);
                } else {
                        evo_mthd(push, 0x0440 + (head->base.index * 0x300), 4);
-                       evo_data(push, 0x83000000);
+                       evo_data(push, 0x87000000);
                        evo_data(push, asyh->lut.offset >> 8);
                        evo_data(push, 0x00000000);
                        evo_data(push, 0x00000000);
@@ -2225,9 +2225,9 @@ nv50_head_lut_load(struct drm_crtc *crtc)
                        writew((*b++ >> 2) + 0x0000, lut + (i * 0x08) + 4);
                } else {
                        /* 0x6000 interferes with the 14-bit color??? */
-                       writew((*r++ >> 2) + 0x6000, lut + (i * 0x20) + 0);
-                       writew((*g++ >> 2) + 0x6000, lut + (i * 0x20) + 2);
-                       writew((*b++ >> 2) + 0x6000, lut + (i * 0x20) + 4);
+                       writew((*r++ >> 2) + 0x6000, lut + (i * 0x08) + 0);
+                       writew((*g++ >> 2) + 0x6000, lut + (i * 0x08) + 2);
+                       writew((*b++ >> 2) + 0x6000, lut + (i * 0x08) + 4);
                }
        }
 }