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

vidmode: remove redundant check 

The DIX already checks for VidModePrivateKey to get the vfunc, so
checking for this again in the DDX is redundant.

Remove the redundant function xf86VidModeAvailable() from the DDX.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
This commit is contained in:
Olivier Fourdan 2016-02-05 09:48:24 +01:00 committed by Adam Jackson
parent f175cf45ae
commit 48fccde2bf
1 changed files with 5 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
hw/xfree86/common/xf86VidMode.c
View File

@ -50,17 +50,6 @@
#include "xf86Extensions.h" #include "xf86Extensions.h"
#include "xf86cmap.h" #include "xf86cmap.h"
static Bool
xf86VidModeAvailable(ScreenPtr pScreen)
{
if (VidModeGetPtr(pScreen))
return TRUE;
else {
DebugF("pVidMode == NULL\n");
return FALSE;
}
}
static vidMonitorValue static vidMonitorValue
xf86VidModeGetMonitorValue(ScreenPtr pScreen, int valtyp, int indx) xf86VidModeGetMonitorValue(ScreenPtr pScreen, int valtyp, int indx)
{ {
@ -68,9 +57,6 @@ xf86VidModeGetMonitorValue(ScreenPtr pScreen, int valtyp, int indx)
MonPtr monitor; MonPtr monitor;
ScrnInfoPtr pScrn; ScrnInfoPtr pScrn;
if (!xf86VidModeAvailable(pScreen))
return ret;
pScrn = xf86ScreenToScrn(pScreen); pScrn = xf86ScreenToScrn(pScreen);
monitor = pScrn->monitor; monitor = pScrn->monitor;
@ -108,9 +94,6 @@ xf86VidModeGetCurrentModeline(ScreenPtr pScreen, DisplayModePtr *mode, int *dotC
{ {
ScrnInfoPtr pScrn; ScrnInfoPtr pScrn;
if (!xf86VidModeAvailable(pScreen))
return FALSE;
pScrn = xf86ScreenToScrn(pScreen); pScrn = xf86ScreenToScrn(pScreen);
if (pScrn->currentMode) { if (pScrn->currentMode) {
@ -127,9 +110,6 @@ xf86VidModeGetDotClock(ScreenPtr pScreen, int Clock)
{ {
ScrnInfoPtr pScrn; ScrnInfoPtr pScrn;
if (!xf86VidModeAvailable(pScreen))
return 0;
pScrn = xf86ScreenToScrn(pScreen); pScrn = xf86ScreenToScrn(pScreen);
if ((pScrn->progClock) || (Clock >= MAXCLOCKS)) if ((pScrn->progClock) || (Clock >= MAXCLOCKS))
return Clock; return Clock;
@ -142,9 +122,6 @@ xf86VidModeGetNumOfClocks(ScreenPtr pScreen, Bool *progClock)
{ {
ScrnInfoPtr pScrn; ScrnInfoPtr pScrn;
if (!xf86VidModeAvailable(pScreen))
return 0;
pScrn = xf86ScreenToScrn(pScreen); pScrn = xf86ScreenToScrn(pScreen);
if (pScrn->progClock) { if (pScrn->progClock) {
*progClock = TRUE; *progClock = TRUE;
@ -162,9 +139,6 @@ xf86VidModeGetClocks(ScreenPtr pScreen, int *Clocks)
ScrnInfoPtr pScrn; ScrnInfoPtr pScrn;
int i; int i;
if (!xf86VidModeAvailable(pScreen))
return FALSE;
pScrn = xf86ScreenToScrn(pScreen); pScrn = xf86ScreenToScrn(pScreen);
if (pScrn->progClock) if (pScrn->progClock)
@ -182,9 +156,6 @@ xf86VidModeGetNextModeline(ScreenPtr pScreen, DisplayModePtr *mode, int *dotCloc
VidModePtr pVidMode; VidModePtr pVidMode;
DisplayModePtr p; DisplayModePtr p;
if (!xf86VidModeAvailable(pScreen))
return FALSE;
pVidMode = VidModeGetPtr(pScreen); pVidMode = VidModeGetPtr(pScreen);
for (p = pVidMode->Next; p != NULL && p != pVidMode->First; p = p->next) { for (p = pVidMode->Next; p != NULL && p != pVidMode->First; p = p->next) {
@ -205,9 +176,6 @@ xf86VidModeGetFirstModeline(ScreenPtr pScreen, DisplayModePtr *mode, int *dotClo
ScrnInfoPtr pScrn; ScrnInfoPtr pScrn;
VidModePtr pVidMode; VidModePtr pVidMode;
if (!xf86VidModeAvailable(pScreen))
return FALSE;
pScrn = xf86ScreenToScrn(pScreen); pScrn = xf86ScreenToScrn(pScreen);
if (pScrn->modes == NULL) if (pScrn->modes == NULL)
return FALSE; return FALSE;
@ -230,7 +198,7 @@ xf86VidModeDeleteModeline(ScreenPtr pScreen, DisplayModePtr mode)
{ {
ScrnInfoPtr pScrn; ScrnInfoPtr pScrn;
if ((mode == NULL) || (!xf86VidModeAvailable(pScreen))) if (mode == NULL)
return FALSE; return FALSE;
pScrn = xf86ScreenToScrn(pScreen); pScrn = xf86ScreenToScrn(pScreen);
@ -241,9 +209,6 @@ xf86VidModeDeleteModeline(ScreenPtr pScreen, DisplayModePtr mode)
static Bool static Bool
xf86VidModeZoomViewport(ScreenPtr pScreen, int zoom) xf86VidModeZoomViewport(ScreenPtr pScreen, int zoom)
{ {
if (!xf86VidModeAvailable(pScreen))
return FALSE;
xf86ZoomViewport(pScreen, zoom); xf86ZoomViewport(pScreen, zoom);
return TRUE; return TRUE;
} }
@ -253,9 +218,6 @@ xf86VidModeSetViewPort(ScreenPtr pScreen, int x, int y)
{ {
ScrnInfoPtr pScrn; ScrnInfoPtr pScrn;
if (!xf86VidModeAvailable(pScreen))
return FALSE;
pScrn = xf86ScreenToScrn(pScreen); pScrn = xf86ScreenToScrn(pScreen);
pScrn->frameX0 = min(max(x, 0), pScrn->frameX0 = min(max(x, 0),
pScrn->virtualX - pScrn->currentMode->HDisplay); pScrn->virtualX - pScrn->currentMode->HDisplay);
@ -274,9 +236,6 @@ xf86VidModeGetViewPort(ScreenPtr pScreen, int *x, int *y)
{ {
ScrnInfoPtr pScrn; ScrnInfoPtr pScrn;
if (!xf86VidModeAvailable(pScreen))
return FALSE;
pScrn = xf86ScreenToScrn(pScreen); pScrn = xf86ScreenToScrn(pScreen);
*x = pScrn->frameX0; *x = pScrn->frameX0;
*y = pScrn->frameY0; *y = pScrn->frameY0;
@ -290,9 +249,6 @@ xf86VidModeSwitchMode(ScreenPtr pScreen, DisplayModePtr mode)
DisplayModePtr pTmpMode; DisplayModePtr pTmpMode;
Bool retval; Bool retval;
if (!xf86VidModeAvailable(pScreen))
return FALSE;
pScrn = xf86ScreenToScrn(pScreen); pScrn = xf86ScreenToScrn(pScreen);
/* save in case we fail */ /* save in case we fail */
pTmpMode = pScrn->currentMode; pTmpMode = pScrn->currentMode;
@ -308,9 +264,6 @@ xf86VidModeSwitchMode(ScreenPtr pScreen, DisplayModePtr mode)
static Bool static Bool
xf86VidModeLockZoom(ScreenPtr pScreen, Bool lock) xf86VidModeLockZoom(ScreenPtr pScreen, Bool lock)
{ {
if (!xf86VidModeAvailable(pScreen))
return FALSE;
if (xf86Info.dontZoom) if (xf86Info.dontZoom)
return FALSE; return FALSE;
@ -323,7 +276,7 @@ xf86VidModeCheckModeForMonitor(ScreenPtr pScreen, DisplayModePtr mode)
{ {
ScrnInfoPtr pScrn; ScrnInfoPtr pScrn;
if ((mode == NULL) || (!xf86VidModeAvailable(pScreen))) if (mode == NULL)
return MODE_ERROR; return MODE_ERROR;
pScrn = xf86ScreenToScrn(pScreen); pScrn = xf86ScreenToScrn(pScreen);
@ -336,7 +289,7 @@ xf86VidModeCheckModeForDriver(ScreenPtr pScreen, DisplayModePtr mode)
{ {
ScrnInfoPtr pScrn; ScrnInfoPtr pScrn;
if ((mode == NULL) || (!xf86VidModeAvailable(pScreen))) if (mode == NULL)
return MODE_ERROR; return MODE_ERROR;
pScrn = xf86ScreenToScrn(pScreen); pScrn = xf86ScreenToScrn(pScreen);
@ -350,7 +303,7 @@ xf86VidModeSetCrtcForMode(ScreenPtr pScreen, DisplayModePtr mode)
ScrnInfoPtr pScrn; ScrnInfoPtr pScrn;
DisplayModePtr ScreenModes; DisplayModePtr ScreenModes;
if ((mode == NULL) || (!xf86VidModeAvailable(pScreen))) if (mode == NULL)
return; return;
/* Ugly hack so that the xf86Mode.c function can be used without change */ /* Ugly hack so that the xf86Mode.c function can be used without change */
@ -368,7 +321,7 @@ xf86VidModeAddModeline(ScreenPtr pScreen, DisplayModePtr mode)
{ {
ScrnInfoPtr pScrn; ScrnInfoPtr pScrn;
if ((mode == NULL) || (!xf86VidModeAvailable(pScreen))) if (mode == NULL)
return FALSE; return FALSE;
pScrn = xf86ScreenToScrn(pScreen); pScrn = xf86ScreenToScrn(pScreen);
@ -405,9 +358,6 @@ xf86VidModeSetGamma(ScreenPtr pScreen, float red, float green, float blue)
{ {
Gamma gamma; Gamma gamma;
if (!xf86VidModeAvailable(pScreen))
return FALSE;
gamma.red = red; gamma.red = red;
gamma.green = green; gamma.green = green;
gamma.blue = blue; gamma.blue = blue;
@ -422,9 +372,6 @@ xf86VidModeGetGamma(ScreenPtr pScreen, float *red, float *green, float *blue)
{ {
ScrnInfoPtr pScrn; ScrnInfoPtr pScrn;
if (!xf86VidModeAvailable(pScreen))
return FALSE;
pScrn = xf86ScreenToScrn(pScreen); pScrn = xf86ScreenToScrn(pScreen);
*red = pScrn->gamma.red; *red = pScrn->gamma.red;
*green = pScrn->gamma.green; *green = pScrn->gamma.green;
@ -435,9 +382,6 @@ xf86VidModeGetGamma(ScreenPtr pScreen, float *red, float *green, float *blue)
static Bool static Bool
xf86VidModeSetGammaRamp(ScreenPtr pScreen, int size, CARD16 *r, CARD16 *g, CARD16 *b) xf86VidModeSetGammaRamp(ScreenPtr pScreen, int size, CARD16 *r, CARD16 *g, CARD16 *b)
{ {
if (!xf86VidModeAvailable(pScreen))
return FALSE;
xf86ChangeGammaRamp(pScreen, size, r, g, b); xf86ChangeGammaRamp(pScreen, size, r, g, b);
return TRUE; return TRUE;
} }
@ -445,9 +389,6 @@ xf86VidModeSetGammaRamp(ScreenPtr pScreen, int size, CARD16 *r, CARD16 *g, CARD1
static Bool static Bool
xf86VidModeGetGammaRamp(ScreenPtr pScreen, int size, CARD16 *r, CARD16 *g, CARD16 *b) xf86VidModeGetGammaRamp(ScreenPtr pScreen, int size, CARD16 *r, CARD16 *g, CARD16 *b)
{ {
if (!xf86VidModeAvailable(pScreen))
return FALSE;
xf86GetGammaRamp(pScreen, size, r, g, b); xf86GetGammaRamp(pScreen, size, r, g, b);
return TRUE; return TRUE;
} }
@ -455,9 +396,6 @@ xf86VidModeGetGammaRamp(ScreenPtr pScreen, int size, CARD16 *r, CARD16 *g, CARD1
static int static int
xf86VidModeGetGammaRampSize(ScreenPtr pScreen) xf86VidModeGetGammaRampSize(ScreenPtr pScreen)
{ {
if (!xf86VidModeAvailable(pScreen))
return 0;
return xf86GetGammaRampSize(pScreen); return xf86GetGammaRampSize(pScreen);
} }