Commit de5bd083 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915/fbc: Skip nuke when flip is pending 



Don't issue a nuke from frontbuffer flush while a flip is pending.
This avoids the DSPADDR/DSPSURF rmw abuse from the pre-snb nuke
from racing with the DSPADDR/DSPSURF write being performed by
the flip/plane update. The flip itself will already cause the nuke
so a double nuke is redundant.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220315140001.1172-4-ville.syrjala@linux.intel.com


Reviewed-by: default avatarMika Kahola <mika.kahola@intel.com>
parent 529b43df

drivers/gpu/drm/i915/display/intel_fbc.c

+8 −2
Original line number Diff line number Diff line
@@ -667,6 +667,10 @@ static bool intel_fbc_is_compressing(struct intel_fbc *fbc) 


static void intel_fbc_nuke(struct intel_fbc *fbc)

{

	struct drm_i915_private *i915 = fbc->i915;



	drm_WARN_ON(&i915->drm, fbc->flip_pending);



	trace_intel_fbc_nuke(fbc->state.plane);



	fbc->funcs->nuke(fbc);
@@ -969,6 +973,7 @@ static void intel_fbc_update_state(struct intel_atomic_state *state, 
	struct intel_fbc_state *fbc_state = &fbc->state;



	WARN_ON(plane_state->no_fbc_reason);

	WARN_ON(fbc_state->plane && fbc_state->plane != plane);



	fbc_state->plane = plane;
@@ -1273,6 +1278,7 @@ static void __intel_fbc_disable(struct intel_fbc *fbc) 
	__intel_fbc_cleanup_cfb(fbc);



	fbc->state.plane = NULL;

	fbc->flip_pending = false;

	fbc->busy_bits = 0;

}
@@ -1367,12 +1373,12 @@ static void __intel_fbc_flush(struct intel_fbc *fbc, 
	if (origin == ORIGIN_FLIP || origin == ORIGIN_CURSOR_UPDATE)

		goto out;



	if (fbc->busy_bits)

	if (fbc->busy_bits || fbc->flip_pending)

		goto out;



	if (fbc->active)

		intel_fbc_nuke(fbc);

	else if (!fbc->flip_pending)

	else

		__intel_fbc_post_update(fbc);



out: