File U_xfree86-handle-no-palette-case-better-in-xf86RandR12CrtcSetGamma.patch of Package xorg-x11-server.24940
Git-commit: a446ff84de2dd29439521f6e87d75bde3bbf002c
Author: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com>
Subject: xfree86/modes: Handle no palette case better in xf86RandR12CrtcSetGamma
References: bnc#1029093 fdo#97154
Signed-off-by: Michal Srb <msrb@suse.com>
Just use the RandR gamma ramp directly.
Fixes random on-monitor colours with drivers which don't call
xf86HandleColormaps, e.g. modesetting.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97154
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
index 1e9cbd3..b136123 100644
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
@@ -1310,9 +1310,17 @@ xf86RandR12CrtcSetGamma(ScreenPtr pScreen, RRCrtcPtr randr_crtc)
if (randrp->palette_size) {
xf86RandR12CrtcComputeGamma(pScreen, randr_crtc);
- xf86RandR12CrtcReloadGamma(randr_crtc);
+ } else {
+ memcpy(crtc->gamma_red, randr_crtc->gammaRed,
+ crtc->gamma_size * sizeof(crtc->gamma_red[0]));
+ memcpy(crtc->gamma_green, randr_crtc->gammaGreen,
+ crtc->gamma_size * sizeof(crtc->gamma_green[0]));
+ memcpy(crtc->gamma_blue, randr_crtc->gammaBlue,
+ crtc->gamma_size * sizeof(crtc->gamma_blue[0]));
}
+ xf86RandR12CrtcReloadGamma(randr_crtc);
+
return TRUE;
}