diff options
| author | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2008-12-31 22:56:57 +0800 |
|---|---|---|
| committer | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2008-12-31 23:09:20 +0800 |
| commit | fac43181af0ad59fa6d06e26d369d886ce221c10 (patch) | |
| tree | 9f7889e5ba04efb08312b6087b68ae6731bd4ceb /src/i830_exa.c | |
| parent | 8dfbd9ea1733768bf528e04a660a1ac478c3249e (diff) | |
UXA: Fallback to dri_bo_map() if pin failed
This fixes VT switch issue with UXA after Eric's
aae4008096399a0e84abc7c016b35092caf9db25 on 2D side.
(cherry picked from commit 1f61e97904dfe5f8c08bb9f284cfdfe878f7e541)
Diffstat (limited to 'src/i830_exa.c')
| -rw-r--r-- | src/i830_exa.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/i830_exa.c b/src/i830_exa.c index 636aa0af..aeffedd8 100644 --- a/src/i830_exa.c +++ b/src/i830_exa.c @@ -785,11 +785,15 @@ i830_uxa_prepare_access (PixmapPtr pixmap, uxa_access_t access) i830->need_sync = FALSE; } - if (drm_intel_bo_pin(bo, 4096) != 0) - return FALSE; - - drm_intel_gem_bo_start_gtt_access(bo, access == UXA_ACCESS_RW); - pixmap->devPrivate.ptr = pI830->FbBase + bo->offset; + if (drm_intel_bo_pin(bo, 4096) != 0) { + /* happen in vt switched */ + if (dri_bo_map(bo, access == UXA_ACCESS_RW) != 0) + return FALSE; + pixmap->devPrivate.ptr = bo->virtual; + } else { + drm_intel_gem_bo_start_gtt_access(bo, access == UXA_ACCESS_RW); + pixmap->devPrivate.ptr = pI830->FbBase + bo->offset; + } } return TRUE; } @@ -804,7 +808,10 @@ i830_uxa_finish_access (PixmapPtr pixmap) ScrnInfoPtr scrn = xf86Screens[screen->myNum]; I830Ptr i830 = I830PTR(scrn); - drm_intel_bo_unpin(bo); + if (bo->virtual) + dri_bo_unmap(bo); + else + drm_intel_bo_unpin(bo); pixmap->devPrivate.ptr = NULL; if (bo == i830->front_buffer->bo) |