diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-04-13 17:04:38 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-04-13 17:04:38 +0100 |
| commit | 30eddaa3ff29f9378ccaebaca0104107b2e12e67 (patch) | |
| tree | d1c47bf3903e05c1afd5c36ef32d30fd0e975b46 | |
| parent | 0709f45d5b63673dfda4e1ea20d9be4d4da3359f (diff) | |
dga: don't use screen index from within code
| -rw-r--r-- | hw/xfree86/common/xf86DGA.c | 10 | ||||
| -rw-r--r-- | hw/xfree86/dixmods/extmod/dgaproc.h | 1 | ||||
| -rw-r--r-- | hw/xfree86/modes/xf86DiDGA.c | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c index 64163721f..1245e69d1 100644 --- a/hw/xfree86/common/xf86DGA.c +++ b/hw/xfree86/common/xf86DGA.c @@ -521,18 +521,24 @@ DGAChangePixmapMode(int index, int *x, int *y, int mode) } Bool -DGAAvailable(int index) +DGAScrAvailable(ScreenPtr pScreen) { if (!DGAScreenKeyRegistered) return FALSE; - if (DGA_GET_SCREEN_PRIV(screenInfo.screens[index])) + if (DGA_GET_SCREEN_PRIV(pScreen)) return TRUE; return FALSE; } Bool +DGAAvailable(int index) +{ + return DGAScrAvailable(screenInfo.screens[index]); +} + +Bool DGAActive(int index) { DGAScreenPtr pScreenPriv; diff --git a/hw/xfree86/dixmods/extmod/dgaproc.h b/hw/xfree86/dixmods/extmod/dgaproc.h index b4e0ddfea..cae8a101c 100644 --- a/hw/xfree86/dixmods/extmod/dgaproc.h +++ b/hw/xfree86/dixmods/extmod/dgaproc.h @@ -64,6 +64,7 @@ extern _X_EXPORT void DGASelectInput(int Index, ClientPtr client, long mask); extern _X_EXPORT Bool DGAAvailable(int Index); +extern _X_EXPORT Bool DGAScrAvailable(ScreenPtr pScreen); extern _X_EXPORT Bool DGAActive(int Index); extern _X_EXPORT void DGAShutdown(void); extern _X_EXPORT void DGAInstallCmap(ColormapPtr cmap); diff --git a/hw/xfree86/modes/xf86DiDGA.c b/hw/xfree86/modes/xf86DiDGA.c index 39a644cd4..fefb8b7d5 100644 --- a/hw/xfree86/modes/xf86DiDGA.c +++ b/hw/xfree86/modes/xf86DiDGA.c @@ -178,7 +178,7 @@ _xf86_di_dga_reinit_internal(ScreenPtr pScreen) ScrnInfoPtr scrn = xf86ScreenToScrn(pScreen); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); - if (!DGAAvailable(pScreen->myNum)) + if (!DGAScrAvailable(pScreen)) return TRUE; if (!xf86_dga_get_modes(pScreen)) |