All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH 2/6] drm/i915/fbc: Remove second redundant intel_fbc_pre_update() call
Date: Fri, 13 Dec 2019 15:34:49 +0200	[thread overview]
Message-ID: <20191213133453.22152-2-ville.syrjala@linux.intel.com> (raw)
In-Reply-To: <20191213133453.22152-1-ville.syrjala@linux.intel.com>

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(-)

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))
-- 
2.23.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2019-12-13 21:09 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-13 13:34 [Intel-gfx] [PATCH 1/6] drm/i915/fbc: Reject PLANE_OFFSET.y%4!=0 on icl+ too Ville Syrjala
2019-12-13 13:34 ` Ville Syrjala [this message]
2019-12-13 13:39   ` [Intel-gfx] [PATCH 2/6] drm/i915/fbc: Remove second redundant intel_fbc_pre_update() call Chris Wilson
2019-12-13 13:34 ` [Intel-gfx] [PATCH 3/6] drm/i915/fbc: Move the plane state check into the fbc functions Ville Syrjala
2020-01-15 15:05   ` Imre Deak
2019-12-13 13:34 ` [Intel-gfx] [PATCH 4/6] drm/i915/fbc: Nuke fbc_supported() Ville Syrjala
2019-12-13 13:49   ` Chris Wilson
2019-12-13 13:34 ` [Intel-gfx] [PATCH 5/6] drm/i915/fbc: Add fbc tracepoints Ville Syrjala
2019-12-13 13:41   ` Chris Wilson
2019-12-13 14:03     ` Ville Syrjälä
2020-01-15 15:08   ` Imre Deak
2019-12-13 13:34 ` [Intel-gfx] [PATCH 6/6] drm/i915: Rename pipe update tracepoints Ville Syrjala
2019-12-13 13:41   ` Chris Wilson
2019-12-13 15:29 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/6] drm/i915/fbc: Reject PLANE_OFFSET.y%4!=0 on icl+ too Patchwork
2019-12-13 15:58 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2019-12-14  9:57 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2019-12-18 17:30 ` [Intel-gfx] [PATCH 1/6] " Imre Deak

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191213133453.22152-2-ville.syrjala@linux.intel.com \
    --to=ville.syrjala@linux.intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.