From 3c33159e87b69647aea7f67a7ee5380ff66c4b34 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 17 Nov 2023 14:43:44 +0000 Subject: [PATCH 1/2] drm/vc4: Drop planes that are completely off-screen 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 just 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 to avoid the incorrect rendering. Signed-off-by: Dave Stevenson --- drivers/gpu/drm/vc4/vc4_plane.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c index 9389b38b30a793..7689b835eb2b17 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -1108,6 +1108,12 @@ static int vc4_plane_mode_set(struct drm_plane *plane, width = vc4_state->src_w[0] >> 16; height = vc4_state->src_h[0] >> 16; + if (!width || !height) { + /* 0 source size probably means the plane is offscreen */ + vc4_state->dlist_initialized = 1; + return 0; + } + /* SCL1 is used for Cb/Cr scaling of planar formats. For RGB * and 4:4:4, scl1 should be set to scl0 so both channels of * the scaler do the same thing. For YUV, the Y plane needs @@ -1623,6 +1629,12 @@ static int vc6_plane_mode_set(struct drm_plane *plane, width = vc4_state->src_w[0] >> 16; height = vc4_state->src_h[0] >> 16; + if (!width || !height) { + /* 0 source size probably means the plane is offscreen */ + vc4_state->dlist_initialized = 1; + return 0; + } + /* SCL1 is used for Cb/Cr scaling of planar formats. For RGB * and 4:4:4, scl1 should be set to scl0 so both channels of * the scaler do the same thing. For YUV, the Y plane needs @@ -1994,6 +2006,9 @@ int vc4_plane_atomic_check(struct drm_plane *plane, if (ret) return ret; + if (!vc4_state->src_w[0] || !vc4_state->src_h[0]) + return 0; + ret = vc4_plane_allocate_lbm(new_plane_state); if (ret) return ret; From 4aecc60c28028db1b55bb8eb36c1ad409d6bd5bf Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 17 Nov 2023 14:50:11 +0000 Subject: [PATCH 2/2] drm/bridge: display-connector: Select DRM_KMS_HELPER Commit 7cd70656d128 ("drm/bridge: display-connector: implement bus fmts callbacks") added use of drm_atomic_helper_bridge_* functions, but didn't select the dependency of DRM_KMS_HELPER. If nothing else selected that dependency it resulted in a build failure. Select the missing dependency. Fixes: 7cd70656d128 ("drm/bridge: display-connector: implement bus fmts callbacks") Signed-off-by: Dave Stevenson --- drivers/gpu/drm/bridge/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig index 57946d80b02dbb..f6c0cddc64349b 100644 --- a/drivers/gpu/drm/bridge/Kconfig +++ b/drivers/gpu/drm/bridge/Kconfig @@ -67,6 +67,7 @@ config DRM_CROS_EC_ANX7688 config DRM_DISPLAY_CONNECTOR tristate "Display connector support" depends on OF + select DRM_KMS_HELPER help Driver for display connectors with support for DDC and hot-plug detection. Most display controllers handle display connectors