From: Dave Stevenson <dave.stevenson@raspberrypi.com>
To: Maxime Ripard <mripard@kernel.org>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Thomas Zimmermann <tzimmermann@suse.de>,
David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>,
dri-devel@lists.freedesktop.org
Cc: Maxime Ripard <maxime@cerno.tech>,
Dave Stevenson <dave.stevenson@raspberrypi.com>
Subject: [PATCH 11/31] drm/vc4: hvs: Print error if we fail an allocation
Date: Thu, 20 Jun 2024 16:46:12 +0100 [thread overview]
Message-ID: <20240620154632.4125308-12-dave.stevenson@raspberrypi.com> (raw)
In-Reply-To: <20240620154632.4125308-1-dave.stevenson@raspberrypi.com>
From: Maxime Ripard <maxime@cerno.tech>
We need to allocate a few additional structures when checking our
atomic_state, especially related to hardware SRAM that will hold the
plane descriptors (DLIST) and the current line context (LBM) during
composition.
Since those allocation can fail, let's add some error message in that
case to help debug what goes wrong.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
---
drivers/gpu/drm/vc4/vc4_hvs.c | 4 +++-
drivers/gpu/drm/vc4/vc4_plane.c | 7 +++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/vc4/vc4_hvs.c b/drivers/gpu/drm/vc4/vc4_hvs.c
index 189d00fcf4c2..2c69b74b25a7 100644
--- a/drivers/gpu/drm/vc4/vc4_hvs.c
+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
@@ -475,8 +475,10 @@ int vc4_hvs_atomic_check(struct drm_crtc *crtc, struct drm_atomic_state *state)
ret = drm_mm_insert_node(&vc4->hvs->dlist_mm, &vc4_state->mm,
dlist_count);
spin_unlock_irqrestore(&vc4->hvs->mm_lock, flags);
- if (ret)
+ if (ret) {
+ drm_err(dev, "Failed to allocate DLIST entry: %d\n", ret);
return ret;
+ }
return 0;
}
diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
index 978433554f3d..e4fcef11cf6f 100644
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
@@ -739,7 +739,8 @@ static void vc4_plane_calc_load(struct drm_plane_state *state)
static int vc4_plane_allocate_lbm(struct drm_plane_state *state)
{
- struct vc4_dev *vc4 = to_vc4_dev(state->plane->dev);
+ struct drm_device *drm = state->plane->dev;
+ struct vc4_dev *vc4 = to_vc4_dev(drm);
struct vc4_plane_state *vc4_state = to_vc4_plane_state(state);
unsigned long irqflags;
u32 lbm_size;
@@ -765,8 +766,10 @@ static int vc4_plane_allocate_lbm(struct drm_plane_state *state)
0, 0);
spin_unlock_irqrestore(&vc4->hvs->mm_lock, irqflags);
- if (ret)
+ if (ret) {
+ drm_err(drm, "Failed to allocate LBM entry: %d\n", ret);
return ret;
+ }
} else {
WARN_ON_ONCE(lbm_size != vc4_state->lbm.size);
}
--
2.34.1
next prev parent reply other threads:[~2024-06-20 15:46 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-20 15:46 [PATCH 00/31] Preparatory patches for BCM2712 (Pi5) support Dave Stevenson
2024-06-20 15:46 ` [PATCH 01/31] drm/vc4: vc4_plane: Keep fractional source coords inside state Dave Stevenson
2024-06-20 15:46 ` [PATCH 02/31] drm/vc4: Handle fractional coordinates using the phase field Dave Stevenson
2024-06-20 15:46 ` [PATCH 03/31] drm/vc4: Force trigger of dlist update on margins change Dave Stevenson
2024-06-20 15:46 ` [PATCH 04/31] drm/vc4: hdmi: Avoid log spam for audio start failure Dave Stevenson
2024-06-20 15:46 ` [PATCH 05/31] drm/vc4_plane: Add support for YUV444 formats Dave Stevenson
2024-06-21 8:57 ` Maxime Ripard
2024-06-21 9:56 ` Dave Stevenson
2024-06-20 15:46 ` [PATCH 06/31] drm/vc4: Set AXI panic modes for the HVS Dave Stevenson
2024-06-20 15:46 ` [PATCH 07/31] drm/vc4: Limit max_bpc to 8 on Pi0-3 Dave Stevenson
2024-06-20 15:46 ` [PATCH 08/31] drm/vc4: hdmi: Increase audio MAI fifo dreq threshold Dave Stevenson
2024-06-20 15:46 ` [PATCH 09/31] drm/vc4: hdmi: Warn if writing to an unknown HDMI register Dave Stevenson
2024-06-20 15:46 ` [PATCH 10/31] drm/vc4: hvs: More logging for dlist generation Dave Stevenson
2024-06-20 15:46 ` Dave Stevenson [this message]
2024-06-20 15:46 ` [PATCH 12/31] drm/vc4: plane: Add more debugging for LBM allocation Dave Stevenson
2024-06-20 15:46 ` [PATCH 13/31] drm/vc4: plane: Use return variable in atomic_check Dave Stevenson
2024-06-20 15:46 ` [PATCH 14/31] drm/vc4: crtc: Move assigned_channel to a variable Dave Stevenson
2024-06-20 15:46 ` [PATCH 15/31] drm/vc4: Don't write gamma luts on 2711 Dave Stevenson
2024-06-20 15:46 ` [PATCH 16/31] drm/vc4: UV planes vertical scaling must always be enabled Dave Stevenson
2024-06-20 15:46 ` [PATCH 17/31] drm/vc4: hdmi: Avoid hang with debug registers when suspended Dave Stevenson
2024-06-20 15:46 ` [PATCH 18/31] drm/vc4: Fix dlist debug not resetting the next entry pointer Dave Stevenson
2024-06-20 15:46 ` [PATCH 19/31] drm/vc4: Remove incorrect limit from hvs_dlist debugfs function Dave Stevenson
2024-06-20 15:46 ` [PATCH 20/31] drm/vc4: hvs: Remove ABORT_ON_EMPTY flag Dave Stevenson
2024-06-20 15:46 ` [PATCH 21/31] drm/vc4: Introduce generation number enum Dave Stevenson
2024-06-20 15:46 ` [PATCH 22/31] drm/vc4: Make v3d paths unavailable on any generation newer than vc4 Dave Stevenson
2024-06-20 15:46 ` [PATCH 23/31] drm/vc4: hvs: Use switch statement to simplify vc4_hvs_get_fifo_from_output Dave Stevenson
2024-06-20 15:46 ` [PATCH 24/31] drm/vc4: hvs: Create hw_init function Dave Stevenson
2024-06-20 15:46 ` [PATCH 25/31] drm/vc4: hvs: Create cob_init function Dave Stevenson
2024-06-20 15:46 ` [PATCH 26/31] drm/vc4: hvs: Rename hvs_regs list Dave Stevenson
2024-06-20 15:46 ` [PATCH 27/31] drm/vc4: plane: Change ptr0_offset to an array Dave Stevenson
2024-06-20 15:46 ` [PATCH 28/31] drm/vc4: hvs: Rework LBM alignment Dave Stevenson
2024-06-20 15:46 ` [PATCH 29/31] drm/vc4: hvs: Change prototype of __vc4_hvs_alloc to pass registers Dave Stevenson
2024-06-20 15:46 ` [PATCH 30/31] drm/vc4: Move the buffer offset out of the vc4_plane_state Dave Stevenson
2024-06-20 15:46 ` [PATCH 31/31] drm/vc4: Enable SCALER_CONTROL early in HVS init Dave Stevenson
2024-06-21 8:55 ` [PATCH 00/31] Preparatory patches for BCM2712 (Pi5) support Maxime Ripard
2024-06-21 10:16 ` Dave Stevenson
2024-06-24 14:19 ` Maxime Ripard
2024-06-24 14:45 ` Dave Stevenson
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=20240620154632.4125308-12-dave.stevenson@raspberrypi.com \
--to=dave.stevenson@raspberrypi.com \
--cc=airlied@gmail.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=maxime@cerno.tech \
--cc=mripard@kernel.org \
--cc=tzimmermann@suse.de \
/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