Commit 973d04f9 authored by Chris Wilson's avatar Chris Wilson Committed by Keith Packard
Browse files

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



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

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
parent 43a9539f

drivers/gpu/drm/i915/intel_display.c

+5 −8
Original line number Diff line number Diff line
@@ -2820,9 +2820,8 @@ static void ironlake_crtc_disable(struct drm_crtc *crtc) 


	intel_disable_plane(dev_priv, plane, pipe);



	if (dev_priv->cfb_plane == plane &&

	    dev_priv->display.disable_fbc)

		dev_priv->display.disable_fbc(dev);

	if (dev_priv->cfb_plane == plane)

		intel_disable_fbc(dev);



	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_update_cursor(crtc, false);



	if (dev_priv->cfb_plane == plane &&

	    dev_priv->display.disable_fbc)

		dev_priv->display.disable_fbc(dev);

	if (dev_priv->cfb_plane == plane)

		intel_disable_fbc(dev);



	intel_disable_plane(dev_priv, plane, pipe);

	intel_disable_pipe(dev_priv, pipe);
@@ -8217,8 +8215,7 @@ void intel_modeset_cleanup(struct drm_device *dev) 
		intel_increase_pllclock(crtc);

	}



	if (dev_priv->display.disable_fbc)

		dev_priv->display.disable_fbc(dev);

	intel_disable_fbc(dev);



	if (IS_IRONLAKE_M(dev))

		ironlake_disable_drps(dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE