summaryrefslogtreecommitdiff
path: root/src/i830_driver.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2010-03-08 17:03:36 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2010-04-08 11:22:16 +0200
commit5d104e9c5cd5cd2d34c9035dd38794fa9b5578f3 (patch)
treeb826c58fd4bc5f6ec253d4d21baee53bbd27ec9c /src/i830_driver.c
parentebc0ffba79cc4bd564a8bd97327f24a1d15b3d1a (diff)
XvMC: unify PutImage handling
Both xvmc are handing in the bo in the exact same way. So move the code to src/i830_video.c and kill this great oeuvre of spaghetti-code. The xvmc driver ini and fini also lost their last use, kill them, too. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'src/i830_driver.c')
-rw-r--r--src/i830_driver.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 22e8472d..95b02f3a 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -1340,11 +1340,6 @@ static void i830AdjustFrame(int scrnIndex, int x, int y, int flags)
static void I830FreeScreen(int scrnIndex, int flags)
{
ScrnInfoPtr scrn = xf86Screens[scrnIndex];
-#ifdef INTEL_XVMC
- intel_screen_private *intel = intel_get_screen_private(scrn);
- if (intel && intel->XvMCEnabled)
- intel_xvmc_finish(xf86Screens[scrnIndex]);
-#endif
i830_close_drm_master(scrn);