xfree86: apply gamma settings on EnterVT.

When entering the VT, re-apply the saved gamma settings for each screen.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit c050aa2f5f)
This commit is contained in:
Adam Jackson 2010-11-15 11:25:12 +10:00 committed by Jeremy Huddleston
parent 2b7588a78f
commit 602ad98684

View file

@ -1776,6 +1776,7 @@ xf86RandR12EnterVT (int screen_index, int flags)
ScreenPtr pScreen = screenInfo.screens[screen_index];
ScrnInfoPtr pScrn = xf86Screens[screen_index];
XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);
rrScrPrivPtr rp = rrGetScrPriv(pScreen);
Bool ret;
if (randrp->orig_EnterVT) {
@ -1787,6 +1788,11 @@ xf86RandR12EnterVT (int screen_index, int flags)
return FALSE;
}
/* reload gamma */
int i;
for (i = 0; i < rp->numCrtcs; i++)
xf86RandR12CrtcSetGamma(pScreen, rp->crtcs[i]);
return RRGetInfo (pScreen, TRUE); /* force a re-probe of outputs and notify clients about changes */
}