diff options
| author | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2008-01-24 10:41:26 +0800 |
|---|---|---|
| committer | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2008-01-24 10:41:26 +0800 |
| commit | 8661ef9db6a01b3d604b8e55c0e494adc50cb503 (patch) | |
| tree | bc9adf9266bb405820c781855ed0b4efef5c8847 | |
| parent | 81986bb35c9aea03665abc491d88ef3ab2db8de4 (diff) | |
| parent | d341e41c863f1212bf2c6b84782a7e472b6612a1 (diff) | |
| download | xorg-driver-xf86-video-intel-8661ef9db6a01b3d604b8e55c0e494adc50cb503.tar.gz | |
Merge branch 'master' into xf86-video-intel-2.2-branch
| -rw-r--r-- | src/i830_display.c | 1 | ||||
| -rw-r--r-- | src/i830_driver.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/i830_display.c b/src/i830_display.c index d16871d4..f61d3c40 100644 --- a/src/i830_display.c +++ b/src/i830_display.c @@ -1342,6 +1342,7 @@ i830_crtc_shadow_allocate (xf86CrtcPtr crtc, int width, int height) "Couldn't allocate shadow memory for rotated CRTC\n"); return NULL; } + memset(pI830->FbBase + intel_crtc->rotate_mem->offset, 0, size); return pI830->FbBase + intel_crtc->rotate_mem->offset; } diff --git a/src/i830_driver.c b/src/i830_driver.c index 32cecff1..70774568 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -2353,6 +2353,7 @@ I830BlockHandler(int i, (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask); + pI830->BlockHandler = pScreen->BlockHandler; pScreen->BlockHandler = I830BlockHandler; I830VideoBlockHandler(i, blockData, pTimeout, pReadmask); |