From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (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 C3A26435AAF; Wed, 2 Sep 2026 12:21:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788351666; cv=none; b=uHozcQhCOJoz5YK1nn2oCT7fMeYEtDgvasg7pXELsRYK0TtbaxfzYB6WiuBjCF7dAYmmY27AZtkqiq9sA36qg9vDHedsdPP56RLBa5BmJ+1330DJMmDPIRr1lZ6mBBkFnNW/vU/PupWzp4/afAqd/HmCGDH8o9MLFn+k+taJvfE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788351666; c=relaxed/simple; bh=UnUbj3MUWaqsk3rYDdzGm72ltph8tBW/VohARXniu5w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aeeNwpXpx3NmneU90/8HPNoQ++itkEvQWm7SynkfPJRqggB+TT2ZRcA72kWFiXxcK9D1mkLjbX0SSkRCYZb2tbQCJ7Q2vxcD8eHcD05fXMs9aQmSdFOGqqJccbn//kl8AAD15n4TeNBxJ+UWywjP32hETSvdTcPKNcPvlPEZuuA= 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=tWqAGtTq; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=41eiQw+w; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=ylOSxUas; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=htUfuc26; arc=none smtp.client-ip=195.135.223.130 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="tWqAGtTq"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="41eiQw+w"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="ylOSxUas"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="htUfuc26" 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-out1.suse.de (Postfix) with ESMTPS id 8B63E21D64; Wed, 2 Sep 2026 12:19:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1788351587; 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=yUIelY8aeAUO1cuK4ODlYYr38Aofkih3tDCNhFpcfqE=; b=tWqAGtTq/hU13Czz90MtS9Z8xn1vHwELfC3VglEp86YEu5MH1gYjL7i47iWLmwnmE+5iWA UPwtxhqZB3leYZiGXN4ylihZ+vM2LtmP1PCKyMr+9snFIiUrUqM5zUTb1tPeHcCCpjG9Rp k87jmg44QAhNl48kckVnrU+zYOCNxfA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1788351587; 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=yUIelY8aeAUO1cuK4ODlYYr38Aofkih3tDCNhFpcfqE=; b=41eiQw+wIBl8ODnDF9cyNqFD57Of3qLldtUxcjA3esnbzZnEL3uqexEbmEKZrY3tcd3kgk ACaSRyK/qsX7G3DA== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1788351583; 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=yUIelY8aeAUO1cuK4ODlYYr38Aofkih3tDCNhFpcfqE=; b=ylOSxUasXeOmQAMiFrn7XnCSz6gzVT2WHU5LJbKebB4+hr4/YXNvFVMg5NtR9UAfSQ/fM7 F7cNzuaarBRd9zymBPlYl9W9413Yds3a4DLsoy/EHrSgkUfAIJmZIbsRGVFVWwHEItLOZp oKYH0GiwpSkIbnoa2bkrvV+/GZMLDu0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1788351583; 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=yUIelY8aeAUO1cuK4ODlYYr38Aofkih3tDCNhFpcfqE=; b=htUfuc26U5JJLEf9PeqfgcVIzCszmbvNiBZ3LqsfySkSWGXew4BtrMui0HwqaLYoNkeDSr 2FrQM+GPEFMoooAg== 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 D9B4E1397E; Wed, 2 Sep 2026 12:19:42 +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 kDP0M14UmGqxEAAAD6G6ig (envelope-from ); Wed, 02 Sep 2026 12:19:42 +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 v3 14/14] drm/panic: Compile KUnit tests as module Date: Wed, 2 Sep 2026 14:13:22 +0200 Message-ID: <20260902121930.597222-15-tzimmermann@suse.de> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260902121930.597222-1-tzimmermann@suse.de> References: <20260902121930.597222-1-tzimmermann@suse.de> Precedence: bulk X-Mailing-List: rust-for-linux@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Level: X-Spam-Score: -6.80 X-Spam-Flag: NO X-Spamd-Result: default: False [-6.80 / 50.00]; REPLY(-4.00)[]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; 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,drm_panic_helper_qr.rs:url]; 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] Fix dependency of the panic-helper KUnit tests on CONFIG_DRM_KUNIT_TEST=y and make them build as a module. Export the necessary interfaces from the panic helpers iff the KUnit framework has been enabled. Select DRM_PANIC_HELPER from DRM_KUNIT_TEST to meet the dependencies of the panic-helper tests. It is now possible to run the tests by modprobe-ing drm_panic_helper_test at runtime. v3: - clean up after each test case (Sashiko) v2: - fix parameter order in decl of drm_panic_helper_draw_screen_qr() (Sashiko) Signed-off-by: Thomas Zimmermann --- drivers/gpu/drm/Kconfig.debug | 1 + drivers/gpu/drm/drm_panic_helper.c | 26 ++++++++++--------- drivers/gpu/drm/tests/Makefile | 1 + drivers/gpu/drm/tests/drm_panic_helper_test.c | 21 ++++++++++++--- include/drm/drm_panic_helper.h | 8 ++++++ 5 files changed, 41 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/Kconfig.debug b/drivers/gpu/drm/Kconfig.debug index 1f4c98cbf090..b909cd0a619f 100644 --- a/drivers/gpu/drm/Kconfig.debug +++ b/drivers/gpu/drm/Kconfig.debug @@ -69,6 +69,7 @@ config DRM_KUNIT_TEST select DRM_EXPORT_FOR_TESTS if m select DRM_GEM_SHMEM_HELPER select DRM_KUNIT_TEST_HELPERS + select DRM_PANIC_HELPER select DRM_SYSFB_HELPER select PRIME_NUMBERS default KUNIT_ALL_TESTS diff --git a/drivers/gpu/drm/drm_panic_helper.c b/drivers/gpu/drm/drm_panic_helper.c index f64a3ca38467..683af48de38c 100644 --- a/drivers/gpu/drm/drm_panic_helper.c +++ b/drivers/gpu/drm/drm_panic_helper.c @@ -8,6 +8,8 @@ #include #include +#include + #include #include #include @@ -433,8 +435,8 @@ static void drm_panic_helper_logo_draw(struct drm_scanout_buffer *sb, struct drm fg_color); } -static int drm_panic_helper_draw_screen_user(struct drm_scanout_buffer *sb, - u32 fg_color, u32 bg_color) +VISIBLE_IF_KUNIT int drm_panic_helper_draw_screen_user(struct drm_scanout_buffer *sb, + u32 fg_color, u32 bg_color) { const struct font_desc *font = get_default_font(sb->width, sb->height, NULL, NULL); struct drm_rect r_screen, r_logo, r_msg; @@ -466,6 +468,7 @@ static int drm_panic_helper_draw_screen_user(struct drm_scanout_buffer *sb, return 0; } +EXPORT_SYMBOL_IF_KUNIT(drm_panic_helper_draw_screen_user); /* * Draw one line of kmsg, and handle wrapping if it won't fit in the screen width. @@ -504,8 +507,8 @@ static int draw_line_with_wrap(struct drm_scanout_buffer *sb, const struct font_ * Draw the kmsg buffer to the screen, starting from the youngest message at the bottom, * and going up until reaching the top of the screen. */ -static int drm_panic_helper_draw_screen_kmsg(struct drm_scanout_buffer *sb, - u32 fg_color, u32 bg_color) +VISIBLE_IF_KUNIT int drm_panic_helper_draw_screen_kmsg(struct drm_scanout_buffer *sb, + u32 fg_color, u32 bg_color) { const struct font_desc *font = get_default_font(sb->width, sb->height, NULL, NULL); struct drm_rect r_screen = DRM_RECT_INIT(0, 0, sb->width, sb->height); @@ -549,6 +552,7 @@ static int drm_panic_helper_draw_screen_kmsg(struct drm_scanout_buffer *sb, return 0; } +EXPORT_SYMBOL_IF_KUNIT(drm_panic_helper_draw_screen_kmsg); #if defined(CONFIG_DRM_PANIC_SCREEN_QR_CODE) /* @@ -691,9 +695,9 @@ static int drm_panic_helper_get_qr_code(u8 **qr_image, unsigned int qr_version) /* * Draw the panic message at the center of the screen, with a QR Code */ -static int drm_panic_helper_draw_screen_qr_code(struct drm_scanout_buffer *sb, - u32 fg_color, u32 bg_color, - unsigned int qr_version) +VISIBLE_IF_KUNIT int drm_panic_helper_draw_screen_qr_code(struct drm_scanout_buffer *sb, + 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; @@ -763,6 +767,7 @@ static int drm_panic_helper_draw_screen_qr_code(struct drm_scanout_buffer *sb, drm_panic_helper_blit(sb, &r_qr, qr_image, qr_pitch, scale, fg_color); return 0; } +EXPORT_SYMBOL_IF_KUNIT(drm_panic_helper_draw_screen_qr_code); #else static void __init drm_panic_helper_qr_init(void) { }; static void __exit drm_panic_helper_qr_exit(void) { }; @@ -815,7 +820,7 @@ static int draw_panic_helper_dispatch(struct drm_scanout_buffer *sb, return ret; } -static void drm_panic_helper_set_description(const char *description) +VISIBLE_IF_KUNIT void drm_panic_helper_set_description(const char *description) { u32 len; @@ -830,6 +835,7 @@ static void drm_panic_helper_set_description(const char *description) desc_line->len = len; } } +EXPORT_SYMBOL_IF_KUNIT(drm_panic_helper_set_description); static void drm_panic_helper_clear_description(void) { @@ -910,7 +916,3 @@ void __exit drm_panic_helper_exit(void) { drm_panic_helper_qr_exit(); } - -#ifdef CONFIG_DRM_KUNIT_TEST -#include "tests/drm_panic_helper_test.c" -#endif diff --git a/drivers/gpu/drm/tests/Makefile b/drivers/gpu/drm/tests/Makefile index e7193b49cf91..42207df1d1c8 100644 --- a/drivers/gpu/drm/tests/Makefile +++ b/drivers/gpu/drm/tests/Makefile @@ -20,6 +20,7 @@ obj-$(CONFIG_DRM_KUNIT_TEST) += \ drm_managed_test.o \ drm_mm_test.o \ drm_modes_test.o \ + drm_panic_helper_test.o \ drm_plane_helper_test.o \ drm_probe_helper_test.o \ drm_rect_test.o \ diff --git a/drivers/gpu/drm/tests/drm_panic_helper_test.c b/drivers/gpu/drm/tests/drm_panic_helper_test.c index e6befe0f1c83..6184a6fc7eb8 100644 --- a/drivers/gpu/drm/tests/drm_panic_helper_test.c +++ b/drivers/gpu/drm/tests/drm_panic_helper_test.c @@ -6,13 +6,17 @@ * KUNIT tests for DRM panic helpers */ -#include -#include +#include +#include +#include #include -#include -#include +#include +#include +#include + +MODULE_IMPORT_NS("EXPORTED_FOR_KUNIT_TESTING"); static void drm_panic_check_color_byte(struct kunit *test, u8 b) { @@ -86,6 +90,11 @@ static int drm_test_panic_init(struct kunit *test) return 0; } +static void drm_test_panic_exit(struct kunit *test) +{ + drm_panic_helper_set_description(NULL); +} + /* * Test drawing the panic screen, using a memory mapped framebuffer * Set the whole buffer to 0xa5, and then check that all pixels have been @@ -229,7 +238,11 @@ static struct kunit_case drm_panic_screen_user_test[] = { static struct kunit_suite drm_panic_helper_suite = { .name = "drm_panic_helper", .init = drm_test_panic_init, + .exit = drm_test_panic_exit, .test_cases = drm_panic_screen_user_test, }; kunit_test_suite(drm_panic_helper_suite); + +MODULE_DESCRIPTION("KUnit test suite for DRM panic handling"); +MODULE_LICENSE("GPL"); diff --git a/include/drm/drm_panic_helper.h b/include/drm/drm_panic_helper.h index 6cc9a0eba077..6b19607e0784 100644 --- a/include/drm/drm_panic_helper.h +++ b/include/drm/drm_panic_helper.h @@ -8,6 +8,7 @@ enum drm_panic_type; struct drm_plane; +struct drm_scanout_buffer; /* drm_panic_helper.c */ int drm_plane_helper_display_panic_screen(struct drm_plane *plane, @@ -15,6 +16,13 @@ int drm_plane_helper_display_panic_screen(struct drm_plane *plane, enum drm_panic_type panic_type, u32 fg_color, u32 bg_color, unsigned int qr_version); +#if IS_ENABLED(CONFIG_KUNIT) +int drm_panic_helper_draw_screen_user(struct drm_scanout_buffer *sb, u32 fg_color, u32 bg_color); +int drm_panic_helper_draw_screen_kmsg(struct drm_scanout_buffer *sb, u32 fg_color, u32 bg_color); +int drm_panic_helper_draw_screen_qr_code(struct drm_scanout_buffer *sb, + u32 fg_color, u32 bg_color, unsigned int qr_version); +void drm_panic_helper_set_description(const char *description); +#endif /* drm_panic_helper_qr.rs */ size_t drm_panic_helper_qr_max_data_size(u8 version, size_t url_len); -- 2.55.0