From: Dave Stevenson <dave.stevenson@raspberrypi.com>
To: "Maxime Ripard" <mripard@kernel.org>,
"Maíra Canal" <mcanal@igalia.com>,
"Raspberry Pi Kernel Maintenance" <kernel-list@raspberrypi.com>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Thomas Zimmermann" <tzimmermann@suse.de>,
"David Airlie" <airlied@gmail.com>,
"Simona Vetter" <simona@ffwll.ch>,
"Rob Herring" <robh@kernel.org>,
"Krzysztof Kozlowski" <krzk+dt@kernel.org>,
"Conor Dooley" <conor+dt@kernel.org>,
"Florian Fainelli" <florian.fainelli@broadcom.com>,
"Broadcom internal kernel review list"
<bcm-kernel-feedback-list@broadcom.com>,
"Ray Jui" <rjui@broadcom.com>,
"Scott Branden" <sbranden@broadcom.com>,
"Michael Turquette" <mturquette@baylibre.com>,
"Stephen Boyd" <sboyd@kernel.org>,
"Javier Martinez Canillas" <javierm@redhat.com>,
"Catalin Marinas" <catalin.marinas@arm.com>,
"Will Deacon" <will@kernel.org>
Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
devicetree@vger.kernel.org,
linux-rpi-kernel@lists.infradead.org,
linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org,
Dave Stevenson <dave.stevenson@raspberrypi.com>
Subject: [PATCH v2 28/36] drm/vc4: Drop planes that are completely off-screen or 0 crtc size
Date: Fri, 25 Oct 2024 18:15:59 +0100 [thread overview]
Message-ID: <20241025-drm-vc4-2712-support-v2-28-35efa83c8fc0@raspberrypi.com> (raw)
In-Reply-To: <20241025-drm-vc4-2712-support-v2-0-35efa83c8fc0@raspberrypi.com>
It is permitted for a plane to be configured such that none
of it is on-screen via either negative dest rectangle X,Y
offset, or an offset that is greater than the crtc dimensions.
These planes were resized via drm_atomic_helper_check_plane_state
such that the source rectangle had a zero width or height, but
they still created a dlist entry even though they contributed
no pixels. In the case of vc6_plane_mode_set, that it could result
in negative values being written into registers, which caused
incorrect behaviour.
Drop planes that result in a source width or height of 0 pixels
or an on-screen size of 0 pixels to avoid the incorrect rendering.
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Reviewed-by: Maxime Ripard <mripard@kernel.org>
---
drivers/gpu/drm/vc4/vc4_plane.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
index c084967d3527..94737c587f20 100644
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
@@ -1230,6 +1230,13 @@ static int vc4_plane_mode_set(struct drm_plane *plane,
if (ret)
return ret;
+ if (!vc4_state->src_w[0] || !vc4_state->src_h[0] ||
+ !vc4_state->crtc_w || !vc4_state->crtc_h) {
+ /* 0 source size probably means the plane is offscreen */
+ vc4_state->dlist_initialized = 1;
+ return 0;
+ }
+
width = vc4_state->src_w[0] >> 16;
height = vc4_state->src_h[0] >> 16;
@@ -1753,6 +1760,15 @@ static int vc6_plane_mode_set(struct drm_plane *plane,
if (ret)
return ret;
+ if (!vc4_state->src_w[0] || !vc4_state->src_h[0] ||
+ !vc4_state->crtc_w || !vc4_state->crtc_h) {
+ /* 0 source size probably means the plane is offscreen.
+ * 0 destination size is a redundant plane.
+ */
+ vc4_state->dlist_initialized = 1;
+ return 0;
+ }
+
width = vc4_state->src_w[0] >> 16;
height = vc4_state->src_h[0] >> 16;
@@ -2135,6 +2151,10 @@ static int vc4_plane_atomic_check(struct drm_plane *plane,
if (ret)
return ret;
+ if (!vc4_state->src_w[0] || !vc4_state->src_h[0] ||
+ !vc4_state->crtc_w || !vc4_state->crtc_h)
+ return 0;
+
ret = vc4_plane_allocate_lbm(new_plane_state);
if (ret)
return ret;
--
2.34.1
next prev parent reply other threads:[~2024-10-25 17:16 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-25 17:15 [PATCH v2 00/36] drm/vc4: Add support for BCM2712 / Pi5 display hardware Dave Stevenson
2024-10-25 17:15 ` [PATCH v2 01/36] drm/vc4: Use of_device_get_match_data to set generation Dave Stevenson
2024-10-25 17:15 ` [PATCH v2 02/36] drm/vc4: Fix reading of frame count on GEN5 / Pi4 Dave Stevenson
2024-10-25 17:15 ` [PATCH v2 03/36] dt-bindings: display: Add BCM2712 HDMI bindings Dave Stevenson
2024-10-25 17:15 ` [PATCH v2 04/36] dt-bindings: display: Add BCM2712 HVS bindings Dave Stevenson
2024-10-25 17:15 ` [PATCH v2 05/36] dt-bindings: display: Add BCM2712 PixelValve bindings Dave Stevenson
2024-10-25 17:15 ` [PATCH v2 06/36] dt-bindings: display: Add BCM2712 MOP bindings Dave Stevenson
2024-10-25 17:15 ` [PATCH v2 07/36] dt-bindings: display: Add BCM2712 MOPLET bindings Dave Stevenson
2024-10-25 17:15 ` [PATCH v2 08/36] dt-bindings: display: Add BCM2712 KMS driver bindings Dave Stevenson
2024-10-25 17:15 ` [PATCH v2 09/36] drm/vc4: drv: Support BCM2712 Dave Stevenson
2024-10-25 17:15 ` [PATCH v2 10/36] drm/vc4: hvs: Add support for BCM2712 HVS Dave Stevenson
2024-10-25 17:15 ` [PATCH v2 11/36] drm/vc4: crtc: Add support for BCM2712 PixelValves Dave Stevenson
2024-10-25 17:15 ` [PATCH v2 12/36] drm/vc4: hdmi: Add support for BCM2712 HDMI controllers Dave Stevenson
2024-10-25 17:15 ` [PATCH v2 13/36] drm/vc4: txp: Introduce structure to deal with revision differences Dave Stevenson
2024-10-25 17:15 ` [PATCH v2 14/36] drm/vc4: txp: Rename TXP data structure Dave Stevenson
2024-10-25 17:15 ` [PATCH v2 15/36] drm/vc4: txp: Add byte enable toggle bit Dave Stevenson
2024-10-25 17:15 ` [PATCH v2 16/36] drm/vc4: txp: Add horizontal and vertical size offset " Dave Stevenson
2024-10-25 17:15 ` [PATCH v2 17/36] drm/vc4: txp: Handle 40-bits DMA Addresses Dave Stevenson
2024-10-25 17:15 ` [PATCH v2 18/36] drm/vc4: txp: Move the encoder type in the variant structure Dave Stevenson
2024-10-25 17:15 ` [PATCH v2 19/36] drm/vc4: txp: Add a new TXP encoder type Dave Stevenson
2024-10-25 17:15 ` [PATCH v2 20/36] drm/vc4: txp: Add support for BCM2712 MOP Dave Stevenson
2024-10-25 17:15 ` [PATCH v2 21/36] drm/vc4: txp: Add BCM2712 MOPLET support Dave Stevenson
2024-10-25 17:15 ` [PATCH v2 22/36] drm/vc4: drv: Add support for 2712 D-step Dave Stevenson
2024-10-25 17:15 ` [PATCH v2 23/36] drm/vc4: hvs: Add in " Dave Stevenson
2024-10-25 17:15 ` [PATCH v2 24/36] drm/vc4: plane: Add " Dave Stevenson
2024-10-25 17:15 ` [PATCH v2 25/36] drm/vc4: hdmi: Support 2712 D-step register map Dave Stevenson
2024-10-25 17:15 ` [PATCH v2 26/36] drm/vc4: Add additional warn_on for incorrect revisions Dave Stevenson
2024-10-25 17:15 ` [PATCH v2 27/36] drm/vc4: Enable bg_fill if there are no planes enabled Dave Stevenson
2024-10-25 17:15 ` Dave Stevenson [this message]
2024-10-25 17:16 ` [PATCH v2 29/36] clk: bcm: rpi: Add ISP to exported clocks Dave Stevenson
2024-10-25 17:16 ` [PATCH v2 30/36] clk: bcm: rpi: Allow cpufreq driver to also adjust gpu clocks Dave Stevenson
2024-10-25 17:16 ` [PATCH v2 31/36] clk: bcm: rpi: Enable minimize for all firmware clocks Dave Stevenson
2024-10-25 17:16 ` [PATCH v2 32/36] clk: bcm: rpi: Create helper to retrieve private data Dave Stevenson
2024-10-25 17:16 ` [PATCH v2 33/36] clk: bcm: rpi: Add disp clock Dave Stevenson
2024-10-25 17:16 ` [PATCH v2 34/36] arm64: dts: broadcom: Add firmware clocks and power nodes to Pi5 DT Dave Stevenson
2024-11-24 17:03 ` Florian Fainelli
2024-10-25 17:16 ` [PATCH v2 35/36] arm64: dts: broadcom: Add display pipeline support to BCM2712 Dave Stevenson
2024-11-24 17:04 ` Florian Fainelli
2024-10-25 17:16 ` [PATCH v2 36/36] arm64: dts: broadcom: Add DT for D-step version of BCM2712 Dave Stevenson
2024-11-24 17:04 ` Florian Fainelli
2024-10-27 21:17 ` [PATCH v2 00/36] drm/vc4: Add support for BCM2712 / Pi5 display hardware Rob Herring (Arm)
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=20241025-drm-vc4-2712-support-v2-28-35efa83c8fc0@raspberrypi.com \
--to=dave.stevenson@raspberrypi.com \
--cc=airlied@gmail.com \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=catalin.marinas@arm.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=florian.fainelli@broadcom.com \
--cc=javierm@redhat.com \
--cc=kernel-list@raspberrypi.com \
--cc=krzk+dt@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mcanal@igalia.com \
--cc=mripard@kernel.org \
--cc=mturquette@baylibre.com \
--cc=rjui@broadcom.com \
--cc=robh@kernel.org \
--cc=sboyd@kernel.org \
--cc=sbranden@broadcom.com \
--cc=simona@ffwll.ch \
--cc=tzimmermann@suse.de \
--cc=will@kernel.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
all inboxes | Powered by JetHome®