public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH 4/8] drm/i915: Clear no_fbc_reason on activate
Date: Wed, 14 Apr 2021 05:23:05 +0300	[thread overview]
Message-ID: <20210414022309.30898-5-ville.syrjala@linux.intel.com> (raw)
In-Reply-To: <20210414022309.30898-1-ville.syrjala@linux.intel.com>

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

We try to set no_fbc_reason when FBC is not possible, let's
consistently clear when activating FBC.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_fbc.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
index 4968e79a6235..fb8c0872a2b7 100644
--- a/drivers/gpu/drm/i915/display/intel_fbc.c
+++ b/drivers/gpu/drm/i915/display/intel_fbc.c
@@ -411,6 +411,17 @@ bool intel_fbc_is_active(struct drm_i915_private *dev_priv)
 	return dev_priv->fbc.active;
 }
 
+static void intel_fbc_activate(struct drm_i915_private *dev_priv)
+{
+	struct intel_fbc *fbc = &dev_priv->fbc;
+
+	drm_WARN_ON(&dev_priv->drm, !mutex_is_locked(&fbc->lock));
+
+	intel_fbc_hw_activate(dev_priv);
+
+	fbc->no_fbc_reason = NULL;
+}
+
 static void intel_fbc_deactivate(struct drm_i915_private *dev_priv,
 				 const char *reason)
 {
@@ -1094,7 +1105,7 @@ static void __intel_fbc_post_update(struct intel_crtc *crtc)
 		return;
 
 	if (!fbc->busy_bits)
-		intel_fbc_hw_activate(dev_priv);
+		intel_fbc_activate(dev_priv);
 	else
 		intel_fbc_deactivate(dev_priv, "frontbuffer write");
 }
-- 
2.26.3

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

  parent reply	other threads:[~2021-04-14  2:23 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-14  2:23 [Intel-gfx] [PATCH 0/8] drm/i915: FBC cleanups Ville Syrjala
2021-04-14  2:23 ` [Intel-gfx] [PATCH 1/8] drm/i915: Add frontbuffer tracking tracepoints Ville Syrjala
2021-04-21 13:01   ` Jani Nikula
2021-04-14  2:23 ` [Intel-gfx] [PATCH 2/8] drm/i915: Rewrite the FBC tiling check a bit Ville Syrjala
2021-04-14 15:09   ` Jani Nikula
2021-04-15 15:34     ` Ville Syrjälä
2021-04-21 13:00       ` Jani Nikula
2021-04-14  2:23 ` [Intel-gfx] [PATCH 3/8] drm/i915: Extract intel_fbc_update() Ville Syrjala
2021-04-21 13:00   ` Jani Nikula
2021-04-14  2:23 ` Ville Syrjala [this message]
2021-04-21 13:48   ` [Intel-gfx] [PATCH 4/8] drm/i915: Clear no_fbc_reason on activate Jani Nikula
2021-04-14  2:23 ` [Intel-gfx] [PATCH 5/8] drm/i915: Move the "recompress on activate" to a central place Ville Syrjala
2021-04-21 13:17   ` Jani Nikula
2021-04-14  2:23 ` [Intel-gfx] [PATCH 6/8] drm/i915: Nuke lots of crap from intel_fbc_state_cache Ville Syrjala
2021-04-14  2:23 ` [Intel-gfx] [PATCH 7/8] drm/i915: No FBC+double wide pipe Ville Syrjala
2021-04-14  2:23 ` [Intel-gfx] [PATCH 8/8] drm/i915: Pimp the FBC debugfs output Ville Syrjala
2021-04-21 13:59   ` Jani Nikula
2021-04-14  3:08 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: FBC cleanups Patchwork
2021-04-14  3:10 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2021-04-14  3:13 ` [Intel-gfx] ✗ Fi.CI.DOCS: " Patchwork
2021-04-14  3:38 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork

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=20210414022309.30898-5-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox