From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (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 1C6BF359A6B; Mon, 24 Aug 2026 12:58:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787576329; cv=none; b=iwYE8IMHoIeB2jd4apZsvuZZCNFLCrRaJh/RfEgM8WXClJfFRq6+8J7G2I8UzuLvs9mNx8+I+mqOMO06gYXnil5rlGSaDoSErUXZ2+x8fpqAhPFnHlyFYGYDTha1V5Sge8ScmiIFL7QEK+SyjR0BKPyVz+ByOgR6GswpVulbyBc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787576329; c=relaxed/simple; bh=eciJ9jsr7AB7/58KShnubYuqD7EkujTJGBnTFwC9GoQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sUi59z3SkvQmKT4Jz7z6QC8AGSZp+DTlQUnUUbrTDBjKVvB5nYJS9qzzP84EechzkDWWP1XQ4USwKML7vNG/XDfxhTlMyoEAOH42RhQ97JYZT4ASqhuIKkiC0vV0qdhLtmuWcIL/RgoxwbwIU8aodHZUtcQ8MQD02CsCKxe4aV4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=obgWw2kz; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=RXT+BYj7; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=mwl4c/Tb; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=+/lh83EJ; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="obgWw2kz"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="RXT+BYj7"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="mwl4c/Tb"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="+/lh83EJ" Received: from imap1.dmz-prg2.suse.org (unknown [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-out2.suse.de (Postfix) with ESMTPS id 855161F793; Mon, 24 Aug 2026 12:52:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1787575935; 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=MC0+KLKbJpYLNfJ5VRFGCqadwDqoWaUxvHFHXz5HZnc=; b=obgWw2kzGBweRTNALmhwjkp4iYGjn81fa1D7NJxa4i1siT6djgftntgpd/z2tW5aWIdh+S uWM1/AcEThWD2yzhAXxxbWaswQ87J1u1sEZFTUZoqGxoNHbx/kS44ViGCtRcP4a6GT5Qgm hqbMy2Y2+eY+6BfOlhUki+1zVsmuxj8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1787575935; 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=MC0+KLKbJpYLNfJ5VRFGCqadwDqoWaUxvHFHXz5HZnc=; b=RXT+BYj7wNzonJqhj1YsE8EcjDo61Rdj7rSLjpDJxNRKHwVuwYxfdezg4lci/Lm6vyIXWK h+3r4Icq4EJv/HCw== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1787575931; 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=MC0+KLKbJpYLNfJ5VRFGCqadwDqoWaUxvHFHXz5HZnc=; b=mwl4c/Tb/ixoV1iqroX/qzKElQCk9f8DUp30+/eJFXYsVcJNLZYbJbf21tIWM13fCOyV0k HM3k3pwMqsB0sKD120xyZDQyUigH6VIMUyRTr8SkH7NcL7YSaKmWHvARV3CH0UxdS6V3bO 4L0XZiosaUlqtPIqdNYoOi8jFNUlPy4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1787575931; 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=MC0+KLKbJpYLNfJ5VRFGCqadwDqoWaUxvHFHXz5HZnc=; b=+/lh83EJjC7C+V05NWqdrrdXbfOmmiT6WFmaEZgIhFk3TBq8Ix8LHWo/uzw6eg3DbJYmXX Rzi9k2oqjbz8S9CQ== 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 DD823133F6; Mon, 24 Aug 2026 12:52:08 +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 sKzSNHg+jGpyNwAAD6G6ig (envelope-from ); Mon, 24 Aug 2026 12:52:08 +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 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, Thomas Zimmermann Subject: [PATCH v2 06/13] drm/panic: Pass global module parameters to drm_panic_dispatch() Date: Mon, 24 Aug 2026 14:43:37 +0200 Message-ID: <20260824125201.218863-7-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> Precedence: bulk X-Mailing-List: linux-doc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -6.80 X-Spam-Level: X-Spam-Flag: NO X-Spamd-Result: default: False [-6.80 / 50.00]; REPLY(-4.00)[]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.999]; MIME_GOOD(-0.10)[text/plain]; RCVD_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; RCPT_COUNT_TWELVE(0.00)[22]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEMAIL_TO(0.00)[redhat.com,gmail.com,ffwll.ch,linux.intel.com,kernel.org,linux-m68k.org,infradead.org]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.de:email,suse.de:mid]; FROM_EQ_ENVFROM(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCVD_TLS_ALL(0.00)[]; R_RATELIMIT(0.00)[to_ip_from(RLqirfcw6gnbcr9a9yhi49fhi6)]; FREEMAIL_ENVRCPT(0.00)[gmail.com] Set the panic type and QR version in draw_panic_plane() as a single point of truth. Pass the values into the individual drawing functions. In the test case, always create a QR code with version 40 (i.e., the highest supported version). Signed-off-by: Thomas Zimmermann Reviewed-by: Jocelyn Falempe --- drivers/gpu/drm/drm_panic.c | 39 ++++++++++++++++---------- drivers/gpu/drm/tests/drm_panic_test.c | 2 +- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/drm_panic.c b/drivers/gpu/drm/drm_panic.c index 834653d288a9..f597ef04c5bc 100644 --- a/drivers/gpu/drm/drm_panic.c +++ b/drivers/gpu/drm/drm_panic.c @@ -654,7 +654,7 @@ static void drm_panic_qr_exit(void) stream.workspace = NULL; } -static int drm_panic_get_qr_code_url(u8 **qr_image) +static int drm_panic_get_qr_code_url(u8 **qr_image, unsigned int qr_version) { struct kmsg_dump_iter iter; char url[256]; @@ -666,7 +666,7 @@ static int drm_panic_get_qr_code_url(u8 **qr_image) CONFIG_DRM_PANIC_SCREEN_QR_CODE_URL, utsname()->machine, utsname()->release); - max_qr_data_size = drm_panic_qr_max_data_size(panic_qr_version, url_len); + max_qr_data_size = drm_panic_qr_max_data_size(qr_version, url_len); max_kmsg_size = min(MAX_ZLIB_RATIO * max_qr_data_size, QR_BUFFER1_SIZE); /* get kmsg to buffer 1 */ @@ -712,11 +712,11 @@ static int drm_panic_get_qr_code_url(u8 **qr_image) qrbuf1, QR_BUFFER1_SIZE); } -static int drm_panic_get_qr_code_raw(u8 **qr_image) +static int drm_panic_get_qr_code_raw(u8 **qr_image, unsigned int qr_version) { struct kmsg_dump_iter iter; size_t kmsg_len; - size_t max_kmsg_size = min(drm_panic_qr_max_data_size(panic_qr_version, 0), + size_t max_kmsg_size = min(drm_panic_qr_max_data_size(qr_version, 0), QR_BUFFER1_SIZE); kmsg_dump_rewind(&iter); @@ -729,19 +729,20 @@ static int drm_panic_get_qr_code_raw(u8 **qr_image) qrbuf2, QR_BUFFER2_SIZE); } -static int drm_panic_get_qr_code(u8 **qr_image) +static int drm_panic_get_qr_code(u8 **qr_image, unsigned int qr_version) { if (strlen(CONFIG_DRM_PANIC_SCREEN_QR_CODE_URL) > 0) - return drm_panic_get_qr_code_url(qr_image); + return drm_panic_get_qr_code_url(qr_image, qr_version); else - return drm_panic_get_qr_code_raw(qr_image); + return drm_panic_get_qr_code_raw(qr_image, qr_version); } /* * Draw the panic message at the center of the screen, with a QR Code */ static int _draw_panic_screen_qr_code(struct drm_scanout_buffer *sb, - u32 fg_color, u32 bg_color) + u32 fg_color, u32 bg_color, + unsigned int qr_version) { const struct font_desc *font = get_default_font(sb->width, sb->height, NULL, NULL); struct drm_rect r_screen, r_logo, r_msg, r_qr, r_qr_canvas; @@ -768,7 +769,7 @@ static int _draw_panic_screen_qr_code(struct drm_scanout_buffer *sb, max_qr_size = min(3 * sb->width / 4, 3 * sb->height / 4); - qr_width = drm_panic_get_qr_code(&qr_image); + qr_width = drm_panic_get_qr_code(&qr_image, qr_version); if (qr_width < 0) return qr_width; else if (!qr_width) @@ -812,9 +813,11 @@ static int _draw_panic_screen_qr_code(struct drm_scanout_buffer *sb, return 0; } -static int draw_panic_screen_qr_code(struct drm_scanout_buffer *sb, u32 fg_color, u32 bg_color) +static int draw_panic_screen_qr_code(struct drm_scanout_buffer *sb, + u32 fg_color, u32 bg_color, + unsigned int qr_version) { - if (_draw_panic_screen_qr_code(sb, fg_color, bg_color)) + if (_draw_panic_screen_qr_code(sb, fg_color, bg_color, qr_version)) return draw_panic_screen_user(sb, fg_color, bg_color); return 0; } @@ -887,17 +890,18 @@ static bool drm_panic_is_format_supported(const struct drm_format_info *format) return drm_draw_can_convert_from_xrgb8888(format->format); } -static int draw_panic_dispatch(struct drm_scanout_buffer *sb, u32 fg_color, u32 bg_color) +static int draw_panic_dispatch(struct drm_scanout_buffer *sb, enum drm_panic_type panic_type, + u32 fg_color, u32 bg_color, unsigned int qr_version) { int ret; - switch (drm_panic_type) { + switch (panic_type) { case DRM_PANIC_TYPE_KMSG: ret = draw_panic_screen_kmsg(sb, fg_color, bg_color); break; #if IS_ENABLED(CONFIG_DRM_PANIC_SCREEN_QR_CODE) case DRM_PANIC_TYPE_QR: - ret = draw_panic_screen_qr_code(sb, fg_color, bg_color); + ret = draw_panic_screen_qr_code(sb, fg_color, bg_color, qr_version); break; #endif case DRM_PANIC_TYPE_USER: @@ -947,6 +951,11 @@ static void draw_panic_plane(struct drm_plane *plane, const char *description) #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; @@ -962,7 +971,7 @@ static void draw_panic_plane(struct drm_plane *plane, const char *description) drm_panic_set_description(description); - ret = draw_panic_dispatch(&sb, fg_color, bg_color); + ret = draw_panic_dispatch(&sb, drm_panic_type, fg_color, bg_color, qr_version); if (!ret) { /* * Only flush if we have a panic screen to display. Otherwise diff --git a/drivers/gpu/drm/tests/drm_panic_test.c b/drivers/gpu/drm/tests/drm_panic_test.c index 969a096ec840..196496238d23 100644 --- a/drivers/gpu/drm/tests/drm_panic_test.c +++ b/drivers/gpu/drm/tests/drm_panic_test.c @@ -58,7 +58,7 @@ static int draw_panic_screen_kmsg_default(struct drm_scanout_buffer *sb) #if IS_ENABLED(CONFIG_DRM_PANIC_SCREEN_QR_CODE) static int draw_panic_screen_qr_code_default(struct drm_scanout_buffer *sb) { - return draw_panic_screen_qr_code(sb, 0x00ffffff, 0x00000000); + return draw_panic_screen_qr_code(sb, 0x00ffffff, 0x00000000, 40); } #endif -- 2.55.0