dri-devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
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 13/31] drm/vc4: plane: Use return variable in atomic_check
Date: Thu, 20 Jun 2024 16:46:14 +0100	[thread overview]
Message-ID: <20240620154632.4125308-14-dave.stevenson@raspberrypi.com> (raw)
In-Reply-To: <20240620154632.4125308-1-dave.stevenson@raspberrypi.com>

From: Maxime Ripard <maxime@cerno.tech>

The vc4_plane_atomic_check() directly returns the result of the final
function it calls.

Using the already defined ret variable to check its content on error,
and a separate return 0 on success, makes it easier to extend.

Signed-off-by: Maxime Ripard <mripard@kernel.org>
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
---
 drivers/gpu/drm/vc4/vc4_plane.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
index 16197c4b4b33..d078a2d21eea 100644
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
@@ -1386,7 +1386,11 @@ static int vc4_plane_atomic_check(struct drm_plane *plane,
 	if (ret)
 		return ret;
 
-	return vc4_plane_allocate_lbm(new_plane_state);
+	ret = vc4_plane_allocate_lbm(new_plane_state);
+	if (ret)
+		return ret;
+
+	return 0;
 }
 
 static void vc4_plane_atomic_update(struct drm_plane *plane,
-- 
2.34.1


  parent reply	other threads:[~2024-06-20 15:47 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 ` [PATCH 11/31] drm/vc4: hvs: Print error if we fail an allocation Dave Stevenson
2024-06-20 15:46 ` [PATCH 12/31] drm/vc4: plane: Add more debugging for LBM allocation Dave Stevenson
2024-06-20 15:46 ` Dave Stevenson [this message]
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-14-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