frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfree86/modes: Remove xf86RandR12CrtcGetGamma 

This would normally return the same values the core RandR code passed to
xf86RandR12CrtcSetGamma before, which is rather pointless. The only
possible exception would be if a driver tried initializing
crtc->gamma_red/green/blue to reflect the hardware LUT state on startup,
but that can't work correctly if whatever set the LUT before the server
started was running at a different depth.

Even the pointless round-trip case will no longer work with the
following change.

Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Michel Dänzer 2016-06-21 16:44:20 +09:00 committed by Michel Dänzer
parent 62f4405257
commit 17213b74fd
1 changed files with 0 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
hw/xfree86/modes/xf86RandR12.c
View File

@ -1279,40 +1279,6 @@ xf86RandR12CrtcSetGamma(ScreenPtr pScreen, RRCrtcPtr randr_crtc)
return TRUE; return TRUE;
} }
static Bool
xf86RandR12CrtcGetGamma(ScreenPtr pScreen, RRCrtcPtr randr_crtc)
{
xf86CrtcPtr crtc = randr_crtc->devPrivate;
if (!crtc->gamma_size)
return FALSE;
if (!crtc->gamma_red || !crtc->gamma_green || !crtc->gamma_blue)
return FALSE;
/* Realloc randr gamma if needed. */
if (randr_crtc->gammaSize != crtc->gamma_size) {
CARD16 *tmp_ptr;
tmp_ptr = reallocarray(randr_crtc->gammaRed,
crtc->gamma_size, 3 * sizeof(CARD16));
if (!tmp_ptr)
return FALSE;
randr_crtc->gammaRed = tmp_ptr;
randr_crtc->gammaGreen = randr_crtc->gammaRed + crtc->gamma_size;
randr_crtc->gammaBlue = randr_crtc->gammaGreen + crtc->gamma_size;
}
randr_crtc->gammaSize = crtc->gamma_size;
memcpy(randr_crtc->gammaRed, crtc->gamma_red,
crtc->gamma_size * sizeof(CARD16));
memcpy(randr_crtc->gammaGreen, crtc->gamma_green,
crtc->gamma_size * sizeof(CARD16));
memcpy(randr_crtc->gammaBlue, crtc->gamma_blue,
crtc->gamma_size * sizeof(CARD16));
return TRUE;
}
static void static void
init_one_component(CARD16 *comp, unsigned size, unsigned shift, float gamma) init_one_component(CARD16 *comp, unsigned size, unsigned shift, float gamma)
{ {
@ -2077,13 +2043,11 @@ xf86RandR12Init12(ScreenPtr pScreen)
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
rrScrPrivPtr rp = rrGetScrPriv(pScreen); rrScrPrivPtr rp = rrGetScrPriv(pScreen);
XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen); XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);
int i;
rp->rrGetInfo = xf86RandR12GetInfo12; rp->rrGetInfo = xf86RandR12GetInfo12;
rp->rrScreenSetSize = xf86RandR12ScreenSetSize; rp->rrScreenSetSize = xf86RandR12ScreenSetSize;
rp->rrCrtcSet = xf86RandR12CrtcSet; rp->rrCrtcSet = xf86RandR12CrtcSet;
rp->rrCrtcSetGamma = xf86RandR12CrtcSetGamma; rp->rrCrtcSetGamma = xf86RandR12CrtcSetGamma;
rp->rrCrtcGetGamma = xf86RandR12CrtcGetGamma;
rp->rrOutputSetProperty = xf86RandR12OutputSetProperty; rp->rrOutputSetProperty = xf86RandR12OutputSetProperty;
rp->rrOutputValidateMode = xf86RandR12OutputValidateMode; rp->rrOutputValidateMode = xf86RandR12OutputValidateMode;
#if RANDR_13_INTERFACE #if RANDR_13_INTERFACE
@ -2124,9 +2088,6 @@ xf86RandR12Init12(ScreenPtr pScreen)
if (!xf86RandR12InitGamma(pScrn, 256)) if (!xf86RandR12InitGamma(pScrn, 256))
return FALSE; return FALSE;
for (i = 0; i < rp->numCrtcs; i++) {
xf86RandR12CrtcGetGamma(pScreen, rp->crtcs[i]);
}
return TRUE; return TRUE;
} }