diff options
| author | Eric Anholt <eric@anholt.net> | 2010-03-04 10:29:09 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-03-04 11:25:14 -0800 |
| commit | 7b7c724da97f358f5d2d4d4dae75cfc85bde2c62 (patch) | |
| tree | af90bcd7a5fa8a26a82ca095536b0a114935841d | |
| parent | 15026d64d3c0d8ad96e0a73fcae3103d1c41fd46 (diff) | |
| download | xf86-video-intel-7b7c724da97f358f5d2d4d4dae75cfc85bde2c62.tar.gz xf86-video-intel-7b7c724da97f358f5d2d4d4dae75cfc85bde2c62.tar.bz2 xf86-video-intel-7b7c724da97f358f5d2d4d4dae75cfc85bde2c62.zip | |
Remove remaining fbOffset setting.
In the long long ago, fbOffset was used for DGA. The server now has
only one reference to fbOffset, a leftover setting of it in fbdevhw.
We can safely ignore it now, which is good since we weren't updating
it in other places where the front buffer offset could change.
| -rw-r--r-- | src/drmmode_display.c | 1 | ||||
| -rw-r--r-- | src/i830.h | 1 | ||||
| -rw-r--r-- | src/i830_driver.c | 3 | ||||
| -rw-r--r-- | src/i830_memory.c | 15 |
4 files changed, 1 insertions, 19 deletions
diff --git a/src/drmmode_display.c b/src/drmmode_display.c index 9cdb7e8bf..b1531bd35 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -1368,7 +1368,6 @@ drmmode_do_pageflip(ScreenPtr screen, dri_bo *new_front, dri_bo *old_front, dri_bo_pin(new_front, 0); dri_bo_unpin(new_front); - scrn->fbOffset = new_front->offset; intel->front_buffer = new_front; drmmode->old_fb_id = old_fb_id; diff --git a/src/i830.h b/src/i830.h index 6d88a4caf..7593cdea1 100644 --- a/src/i830.h +++ b/src/i830.h @@ -432,7 +432,6 @@ Bool i830_tiled_width(intel_screen_private *intel, int *width, int cpp); int i830_pad_drawable_width(int width, int cpp); /* i830_memory.c */ -Bool i830_reinit_memory(ScrnInfoPtr scrn); unsigned long i830_get_fence_size(intel_screen_private *intel, unsigned long size); unsigned long i830_get_fence_pitch(intel_screen_private *intel, unsigned long pitch, uint32_t tiling_mode); diff --git a/src/i830_driver.c b/src/i830_driver.c index 284ad7114..53d866363 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -1389,8 +1389,7 @@ static Bool I830EnterVT(int scrnIndex, int flags) strerror(errno)); } - if (!i830_reinit_memory(scrn)) - return FALSE; + i830_set_gem_max_sizes(scrn); if (!xf86SetDesiredModes(scrn)) return FALSE; diff --git a/src/i830_memory.c b/src/i830_memory.c index ae5e9f0ff..a21f29b51 100644 --- a/src/i830_memory.c +++ b/src/i830_memory.c @@ -276,21 +276,6 @@ drm_intel_bo *i830_allocate_framebuffer(ScrnInfoPtr scrn) return front_buffer; } -/** - * Called at EnterVT to reinit memory related stuff.. - */ -Bool i830_reinit_memory(ScrnInfoPtr scrn) -{ - intel_screen_private *intel = intel_get_screen_private(scrn); - - i830_set_gem_max_sizes(scrn); - - if (intel->front_buffer) - scrn->fbOffset = intel->front_buffer->offset; - - return TRUE; -} - static void i830_set_max_gtt_map_size(ScrnInfoPtr scrn) { intel_screen_private *intel = intel_get_screen_private(scrn); |