Commit 33ee0c3b authored by Mario Kleiner's avatar Mario Kleiner Committed by Chris Wilson

sna/uxa: Fix colormap handling at screen depth 30. (v2)

The various clut handling functions like a setup
consistent with the x-screen color depth. Otherwise
we observe improper sampling in the gamma tables
at depth 30.

Therefore replace hard-coded bitsPerRGB = 8 by actual
bits per channel scrn->rgbBits. Also use this for call
to xf86HandleColormaps().

Tested for uxa and sna at depths 8, 16, 24 and 30 on
IvyBridge, and tested at depth 24 and 30 that xgamma
and gamma table animations work, and with measurement
equipment to make sure identity gamma ramps actually
are identity mappings at the output.

v2: Also deal with X-Server 1.19 and earlier, which as of
    v1.19.6 lack a fix to color palette handling and can
    not deal with depths/bpc > 24/8 bpc. On < 1.20 we skip
    xf86HandleColormaps() setup at > 8 bpc. This disables
    color palette handling on such servers at > 8 bpc, but
    still keeps RandR gamma table handling intact.

    Tested on 1.19.6 and 1.20.0 to do the right thing.
Signed-off-by: 's avatarMario Kleiner <mario.kleiner.de@gmail.com>
Reviewed-by: Ville Syrjälä's avatarVille Syrjälä <ville.syrjala@linux.intel.com>
parent c37c7ee0
......@@ -1155,7 +1155,7 @@ sna_screen_init(SCREEN_INIT_ARGS_DECL)
if (!miInitVisuals(&visuals, &depths, &nvisuals, &ndepths, &rootdepth,
&defaultVisual,
((unsigned long)1 << (scrn->bitsPerPixel - 1)),
8, -1))
scrn->rgbBits, -1))
return FALSE;
if (!miScreenInit(screen, NULL,
......@@ -1226,8 +1226,11 @@ sna_screen_init(SCREEN_INIT_ARGS_DECL)
if (!miCreateDefColormap(screen))
return FALSE;
if (sna->mode.num_real_crtc &&
!xf86HandleColormaps(screen, 256, 8, sna_load_palette, NULL,
/* X-Server < 1.20 mishandles > 256 slots / > 8 bpc color maps. */
if (sna->mode.num_real_crtc && (scrn->rgbBits <= 8 ||
XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,20,0,0,0)) &&
!xf86HandleColormaps(screen, 1 << scrn->rgbBits, scrn->rgbBits,
sna_load_palette, NULL,
CMAP_RELOAD_ON_MODE_SWITCH |
CMAP_PALETTED_TRUECOLOR))
return FALSE;
......
......@@ -991,7 +991,11 @@ I830ScreenInit(SCREEN_INIT_ARGS_DECL)
if (!miCreateDefColormap(screen))
return FALSE;
if (!xf86HandleColormaps(screen, 256, 8, I830LoadPalette, NULL,
/* X-Server < 1.20 mishandles > 256 slots / > 8 bpc color maps. */
if ((scrn->rgbBits <= 8 ||
XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,20,0,0,0)) &&
!xf86HandleColormaps(screen, 1 << scrn->rgbBits, scrn->rgbBits,
I830LoadPalette, NULL,
CMAP_RELOAD_ON_MODE_SWITCH |
CMAP_PALETTED_TRUECOLOR)) {
return FALSE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment