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 271D51090249 for ; Thu, 19 Mar 2026 16:01:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7598A10E904; Thu, 19 Mar 2026 16:01:46 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.b="r6BpCvnU"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="kc9Qd95D"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="DUcu3M0w"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="HKCp30HJ"; dkim-atps=neutral Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by gabe.freedesktop.org (Postfix) with ESMTPS id 83B3A10E8F9 for ; Thu, 19 Mar 2026 16:01:36 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id E1BED4D2C6; Thu, 19 Mar 2026 16:01:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1773936082; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=97TPE9cG4qaKcEJeDTAb6QOD+ZYDbv1KRlKhwBQ6JYE=; b=r6BpCvnUQHcjWvACf0AjqAmm9VA17v/ZdxA31ph7KRTTqyGF1sF1+TpDJ2af8VihkgmIJc wiqqvP1C79F4cNpnrx6h+A6nAic6Ix3LFmNu45sllVYgG/kw6QIcIEqW6EXLMMHEDGr5et xMFQ0Y0AbRZdKExtPoQIHtNCdpqdCYc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1773936082; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=97TPE9cG4qaKcEJeDTAb6QOD+ZYDbv1KRlKhwBQ6JYE=; b=kc9Qd95DYUs4n8X2KCRTrMPiB9pvTSLB6VyS1fuC5UuJ9sLeZ1PUKyxD2d1ZnhXJFvV9IS PdtuwbBNrc2vW8AA== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=DUcu3M0w; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=HKCp30HJ DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1773936081; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=97TPE9cG4qaKcEJeDTAb6QOD+ZYDbv1KRlKhwBQ6JYE=; b=DUcu3M0wQa9537ZZKAsMmtmxertWSu8IEw2kOtB3Vcb5tLX0e7La2jyvaCtmYc6SO1k87f Zzxvl9582peBq3ib0szjekPBOtDIp1ypVylBqyf5JcszAPDAqsumS0I+rZv5QVZLfJT+xZ mxHcFddvtegOph90fuBfNfhk2oZfciw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1773936081; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=97TPE9cG4qaKcEJeDTAb6QOD+ZYDbv1KRlKhwBQ6JYE=; b=HKCp30HJqKxKj7Zkp/GECucZQ9uszgzn+RNYWXOiQxT+LyT54O7yRH9qDe4I28QnkJJb0t qOTDng3IKBHzCnAQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 2642B42752; Thu, 19 Mar 2026 16:01:17 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id iAMmCM0dvGn0WQAAD6G6ig (envelope-from ); Thu, 19 Mar 2026 16:01:17 +0000 From: Thomas Zimmermann To: david@lechnology.com, javierm@redhat.com, lanzano.alex@gmail.com, kamlesh.gurudasani@gmail.com, architanant5@gmail.com, wens@kernel.org, mripard@kernel.org, maarten.lankhorst@linux.intel.com, simona@ffwll.ch, airlied@gmail.com Cc: dri-devel@lists.freedesktop.org, Thomas Zimmermann Subject: [PATCH v3 08/16] drm/ili9486: Use regular atomic helpers; drop simple-display helpers Date: Thu, 19 Mar 2026 16:59:44 +0100 Message-ID: <20260319160110.109610-9-tzimmermann@suse.de> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260319160110.109610-1-tzimmermann@suse.de> References: <20260319160110.109610-1-tzimmermann@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Action: no action X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-1.51 / 50.00]; BAYES_HAM(-3.00)[100.00%]; SUSPICIOUS_RECIPS(1.50)[]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; RCPT_COUNT_TWELVE(0.00)[12]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_TO(0.00)[lechnology.com,redhat.com,gmail.com,kernel.org,linux.intel.com,ffwll.ch]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,suse.de:mid,suse.de:email,imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns]; TAGGED_RCPT(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; R_RATELIMIT(0.00)[to_ip_from(RLqtkr6cif1ebgurukgmwdm7xc)]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmail.com] X-Rspamd-Queue-Id: E1BED4D2C6 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" Replace simple-display helpers with regular atomic helpers. Store the pipeline elements in struct ili9486_device and initialize them as part of probing the device. Use mipi-dbi's existing helpers and initializer macros where possible. Effectively open-codes the modesetting code in the initializer helpers of mipi-dbi and simple-display. Ili9486 requires a custom helper for CRTC enablement, and non-freeing cleanup of the pipeline. v3: - set ili9486 variable (David) v2: - fix connector initialization Signed-off-by: Thomas Zimmermann Acked-by: David Lechner --- drivers/gpu/drm/tiny/ili9486.c | 136 +++++++++++++++++++++++++++++---- 1 file changed, 122 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/tiny/ili9486.c b/drivers/gpu/drm/tiny/ili9486.c index 52b14f2cb0e1..030e87a8a3f0 100644 --- a/drivers/gpu/drm/tiny/ili9486.c +++ b/drivers/gpu/drm/tiny/ili9486.c @@ -36,6 +36,20 @@ #define ILI9486_MADCTL_MX BIT(6) #define ILI9486_MADCTL_MY BIT(7) +struct ili9486_device { + struct mipi_dbi_dev dbidev; + + struct drm_plane plane; + struct drm_crtc crtc; + struct drm_encoder encoder; + struct drm_connector connector; +}; + +static struct ili9486_device *to_ili9486_device(struct drm_device *dev) +{ + return container_of(drm_to_mipi_dbi_dev(dev), struct ili9486_device, dbidev); +} + /* * The PiScreen/waveshare rpi-lcd-35 has a SPI to 16-bit parallel bus converter * in front of the display controller. This means that 8-bit values have to be @@ -94,16 +108,34 @@ static int waveshare_command(struct mipi_dbi *mipi, u8 *cmd, u8 *par, return ret; } -static void waveshare_enable(struct drm_simple_display_pipe *pipe, - struct drm_crtc_state *crtc_state, - struct drm_plane_state *plane_state) +static const u32 ili9486_plane_formats[] = { + DRM_MIPI_DBI_PLANE_FORMATS, +}; + +static const u64 ili9486_plane_format_modifiers[] = { + DRM_MIPI_DBI_PLANE_FORMAT_MODIFIERS, +}; + +static const struct drm_plane_helper_funcs ili9486_plane_helper_funcs = { + DRM_MIPI_DBI_PLANE_HELPER_FUNCS, +}; + +static const struct drm_plane_funcs ili9486_plane_funcs = { + DRM_MIPI_DBI_PLANE_FUNCS, + .destroy = drm_plane_cleanup, +}; + +static void ili9486_crtc_helper_atomic_enable(struct drm_crtc *crtc, + struct drm_atomic_state *state) { - struct mipi_dbi_dev *dbidev = drm_to_mipi_dbi_dev(pipe->crtc.dev); + struct drm_device *drm = crtc->dev; + struct ili9486_device *ili9486 = to_ili9486_device(drm); + struct mipi_dbi_dev *dbidev = &ili9486->dbidev; struct mipi_dbi *dbi = &dbidev->dbi; u8 addr_mode; int ret, idx; - if (!drm_dev_enter(pipe->crtc.dev, &idx)) + if (!drm_dev_enter(drm, &idx)) return; DRM_DEBUG_KMS("\n"); @@ -161,8 +193,35 @@ static void waveshare_enable(struct drm_simple_display_pipe *pipe, drm_dev_exit(idx); } -static const struct drm_simple_display_pipe_funcs waveshare_pipe_funcs = { - DRM_MIPI_DBI_SIMPLE_DISPLAY_PIPE_FUNCS(waveshare_enable), +static const struct drm_crtc_helper_funcs ili9486_crtc_helper_funcs = { + DRM_MIPI_DBI_CRTC_HELPER_FUNCS, + .atomic_enable = ili9486_crtc_helper_atomic_enable, +}; + +static const struct drm_crtc_funcs ili9486_crtc_funcs = { + DRM_MIPI_DBI_CRTC_FUNCS, + .destroy = drm_crtc_cleanup, +}; + +static const struct drm_encoder_funcs ili9486_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; + +static const struct drm_connector_helper_funcs ili9486_connector_helper_funcs = { + DRM_MIPI_DBI_CONNECTOR_HELPER_FUNCS, +}; + +static const struct drm_connector_funcs ili9486_connector_funcs = { + DRM_MIPI_DBI_CONNECTOR_FUNCS, + .destroy = drm_connector_cleanup, +}; + +static const struct drm_mode_config_helper_funcs ili9486_mode_config_helper_funcs = { + DRM_MIPI_DBI_MODE_CONFIG_HELPER_FUNCS, +}; + +static const struct drm_mode_config_funcs ili9486_mode_config_funcs = { + DRM_MIPI_DBI_MODE_CONFIG_FUNCS, }; static const struct drm_display_mode waveshare_mode = { @@ -201,18 +260,22 @@ MODULE_DEVICE_TABLE(spi, ili9486_id); static int ili9486_probe(struct spi_device *spi) { struct device *dev = &spi->dev; + struct ili9486_device *ili9486; struct mipi_dbi_dev *dbidev; struct drm_device *drm; struct mipi_dbi *dbi; struct gpio_desc *dc; + struct drm_plane *plane; + struct drm_crtc *crtc; + struct drm_encoder *encoder; + struct drm_connector *connector; u32 rotation = 0; int ret; - dbidev = devm_drm_dev_alloc(dev, &ili9486_driver, - struct mipi_dbi_dev, drm); - if (IS_ERR(dbidev)) - return PTR_ERR(dbidev); - + ili9486 = devm_drm_dev_alloc(dev, &ili9486_driver, struct ili9486_device, dbidev.drm); + if (IS_ERR(ili9486)) + return PTR_ERR(ili9486); + dbidev = &ili9486->dbidev; dbi = &dbidev->dbi; drm = &dbidev->drm; @@ -237,8 +300,53 @@ static int ili9486_probe(struct spi_device *spi) dbi->command = waveshare_command; dbi->read_commands = NULL; - ret = mipi_dbi_dev_init(dbidev, &waveshare_pipe_funcs, - &waveshare_mode, rotation); + ret = drm_mipi_dbi_dev_init(dbidev, &waveshare_mode, ili9486_plane_formats[0], + rotation, 0); + if (ret) + return ret; + + ret = drmm_mode_config_init(drm); + if (ret) + return ret; + + drm->mode_config.min_width = dbidev->mode.hdisplay; + drm->mode_config.max_width = dbidev->mode.hdisplay; + drm->mode_config.min_height = dbidev->mode.vdisplay; + drm->mode_config.max_height = dbidev->mode.vdisplay; + drm->mode_config.funcs = &ili9486_mode_config_funcs; + drm->mode_config.preferred_depth = 16; + drm->mode_config.helper_private = &ili9486_mode_config_helper_funcs; + + plane = &ili9486->plane; + ret = drm_universal_plane_init(drm, plane, 0, &ili9486_plane_funcs, + ili9486_plane_formats, ARRAY_SIZE(ili9486_plane_formats), + ili9486_plane_format_modifiers, + DRM_PLANE_TYPE_PRIMARY, NULL); + if (ret) + return ret; + drm_plane_helper_add(plane, &ili9486_plane_helper_funcs); + drm_plane_enable_fb_damage_clips(plane); + + crtc = &ili9486->crtc; + ret = drm_crtc_init_with_planes(drm, crtc, plane, NULL, &ili9486_crtc_funcs, NULL); + if (ret) + return ret; + drm_crtc_helper_add(crtc, &ili9486_crtc_helper_funcs); + + encoder = &ili9486->encoder; + ret = drm_encoder_init(drm, encoder, &ili9486_encoder_funcs, DRM_MODE_ENCODER_NONE, NULL); + if (ret) + return ret; + encoder->possible_crtcs = drm_crtc_mask(crtc); + + connector = &ili9486->connector; + ret = drm_connector_init(drm, connector, &ili9486_connector_funcs, + DRM_MODE_CONNECTOR_SPI); + if (ret) + return ret; + drm_connector_helper_add(connector, &ili9486_connector_helper_funcs); + + ret = drm_connector_attach_encoder(connector, encoder); if (ret) return ret; -- 2.53.0