[PATCH siliconmotion] Remove reference to pixmapPrivate.
Trevor Woerner
twoerner at gmail.com
Fri Oct 1 05:13:46 PDT 2010
From: Trevor Woerner <twoerner at gmail.com>
Signed-off-by: Trevor Woerner <twoerner at gmail.com>
---
src/smi_crtc.c | 5 -----
src/smi_driver.c | 1 -
2 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/src/smi_crtc.c b/src/smi_crtc.c
index bccf9b2..36bd085 100644
--- a/src/smi_crtc.c
+++ b/src/smi_crtc.c
@@ -210,11 +210,6 @@ SMI_CrtcConfigResize(ScrnInfoPtr pScrn,
pScrn->pScreen->ModifyPixmapHeader(pScrn->pScreen->GetScreenPixmap(pScrn->pScreen),
-1,-1,-1,-1,-1, pSmi->FBBase + pSmi->FBOffset);
- if(pScrn->pixmapPrivate.ptr)
- /* The pixmap devPrivate just set may be overwritten by
- xf86EnableDisableFBAccess */
- pScrn->pixmapPrivate.ptr = pSmi->FBBase + pSmi->FBOffset;
-
/* Modify the screen pitch */
pScrn->displayWidth = aligned_pitch / pSmi->Bpp;
pScrn->pScreen->ModifyPixmapHeader(pScrn->pScreen->GetScreenPixmap(pScrn->pScreen),
diff --git a/src/smi_driver.c b/src/smi_driver.c
index 391efbc..45d19a9 100644
--- a/src/smi_driver.c
+++ b/src/smi_driver.c
@@ -927,7 +927,6 @@ 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);
- pScrn->pixmapPrivate.ptr=pSmi->FBBase + pSmi->FBOffset;
if(pSmi->useEXA)
pSmi->EXADriverPtr->memoryBase=pSmi->FBBase;
--
1.7.3.1.45.g9855b
More information about the xorg-devel
mailing list