diff options
| author | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2009-01-14 16:39:08 +0800 |
|---|---|---|
| committer | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2009-01-14 16:39:08 +0800 |
| commit | 70ba6d45c9a00756e0ad36a58136281adba138f9 (patch) | |
| tree | 60770ff68d44ff37a42e8ad937d1bfb37d37ec3f | |
| parent | 3743747dbcf538ddd6db882bde7243656d0c5596 (diff) | |
Revert "Assign rotation memory dri_bo to rotation pixmap."
This reverts commit d994978488648a68ade0d518e5dd40d100e953ed.
This requires i830_set_pixmap_bo() on master that is not in
2.6 branch.
| -rw-r--r-- | src/i830_display.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/i830_display.c b/src/i830_display.c index e1ba661f..022d519d 100644 --- a/src/i830_display.c +++ b/src/i830_display.c @@ -1624,7 +1624,6 @@ static PixmapPtr i830_crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height) { ScrnInfoPtr pScrn = crtc->scrn; - I830CrtcPrivatePtr intel_crtc = crtc->driver_private; I830Ptr pI830 = I830PTR(pScrn); unsigned long rotate_pitch; PixmapPtr rotate_pixmap; @@ -1645,8 +1644,6 @@ i830_crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height) xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Couldn't allocate shadow pixmap for rotated CRTC\n"); } - if (intel_crtc->rotate_mem && intel_crtc->rotate_mem->bo) - i830_set_pixmap_bo(rotate_pixmap, intel_crtc->rotate_mem->bo); return rotate_pixmap; } |