diff options
| author |   Ville Syrjälä <ville.syrjala@linux.intel.com> | 2019-12-13 15:34:49 +0200 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2019-12-19 22:29:09 +0200 |
| commit | 36fef958e2da969595871da07dd913a2e5be2816 (patch) | |
| tree | 13f6b946c1605f55e79c89fa93375956224ae21e | |
| parent | drm/i915/fbc: Reject PLANE_OFFSET.y%4!=0 on icl+ too (diff) | |
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 <chris@chris-wilson.co.uk>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191213133453.22152-2-ville.syrjala@linux.intel.com
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_display.c | 3 |
1 files changed, 0 insertions, 3 deletions
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)) |