From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 41BF8C79FAD for ; Wed, 9 Sep 2026 12:41:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 61D2E10E186; Wed, 9 Sep 2026 12:41:15 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="R5fkZauy"; dkim-atps=neutral Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by gabe.freedesktop.org (Postfix) with ESMTPS id 58BD610E186 for ; Wed, 9 Sep 2026 12:41:14 +0000 (UTC) Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-498028b3d5eso55239775e9.1 for ; Wed, 09 Sep 2026 05:41:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788957673; x=1789562473; darn=lists.freedesktop.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=U++xriGSV8Y0IeslzQ+0/UgYXYPu5RhMaCi/7ZCxAIs=; b=R5fkZauynoLZghmHObm93AtUK9HvHzW+WI9KMYMnGQGSO5E1jMA2f0bRfRPPUUxW28 Q7Gt521zjYokDG0hZyMofT+OjkJpzbpDcEeYLItHXZ86qHhSuftVYftiR1lsACwzVRrB UJSX0uSpZ4NQfC1pY+gyfTYxrC4PHlmLpQqpvZhf36JPO4F+zHgSQrMngUZl0wnG9IUI 9OWncNQguTtaLb+RGj/exOQQ7vClkFZyZMkLwHobTMtwlpz1KhImyNV8qzS3o2EfCHIk 079ka2qbkte060isrO/Mzpopf8LfCRlrdxkO6+7BUxbh1tflmgTzqiYKGQCT/mA4yP9K wqbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788957673; x=1789562473; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=U++xriGSV8Y0IeslzQ+0/UgYXYPu5RhMaCi/7ZCxAIs=; b=MsfU20VeCwaQ1uZpSbU0BXg1UFJwf9VYkdcPOJN6sOPqgWEWd3ZaGsJ9xkQxwzQ2Lc xpIX0L9w2Su5Nwo+2fBkdEXJFdxBO1erEubccGiX4wMLR1k1ZIQnehtJ9Vq6YYtq/DDO ybjUb8TqUNfqg86MfJoNB9d2kmvtgJsa4G5VnTyanwqeDXZm1SEgRtuCqbto91+frMyj OsWzWsu+pqkU1xGjY1ynzFlPnySncTBR+sGPfkXzTL1LE/9ZAaw7j/pPy5O9Q9FiBWNX Exvss5pXJVCOEVQaDPw3p+uqp2d0k4eiSjpTt41hpzBOm7OhdDdJ0eolapBQ2N8FciAf WdGw== X-Forwarded-Encrypted: i=1; AKwUvBx6ZKn8ttKiknDedVFlHU9gnU+kFB4D8jT+ObY8Ddx9IOeznMizyV0yZPH/w+pzqo2yr71xb4qK7hU=@lists.freedesktop.org X-Gm-Message-State: AFuF++kISlHyavdAS6mrd1L/GCCcwi8WuAiPVqEEtyOeLdLbLwxxrJcE vkxRDxoGscyT9c78eSYgMRR7NBivoNG8J8igfKtWt5R2K+b2PJoFjxtu X-Gm-Gg: AYBFou0pDlH/vr0CtD2Gz88Dvy1zLY2xXytXLkCmhuWkdfu6PQymCI7/0HS7kMlVQML 9xaskWKFkflAAx/fKDz7KtRpUdfMZd9Q21NFZSdKZRg9YmvEOmGkkof9M2KpgNztshhTdMGqSe+ VNHUtBMHt3g6zGN9LGYmmzFiBzKGTYb2XN1SfdMLnQmoBk0CB+RgFqX0yHp73XViGDTTQoTvvmT 9pKz4GXkONp4/fGIXVSC8AZM3xjNpr9eKilf87bT0IYyYgpxD6Z93kbQOzT+sNpQSuDc02ucJyn SmQDQ3KcF3CN2ySv4qOkVNau72j4jEO6dM9j+xCv5lVFDGKFhJlmqx3ygx8vxFAJNI/MaUVz070 4qYOHxYqwEaOmyqBJt+y+xAcE9UbfJycG0GPIQ816PS0OapiOad4iJY1Y9OUJVxM/8aDjDqqr6W 6T8N0xr+CRBcHK5ARVwIZR4wMrqUC0o7HKQRNhVczLQ7O578HLsalrua+7Xlg0o4uPZ1knmOOj9 UjeOF85g7qd8Sn6NDeQubOVwPJbfS7eO08XaCwACp3QYzhBL1lJIC3ZzwWxf/kqQnLJrnGxlu/a d7ROvcuV3x2nyDMp2sFFzyAMpLFeRfquWy8ntw== X-Received: by 2002:a05:600c:a01:b0:499:7219:122f with SMTP id 5b1f17b1804b1-49cf8222d53mr350888445e9.4.1788957672359; Wed, 09 Sep 2026 05:41:12 -0700 (PDT) Received: from PC-Davide.homenet.telecomitalia.it (host-79-24-252-102.retail.telecomitalia.it. [79.24.252.102]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49d1fd8a566sm53006285e9.1.2026.09.09.05.41.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2026 05:41:10 -0700 (PDT) From: Davide Bonatto To: Alexey Brodkin , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , dri-devel@lists.freedesktop.org (open list:DRM DRIVERS), linux-kernel@vger.kernel.org (open list) Cc: Davide Bonatto Subject: [PATCH v4] drm/tiny: arcpgu: Replace simple display pipe with regular atomic helpers Date: Wed, 9 Sep 2026 14:41:05 +0200 Message-ID: <20260909124108.168371-1-bonatto.davide@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260909092455.131962-1-bonatto.davide@gmail.com> References: <20260909092455.131962-1-bonatto.davide@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The drm_simple_display_pipe helper is considered legacy/deprecated in favor of explicitly managing individual plane, CRTC, and encoder objects using standard atomic helpers. Migrate arcpgu to initialize its primary plane, CRTC, and encoder explicitly, and route mode validation, enable, and disable hooks through drm_crtc_helper_funcs, and plane updates through drm_plane_helper_funcs. Signed-off-by: Davide Bonatto --- v4: - Use drm_atomic_get_plane_state() in CRTC .atomic_check to ensure the primary plane state is attached and locked, avoiding false -EINVAL rejections and broken partial atomic commits. v3: - Add CRTC .atomic_check hook to validate primary plane presence and avoid NULL pointer dereference in arc_pgu_set_pxl_fmt(). - Pass framebuffer explicitly to arc_pgu_mode_set() and read plane state via drm_atomic_get_new_plane_state() in CRTC enable to prevent UAF. - Keep CRTC global enable bit intact during plane disable to avoid hardware state desync. v2: - Add .prepare_fb callback to support implicit synchronization. - Add .atomic_check using drm_atomic_helper_check_plane_state() to validate hardware scaling/clipping constraints. - Implement arc_pgu_plane_atomic_disable() to stop DMA and clear buffer address register, preventing hardware DMA scanout UAF. drivers/gpu/drm/tiny/arcpgu.c | 194 +++++++++++++++++++++++++++------- 1 file changed, 156 insertions(+), 38 deletions(-) diff --git a/drivers/gpu/drm/tiny/arcpgu.c b/drivers/gpu/drm/tiny/arcpgu.c index c93d61ac0bb7..adda40692733 100644 --- a/drivers/gpu/drm/tiny/arcpgu.c +++ b/drivers/gpu/drm/tiny/arcpgu.c @@ -5,6 +5,8 @@ * Copyright (C) 2016 Synopsys, Inc. (www.synopsys.com) */ +#include "drm/drm_gem_atomic_helper.h" + #include #include @@ -23,6 +25,8 @@ #include #include #include +#include +#include #include #include #include @@ -52,13 +56,17 @@ struct arcpgu_drm_private { struct drm_device drm; void __iomem *regs; struct clk *clk; - struct drm_simple_display_pipe pipe; + struct drm_plane plane; + struct drm_crtc crtc; + struct drm_encoder encoder; struct drm_connector sim_conn; }; #define dev_to_arcpgu(x) container_of(x, struct arcpgu_drm_private, drm) -#define pipe_to_arcpgu_priv(x) container_of(x, struct arcpgu_drm_private, pipe) +#define crtc_to_arcpgu_priv(x) container_of(x, struct arcpgu_drm_private, crtc) + +#define plane_to_arcpgu(x) container_of(x, struct arcpgu_drm_private, plane) static inline void arc_pgu_write(struct arcpgu_drm_private *arcpgu, unsigned int reg, u32 value) @@ -115,14 +123,19 @@ static const u32 arc_pgu_supported_formats[] = { DRM_FORMAT_ARGB8888, }; -static void arc_pgu_set_pxl_fmt(struct arcpgu_drm_private *arcpgu) +static void arc_pgu_set_pxl_fmt(struct arcpgu_drm_private *arcpgu, + const struct drm_framebuffer *fb) { - const struct drm_framebuffer *fb = arcpgu->pipe.plane.state->fb; - uint32_t pixel_format = fb->format->format; + u32 pixel_format; u32 format = DRM_FORMAT_INVALID; int i; u32 reg_ctrl; + if (!fb) + return; + + pixel_format = fb->format->format; + for (i = 0; i < ARRAY_SIZE(arc_pgu_supported_formats); i++) { if (arc_pgu_supported_formats[i] == pixel_format) format = arc_pgu_supported_formats[i]; @@ -139,10 +152,10 @@ static void arc_pgu_set_pxl_fmt(struct arcpgu_drm_private *arcpgu) arc_pgu_write(arcpgu, ARCPGU_REG_CTRL, reg_ctrl); } -static enum drm_mode_status arc_pgu_mode_valid(struct drm_simple_display_pipe *pipe, - const struct drm_display_mode *mode) +static enum drm_mode_status arc_pgu_crtc_mode_valid(struct drm_crtc *crtc, + const struct drm_display_mode *mode) { - struct arcpgu_drm_private *arcpgu = pipe_to_arcpgu_priv(pipe); + struct arcpgu_drm_private *arcpgu = crtc_to_arcpgu_priv(crtc); long rate, clk_rate = mode->clock * 1000; long diff = clk_rate / 200; /* +-0.5% allowed by HDMI spec */ @@ -153,9 +166,10 @@ static enum drm_mode_status arc_pgu_mode_valid(struct drm_simple_display_pipe *p return MODE_NOCLOCK; } -static void arc_pgu_mode_set(struct arcpgu_drm_private *arcpgu) +static void arc_pgu_mode_set(struct arcpgu_drm_private *arcpgu, + const struct drm_framebuffer *fb) { - struct drm_display_mode *m = &arcpgu->pipe.crtc.state->adjusted_mode; + struct drm_display_mode *m = &arcpgu->crtc.state->adjusted_mode; u32 val; arc_pgu_write(arcpgu, ARCPGU_REG_FMT, @@ -189,54 +203,133 @@ static void arc_pgu_mode_set(struct arcpgu_drm_private *arcpgu) arc_pgu_write(arcpgu, ARCPGU_REG_STRIDE, 0); arc_pgu_write(arcpgu, ARCPGU_REG_START_SET, 1); - arc_pgu_set_pxl_fmt(arcpgu); + arc_pgu_set_pxl_fmt(arcpgu, fb); clk_set_rate(arcpgu->clk, m->crtc_clock * 1000); } -static void arc_pgu_enable(struct drm_simple_display_pipe *pipe, - struct drm_crtc_state *crtc_state, - struct drm_plane_state *plane_state) +static void arc_pgu_crtc_atomic_enable(struct drm_crtc *crtc, + struct drm_atomic_commit *state) { - struct arcpgu_drm_private *arcpgu = pipe_to_arcpgu_priv(pipe); + struct arcpgu_drm_private *arcpgu = crtc_to_arcpgu_priv(crtc); + struct drm_plane_state *plane_state = + drm_atomic_get_new_plane_state(state, &arcpgu->plane); + const struct drm_framebuffer *fb = plane_state ? plane_state->fb : NULL; - arc_pgu_mode_set(arcpgu); + arc_pgu_mode_set(arcpgu, fb); clk_prepare_enable(arcpgu->clk); arc_pgu_write(arcpgu, ARCPGU_REG_CTRL, arc_pgu_read(arcpgu, ARCPGU_REG_CTRL) | - ARCPGU_CTRL_ENABLE_MASK); + ARCPGU_CTRL_ENABLE_MASK); } -static void arc_pgu_disable(struct drm_simple_display_pipe *pipe) +static void arc_pgu_crtc_atomic_disable(struct drm_crtc *crtc, + struct drm_atomic_commit *state) { - struct arcpgu_drm_private *arcpgu = pipe_to_arcpgu_priv(pipe); + struct arcpgu_drm_private *arcpgu = crtc_to_arcpgu_priv(crtc); clk_disable_unprepare(arcpgu->clk); arc_pgu_write(arcpgu, ARCPGU_REG_CTRL, - arc_pgu_read(arcpgu, ARCPGU_REG_CTRL) & - ~ARCPGU_CTRL_ENABLE_MASK); + arc_pgu_read(arcpgu, ARCPGU_REG_CTRL) & + ~ARCPGU_CTRL_ENABLE_MASK); } -static void arc_pgu_update(struct drm_simple_display_pipe *pipe, - struct drm_plane_state *state) +static void arc_pgu_plane_atomic_update(struct drm_plane *plane, + struct drm_atomic_commit *state) { - struct arcpgu_drm_private *arcpgu; + struct arcpgu_drm_private *arcpgu = plane_to_arcpgu(plane); + struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state, plane); struct drm_gem_dma_object *gem; - if (!pipe->plane.state->fb) + if (!new_plane_state->fb) return; - arcpgu = pipe_to_arcpgu_priv(pipe); - gem = drm_fb_dma_get_gem_obj(pipe->plane.state->fb, 0); + gem = drm_fb_dma_get_gem_obj(new_plane_state->fb, 0); arc_pgu_write(arcpgu, ARCPGU_REG_BUF0_ADDR, gem->dma_addr); } -static const struct drm_simple_display_pipe_funcs arc_pgu_pipe_funcs = { - .update = arc_pgu_update, - .mode_valid = arc_pgu_mode_valid, - .enable = arc_pgu_enable, - .disable = arc_pgu_disable, +static void arc_pgu_plane_atomic_disable(struct drm_plane *plane, + struct drm_atomic_commit *state) +{ + struct arcpgu_drm_private *arcpgu = plane_to_arcpgu(plane); + + arc_pgu_write(arcpgu, ARCPGU_REG_BUF0_ADDR, 0); +} + +static int arc_pgu_plane_atomic_check(struct drm_plane *plane, + struct drm_atomic_commit *state) +{ + struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state, plane); + struct drm_crtc_state *crtc_state; + + if (!new_plane_state->crtc) + return 0; + + crtc_state = drm_atomic_get_new_crtc_state(state, new_plane_state->crtc); + if (!crtc_state) + return -EINVAL; + + return drm_atomic_helper_check_plane_state(new_plane_state, crtc_state, + DRM_PLANE_NO_SCALING, + DRM_PLANE_NO_SCALING, + false, true); +} + +static int arc_pgu_crtc_atomic_check(struct drm_crtc *crtc, + struct drm_atomic_commit *state) +{ + struct drm_crtc_state *crct_state = drm_atomic_get_new_crtc_state(state, crtc); + struct arcpgu_drm_private *arcpgu = crtc_to_arcpgu_priv(crtc); + struct drm_plane_state *plane_state; + + if (!crct_state->enable) + return 0; + + plane_state = drm_atomic_get_new_plane_state(state, &arcpgu->plane); + if (IS_ERR(plane_state)) + return PTR_ERR(plane_state); + + if (!plane_state->fb) + return -EINVAL; + + return 0; +} + +static const struct drm_crtc_helper_funcs arc_pgu_crtc_helper_funcs = { + .mode_valid = arc_pgu_crtc_mode_valid, + .atomic_enable = arc_pgu_crtc_atomic_enable, + .atomic_disable = arc_pgu_crtc_atomic_disable, + .atomic_check = arc_pgu_crtc_atomic_check, +}; + +static const struct drm_crtc_funcs arc_pgu_crtc_funcs = { + .reset = drm_atomic_helper_crtc_reset, + .destroy = drm_crtc_cleanup, + .set_config = drm_atomic_helper_set_config, + .page_flip = drm_atomic_helper_page_flip, + .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, +}; + +static const struct drm_plane_helper_funcs arc_pgu_plane_helper_funcs = { + .atomic_update = arc_pgu_plane_atomic_update, + .prepare_fb = drm_gem_plane_helper_prepare_fb, + .atomic_check = arc_pgu_plane_atomic_check, + .atomic_disable = arc_pgu_plane_atomic_disable, +}; + +static const struct drm_plane_funcs arc_pgu_plane_funcs = { + .update_plane = drm_atomic_helper_update_plane, + .disable_plane = drm_atomic_helper_disable_plane, + .destroy = drm_plane_cleanup, + .reset = drm_atomic_helper_plane_reset, + .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_plane_destroy_state, +}; + +static const struct drm_encoder_funcs arc_pgu_encoder_funcs = { + .destroy = drm_encoder_cleanup }; static const struct drm_mode_config_funcs arcpgu_drm_modecfg_funcs = { @@ -301,13 +394,38 @@ static int arcpgu_load(struct arcpgu_drm_private *arcpgu) return ret; } - ret = drm_simple_display_pipe_init(drm, &arcpgu->pipe, &arc_pgu_pipe_funcs, - arc_pgu_supported_formats, - ARRAY_SIZE(arc_pgu_supported_formats), - NULL, connector); + ret = drm_universal_plane_init(drm, &arcpgu->plane, 0, + &arc_pgu_plane_funcs, arc_pgu_supported_formats, + ARRAY_SIZE(arc_pgu_supported_formats), NULL, + DRM_PLANE_TYPE_PRIMARY, NULL); + + if (ret) + return ret; + + drm_plane_helper_add(&arcpgu->plane, &arc_pgu_plane_helper_funcs); + + ret = drm_crtc_init_with_planes(drm, &arcpgu->crtc, &arcpgu->plane, NULL, + &arc_pgu_crtc_funcs, NULL); + + if (ret) + return ret; + + drm_crtc_helper_add(&arcpgu->crtc, &arc_pgu_crtc_helper_funcs); + + ret = drm_encoder_init(drm, &arcpgu->encoder, &arc_pgu_encoder_funcs, + DRM_MODE_ENCODER_NONE, NULL); + if (ret) return ret; + arcpgu->encoder.possible_crtcs = drm_crtc_mask(&arcpgu->crtc); + + if (connector) { + ret = drm_connector_attach_encoder(connector, &arcpgu->encoder); + if (ret) + return ret; + } + if (encoder_node) { /* Locate drm bridge from the hdmi encoder DT node */ struct drm_bridge *bridge __free(drm_bridge_put) = @@ -315,7 +433,7 @@ static int arcpgu_load(struct arcpgu_drm_private *arcpgu) if (!bridge) return -EPROBE_DEFER; - ret = drm_simple_display_pipe_attach_bridge(&arcpgu->pipe, bridge); + ret = drm_bridge_attach(&arcpgu->encoder, bridge, NULL, 0); if (ret) return ret; } @@ -342,7 +460,7 @@ static int arcpgu_show_pxlclock(struct seq_file *m, void *arg) struct drm_device *drm = node->minor->dev; struct arcpgu_drm_private *arcpgu = dev_to_arcpgu(drm); unsigned long clkrate = clk_get_rate(arcpgu->clk); - unsigned long mode_clock = arcpgu->pipe.crtc.mode.crtc_clock * 1000; + unsigned long mode_clock = arcpgu->crtc.mode.crtc_clock * 1000; seq_printf(m, "hw : %lu\n", clkrate); seq_printf(m, "mode: %lu\n", mode_clock); -- 2.43.0