From a8f4108bea0966406b0fcae8d062ae1cfb4afbb3 Mon Sep 17 00:00:00 2001 From: Hong Liu Date: Wed, 12 Mar 2008 21:55:56 +0800 Subject: [PATCH] Fix rotation mem with kernel memory manager in VT switch Unbind and bind a DRM BO may change the buffer offset, thus crtc may reference a wrong rotated memory after a VT switch cycle. Destroying it here will cause its reallocation when entering VT. --- src/i830_driver.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/i830_driver.c b/src/i830_driver.c index 4c282679..644a11c9 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -3088,6 +3088,8 @@ I830LeaveVT(int scrnIndex, int flags) { ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; I830Ptr pI830 = I830PTR(pScrn); + xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); + int o; DPRINTF(PFX, "Leave VT\n"); @@ -3115,6 +3117,17 @@ I830LeaveVT(int scrnIndex, int flags) } #endif + for (o = 0; o < config->num_crtc; o++) { + xf86CrtcPtr crtc = config->crtc[o]; + + if (crtc->rotatedPixmap || crtc->rotatedData) { + crtc->funcs->shadow_destroy(crtc, crtc->rotatedPixmap, + crtc->rotatedData); + crtc->rotatedPixmap = NULL; + crtc->rotatedData = NULL; + } + } + xf86_hide_cursors (pScrn); RestoreHWState(pScrn);