summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Martin <consume.noise@gmail.com>2017-11-20 10:47:43 +0100
committerAdam Jackson <ajax@redhat.com>2017-11-29 14:50:50 -0500
commit78b2ce1410dda758537d52398223ca9b757883bc (patch)
tree5aeafee60bbdbaa450cfe485cc9a01251d0916a3
parentd563443381142fbc0b102422d7e7389bf3621331 (diff)
modesetting: Remove #if 0 CMAP_LOAD_EVEN_IF_OFFSCREEN
CMAP_LOAD_EVEN_IF_OFFSCREEN has been encapsulated since the import of xf86-video-modesetting into the tree. Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Daniel Martin <consume.noise@gmail.com>
-rw-r--r--hw/xfree86/drivers/modesetting/drmmode_display.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
index 3b8107359..a51722b58 100644
--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
@@ -2206,12 +2206,9 @@ drmmode_setup_colormap(ScreenPtr pScreen, ScrnInfoPtr pScrn)
if (!miCreateDefColormap(pScreen))
return FALSE;
/* all radeons support 10 bit CLUTs */
- if (!xf86HandleColormaps(pScreen, 256, 10,
- drmmode_load_palette, NULL, CMAP_PALETTED_TRUECOLOR
-#if 0 /* This option messes up text mode! (eich@suse.de) */
- | CMAP_LOAD_EVEN_IF_OFFSCREEN
-#endif
- | CMAP_RELOAD_ON_MODE_SWITCH))
+ if (!xf86HandleColormaps(pScreen, 256, 10, drmmode_load_palette, NULL,
+ CMAP_PALETTED_TRUECOLOR |
+ CMAP_RELOAD_ON_MODE_SWITCH))
return FALSE;
return TRUE;
}