diff options
| author | Eric Anholt <eric@anholt.net> | 2007-02-23 14:17:07 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-02-23 14:17:07 -0800 |
| commit | 54198b26e87baa180208932b97f10b27d9c0fddc (patch) | |
| tree | 4c50691591a016c5269d12abca6dc365d8a722d6 /src/i830_display.c | |
| parent | 828deff6453872ef0f9fa35c08c9f95f464b1785 (diff) | |
Move memory allocation to ScreenInit rather than PreInit.
This lets us do memory allocation just once rather than having several passes
(as long as things succeed), avoids trouble with zaphod mode, and will let us
do better automatic sizing of allocations soon.
Diffstat (limited to 'src/i830_display.c')
| -rw-r--r-- | src/i830_display.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/i830_display.c b/src/i830_display.c index a09d96ae..f3beb572 100644 --- a/src/i830_display.c +++ b/src/i830_display.c @@ -972,7 +972,7 @@ i830_crtc_shadow_allocate (xf86CrtcPtr crtc, int width, int height) unsigned long rotate_offset; int align = KB(4), size; - rotate_pitch = pI830->displayWidth * pI830->cpp; + rotate_pitch = pScrn->displayWidth * pI830->cpp; size = rotate_pitch * height; #ifdef I830_USE_EXA @@ -1034,7 +1034,7 @@ i830_crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height) if (!data) data = i830_crtc_shadow_allocate (crtc, width, height); - rotate_pitch = pI830->displayWidth * pI830->cpp; + rotate_pitch = pScrn->displayWidth * pI830->cpp; rotate_pixmap = GetScratchPixmapHeader(pScrn->pScreen, width, height, |