[2/6] drm/i915/fbc: Remove second redundant intel_fbc_pre_update() call
diff mbox series

Message ID 20191213133453.22152-2-ville.syrjala@linux.intel.com
State New
Headers show
Series
  • [1/6] drm/i915/fbc: Reject PLANE_OFFSET.y%4!=0 on icl+ too
Related show

Commit Message

Ville Syrjälä Dec. 13, 2019, 1:34 p.m. UTC
From: Ville Syrjälä <ville.syrjala@linux.intel.com>

I fumbled the conflict resolution a bit when applying the
fbc vblank wait w/a. Because of that we now call intel_fbc_pre_update()
twice. Remove the second redundant call.

Reported-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 3 ---
 1 file changed, 3 deletions(-)

Comments

Chris Wilson Dec. 13, 2019, 1:39 p.m. UTC | #1
Quoting Ville Syrjala (2019-12-13 13:34:49)
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> I fumbled the conflict resolution a bit when applying the
> fbc vblank wait w/a. Because of that we now call intel_fbc_pre_update()
> twice. Remove the second redundant call.
> 
> Reported-by: Chris Wilson <chris@chris-wilson.co.uk>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris

Patch
diff mbox series

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 0f37f1d2026d..8f14352a2193 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -6062,9 +6062,6 @@  static void intel_pre_plane_update(struct intel_atomic_state *state,
 	    intel_fbc_pre_update(crtc, new_crtc_state, new_primary_state))
 		intel_wait_for_vblank(dev_priv, pipe);
 
-	if (new_primary_state)
-		intel_fbc_pre_update(crtc, new_crtc_state, new_primary_state);
-
 	/* Display WA 827 */
 	if (!needs_nv12_wa(old_crtc_state) &&
 	    needs_nv12_wa(new_crtc_state))