Commit 6008906f authored by Julien Cristau's avatar Julien Cristau
Browse files

Fix build with xserver 1.10



ScrnInfo->pixmapPrivate is gone
Signed-off-by: Julien Cristau's avatarJulien Cristau <jcristau@debian.org>
parent 903aac1d
......@@ -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;
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment