]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/nouveau/kms/nv50: use "low res" lut for indexed mode
authorIlia Mirkin <imirkin@alum.mit.edu>
Sun, 31 Dec 2017 04:35:28 +0000 (23:35 -0500)
committerBen Skeggs <bskeggs@redhat.com>
Fri, 2 Feb 2018 05:24:06 +0000 (15:24 +1000)
This is what was done prior to the big refactor in kernel 3.8, and what
was done by xf86-video-nv. Experimentally, it seems like there's some
sort of issue with the high-res lut to be used there. Tested on G92.

This ends up mattering because fbcon/fbdev chooses the C8 fb format for
low-vram systems, which can occur with some IGP-based configurations
with little "stolen" vram.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=80675
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nv50_display.c

index 2293b8ff56c676b5936b823c575c44d10a68cf0a..f4daf8c55de11e09f7026f26346ca6fbe8185e98 100644 (file)
@@ -1805,12 +1805,14 @@ nv50_head_lut_set(struct nv50_head *head, struct nv50_head_atom *asyh)
        if ((push = evo_wait(core, 7))) {
                if (core->base.user.oclass < G82_DISP_CORE_CHANNEL_DMA) {
                        evo_mthd(push, 0x0840 + (head->base.index * 0x400), 2);
-                       evo_data(push, 0xc0000000);
+                       evo_data(push, asyh->base.depth == 8 ?
+                                0x80000000 : 0xc0000000);
                        evo_data(push, asyh->lut.offset >> 8);
                } else
                if (core->base.user.oclass < GF110_DISP_CORE_CHANNEL_DMA) {
                        evo_mthd(push, 0x0840 + (head->base.index * 0x400), 2);
-                       evo_data(push, 0xc0000000);
+                       evo_data(push, asyh->base.depth == 8 ?
+                                0x80000000 : 0xc0000000);
                        evo_data(push, asyh->lut.offset >> 8);
                        evo_mthd(push, 0x085c + (head->base.index * 0x400), 1);
                        evo_data(push, asyh->lut.handle);