From: Ville Syrjälä Date: Fri, 13 Dec 2019 13:34:49 +0000 (+0200) Subject: drm/i915/fbc: Remove second redundant intel_fbc_pre_update() call X-Git-Tag: v5.15~4600^2~17^2~32 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=36fef958e2da969595871da07dd913a2e5be2816;p=mirror_ubuntu-kernels.git drm/i915/fbc: Remove second redundant intel_fbc_pre_update() call 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 Signed-off-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20191213133453.22152-2-ville.syrjala@linux.intel.com Reviewed-by: Chris Wilson --- diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 38bc92256f64..983f5b084ff9 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -6043,9 +6043,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))