Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abae50ed authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Do the fbc vs. primary plane enable/disable in the right order 



Disable fbc before disabling the primary plane, and enable fbc after
the primary plane has been enabled again.

Also use intel_disable_fbc() to disable FBC to avoid the pointless
overhead of intel_update_fbc(), and especially avoid having to clean
up and set up the stolen mem compressed buffer again.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 098ebd6b

drivers/gpu/drm/i915/intel_sprite.c

+6 −5
Original line number Diff line number Diff line
@@ -526,11 +526,11 @@ intel_enable_primary(struct drm_crtc *crtc) 


	intel_crtc->primary_disabled = false;



	I915_WRITE(reg, I915_READ(reg) | DISPLAY_PLANE_ENABLE);



	mutex_lock(&dev->struct_mutex);

	intel_update_fbc(dev);

	mutex_unlock(&dev->struct_mutex);



	I915_WRITE(reg, I915_READ(reg) | DISPLAY_PLANE_ENABLE);

}



static void
@@ -544,13 +544,14 @@ intel_disable_primary(struct drm_crtc *crtc) 
	if (intel_crtc->primary_disabled)

		return;



	I915_WRITE(reg, I915_READ(reg) & ~DISPLAY_PLANE_ENABLE);



	intel_crtc->primary_disabled = true;



	mutex_lock(&dev->struct_mutex);

	intel_update_fbc(dev);

	if (dev_priv->fbc.plane == intel_crtc->plane)

		intel_disable_fbc(dev);

	mutex_unlock(&dev->struct_mutex);



	I915_WRITE(reg, I915_READ(reg) & ~DISPLAY_PLANE_ENABLE);

}



static int