summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2010-02-19 08:03:44 -0800
committerEric Anholt <eric@anholt.net>2010-02-20 12:55:13 -0500
commit03657d4a698e0a25ab3863a15ad4c8b9d64dbb9a (patch)
tree0a2119fdf8e22cc3ca177e0ebe35661bcf8f9fd3
parent1c3aaad09d6ef207fba748ad4ef4575a26ab2e5c (diff)
Remove dead UMS CRTC resize code.
-rw-r--r--src/i830_driver.c65
1 files changed, 0 insertions, 65 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c
index e94a60c9..32d18996 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -403,71 +403,6 @@ int i830_pad_drawable_width(int width, int cpp)
return (width + 63) & ~63;
}
-static Bool i830_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
-{
-#ifdef DRI2
- intel_screen_private *intel = intel_get_screen_private(scrn);
- int old_width = scrn->displayWidth;
-#endif
- int old_x = scrn->virtualX;
- int old_y = scrn->virtualY;
-
- if (old_x == width && old_y == height)
- return TRUE;
-
- scrn->virtualX = width;
- scrn->virtualY = height;
-#ifdef DRI2
- if (intel->front_buffer) {
- i830_memory *new_front, *old_front;
- Bool tiled;
- ScreenPtr screen = screenInfo.screens[scrn->scrnIndex];
-
- scrn->displayWidth = i830_pad_drawable_width(width, intel->cpp);
- tiled = i830_tiled_width(intel, &scrn->displayWidth, intel->cpp);
- xf86DrvMsg(scrn->scrnIndex, X_INFO,
- "Allocate new frame buffer %dx%d stride %d\n", width,
- height, scrn->displayWidth);
- intel_sync(scrn);
- i830WaitForVblank(scrn);
- new_front = i830_allocate_framebuffer(scrn);
- if (!new_front) {
- scrn->virtualX = old_x;
- scrn->virtualY = old_y;
- scrn->displayWidth = old_width;
- return FALSE;
- }
- old_front = intel->front_buffer;
- intel->front_buffer = new_front;
- i830_set_pixmap_bo(screen->GetScreenPixmap(screen),
- new_front->bo);
- scrn->fbOffset = intel->front_buffer->offset;
-
- screen->ModifyPixmapHeader(screen->GetScreenPixmap(screen),
- width, height, -1, -1,
- scrn->displayWidth * intel->cpp,
- NULL);
-
- /* ick. xf86EnableDisableFBAccess smashes the screen pixmap devPrivate,
- * so update the value it uses
- */
- scrn->pixmapPrivate.ptr = NULL;
- xf86DrvMsg(scrn->scrnIndex, X_INFO,
- "New front buffer at 0x%lx\n",
- intel->front_buffer->offset);
- i830_set_new_crtc_bo(scrn);
- intel_sync(scrn);
- i830WaitForVblank(scrn);
- i830_free_memory(scrn, old_front);
- }
-#endif
- return TRUE;
-}
-
-static const xf86CrtcConfigFuncsRec i830_xf86crtc_config_funcs = {
- i830_xf86crtc_resize
-};
-
/*
* DRM mode setting Linux only at this point... later on we could
* add a wrapper here.