Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: intel-xe@lists.freedesktop.org,
	Uma Shankar <uma.shankar@intel.com>,
	Paz Zcharya <pazz@chromium.org>
Subject: [PATCH v4 16/16] drm/i915: Annotate more of the BIOS fb takeover failure paths
Date: Sat,  3 Feb 2024 00:43:40 +0200	[thread overview]
Message-ID: <20240202224340.30647-17-ville.syrjala@linux.intel.com> (raw)
In-Reply-To: <20240202224340.30647-1-ville.syrjala@linux.intel.com>

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

Annotate a few more of the failure paths on the initial
BIOS fb takeover to avoid having to guess why things
aren't working the way we expect.

Reviewed-by: Uma Shankar <uma.shankar@intel.com>
Tested-by: Paz Zcharya <pazz@chromium.org>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_plane_initial.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_plane_initial.c b/drivers/gpu/drm/i915/display/intel_plane_initial.c
index b43b8cf4680c..ada1792df5b3 100644
--- a/drivers/gpu/drm/i915/display/intel_plane_initial.c
+++ b/drivers/gpu/drm/i915/display/intel_plane_initial.c
@@ -167,14 +167,19 @@ initial_plane_vma(struct drm_i915_private *i915,
 	 */
 	if (IS_ENABLED(CONFIG_FRAMEBUFFER_CONSOLE) &&
 	    mem == i915->mm.stolen_region &&
-	    size * 2 > i915->dsm.usable_size)
+	    size * 2 > i915->dsm.usable_size) {
+		drm_dbg_kms(&i915->drm, "Initial FB size exceeds half of stolen, discarding\n");
 		return NULL;
+	}
 
 	obj = i915_gem_object_create_region_at(mem, phys_base, size,
 					       I915_BO_ALLOC_USER |
 					       I915_BO_PREALLOC);
-	if (IS_ERR(obj))
+	if (IS_ERR(obj)) {
+		drm_dbg_kms(&i915->drm, "Failed to preallocate initial FB in %s\n",
+			    mem->region.name);
 		return NULL;
+	}
 
 	/*
 	 * Mark it WT ahead of time to avoid changing the
-- 
2.43.0


  parent reply	other threads:[~2024-02-02 22:51 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-02 22:43 [PATCH v4 00/16] drm/i915: (stolen) memory region related fixes Ville Syrjala
2024-02-02 22:43 ` [PATCH v4 01/16] drm/i915: Use struct resource for memory region IO as well Ville Syrjala
2024-02-02 22:43 ` [PATCH v4 02/16] drm/i915: Print memory region info during probe Ville Syrjala
2024-02-02 22:43 ` [PATCH v4 03/16] drm/i915: Remove ad-hoc lmem/stolen debugs Ville Syrjala
2024-02-02 22:43 ` [PATCH v4 04/16] drm/i915: Bypass LMEMBAR/GTTMMADR for MTL stolen memory access Ville Syrjala
2024-02-02 22:43 ` [PATCH v4 05/16] drm/i915: Disable the "binder" Ville Syrjala
2024-02-02 22:43 ` [PATCH v4 06/16] drm/i915: Rename the DSM/GSM registers Ville Syrjala
2024-02-02 22:43 ` [PATCH v4 07/16] drm/i915: Fix PTE decode during initial plane readout Ville Syrjala
2024-02-02 22:43 ` [PATCH v4 08/16] drm/i915: Fix region start " Ville Syrjala
2024-02-02 22:43 ` [PATCH v4 09/16] drm/i915: Fix MTL " Ville Syrjala
2024-02-02 22:43 ` [PATCH v4 10/16] drm/i915: s/phys_base/dma_addr/ Ville Syrjala
2024-02-02 22:43 ` [PATCH v4 11/16] drm/i915: Split the smem and lmem plane readout apart Ville Syrjala
2024-02-02 22:43 ` [PATCH v4 12/16] drm/i915: Simplify intel_initial_plane_config() calling convention Ville Syrjala
2024-02-02 22:43 ` [PATCH v4 13/16] drm/i915/fbdev: Fix smem_start for LMEMBAR stolen objects Ville Syrjala
2024-02-02 22:43 ` [PATCH v4 14/16] drm/i915: Tweak BIOS fb reuse check Ville Syrjala
2024-02-02 22:43 ` [PATCH v4 15/16] drm/i915: Try to relocate the BIOS fb to the start of ggtt Ville Syrjala
2024-02-02 22:43 ` Ville Syrjala [this message]
2024-02-03  0:33 ` ✓ CI.Patch_applied: success for drm/i915: (stolen) memory region related fixes Patchwork
2024-02-03  0:33 ` ✗ CI.checkpatch: warning " Patchwork
2024-02-03  0:34 ` ✓ CI.KUnit: success " Patchwork
2024-02-03  0:41 ` ✓ CI.Build: " Patchwork
2024-02-03  0:42 ` ✓ CI.Hooks: " Patchwork
2024-02-03  0:43 ` ✗ CI.checksparse: warning " Patchwork
2024-02-03  1:07 ` ✓ CI.BAT: success " Patchwork
2024-02-05 11:38 ` [PATCH v4 00/16] " Jani Nikula
2024-02-05 14:16   ` Lucas De Marchi
2024-02-05 14:37     ` Saarinen, Jani
2024-02-07  0:12     ` Ville Syrjälä

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=20240202224340.30647-17-ville.syrjala@linux.intel.com \
    --to=ville.syrjala@linux.intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=intel-xe@lists.freedesktop.org \
    --cc=pazz@chromium.org \
    --cc=uma.shankar@intel.com \
    /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