[PATCH] xf86cmap: Use old palette system for pseudocolour.

Michel Dänzer michel at daenzer.net
Wed Jan 5 06:26:31 PST 2011


From: Michel Dänzer <daenzer at vmware.com>

RandR doesn't seem to deal with pseudocolour at all, so without this the
pseudocolour palette never gets loaded to the hardware.

Signed-off-by: Michel Dänzer <daenzer at vmware.com>
---
Should fix https://bugs.freedesktop.org/show_bug.cgi?id=31375 or at least help
with it.

 hw/xfree86/common/xf86cmap.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c
index 8b27b84..4ede4a9 100644
--- a/hw/xfree86/common/xf86cmap.c
+++ b/hw/xfree86/common/xf86cmap.c
@@ -132,7 +132,7 @@ static void CMapUnwrapScreen(ScreenPtr pScreen);
 Bool xf86ColormapAllocatePrivates(ScrnInfoPtr pScrn)
 {
     /* If we support a better colormap system, then pretend we succeeded. */
-    if (xf86_crtc_supports_gamma(pScrn))
+    if (pScrn->defaultVisual != PseudoColor && xf86_crtc_supports_gamma(pScrn))
 	return TRUE;
     if (!dixRegisterPrivateKey(&CMapScreenKeyRec, PRIVATE_SCREEN, 0))
 	return FALSE;
@@ -158,7 +158,7 @@ Bool xf86HandleColormaps(
     int elements;
 
     /* If we support a better colormap system, then pretend we succeeded. */
-    if (xf86_crtc_supports_gamma(pScrn))
+    if (pScrn->defaultVisual != PseudoColor && xf86_crtc_supports_gamma(pScrn))
 	return TRUE;
 
     if(!maxColors || !sigRGBbits || !loadPalette)
-- 
1.7.2.3



More information about the xorg-devel mailing list