From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 277D754B1C6 for ; Wed, 9 Sep 2026 12:58:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788958694; cv=none; b=KTsNh7Anr7ORW+VTICFdtEj3YbIAprCk/psg8Ul7YWdz4WDPyb/n3aYKpX25cvG2RoO13jsd3V0lsoEd6Y2YNsqdLVlOBp5fZJ+8gfdMMdeCVGtUEyJzuRvmLL7HvVsahOCFBeb50xyxv5FCjKpsSGznVVVyCgkm3Y1tFlsWtvY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788958694; c=relaxed/simple; bh=3Q0M1744me0qsolg9qrDZCRcGHaHVe/MhjnUUvkzarQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dJMD0aip5PongdnRifSvewthtP/VQ2eSav7+hShcNsz9m+ERb4+gKVyCCsADFQpMFxmAccyg2g5tR6yt2kufrhxjwnsJr83dkT2BBIkF9hpsaMN6GsVDzSPqkPlc80mLjgHktEIfO6CbElblfiiXefJZydqg0QjNusu9vJsQH3Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ilOltwoI; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ilOltwoI" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-49d036e0e99so24214115e9.1 for ; Wed, 09 Sep 2026 05:58:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788958690; x=1789563490; darn=vger.kernel.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=fDJIsvQodZTtbEW9SHhG5tI4vA4bsB8pqciFKepxJb0=; b=ilOltwoIZhkTY1hOjWT+ISeIyPT7cyBgCBL5wftQr5MbRE0dj44McFUsMiVWWqGMWh Xfj5SpyrS61w4X3F5YTrt0oBhXaS4AC74LCbnJLeO4tLfGnrWsl81+U0HxTZ+KgVYhCD r0Fg0e4zt3gLgwKG3AqdtNyc7woW/dh8scP3Da59pCO0j9fwK9uXYjSlIiKqOzq9zJ7j WPbAGnoSD3lUSELA5Twce3Hxl3z9UOU7MCG9XS1PuiEKYj1L1+38zyb1yAOhchOyBnOa yqRrVxIhjBAJnDrHsDc3hNTUjuQAQdXxFoJkXpwrgiDfIGsgkJVqo0HHkPF+BgSWjPB5 HPWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788958690; x=1789563490; 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=fDJIsvQodZTtbEW9SHhG5tI4vA4bsB8pqciFKepxJb0=; b=DTRS05au+SXpFhOexGfdGqcqpD7NQt3DjzrcZSeb4/iCaD19i9SY4xYO8oyehKcp9U 7FOZysl5oAmZ/w7K+2RLwaTiu8Dd4SE4CHIg1JZvsyeVSbDuU9KrBWCX21qGsCbICrd5 qVnsHhxhTxbHfF1JwYqXQTBUKn9+XKZtMwFgIv2k1AiTytGTvQqdhR7lHW2KLfBy//p8 WeMC7YrDcsk7uatrVGvkg5vlEDbWYdyFF1xAvW0OmTmOJrmk+zY/2TFAfzvZQg8K8WZu sd0DDz70eF1gHmVIAmbg32EvOwtwOqlEPF6ruUoxmw/0g8ojJXf1b6EsV+bhy84JWgm6 kyRw== X-Forwarded-Encrypted: i=1; AKwUvBxrW1IAD2RG93dC/EwlOYqf/wqARbJqPEVqZTL+TUDhaJfkAkGVs6AckerVzQT/Rk8uC6xcGXNxHdwxE1w=@vger.kernel.org X-Gm-Message-State: AFuF++lTlzPlblWTBYPjxDb4RsEz5pSumbmS4x054QOapMmI+pzjJqi9 biwFO4eC4BHRndDKvo1k+JAPLo3KXq9Lxy6ySdiGoyQZojkknV0bIipm X-Gm-Gg: AYBFou2GWnvgxVNc1L9Uw4JLXabarkik6Dvk86dAdiFmDonTZeT9qsHctdG+6eQCkgz /7/LF4D0RJVer6kcBo+4/OflCh2xlEXeLDImf4ck2NkQ9UfODQD0SRI4I7XCRdPwDfYH3zCicCi CXJ1edzNnRLiM/ZKYccvcEK280HnIKU5WnXt2Vq2ZXgCycS7RzQTwce4OaKVU8GUnpawrIUOZcW dr3ZPiN2bSQbxDjla5j2KIK7WW3aY7pIqA1q+Pv7kXYWAFlnPlBfHLnBJ53AH6UMZQDvSYIOOuM 9B2q1HMEfuHyXAx+RvGw9FBiAHqWNdJXhcU3Xt9Ajl2WT5jOjEIpXEg7bvOtBSS63liBb/2NshE PiZRSsIw+05rz4LSgB6EjEUHeT5URA/PxnSxMbfWwb9a/1RTgLVC17CI9S+3e7EynbfS2M3rfN3 s6oajfGbbjfWKKY1jg8Rqi4kVMP7oeCA9sc77vK+McOnXX0P2WuR6NRH/I7omphqbk2mYRYk5X9 oFUDJKXB/iAkmRPwojBtl+xxHkmSgb3Yf7PRewJTxhie87occ/MZm/yFZ9w+2pDVJ3f+c03wNVs kq0L97da3NSwUSIRK8xc6QEeZtllAAe1RWQlSbbLRY9aNbDB X-Received: by 2002:a05:600c:6098:b0:49c:fc6c:be05 with SMTP id 5b1f17b1804b1-49cfc6cbfdbmr373559205e9.28.1788958689949; Wed, 09 Sep 2026 05:58:09 -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-49cf772692dsm550297605e9.10.2026.09.09.05.58.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2026 05:58:09 -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 v5] drm/tiny: arcpgu: Replace simple display pipe with regular atomic helpers Date: Wed, 9 Sep 2026 14:58:02 +0200 Message-ID: <20260909125806.174851-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 --- v5: - Fix NULL pointer dereference in arc_pgu_crtc_atomic_check() by checking crtc_state->plane_mask instead of manually querying plane state. 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 | 188 +++++++++++++++++++++++++++------- 1 file changed, 150 insertions(+), 38 deletions(-) diff --git a/drivers/gpu/drm/tiny/arcpgu.c b/drivers/gpu/drm/tiny/arcpgu.c index c93d61ac0bb7..c6308fee568d 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,127 @@ 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); + + if (!crct_state->enable) + return 0; + + if (!crct_state->plane_mask) + 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 +388,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 +427,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 +454,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