xserver: Branch 'master'
Michel Dänzer
daenzer at kemper.freedesktop.org
Wed Aug 10 08:04:52 UTC 2016
hw/xfree86/modes/xf86RandR12.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit a446ff84de2dd29439521f6e87d75bde3bbf002c
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Fri Jul 29 17:38:21 2016 +0900
xfree86/modes: Handle no palette case better in xf86RandR12CrtcSetGamma
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 at 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;
}
More information about the xorg-commit
mailing list