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 705ABC5DF94 for ; Mon, 24 Aug 2026 12:52:29 +0000 (UTC) Received: from kara.freedesktop.org (unknown [131.252.210.166]) by gabe.freedesktop.org (Postfix) with ESMTPS id 453CE10E788; Mon, 24 Aug 2026 12:52:29 +0000 (UTC) Received: from kara.freedesktop.org (localhost [127.0.0.1]) by kara.freedesktop.org (Postfix) with ESMTP id 4A55247191; Mon, 24 Aug 2026 12:35:45 +0000 (UTC) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=lists.freedesktop.org; s=20240201; t=1787574945; b=yrWQtBeL72LQzIeycDhTs733RNX2Tr16+YA/DvLVYib06GipK1+tNu66+IbTz42cDyTFA CqRxgWoQ5b+Ohyg+K1G4tKDDT1mISx1io2/Jm55XvHiqkBXRQOvgUQ03vKdDzXtH0Vi1jFr QMQTamJswGby/L1B9Aqtib19rniuGTHZmOnMQ8Gu2zRYJOAh3l+E3e730YcAzjB3VuzU4Yo STUnSqKjBIx2HTN98KFRJKalopS2M78xEr5ICnsLb+B503/exNON6aRCJBbQz/evgbmhvjP XdE2KYMccxuHaYnp/Mwzrxt5OxTy0JM4W357Il1jXEW/SF7E1ZmSV7JHwA+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.freedesktop.org; s=20240201; t=1787574945; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=WISvvk6eNRreWRsq3TswK9YBEbN+xmIZxZMKO/B6o1o=; b=v35+kaPxguy75FINaNc2+gl3Qc1JhWjo3zNQA90ia50utGNPSP67nR2QjrMRwZOCuA3yj S2IhZkDt5Oyav9YsGadHyw6GeI5LdKuEfa0XiguKTOCRcBahgWir5cQ+FwP+nIJ7OvrdLqD VCm6LQVvizJLFb0gAb8w4pT8ftUTNEkhH3sQTM7xsxSiyTjOKFfTUsSoIcew7anh0lI7/Jm 4lpgQeLF9Nnm5odkvwkgf98WG1Vc0/U8QF+J4STjpU49KgZW0LzDzD39b2iZhl+LNmAZVf8 hfyTaQcPT247MyEAJTH6Dtv5u4OlRobPEaCLLTbDhKFc1Yr5b96auJ4zpndw== ARC-Authentication-Results: i=1; mail.freedesktop.org; dkim=fail; arc=none (Message is not ARC signed); dmarc=fail (Used From Domain Record) header.from=suse.de policy.dmarc=none Authentication-Results: mail.freedesktop.org; dkim=fail; arc=none (Message is not ARC signed); dmarc=fail (Used From Domain Record) header.from=suse.de policy.dmarc=none Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by kara.freedesktop.org (Postfix) with ESMTPS id BB8BD40951 for ; Mon, 24 Aug 2026 12:35:41 +0000 (UTC) Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4404D10E77B for ; Mon, 24 Aug 2026 12:52:25 +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 8E22F867B3; Mon, 24 Aug 2026 12:52:11 +0000 (UTC) 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 E7F8A1340C; Mon, 24 Aug 2026 12:52:09 +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 CD1vN3k+jGpyNwAAD6G6ig (envelope-from ); Mon, 24 Aug 2026 12:52:09 +0000 From: Thomas Zimmermann To: jfalempe@redhat.com, javierm@redhat.com, airlied@gmail.com, simona@ffwll.ch, maarten.lankhorst@linux.intel.com, mripard@kernel.org, geert@linux-m68k.org, rdunlap@infradead.org Subject: [PATCH v2 08/13] drm/panic: Split draw_panic_plane() Date: Mon, 24 Aug 2026 14:43:39 +0200 Message-ID: <20260824125201.218863-9-tzimmermann@suse.de> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260824125201.218863-1-tzimmermann@suse.de> References: <20260824125201.218863-1-tzimmermann@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 8E22F867B3 X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 50.00]; REPLY(-4.00)[] X-Rspamd-Action: no action Message-ID-Hash: K24RWJ6ZB75YOXWAMBTWND7AMG6I5CZK X-Message-ID-Hash: K24RWJ6ZB75YOXWAMBTWND7AMG6I5CZK X-MailFrom: tzimmermann@suse.de X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: dri-devel@lists.freedesktop.org, linux-doc@vger.kernel.org, amd-gfx@lists.freedesktop.org, rust-for-linux@vger.kernel.org, linux-hyperv@vger.kernel.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, nouveau@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, virtualization@lists.linux.dev, sashiko-reviews@lists.linux.dev X-Mailman-Version: 3.3.8 Precedence: list List-Id: Nouveau development list Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Move locking and parameters from draw_panic_plane() into the new helper drm_panic_display_panic_screen(). Call draw_panic_plane() from there. The new helper drm_panic_display_panic_screen() is now the DRM core's interface for displaying a panic screen. The code remaining in draw_panic_plane() still does all the heavy lifting. It will become a plane helper for DRM drivers. v2: - use panic_type argument in draw_panic_plane() (Sashiko) Signed-off-by: Thomas Zimmermann --- drivers/gpu/drm/drm_panic.c | 62 ++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 28 deletions(-) diff --git a/drivers/gpu/drm/drm_panic.c b/drivers/gpu/drm/drm_panic.c index bc7c096c4236..2048a3bf736f 100644 --- a/drivers/gpu/drm/drm_panic.c +++ b/drivers/gpu/drm/drm_panic.c @@ -936,42 +936,25 @@ static void drm_panic_clear_description(void) desc_line->txt = NULL; } -static void draw_panic_plane(struct drm_plane *plane, const char *description) +static void draw_panic_plane(struct drm_plane *plane, const char *description, + enum drm_panic_type panic_type, u32 fg_color, u32 bg_color, + unsigned int qr_version) { struct drm_scanout_buffer sb = { }; int ret; - unsigned long flags; -#if defined(CONFIG_DRM_PANIC_FOREGROUND_COLOR) - u32 fg_color = CONFIG_DRM_PANIC_FOREGROUND_COLOR; -#else - u32 fg_color = 0x00ffffff; -#endif -#if defined(CONFIG_DRM_PANIC_BACKGROUND_COLOR) - u32 bg_color = CONFIG_DRM_PANIC_BACKGROUND_COLOR; -#else - u32 bg_color = 0x00000000; -#endif -#if IS_ENABLED(CONFIG_DRM_PANIC_SCREEN_QR_CODE) - unsigned int qr_version = panic_qr_version; -#else - unsigned int qr_version = 0; -#endif - - if (!drm_panic_trylock(plane->dev, flags)) - return; ret = plane->helper_private->get_scanout_buffer(plane, &sb); if (ret || !drm_panic_is_format_supported(sb.format)) - goto unlock; + return; /* One of these should be set, or it can't draw pixels */ if (!sb.set_pixel && !sb.pages && iosys_map_is_null(&sb.map[0])) - goto unlock; + return; drm_panic_set_description(description); - ret = draw_panic_dispatch(&sb, drm_panic_type, fg_color, bg_color, qr_version); + ret = draw_panic_dispatch(&sb, panic_type, fg_color, bg_color, qr_version); if (!ret) { /* * Only flush if we have a panic screen to display. Otherwise @@ -982,9 +965,33 @@ static void draw_panic_plane(struct drm_plane *plane, const char *description) } drm_panic_clear_description(); +} -unlock: - drm_panic_unlock(plane->dev, flags); +static void drm_panic_display_panic_screen(struct drm_plane *plane, const char *description) +{ +#if defined(CONFIG_DRM_PANIC_FOREGROUND_COLOR) + u32 fg_color = CONFIG_DRM_PANIC_FOREGROUND_COLOR; +#else + u32 fg_color = 0x00ffffff; +#endif +#if defined(CONFIG_DRM_PANIC_BACKGROUND_COLOR) + u32 bg_color = CONFIG_DRM_PANIC_BACKGROUND_COLOR; +#else + u32 bg_color = 0x00000000; +#endif +#if IS_ENABLED(CONFIG_DRM_PANIC_SCREEN_QR_CODE) + unsigned int qr_version = panic_qr_version; +#else + unsigned int qr_version = 0; +#endif + struct drm_device *dev = plane->dev; + unsigned long flags; + + if (drm_panic_trylock(dev, flags)) { + draw_panic_plane(plane, description, drm_panic_type, + fg_color, bg_color, qr_version); + drm_panic_unlock(dev, flags); + } } static struct drm_plane *to_drm_plane(struct kmsg_dumper *kd) @@ -997,10 +1004,9 @@ static void drm_panic(struct kmsg_dumper *dumper, struct kmsg_dump_detail *detai struct drm_plane *plane = to_drm_plane(dumper); if (detail->reason == KMSG_DUMP_PANIC) - draw_panic_plane(plane, detail->description); + drm_panic_display_panic_screen(plane, detail->description); } - /* * DEBUG FS, This is currently unsafe. * Create one file per plane, so it's possible to debug one plane at a time. @@ -1017,7 +1023,7 @@ static ssize_t debugfs_trigger_write(struct file *file, const char __user *user_ if (kstrtobool_from_user(user_buf, count, &run) == 0 && run) { struct drm_plane *plane = file->private_data; - draw_panic_plane(plane, "Test from debugfs"); + drm_panic_display_panic_screen(plane, "Test from debugfs"); } return count; } -- 2.55.0