diff options
| author | Julien Cristau <jcristau@debian.org> | 2011-02-27 15:46:13 +0100 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2011-02-27 15:46:13 +0100 |
| commit | 6008906f0e328180b17e7b604b97dfdfd4280508 (patch) | |
| tree | 4d7e933fe716266517fb265ab855289ca553da7a | |
| parent | 903aac1db82e17954b74581019ebb946d5b43fe3 (diff) | |
Fix build with xserver 1.10
ScrnInfo->pixmapPrivate is gone
Signed-off-by: Julien Cristau <jcristau@debian.org>
| -rw-r--r-- | src/smi_crtc.c | 2 | ||||
| -rw-r--r-- | src/smi_driver.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/smi_crtc.c b/src/smi_crtc.c index bccf9b2..2bcdc0a 100644 --- a/src/smi_crtc.c +++ b/src/smi_crtc.c @@ -210,10 +210,12 @@ SMI_CrtcConfigResize(ScrnInfoPtr pScrn, pScrn->pScreen->ModifyPixmapHeader(pScrn->pScreen->GetScreenPixmap(pScrn->pScreen), -1,-1,-1,-1,-1, pSmi->FBBase + pSmi->FBOffset); +#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0)) if(pScrn->pixmapPrivate.ptr) /* The pixmap devPrivate just set may be overwritten by xf86EnableDisableFBAccess */ pScrn->pixmapPrivate.ptr = pSmi->FBBase + pSmi->FBOffset; +#endif /* Modify the screen pitch */ pScrn->displayWidth = aligned_pitch / pSmi->Bpp; diff --git a/src/smi_driver.c b/src/smi_driver.c index 391efbc..b736637 100644 --- a/src/smi_driver.c +++ b/src/smi_driver.c @@ -927,7 +927,9 @@ SMI_EnterVT(int scrnIndex, int flags) /* FBBase may have changed after remapping the memory */ pScrn->pScreen->ModifyPixmapHeader(pScrn->pScreen->GetScreenPixmap(pScrn->pScreen), -1,-1,-1,-1,-1, pSmi->FBBase + pSmi->FBOffset); +#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0)) pScrn->pixmapPrivate.ptr=pSmi->FBBase + pSmi->FBOffset; +#endif if(pSmi->useEXA) pSmi->EXADriverPtr->memoryBase=pSmi->FBBase; |