Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

drm/i915: Replace direct calls to vfunc.disable_fbc with intel_disable_fbc()

Browse source 
...to ensure that any pending FBC enable tasklet is cancelled.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Chris Wilson 2011-07-08 12:22:37 +01:00 committed by Keith Packard
parent 43a9539fa9
commit 973d04f990
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/gpu/drm/i915/intel_display.c
View file

@ -2820,9 +2820,8 @@ static void ironlake_crtc_disable(struct drm_crtc *crtc)
intel_disable_plane(dev_priv, plane, pipe); intel_disable_plane(dev_priv, plane, pipe);
if (dev_priv->cfb_plane == plane && if (dev_priv->cfb_plane == plane)
dev_priv->display.disable_fbc) intel_disable_fbc(dev);
dev_priv->display.disable_fbc(dev);
intel_disable_pipe(dev_priv, pipe); intel_disable_pipe(dev_priv, pipe);
@ -2986,9 +2985,8 @@ static void i9xx_crtc_disable(struct drm_crtc *crtc)
intel_crtc_dpms_overlay(intel_crtc, false); intel_crtc_dpms_overlay(intel_crtc, false);
intel_crtc_update_cursor(crtc, false); intel_crtc_update_cursor(crtc, false);
if (dev_priv->cfb_plane == plane && if (dev_priv->cfb_plane == plane)
dev_priv->display.disable_fbc) intel_disable_fbc(dev);
dev_priv->display.disable_fbc(dev);
intel_disable_plane(dev_priv, plane, pipe); intel_disable_plane(dev_priv, plane, pipe);
intel_disable_pipe(dev_priv, pipe); intel_disable_pipe(dev_priv, pipe);
@ -8217,8 +8215,7 @@ void intel_modeset_cleanup(struct drm_device *dev)
intel_increase_pllclock(crtc); intel_increase_pllclock(crtc);
} }
if (dev_priv->display.disable_fbc) intel_disable_fbc(dev);
dev_priv->display.disable_fbc(dev);
if (IS_IRONLAKE_M(dev)) if (IS_IRONLAKE_M(dev))
ironlake_disable_drps(dev); ironlake_disable_drps(dev);