core/xf86-video-siliconmotion/pixmapPrivate.patch
2011-03-05 17:38:37 +01:00

35 lines
1.4 KiB
Diff

Signed-off-by: Trevor Woerner <twoerner@...>
---
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;
--