Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: "Jouni Högander" <jouni.hogander@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH v3 01/10] Revert "drm/i915/display: Make FBC check stolen at use time."
Date: Fri,  2 Jun 2023 13:39:19 +0300	[thread overview]
Message-ID: <20230602103928.1012470-2-jouni.hogander@intel.com> (raw)
In-Reply-To: <20230602103928.1012470-1-jouni.hogander@intel.com>

This reverts commit 21e4ad64271f79f821e808a3a84bc145f4c5b2cb.

As a part of clean-up we want to revert this patch and introduce required
changes as a set of patches.

Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
---
 drivers/gpu/drm/i915/display/intel_fbc.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
index 0e8e899f596b..0a9b081c18b8 100644
--- a/drivers/gpu/drm/i915/display/intel_fbc.c
+++ b/drivers/gpu/drm/i915/display/intel_fbc.c
@@ -1134,13 +1134,6 @@ static int intel_fbc_check_plane(struct intel_atomic_state *state,
 	if (!fbc)
 		return 0;
 
-#ifndef I915
-	if (!i915_gem_stolen_initialized(i915)) {
-		plane_state->no_fbc_reason = "stolen memory not initialised";
-		return 0;
-	}
-#endif
-
 	if (intel_vgpu_active(i915)) {
 		plane_state->no_fbc_reason = "VGPU active";
 		return 0;
@@ -1794,10 +1787,8 @@ void intel_fbc_init(struct drm_i915_private *i915)
 {
 	enum intel_fbc_id fbc_id;
 
-#ifdef I915
 	if (!i915_gem_stolen_initialized(i915))
 		RUNTIME_INFO(i915)->fbc_mask = 0;
-#endif
 
 	if (need_fbc_vtd_wa(i915))
 		RUNTIME_INFO(i915)->fbc_mask = 0;
-- 
2.34.1


  reply	other threads:[~2023-06-02 10:40 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-02 10:39 [Intel-gfx] [PATCH v3 00/10] Clean-up Xe FBC additions Jouni Högander
2023-06-02 10:39 ` Jouni Högander [this message]
2023-06-02 10:39 ` [Intel-gfx] [PATCH v3 02/10] Revert "drm/i915/fbc: set compressed_fb to NULL on error" Jouni Högander
2023-06-02 10:46 ` [Intel-gfx] [PATCH v3 00/10] Clean-up Xe FBC additions Hogander, Jouni

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=20230602103928.1012470-2-jouni.hogander@intel.com \
    --to=jouni.hogander@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