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

xf86: migrate to using xf86ScreenToScrn wrapper (v2) 

migrate to new helper API.

This just wraps all the obvious uses of xf86Screens[pScreen->myNum],
and should be fairly simple to review.

v2: remove commented out lines.

Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2012-04-10 15:47:33 +01:00 committed by Dave Airlie
parent 53932b3803
commit 41151f88a6
31 changed files with 92 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glx/glxdri.c
View File

@ -961,7 +961,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
__GLXDRIscreen *screen; __GLXDRIscreen *screen;
Bool isCapable; Bool isCapable;
size_t buffer_size; size_t buffer_size;
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable") || if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable") ||
!DRIQueryDirectRenderingCapable(pScreen, &isCapable) || !isCapable) { !DRIQueryDirectRenderingCapable(pScreen, &isCapable) || !isCapable) {

2
glx/glxdri2.c
View File

@ -686,7 +686,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
const char *driverName, *deviceName; const char *driverName, *deviceName;
__GLXDRIscreen *screen; __GLXDRIscreen *screen;
size_t buffer_size; size_t buffer_size;
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
screen = calloc(1, sizeof *screen); screen = calloc(1, sizeof *screen);
if (screen == NULL) if (screen == NULL)

2
hw/xfree86/common/xf86DGA.c
View File

@ -100,7 +100,7 @@ typedef struct {
Bool Bool
DGAInit(ScreenPtr pScreen, DGAFunctionPtr funcs, DGAModePtr modes, int num) DGAInit(ScreenPtr pScreen, DGAFunctionPtr funcs, DGAModePtr modes, int num)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
DGAScreenPtr pScreenPriv; DGAScreenPtr pScreenPriv;
int i; int i;

2
hw/xfree86/common/xf86DPMS.c
View File

@ -57,7 +57,7 @@ Bool
xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags) xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags)
{ {
#ifdef DPMSExtension #ifdef DPMSExtension
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
DPMSPtr pDPMS; DPMSPtr pDPMS;
pointer DPMSOpt; pointer DPMSOpt;
MessageType enabled_from; MessageType enabled_from;

4
hw/xfree86/common/xf86Helper.c
View File

@ -1577,7 +1577,7 @@ xf86SetBackingStore(ScreenPtr pScreen)
{ {
Bool useBS = FALSE; Bool useBS = FALSE;
MessageType from = X_DEFAULT; MessageType from = X_DEFAULT;
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
OptionInfoPtr options; OptionInfoPtr options;
options = xnfalloc(sizeof(BSOptions)); options = xnfalloc(sizeof(BSOptions));
@ -1618,7 +1618,7 @@ xf86SetSilkenMouse(ScreenPtr pScreen)
{ {
Bool useSM = TRUE; Bool useSM = TRUE;
MessageType from = X_DEFAULT; MessageType from = X_DEFAULT;
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
OptionInfoPtr options; OptionInfoPtr options;
options = xnfalloc(sizeof(SMOptions)); options = xnfalloc(sizeof(SMOptions));

8
hw/xfree86/common/xf86VGAarbiter.c
View File

@ -106,7 +106,7 @@ xf86VGAarbiterAllowDRI(ScreenPtr pScreen)
{ {
int vga_count; int vga_count;
int rsrc_decodes; int rsrc_decodes;
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
if (vga_no_arb) if (vga_no_arb)
return TRUE; return TRUE;
@ -173,7 +173,7 @@ xf86VGAarbiterWrapFunctions(void)
for (i = 0; i < xf86NumScreens; i++) { for (i = 0; i < xf86NumScreens; i++) {
pScreen = xf86Screens[i]->pScreen; pScreen = xf86Screens[i]->pScreen;
ps = GetPictureScreenIfSet(pScreen); ps = GetPictureScreenIfSet(pScreen);
pScrn = xf86Screens[pScreen->myNum]; pScrn = xf86ScreenToScrn(pScreen);
PointPriv = dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey); PointPriv = dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey);
if (!dixRegisterPrivateKey if (!dixRegisterPrivateKey
@ -224,7 +224,7 @@ static Bool
VGAarbiterCloseScreen(int i, ScreenPtr pScreen) VGAarbiterCloseScreen(int i, ScreenPtr pScreen)
{ {
Bool val; Bool val;
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
VGAarbiterScreenPtr pScreenPriv = VGAarbiterScreenPtr pScreenPriv =
(VGAarbiterScreenPtr) dixLookupPrivate(&pScreen->devPrivates, (VGAarbiterScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
VGAarbiterScreenKey); VGAarbiterScreenKey);
@ -298,9 +298,7 @@ VGAarbiterGetImage(DrawablePtr pDrawable,
ScreenPtr pScreen = pDrawable->pScreen; ScreenPtr pScreen = pDrawable->pScreen;
SCREEN_PROLOG(GetImage); SCREEN_PROLOG(GetImage);
// if (xf86Screens[pScreen->myNum]->vtSema) {
VGAGet(pScreen); VGAGet(pScreen);
// }
(*pScreen->GetImage) (pDrawable, sx, sy, w, h, format, planemask, pdstLine); (*pScreen->GetImage) (pDrawable, sx, sy, w, h, format, planemask, pdstLine);
VGAPut(); VGAPut();
SCREEN_EPILOG(GetImage, VGAarbiterGetImage); SCREEN_EPILOG(GetImage, VGAarbiterGetImage);

2
hw/xfree86/common/xf86VGAarbiterPriv.h
View File

@ -95,7 +95,7 @@
static inline void static inline void
VGAGet(ScreenPtr pScreen) VGAGet(ScreenPtr pScreen)
{ {
pci_device_vgaarb_set_target(xf86Screens[pScreen->myNum]->vgaDev); pci_device_vgaarb_set_target(xf86ScreenToScrn(pScreen)->vgaDev);
pci_device_vgaarb_lock(); pci_device_vgaarb_lock();
} }

22
hw/xfree86/common/xf86cmap.c
View File

@ -66,7 +66,7 @@
#define LOAD_PALETTE(pmap) \ #define LOAD_PALETTE(pmap) \
((pmap == GetInstalledmiColormap(pmap->pScreen)) && \ ((pmap == GetInstalledmiColormap(pmap->pScreen)) && \
((pScreenPriv->flags & CMAP_LOAD_EVEN_IF_OFFSCREEN) || \ ((pScreenPriv->flags & CMAP_LOAD_EVEN_IF_OFFSCREEN) || \
xf86Screens[pmap->pScreen->myNum]->vtSema || pScreenPriv->isDGAmode)) xf86ScreenToScrn(pmap->pScreen)->vtSema || pScreenPriv->isDGAmode))
typedef struct _CMapLink { typedef struct _CMapLink {
ColormapPtr cmap; ColormapPtr cmap;
@ -151,7 +151,7 @@ xf86HandleColormaps(ScreenPtr pScreen,
xf86LoadPaletteProc * loadPalette, xf86LoadPaletteProc * loadPalette,
xf86SetOverscanProc * setOverscan, unsigned int flags) xf86SetOverscanProc * setOverscan, unsigned int flags)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
ColormapPtr pDefMap = NULL; ColormapPtr pDefMap = NULL;
CMapScreenPtr pScreenPriv; CMapScreenPtr pScreenPriv;
LOCO *gamma; LOCO *gamma;
@ -511,7 +511,7 @@ CMapSetDGAMode(int index, int num, DGADevicePtr dev)
pScreenPriv->isDGAmode = DGAActive(index); pScreenPriv->isDGAmode = DGAActive(index);
if (!pScreenPriv->isDGAmode && GetInstalledmiColormap(pScreen) if (!pScreenPriv->isDGAmode && GetInstalledmiColormap(pScreen)
&& xf86Screens[pScreen->myNum]->vtSema) && xf86ScreenToScrn(pScreen)->vtSema)
CMapReinstallMap(GetInstalledmiColormap(pScreen)); CMapReinstallMap(GetInstalledmiColormap(pScreen));
return ret; return ret;
@ -528,7 +528,7 @@ CMapReinstallMap(ColormapPtr pmap)
CMapScreenKey); CMapScreenKey);
CMapColormapPtr cmapPriv = CMapColormapPtr cmapPriv =
(CMapColormapPtr) dixLookupPrivate(&pmap->devPrivates, CMapColormapKey); (CMapColormapPtr) dixLookupPrivate(&pmap->devPrivates, CMapColormapKey);
ScrnInfoPtr pScrn = xf86Screens[pmap->pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pmap->pScreen);
int i = cmapPriv->numColors; int i = cmapPriv->numColors;
int *indices = pScreenPriv->PreAllocIndices; int *indices = pScreenPriv->PreAllocIndices;
@ -560,7 +560,7 @@ CMapRefreshColors(ColormapPtr pmap, int defs, int *indices)
CMapColormapPtr pColPriv = CMapColormapPtr pColPriv =
(CMapColormapPtr) dixLookupPrivate(&pmap->devPrivates, CMapColormapKey); (CMapColormapPtr) dixLookupPrivate(&pmap->devPrivates, CMapColormapKey);
VisualPtr pVisual = pmap->pVisual; VisualPtr pVisual = pmap->pVisual;
ScrnInfoPtr pScrn = xf86Screens[pmap->pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pmap->pScreen);
int numColors, i; int numColors, i;
LOCO *gamma, *colors; LOCO *gamma, *colors;
EntryPtr entry; EntryPtr entry;
@ -692,7 +692,7 @@ CMapSetOverscan(ColormapPtr pmap, int defs, int *indices)
CMapScreenKey); CMapScreenKey);
CMapColormapPtr pColPriv = CMapColormapPtr pColPriv =
(CMapColormapPtr) dixLookupPrivate(&pmap->devPrivates, CMapColormapKey); (CMapColormapPtr) dixLookupPrivate(&pmap->devPrivates, CMapColormapKey);
ScrnInfoPtr pScrn = xf86Screens[pmap->pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pmap->pScreen);
VisualPtr pVisual = pmap->pVisual; VisualPtr pVisual = pmap->pVisual;
int i; int i;
LOCO *colors; LOCO *colors;
@ -833,7 +833,7 @@ CMapUnwrapScreen(ScreenPtr pScreen)
{ {
CMapScreenPtr pScreenPriv = CMapScreenPtr pScreenPriv =
(CMapScreenPtr) dixLookupPrivate(&pScreen->devPrivates, CMapScreenKey); (CMapScreenPtr) dixLookupPrivate(&pScreen->devPrivates, CMapScreenKey);
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
pScreen->CloseScreen = pScreenPriv->CloseScreen; pScreen->CloseScreen = pScreenPriv->CloseScreen;
pScreen->CreateColormap = pScreenPriv->CreateColormap; pScreen->CreateColormap = pScreenPriv->CreateColormap;
@ -1008,7 +1008,7 @@ xf86ChangeGammaRamp(ScreenPtr pScreen,
unsigned short *red, unsigned short *red,
unsigned short *green, unsigned short *blue) unsigned short *green, unsigned short *blue)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
CMapColormapPtr pColPriv; CMapColormapPtr pColPriv;
CMapScreenPtr pScreenPriv; CMapScreenPtr pScreenPriv;
CMapLinkPtr pLink; CMapLinkPtr pLink;
@ -1085,7 +1085,7 @@ xf86ChangeGammaRamp(ScreenPtr pScreen,
int int
xf86GetGammaRampSize(ScreenPtr pScreen) xf86GetGammaRampSize(ScreenPtr pScreen)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
CMapScreenPtr pScreenPriv; CMapScreenPtr pScreenPriv;
if (xf86_crtc_supports_gamma(pScrn)) { if (xf86_crtc_supports_gamma(pScrn)) {
@ -1112,7 +1112,7 @@ xf86GetGammaRamp(ScreenPtr pScreen,
unsigned short *red, unsigned short *red,
unsigned short *green, unsigned short *blue) unsigned short *green, unsigned short *blue)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
CMapScreenPtr pScreenPriv; CMapScreenPtr pScreenPriv;
LOCO *entry; LOCO *entry;
int shift, sigbits; int shift, sigbits;
@ -1172,7 +1172,7 @@ xf86GetGammaRamp(ScreenPtr pScreen,
int int
xf86ChangeGamma(ScreenPtr pScreen, Gamma gamma) xf86ChangeGamma(ScreenPtr pScreen, Gamma gamma)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
if (pScrn->ChangeGamma) if (pScrn->ChangeGamma)
return (*pScrn->ChangeGamma) (pScreen->myNum, gamma); return (*pScrn->ChangeGamma) (pScreen->myNum, gamma);

4
hw/xfree86/common/xf86fbman.c
View File

@ -1186,7 +1186,7 @@ xf86FBCloseScreen(int i, ScreenPtr pScreen)
Bool Bool
xf86InitFBManager(ScreenPtr pScreen, BoxPtr FullBox) xf86InitFBManager(ScreenPtr pScreen, BoxPtr FullBox)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
RegionRec ScreenRegion; RegionRec ScreenRegion;
RegionRec FullRegion; RegionRec FullRegion;
BoxRec ScreenBox; BoxRec ScreenBox;
@ -1223,7 +1223,7 @@ xf86InitFBManager(ScreenPtr pScreen, BoxPtr FullBox)
Bool Bool
xf86InitFBManagerArea(ScreenPtr pScreen, int PixelArea, int Verbosity) xf86InitFBManagerArea(ScreenPtr pScreen, int PixelArea, int Verbosity)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
xRectangle Rect[3]; xRectangle Rect[3];
RegionPtr pRegion, pScreenRegion; RegionPtr pRegion, pScreenRegion;
int nRect; int nRect;

10
hw/xfree86/common/xf86xv.c
View File

@ -271,7 +271,7 @@ xf86XVScreenInit(ScreenPtr pScreen, XF86VideoAdaptorPtr * adaptors, int num)
if (!ScreenPriv) if (!ScreenPriv)
return FALSE; return FALSE;
pScrn = xf86Screens[pScreen->myNum]; pScrn = xf86ScreenToScrn(pScreen);
ScreenPriv->DestroyWindow = pScreen->DestroyWindow; ScreenPriv->DestroyWindow = pScreen->DestroyWindow;
ScreenPriv->WindowExposures = pScreen->WindowExposures; ScreenPriv->WindowExposures = pScreen->WindowExposures;
@ -356,7 +356,7 @@ static Bool
xf86XVInitAdaptors(ScreenPtr pScreen, XF86VideoAdaptorPtr * infoPtr, int number) xf86XVInitAdaptors(ScreenPtr pScreen, XF86VideoAdaptorPtr * infoPtr, int number)
{ {
XvScreenPtr pxvs = GET_XV_SCREEN(pScreen); XvScreenPtr pxvs = GET_XV_SCREEN(pScreen);
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
XF86VideoAdaptorPtr adaptorPtr; XF86VideoAdaptorPtr adaptorPtr;
XvAdaptorPtr pAdaptor, pa; XvAdaptorPtr pAdaptor, pa;
XvAdaptorRecPrivatePtr adaptorPriv; XvAdaptorRecPrivatePtr adaptorPriv;
@ -1150,7 +1150,7 @@ xf86XVPostValidateTree(WindowPtr pWin, WindowPtr pLayerWin, VTKind kind)
pScreen = pLayerWin->drawable.pScreen; pScreen = pLayerWin->drawable.pScreen;
ScreenPriv = GET_XF86XV_SCREEN(pScreen); ScreenPriv = GET_XF86XV_SCREEN(pScreen);
pScrn = xf86Screens[pScreen->myNum]; pScrn = xf86ScreenToScrn(pScreen);
xf86XVReputOrStopAllPorts(pScrn, TRUE); xf86XVReputOrStopAllPorts(pScrn, TRUE);
@ -1257,7 +1257,7 @@ xf86XVClipNotify(WindowPtr pWin, int dx, int dy)
static Bool static Bool
xf86XVCloseScreen(int i, ScreenPtr pScreen) xf86XVCloseScreen(int i, ScreenPtr pScreen)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
XvScreenPtr pxvs = GET_XV_SCREEN(pScreen); XvScreenPtr pxvs = GET_XV_SCREEN(pScreen);
XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen); XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen);
XvAdaptorPtr pa; XvAdaptorPtr pa;
@ -1899,7 +1899,7 @@ xf86XVFillKeyHelperDrawable(DrawablePtr pDraw, CARD32 key, RegionPtr fillboxes)
xRectangle *rects; xRectangle *rects;
GCPtr gc; GCPtr gc;
if (!xf86Screens[pScreen->myNum]->vtSema) if (!xf86ScreenToScrn(pScreen)->vtSema)
return; return;
gc = GetScratchGC(pDraw->depth, pScreen); gc = GetScratchGC(pDraw->depth, pScreen);

12
hw/xfree86/common/xf86xvmc.c
View File

@ -64,7 +64,7 @@ xf86XvMCCreateContext(XvPortPtr pPort,
XvMCContextPtr pContext, int *num_priv, CARD32 **priv) XvMCContextPtr pContext, int *num_priv, CARD32 **priv)
{ {
xf86XvMCScreenPtr pScreenPriv = XF86XVMC_GET_PRIVATE(pContext->pScreen); xf86XvMCScreenPtr pScreenPriv = XF86XVMC_GET_PRIVATE(pContext->pScreen);
ScrnInfoPtr pScrn = xf86Screens[pContext->pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pContext->pScreen);
pContext->port_priv = (XvPortRecPrivatePtr) (pPort->devPriv.ptr); pContext->port_priv = (XvPortRecPrivatePtr) (pPort->devPriv.ptr);
@ -78,7 +78,7 @@ static void
xf86XvMCDestroyContext(XvMCContextPtr pContext) xf86XvMCDestroyContext(XvMCContextPtr pContext)
{ {
xf86XvMCScreenPtr pScreenPriv = XF86XVMC_GET_PRIVATE(pContext->pScreen); xf86XvMCScreenPtr pScreenPriv = XF86XVMC_GET_PRIVATE(pContext->pScreen);
ScrnInfoPtr pScrn = xf86Screens[pContext->pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pContext->pScreen);
(*pScreenPriv->adaptors[pContext->adapt_num]->DestroyContext) (pScrn, (*pScreenPriv->adaptors[pContext->adapt_num]->DestroyContext) (pScrn,
pContext); pContext);
@ -89,7 +89,7 @@ xf86XvMCCreateSurface(XvMCSurfacePtr pSurface, int *num_priv, CARD32 **priv)
{ {
XvMCContextPtr pContext = pSurface->context; XvMCContextPtr pContext = pSurface->context;
xf86XvMCScreenPtr pScreenPriv = XF86XVMC_GET_PRIVATE(pContext->pScreen); xf86XvMCScreenPtr pScreenPriv = XF86XVMC_GET_PRIVATE(pContext->pScreen);
ScrnInfoPtr pScrn = xf86Screens[pContext->pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pContext->pScreen);
return (*pScreenPriv->adaptors[pContext->adapt_num]->CreateSurface) (pScrn, return (*pScreenPriv->adaptors[pContext->adapt_num]->CreateSurface) (pScrn,
pSurface, pSurface,
@ -102,7 +102,7 @@ xf86XvMCDestroySurface(XvMCSurfacePtr pSurface)
{ {
XvMCContextPtr pContext = pSurface->context; XvMCContextPtr pContext = pSurface->context;
xf86XvMCScreenPtr pScreenPriv = XF86XVMC_GET_PRIVATE(pContext->pScreen); xf86XvMCScreenPtr pScreenPriv = XF86XVMC_GET_PRIVATE(pContext->pScreen);
ScrnInfoPtr pScrn = xf86Screens[pContext->pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pContext->pScreen);
(*pScreenPriv->adaptors[pContext->adapt_num]->DestroySurface) (pScrn, (*pScreenPriv->adaptors[pContext->adapt_num]->DestroySurface) (pScrn,
pSurface); pSurface);
@ -114,7 +114,7 @@ xf86XvMCCreateSubpicture(XvMCSubpicturePtr pSubpicture,
{ {
XvMCContextPtr pContext = pSubpicture->context; XvMCContextPtr pContext = pSubpicture->context;
xf86XvMCScreenPtr pScreenPriv = XF86XVMC_GET_PRIVATE(pContext->pScreen); xf86XvMCScreenPtr pScreenPriv = XF86XVMC_GET_PRIVATE(pContext->pScreen);
ScrnInfoPtr pScrn = xf86Screens[pContext->pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pContext->pScreen);
return (*pScreenPriv->adaptors[pContext->adapt_num]-> return (*pScreenPriv->adaptors[pContext->adapt_num]->
CreateSubpicture) (pScrn, pSubpicture, num_priv, priv); CreateSubpicture) (pScrn, pSubpicture, num_priv, priv);
@ -125,7 +125,7 @@ xf86XvMCDestroySubpicture(XvMCSubpicturePtr pSubpicture)
{ {
XvMCContextPtr pContext = pSubpicture->context; XvMCContextPtr pContext = pSubpicture->context;
xf86XvMCScreenPtr pScreenPriv = XF86XVMC_GET_PRIVATE(pContext->pScreen); xf86XvMCScreenPtr pScreenPriv = XF86XVMC_GET_PRIVATE(pContext->pScreen);
ScrnInfoPtr pScrn = xf86Screens[pContext->pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pContext->pScreen);
(*pScreenPriv->adaptors[pContext->adapt_num]->DestroySubpicture) (pScrn, (*pScreenPriv->adaptors[pContext->adapt_num]->DestroySubpicture) (pScrn,
pSubpicture); pSubpicture);

2
hw/xfree86/doc/ddxDesign.xml
View File

@ -9061,7 +9061,7 @@ static Bool
ZZZScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) ZZZScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
{ {
/* Get the ScrnInfoRec */ /* Get the ScrnInfoRec */
pScrn = xf86Screens[pScreen-&gt;myNum]; pScrn = xf86ScreenToScrn(pScreen);
/* /*
* If using the vgahw module, its data structures and related * If using the vgahw module, its data structures and related

10
hw/xfree86/dri/dri.c
View File

@ -315,7 +315,7 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
int reserved_count; int reserved_count;
int i; int i;
DRIEntPrivPtr pDRIEntPriv; DRIEntPrivPtr pDRIEntPriv;
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
DRIContextFlags flags = 0; DRIContextFlags flags = 0;
DRIContextPrivPtr pDRIContextPriv; DRIContextPrivPtr pDRIContextPriv;
@ -615,7 +615,7 @@ DRIFinishScreenInit(ScreenPtr pScreen)
pScreen->ClipNotify = pDRIInfo->wrap.ClipNotify; pScreen->ClipNotify = pDRIInfo->wrap.ClipNotify;
} }
if (pDRIInfo->wrap.AdjustFrame) { if (pDRIInfo->wrap.AdjustFrame) {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
pDRIPriv->wrap.AdjustFrame = pScrn->AdjustFrame; pDRIPriv->wrap.AdjustFrame = pScrn->AdjustFrame;
pScrn->AdjustFrame = pDRIInfo->wrap.AdjustFrame; pScrn->AdjustFrame = pDRIInfo->wrap.AdjustFrame;
@ -634,7 +634,7 @@ DRICloseScreen(ScreenPtr pScreen)
DRIInfoPtr pDRIInfo; DRIInfoPtr pDRIInfo;
drm_context_t *reserved; drm_context_t *reserved;
int reserved_count; int reserved_count;
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
DRIEntPrivPtr pDRIEntPriv = DRI_ENT_PRIV(pScrn); DRIEntPrivPtr pDRIEntPriv = DRI_ENT_PRIV(pScrn);
Bool closeMaster; Bool closeMaster;
@ -672,7 +672,7 @@ DRICloseScreen(ScreenPtr pScreen)
pDRIPriv->wrap.ClipNotify = NULL; pDRIPriv->wrap.ClipNotify = NULL;
} }
if (pDRIInfo->wrap.AdjustFrame) { if (pDRIInfo->wrap.AdjustFrame) {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
pScrn->AdjustFrame = pDRIPriv->wrap.AdjustFrame; pScrn->AdjustFrame = pDRIPriv->wrap.AdjustFrame;
pDRIPriv->wrap.AdjustFrame = NULL; pDRIPriv->wrap.AdjustFrame = NULL;
@ -2311,7 +2311,7 @@ DRIAdjustFrame(int scrnIndex, int x, int y, int flags)
{ {
ScreenPtr pScreen = screenInfo.screens[scrnIndex]; ScreenPtr pScreen = screenInfo.screens[scrnIndex];
DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen); DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
int px, py; int px, py;
if (!pDRIPriv || !pDRIPriv->pSAREA) { if (!pDRIPriv || !pDRIPriv->pSAREA) {

2
hw/xfree86/exa/examodule.c
View File

@ -112,7 +112,7 @@ exaDDXDriverInit(ScreenPtr pScreen)
{ {
ExaScreenPriv(pScreen); ExaScreenPriv(pScreen);
/* Do NOT use XF86SCRNINFO macro here!! */ /* Do NOT use XF86SCRNINFO macro here!! */
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
ExaXorgScreenPrivPtr pScreenPriv; ExaXorgScreenPrivPtr pScreenPriv;
if (!dixRegisterPrivateKey(&exaXorgScreenPrivateKeyRec, PRIVATE_SCREEN, 0)) if (!dixRegisterPrivateKey(&exaXorgScreenPrivateKeyRec, PRIVATE_SCREEN, 0))

2
hw/xfree86/fbdevhw/fbdevhw.c
View File

@ -866,7 +866,7 @@ fbdevHWDPMSSet(ScrnInfoPtr pScrn, int mode, int flags)
Bool Bool
fbdevHWSaveScreen(ScreenPtr pScreen, int mode) fbdevHWSaveScreen(ScreenPtr pScreen, int mode)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
fbdevHWPtr fPtr = FBDEVHWPTR(pScrn); fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
unsigned long unblank; unsigned long unblank;

16
hw/xfree86/modes/xf86Crtc.c
View File

@ -182,7 +182,7 @@ xf86CrtcSetScreenSubpixelOrder(ScreenPtr pScreen)
{ {
int subpixel_order = SubPixelUnknown; int subpixel_order = SubPixelUnknown;
Bool has_none = FALSE; Bool has_none = FALSE;
ScrnInfoPtr scrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr scrn = xf86ScreenToScrn(pScreen);
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
int c, o; int c, o;
@ -698,7 +698,7 @@ xf86OutputDestroy(xf86OutputPtr output)
static Bool static Bool
xf86CrtcCreateScreenResources(ScreenPtr screen) xf86CrtcCreateScreenResources(ScreenPtr screen)
{ {
ScrnInfoPtr scrn = xf86Screens[screen->myNum]; ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
screen->CreateScreenResources = config->CreateScreenResources; screen->CreateScreenResources = config->CreateScreenResources;
@ -718,7 +718,7 @@ xf86CrtcCreateScreenResources(ScreenPtr screen)
static Bool static Bool
xf86CrtcCloseScreen(int index, ScreenPtr screen) xf86CrtcCloseScreen(int index, ScreenPtr screen)
{ {
ScrnInfoPtr scrn = xf86Screens[screen->myNum]; ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
int o, c; int o, c;
@ -751,7 +751,7 @@ Bool
#endif #endif
xf86CrtcScreenInit(ScreenPtr screen) xf86CrtcScreenInit(ScreenPtr screen)
{ {
ScrnInfoPtr scrn = xf86Screens[screen->myNum]; ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
int c; int c;
@ -2823,7 +2823,7 @@ xf86DPMSSet(ScrnInfoPtr scrn, int mode, int flags)
Bool Bool
xf86SaveScreen(ScreenPtr pScreen, int mode) xf86SaveScreen(ScreenPtr pScreen, int mode)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
if (xf86IsUnblank(mode)) if (xf86IsUnblank(mode))
xf86DPMSSet(pScrn, DPMSModeOn, 0); xf86DPMSSet(pScrn, DPMSModeOn, 0);
@ -3151,7 +3151,7 @@ xf86_crtc_notify_proc_ptr
xf86_wrap_crtc_notify(ScreenPtr screen, xf86_crtc_notify_proc_ptr new) xf86_wrap_crtc_notify(ScreenPtr screen, xf86_crtc_notify_proc_ptr new)
{ {
if (xf86CrtcConfigPrivateIndex != -1) { if (xf86CrtcConfigPrivateIndex != -1) {
ScrnInfoPtr scrn = xf86Screens[screen->myNum]; ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
xf86_crtc_notify_proc_ptr old; xf86_crtc_notify_proc_ptr old;
@ -3166,7 +3166,7 @@ void
xf86_unwrap_crtc_notify(ScreenPtr screen, xf86_crtc_notify_proc_ptr old) xf86_unwrap_crtc_notify(ScreenPtr screen, xf86_crtc_notify_proc_ptr old)
{ {
if (xf86CrtcConfigPrivateIndex != -1) { if (xf86CrtcConfigPrivateIndex != -1) {
ScrnInfoPtr scrn = xf86Screens[screen->myNum]; ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
config->xf86_crtc_notify = old; config->xf86_crtc_notify = old;
@ -3176,7 +3176,7 @@ xf86_unwrap_crtc_notify(ScreenPtr screen, xf86_crtc_notify_proc_ptr old)
void void
xf86_crtc_notify(ScreenPtr screen) xf86_crtc_notify(ScreenPtr screen)
{ {
ScrnInfoPtr scrn = xf86Screens[screen->myNum]; ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
if (config->xf86_crtc_notify) if (config->xf86_crtc_notify)

10
hw/xfree86/modes/xf86Cursors.c
View File

@ -477,7 +477,7 @@ xf86_load_cursor_image(ScrnInfoPtr scrn, unsigned char *src)
static Bool static Bool
xf86_use_hw_cursor(ScreenPtr screen, CursorPtr cursor) xf86_use_hw_cursor(ScreenPtr screen, CursorPtr cursor)
{ {
ScrnInfoPtr scrn = xf86Screens[screen->myNum]; ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
xf86CursorInfoPtr cursor_info = xf86_config->cursor_info; xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
@ -496,7 +496,7 @@ xf86_use_hw_cursor(ScreenPtr screen, CursorPtr cursor)
static Bool static Bool
xf86_use_hw_cursor_argb(ScreenPtr screen, CursorPtr cursor) xf86_use_hw_cursor_argb(ScreenPtr screen, CursorPtr cursor)
{ {
ScrnInfoPtr scrn = xf86Screens[screen->myNum]; ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
xf86CursorInfoPtr cursor_info = xf86_config->cursor_info; xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
@ -564,7 +564,7 @@ xf86_load_cursor_argb(ScrnInfoPtr scrn, CursorPtr cursor)
Bool Bool
xf86_cursors_init(ScreenPtr screen, int max_width, int max_height, int flags) xf86_cursors_init(ScreenPtr screen, int max_width, int max_height, int flags)
{ {
ScrnInfoPtr scrn = xf86Screens[screen->myNum]; ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
xf86CursorInfoPtr cursor_info; xf86CursorInfoPtr cursor_info;
@ -631,7 +631,7 @@ xf86_reload_cursors(ScreenPtr screen)
if (!cursor_screen_priv || !cursor_screen_priv->isUp) if (!cursor_screen_priv || !cursor_screen_priv->isUp)
return; return;
scrn = xf86Screens[screen->myNum]; scrn = xf86ScreenToScrn(screen);
xf86_config = XF86_CRTC_CONFIG_PTR(scrn); xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
/* make sure the cursor code has been initialized */ /* make sure the cursor code has been initialized */
@ -667,7 +667,7 @@ xf86_reload_cursors(ScreenPtr screen)
void void
xf86_cursors_fini(ScreenPtr screen) xf86_cursors_fini(ScreenPtr screen)
{ {
ScrnInfoPtr scrn = xf86Screens[screen->myNum]; ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
if (xf86_config->cursor_info) { if (xf86_config->cursor_info) {

6
hw/xfree86/modes/xf86DiDGA.c
View File

@ -41,7 +41,7 @@
static Bool static Bool
xf86_dga_get_modes(ScreenPtr pScreen) xf86_dga_get_modes(ScreenPtr pScreen)
{ {
ScrnInfoPtr scrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr scrn = xf86ScreenToScrn(pScreen);
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
DGAModePtr modes, mode; DGAModePtr modes, mode;
DisplayModePtr display_mode; DisplayModePtr display_mode;
@ -175,7 +175,7 @@ xf86DiDGAReInit(ScreenPtr pScreen)
Bool Bool
_xf86_di_dga_reinit_internal(ScreenPtr pScreen) _xf86_di_dga_reinit_internal(ScreenPtr pScreen)
{ {
ScrnInfoPtr scrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr scrn = xf86ScreenToScrn(pScreen);
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
if (!DGAAvailable(pScreen->myNum)) if (!DGAAvailable(pScreen->myNum))
@ -197,7 +197,7 @@ xf86DiDGAInit(ScreenPtr pScreen, unsigned long dga_address)
Bool Bool
_xf86_di_dga_init_internal(ScreenPtr pScreen) _xf86_di_dga_init_internal(ScreenPtr pScreen)
{ {
ScrnInfoPtr scrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr scrn = xf86ScreenToScrn(pScreen);
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
xf86_config->dga_flags = 0; xf86_config->dga_flags = 0;

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

@ -743,7 +743,7 @@ xf86RandR12GetRotation(ScreenPtr pScreen)
Bool Bool
xf86RandR12CreateScreenResources(ScreenPtr pScreen) xf86RandR12CreateScreenResources(ScreenPtr pScreen)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
xf86CrtcConfigPtr config; xf86CrtcConfigPtr config;
XF86RandRInfoPtr randrp; XF86RandRInfoPtr randrp;
int c; int c;
@ -902,7 +902,7 @@ xf86RandR12CloseScreen(ScreenPtr pScreen)
randrp = XF86RANDRINFO(pScreen); randrp = XF86RANDRINFO(pScreen);
#if RANDR_12_INTERFACE #if RANDR_12_INTERFACE
xf86Screens[pScreen->myNum]->EnterVT = randrp->orig_EnterVT; xf86ScreenToScrn(pScreen)->EnterVT = randrp->orig_EnterVT;
#endif #endif
free(randrp); free(randrp);
@ -914,7 +914,7 @@ xf86RandR12SetRotations(ScreenPtr pScreen, Rotation rotations)
XF86RandRInfoPtr randrp; XF86RandRInfoPtr randrp;
#if RANDR_12_INTERFACE #if RANDR_12_INTERFACE
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
int c; int c;
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
#endif #endif
@ -939,7 +939,7 @@ xf86RandR12SetTransformSupport(ScreenPtr pScreen, Bool transforms)
XF86RandRInfoPtr randrp; XF86RandRInfoPtr randrp;
#if RANDR_13_INTERFACE #if RANDR_13_INTERFACE
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
int c; int c;
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
#endif #endif
@ -1041,7 +1041,7 @@ static Bool
xf86RandR12CrtcNotify(RRCrtcPtr randr_crtc) xf86RandR12CrtcNotify(RRCrtcPtr randr_crtc)
{ {
ScreenPtr pScreen = randr_crtc->pScreen; ScreenPtr pScreen = randr_crtc->pScreen;
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
RRModePtr randr_mode = NULL; RRModePtr randr_mode = NULL;
int x; int x;
@ -1136,7 +1136,7 @@ xf86RandR12CrtcSet(ScreenPtr pScreen,
int num_randr_outputs, RROutputPtr * randr_outputs) int num_randr_outputs, RROutputPtr * randr_outputs)
{ {
XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen); XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
xf86CrtcPtr crtc = randr_crtc->devPrivate; xf86CrtcPtr crtc = randr_crtc->devPrivate;
RRTransformPtr transform; RRTransformPtr transform;
@ -1349,7 +1349,7 @@ static Bool
xf86RandR12OutputValidateMode(ScreenPtr pScreen, xf86RandR12OutputValidateMode(ScreenPtr pScreen,
RROutputPtr randr_output, RRModePtr randr_mode) RROutputPtr randr_output, RRModePtr randr_mode)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
xf86OutputPtr output = randr_output->devPrivate; xf86OutputPtr output = randr_output->devPrivate;
DisplayModeRec mode; DisplayModeRec mode;
@ -1434,7 +1434,7 @@ xf86RROutputSetModes(RROutputPtr randr_output, DisplayModePtr modes)
static Bool static Bool
xf86RandR12SetInfo12(ScreenPtr pScreen) xf86RandR12SetInfo12(ScreenPtr pScreen)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
RROutputPtr *clones; RROutputPtr *clones;
RRCrtcPtr *crtcs; RRCrtcPtr *crtcs;
@ -1510,7 +1510,7 @@ xf86RandR12SetInfo12(ScreenPtr pScreen)
static Bool static Bool
xf86RandR12GetInfo12(ScreenPtr pScreen, Rotation * rotations) xf86RandR12GetInfo12(ScreenPtr pScreen, Rotation * rotations)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
if (!pScrn->vtSema) if (!pScrn->vtSema)
return TRUE; return TRUE;
@ -1522,7 +1522,7 @@ xf86RandR12GetInfo12(ScreenPtr pScreen, Rotation * rotations)
static Bool static Bool
xf86RandR12CreateObjects12(ScreenPtr pScreen) xf86RandR12CreateObjects12(ScreenPtr pScreen)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
int c; int c;
int o; int o;
@ -1559,7 +1559,7 @@ static Bool
xf86RandR12CreateScreenResources12(ScreenPtr pScreen) xf86RandR12CreateScreenResources12(ScreenPtr pScreen)
{ {
int c; int c;
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
if (xf86RandR12Key == NULL) if (xf86RandR12Key == NULL)
@ -1581,7 +1581,7 @@ xf86RandR12CreateScreenResources12(ScreenPtr pScreen)
void void
xf86RandR12TellChanged(ScreenPtr pScreen) xf86RandR12TellChanged(ScreenPtr pScreen)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
int c; int c;
@ -1751,7 +1751,7 @@ xf86RandR12EnterVT(int screen_index, int flags)
static Bool static Bool
xf86RandR12Init12(ScreenPtr pScreen) xf86RandR12Init12(ScreenPtr pScreen)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
rrScrPrivPtr rp = rrGetScrPriv(pScreen); rrScrPrivPtr rp = rrGetScrPriv(pScreen);
XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen); XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);
int i; int i;

6
hw/xfree86/modes/xf86Rotate.c
View File

@ -174,7 +174,7 @@ xf86CrtcDamageShadow(xf86CrtcPtr crtc)
static void static void
xf86RotatePrepare(ScreenPtr pScreen) xf86RotatePrepare(ScreenPtr pScreen)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
int c; int c;
@ -204,7 +204,7 @@ xf86RotatePrepare(ScreenPtr pScreen)
static Bool static Bool
xf86RotateRedisplay(ScreenPtr pScreen) xf86RotateRedisplay(ScreenPtr pScreen)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
DamagePtr damage = xf86_config->rotation_damage; DamagePtr damage = xf86_config->rotation_damage;
RegionPtr region; RegionPtr region;
@ -328,7 +328,7 @@ xf86RotateFreeShadow(ScrnInfoPtr pScrn)
void void
xf86RotateCloseScreen(ScreenPtr screen) xf86RotateCloseScreen(ScreenPtr screen)
{ {
ScrnInfoPtr scrn = xf86Screens[screen->myNum]; ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
int c; int c;

4
hw/xfree86/ramdac/xf86Cursor.c
View File

@ -55,7 +55,7 @@ static Bool xf86CursorSwitchMode(int, DisplayModePtr, int);
Bool Bool
xf86InitCursor(ScreenPtr pScreen, xf86CursorInfoPtr infoPtr) xf86InitCursor(ScreenPtr pScreen, xf86CursorInfoPtr infoPtr)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
xf86CursorScreenPtr ScreenPriv; xf86CursorScreenPtr ScreenPriv;
miPointerScreenPtr PointPriv; miPointerScreenPtr PointPriv;
@ -120,7 +120,7 @@ xf86InitCursor(ScreenPtr pScreen, xf86CursorInfoPtr infoPtr)
static Bool static Bool
xf86CursorCloseScreen(int i, ScreenPtr pScreen) xf86CursorCloseScreen(int i, ScreenPtr pScreen)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
miPointerScreenPtr PointPriv = miPointerScreenPtr PointPriv =
(miPointerScreenPtr) dixLookupPrivate(&pScreen->devPrivates, (miPointerScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
miPointerScreenKey); miPointerScreenKey);

2
hw/xfree86/ramdac/xf86HWCurs.c
View File

@ -105,7 +105,7 @@ xf86InitHardwareCursor(ScreenPtr pScreen, xf86CursorInfoPtr infoPtr)
infoPtr->RealizeCursor = RealizeCursorInterleave0; infoPtr->RealizeCursor = RealizeCursorInterleave0;
} }
infoPtr->pScrn = xf86Screens[pScreen->myNum]; infoPtr->pScrn = xf86ScreenToScrn(pScreen);
return TRUE; return TRUE;
} }

2
hw/xfree86/ramdac/xf86RamDacCmap.c
View File

@ -59,7 +59,7 @@ Bool
RamDacHandleColormaps(ScreenPtr pScreen, int maxColors, int sigRGBbits, RamDacHandleColormaps(ScreenPtr pScreen, int maxColors, int sigRGBbits,
unsigned int flags) unsigned int flags)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
RamDacRecPtr hwp = RAMDACSCRPTR(pScrn); RamDacRecPtr hwp = RAMDACSCRPTR(pScrn);
if (hwp->LoadPalette == NULL) if (hwp->LoadPalette == NULL)

4
hw/xfree86/shadowfb/shadow.c
View File

@ -136,7 +136,7 @@ ShadowFBInit2(ScreenPtr pScreen,
RefreshAreaFuncPtr preRefreshArea, RefreshAreaFuncPtr preRefreshArea,
RefreshAreaFuncPtr postRefreshArea) RefreshAreaFuncPtr postRefreshArea)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
ShadowScreenPtr pPriv; ShadowScreenPtr pPriv;
PictureScreenPtr ps = GetPictureScreenIfSet(pScreen); PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
@ -229,7 +229,7 @@ ShadowLeaveVT(int index, int flags)
static Bool static Bool
ShadowCloseScreen(int i, ScreenPtr pScreen) ShadowCloseScreen(int i, ScreenPtr pScreen)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
ShadowScreenPtr pPriv = GET_SCREEN_PRIVATE(pScreen); ShadowScreenPtr pPriv = GET_SCREEN_PRIVATE(pScreen);
PictureScreenPtr ps = GetPictureScreenIfSet(pScreen); PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);

2
hw/xfree86/vgahw/vgaCmap.c
View File

@ -85,7 +85,7 @@ xColorItem *pdefs;
/* This can get called before the ScrnInfoRec is installed so we /* This can get called before the ScrnInfoRec is installed so we
can't rely on getting it with XF86SCRNINFO() */ can't rely on getting it with XF86SCRNINFO() */
int scrnIndex = pmap->pScreen->myNum; int scrnIndex = pmap->pScreen->myNum;
ScrnInfoPtr scrninfp = xf86Screens[scrnIndex]; ScrnInfoPtr scrninfp = xf86ScreenToScrn(pmap->pScreen);
vgaHWPtr hwp = VGAHWPTR(scrninfp); vgaHWPtr hwp = VGAHWPTR(scrninfp);
unsigned char overscan = hwp->ModeReg.Attribute[OVERSCAN]; unsigned char overscan = hwp->ModeReg.Attribute[OVERSCAN];

4
hw/xfree86/vgahw/vgaHW.c
View File

@ -651,7 +651,7 @@ vgaHWSaveScreen(ScreenPtr pScreen, int mode)
Bool on; Bool on;
if (pScreen != NULL) if (pScreen != NULL)
pScrn = xf86Screens[pScreen->myNum]; pScrn = xf86ScreenToScrn(pScreen);
on = xf86IsUnblank(mode); on = xf86IsUnblank(mode);
@ -1873,7 +1873,7 @@ vgaHWSetOverscan(ScrnInfoPtr pScrn, int overscan)
Bool Bool
vgaHWHandleColormaps(ScreenPtr pScreen) vgaHWHandleColormaps(ScreenPtr pScreen)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
if (pScrn->depth > 1 && pScrn->depth <= 8) { if (pScrn->depth > 1 && pScrn->depth <= 8) {
return xf86HandleColormaps(pScreen, 1 << pScrn->depth, return xf86HandleColormaps(pScreen, 1 << pScrn->depth,

10
hw/xfree86/xaa/xaaInit.c
View File

@ -104,7 +104,7 @@ XAADestroyInfoRec(XAAInfoRecPtr infoRec)
Bool Bool
XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec) XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
XAAScreenPtr pScreenPriv; XAAScreenPtr pScreenPriv;
int i; int i;
PictureScreenPtr ps = GetPictureScreenIfSet(pScreen); PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
@ -216,7 +216,7 @@ XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
static Bool static Bool
XAACloseScreen(int i, ScreenPtr pScreen) XAACloseScreen(int i, ScreenPtr pScreen)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
XAAScreenPtr pScreenPriv = XAAScreenPtr pScreenPriv =
(XAAScreenPtr) dixLookupPrivate(&pScreen->devPrivates, XAAScreenKey); (XAAScreenPtr) dixLookupPrivate(&pScreen->devPrivates, XAAScreenKey);
@ -278,7 +278,7 @@ XAAGetSpans(DrawablePtr pDraw,
ScreenPtr pScreen = pDraw->pScreen; ScreenPtr pScreen = pDraw->pScreen;
XAA_SCREEN_PROLOGUE(pScreen, GetSpans); XAA_SCREEN_PROLOGUE(pScreen, GetSpans);
if (xf86Screens[pScreen->myNum]->vtSema && if (xf86ScreenToScrn(pScreen)->vtSema &&
((pDraw->type == DRAWABLE_WINDOW) || IS_OFFSCREEN_PIXMAP(pDraw))) { ((pDraw->type == DRAWABLE_WINDOW) || IS_OFFSCREEN_PIXMAP(pDraw))) {
SYNC_CHECK(pDraw); SYNC_CHECK(pDraw);
} }
@ -311,7 +311,7 @@ static void
XAAInitializeOffscreenDepths(ScreenPtr pScreen) XAAInitializeOffscreenDepths(ScreenPtr pScreen)
{ {
XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen); XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
int d, dep; int d, dep;
infoRec->offscreenDepthsInitialized = TRUE; infoRec->offscreenDepthsInitialized = TRUE;
@ -329,7 +329,7 @@ static PixmapPtr
XAACreatePixmap(ScreenPtr pScreen, int w, int h, int depth, unsigned usage_hint) XAACreatePixmap(ScreenPtr pScreen, int w, int h, int depth, unsigned usage_hint)
{ {
XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen); XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
XAAPixmapPtr pPriv; XAAPixmapPtr pPriv;
PixmapPtr pPix = NULL; PixmapPtr pPix = NULL;
int size = w * h; int size = w * h;

2
hw/xfree86/xaa/xaaInitAccel.c
View File

@ -116,7 +116,7 @@ Bool
XAAInitAccel(ScreenPtr pScreen, XAAInfoRecPtr infoRec) XAAInitAccel(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
{ {
int index = pScreen->myNum; int index = pScreen->myNum;
ScrnInfoPtr pScrn = xf86Screens[index]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
Bool HaveScreenToScreenCopy = FALSE; Bool HaveScreenToScreenCopy = FALSE;
Bool HaveColorExpansion = FALSE; Bool HaveColorExpansion = FALSE;
Bool HaveScanlineColorExpansion = FALSE; Bool HaveScanlineColorExpansion = FALSE;

2
hw/xfree86/xaa/xaaOverlayDF.c
View File

@ -171,7 +171,7 @@ static DevPrivateKeyRec XAAOverlayKeyRec;
Bool Bool
XAAInitDualFramebufferOverlay(ScreenPtr pScreen, DepthChangeFuncPtr callback) XAAInitDualFramebufferOverlay(ScreenPtr pScreen, DepthChangeFuncPtr callback)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen); XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
XAAOverlayPtr pOverPriv; XAAOverlayPtr pOverPriv;

2
hw/xfree86/xaa/xaaPCache.c
View File

@ -652,7 +652,7 @@ ConvertSomePartialsTo8x8(int *NumMono, int *NumColor, int *NumPartial,
void void
XAAInitPixmapCache(ScreenPtr pScreen, RegionPtr areas, pointer data) XAAInitPixmapCache(ScreenPtr pScreen, RegionPtr areas, pointer data)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
XAAInfoRecPtr infoRec = (XAAInfoRecPtr) data; XAAInfoRecPtr infoRec = (XAAInfoRecPtr) data;
XAAPixmapCachePrivatePtr pCachePriv; XAAPixmapCachePrivatePtr pCachePriv;
BoxPtr pBox = RegionRects(areas); BoxPtr pBox = RegionRects(areas);

2
hw/xfree86/xaa/xaaStateChange.c
View File

@ -1532,7 +1532,7 @@ XAAStateWrapSetupForCPUToScreenTexture2(ScrnInfoPtr pScrn, int op,
Bool Bool
XAAInitStateWrap(ScreenPtr pScreen, XAAInfoRecPtr infoRec) XAAInitStateWrap(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
XAAStateWrapPtr pStatePriv; XAAStateWrapPtr pStatePriv;
int i = 0; int i = 0;