From nobody Sat Oct 4 01:44:58 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 17D592DAFC7 for ; Thu, 21 Aug 2025 09:52:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755769967; cv=none; b=pljXcU2Ofb55Mz8PdvHHWuQs/QlFNcVjnFW6FIBD7muz0/P2Vbq2Px6bYKwBreXH8miPQXeDHA98hbfo/fSYY24far624irKdDT6W4y1YU0k/rbU1TpYnSj2MkOhVEZPxen61dcI4WLOamyj7KzCo1iPwCtYma1skbPwYuoz0pM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755769967; c=relaxed/simple; bh=5OYGRPbTF7OQtS3BfhI0g4Y4h93HCUlmBzYKZQ4ZRws=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pg2tleSnqVOAYsTqkNrgazpFoDzSAKNfroexdScnNfk/Cd4ZJzv+LemS+jib1OSp04IcX3//Zu4zVYCpzxRTVwVvaiVoxm8xwENONpfB0xyEZYMmpMWfvvQ88qnMqlIEPGnEqGyPioHfSoRCJX3qOtJe9T8zdXORSYZnyMhSUY4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=KRmQn5im; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="KRmQn5im" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1755769965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5iAm/zvI0Eff2wE9jd/ydPFKoAPLPkgSyf/zQO1N1E4=; b=KRmQn5imQVpxFOyXd0ZhkqVd4So1GHly7WaxRloD92RmYlmRLVxBDaVWRVswWqaBHPto16 gmrR/lIwx87JYcCyJAKovlcVRW0TojS6lKMu9PtdK1pLepKgJ8eBXEjqTNTMIUalmRCGNx RBjYIHXkIigTiL2ZZRgFrSxzkLJJEXo= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-361-i8PxERLhON2CMRY71zdtwQ-1; Thu, 21 Aug 2025 05:52:41 -0400 X-MC-Unique: i8PxERLhON2CMRY71zdtwQ-1 X-Mimecast-MFC-AGG-ID: i8PxERLhON2CMRY71zdtwQ_1755769959 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8810919560B0; Thu, 21 Aug 2025 09:52:39 +0000 (UTC) Received: from hydra.redhat.com (unknown [10.44.33.118]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5D41B197768D; Thu, 21 Aug 2025 09:52:36 +0000 (UTC) From: Jocelyn Falempe To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Jocelyn Falempe , Javier Martinez Canillas , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH 1/3] drm/panic: Rename draw_panic_static_* to draw_panic_screen_* Date: Thu, 21 Aug 2025 11:49:05 +0200 Message-ID: <20250821095228.648156-2-jfalempe@redhat.com> In-Reply-To: <20250821095228.648156-1-jfalempe@redhat.com> References: <20250821095228.648156-1-jfalempe@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Content-Type: text/plain; charset="utf-8" I called them "static" because the panic screen is drawn only once, but this can be confused with the static meaning in C. Also remove some unnecessary braces in draw_panic_dispatch(). No functionnal change. Signed-off-by: Jocelyn Falempe --- drivers/gpu/drm/drm_panic.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/drm_panic.c b/drivers/gpu/drm/drm_panic.c index 1d6312fa1429..1e06e3a18d09 100644 --- a/drivers/gpu/drm/drm_panic.c +++ b/drivers/gpu/drm/drm_panic.c @@ -437,7 +437,7 @@ static void drm_panic_logo_draw(struct drm_scanout_buff= er *sb, struct drm_rect * fg_color); } =20 -static void draw_panic_static_user(struct drm_scanout_buffer *sb) +static void draw_panic_screen_user(struct drm_scanout_buffer *sb) { u32 fg_color =3D drm_draw_color_from_xrgb8888(CONFIG_DRM_PANIC_FOREGROUND= _COLOR, sb->format->format); @@ -506,7 +506,7 @@ static int draw_line_with_wrap(struct drm_scanout_buffe= r *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 void draw_panic_static_kmsg(struct drm_scanout_buffer *sb) +static void draw_panic_screen_kmsg(struct drm_scanout_buffer *sb) { u32 fg_color =3D drm_draw_color_from_xrgb8888(CONFIG_DRM_PANIC_FOREGROUND= _COLOR, sb->format->format); @@ -694,7 +694,7 @@ static int drm_panic_get_qr_code(u8 **qr_image) /* * Draw the panic message at the center of the screen, with a QR Code */ -static int _draw_panic_static_qr_code(struct drm_scanout_buffer *sb) +static int _draw_panic_screen_qr_code(struct drm_scanout_buffer *sb) { u32 fg_color =3D drm_draw_color_from_xrgb8888(CONFIG_DRM_PANIC_FOREGROUND= _COLOR, sb->format->format); @@ -759,15 +759,15 @@ static int _draw_panic_static_qr_code(struct drm_scan= out_buffer *sb) return 0; } =20 -static void draw_panic_static_qr_code(struct drm_scanout_buffer *sb) +static void draw_panic_screen_qr_code(struct drm_scanout_buffer *sb) { - if (_draw_panic_static_qr_code(sb)) - draw_panic_static_user(sb); + if (_draw_panic_screen_qr_code(sb)) + draw_panic_screen_user(sb); } #else -static void draw_panic_static_qr_code(struct drm_scanout_buffer *sb) +static void draw_panic_screen_qr_code(struct drm_scanout_buffer *sb) { - draw_panic_static_user(sb); + draw_panic_screen_user(sb); } =20 static void drm_panic_qr_init(void) {}; @@ -790,13 +790,12 @@ static bool drm_panic_is_format_supported(const struc= t drm_format_info *format) =20 static void draw_panic_dispatch(struct drm_scanout_buffer *sb) { - if (!strcmp(drm_panic_screen, "kmsg")) { - draw_panic_static_kmsg(sb); - } else if (!strcmp(drm_panic_screen, "qr_code")) { - draw_panic_static_qr_code(sb); - } else { - draw_panic_static_user(sb); - } + if (!strcmp(drm_panic_screen, "kmsg")) + draw_panic_screen_kmsg(sb); + else if (!strcmp(drm_panic_screen, "qr_code")) + draw_panic_screen_qr_code(sb); + else + draw_panic_screen_user(sb); } =20 static void drm_panic_set_description(const char *description) --=20 2.50.1 From nobody Sat Oct 4 01:44:58 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0BD762E2DC6 for ; Thu, 21 Aug 2025 09:52:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755769970; cv=none; b=M5XVbCOvc5+SH3gfPVWfjRHxpDznmthqnFGTkUHI+YLOjKXtuZw94c03LZ6n3e9L17/xfFval9PsOIIhkjj8yNPLIxZzYAV6NP5u9oWipms3Dop8Hg7J29ckgs6sVa8MI1mCo3U7qOBzwJI7BycIVR4aH30iYeeC/N6FL1tcyz0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755769970; c=relaxed/simple; bh=t2iUy/wZuKlC7s7lNGJcsEGhu3N4LW8iuiwyZGIDZRA=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rkW+8B3kiTyzRqgGpj674VedH06aBIm62s74bfRR/4hiqyVxMu83wOzks5z2YaHXwOPPrXzGK/lqtgz5IkJ3uOSzIFe5owPiIhhtL0bEOyTY0qlibzZhvdBmjP5rWchgzBUiK4MUXTkspcmGWJwbM3jLReMeFCyU9FRHohKuqFI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=fXGGMaTQ; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="fXGGMaTQ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1755769967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kgTYz/xc1IhWIiyKBtA2fPS1zW/AfOLuNLmyMAtu254=; b=fXGGMaTQDw0ynK0b3eWgcvgltQu1GoNz98nhK+cfQo5jlGAFEmdvePz5LtzrUAeAyh3yGZ SngCOQF06J37iO6gDrtSJxckKjqEv1f+cJRhLeaQhpxLAkmxpZt++u58aYW5P9bXOJiTpC nX4Oademel5+ofjuSApMKF+EX2ACvaU= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-552-lG8voXtTPkmKoLxWi8A7gg-1; Thu, 21 Aug 2025 05:52:44 -0400 X-MC-Unique: lG8voXtTPkmKoLxWi8A7gg-1 X-Mimecast-MFC-AGG-ID: lG8voXtTPkmKoLxWi8A7gg_1755769963 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1BE841956086; Thu, 21 Aug 2025 09:52:43 +0000 (UTC) Received: from hydra.redhat.com (unknown [10.44.33.118]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 112B01977691; Thu, 21 Aug 2025 09:52:39 +0000 (UTC) From: Jocelyn Falempe To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Jocelyn Falempe , Javier Martinez Canillas , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH 2/3] drm/panic: Add kunit tests for drm_panic Date: Thu, 21 Aug 2025 11:49:06 +0200 Message-ID: <20250821095228.648156-3-jfalempe@redhat.com> In-Reply-To: <20250821095228.648156-1-jfalempe@redhat.com> References: <20250821095228.648156-1-jfalempe@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Content-Type: text/plain; charset="utf-8" Add kunit tests for drm_panic. They check that drawing the panic screen doesn't crash, but they don't check the correctness of the resulting image. Signed-off-by: Jocelyn Falempe --- MAINTAINERS | 1 + drivers/gpu/drm/drm_panic.c | 4 + drivers/gpu/drm/tests/drm_panic_test.c | 164 +++++++++++++++++++++++++ 3 files changed, 169 insertions(+) create mode 100644 drivers/gpu/drm/tests/drm_panic_test.c diff --git a/MAINTAINERS b/MAINTAINERS index cfa28b3470ab..285d1e27734f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8465,6 +8465,7 @@ T: git https://gitlab.freedesktop.org/drm/misc/kernel= .git F: drivers/gpu/drm/drm_draw.c F: drivers/gpu/drm/drm_draw_internal.h F: drivers/gpu/drm/drm_panic*.c +F: drivers/gpu/drm/tests/drm_panic_test.c F: include/drm/drm_panic* =20 DRM PANIC QR CODE diff --git a/drivers/gpu/drm/drm_panic.c b/drivers/gpu/drm/drm_panic.c index 1e06e3a18d09..d89812ff1935 100644 --- a/drivers/gpu/drm/drm_panic.c +++ b/drivers/gpu/drm/drm_panic.c @@ -986,3 +986,7 @@ void drm_panic_exit(void) { drm_panic_qr_exit(); } + +#ifdef CONFIG_DRM_KUNIT_TEST +#include "tests/drm_panic_test.c" +#endif diff --git a/drivers/gpu/drm/tests/drm_panic_test.c b/drivers/gpu/drm/tests= /drm_panic_test.c new file mode 100644 index 000000000000..46ff3e5e0e5d --- /dev/null +++ b/drivers/gpu/drm/tests/drm_panic_test.c @@ -0,0 +1,164 @@ +// SPDX-License-Identifier: GPL-2.0 or MIT +/* + * Copyright (c) 2025 Red Hat. + * Author: Jocelyn Falempe + * + * KUNIT tests for drm panic + */ + +#include +#include + +#include + +#include +#include + +struct drm_test_mode { + const int width; + const int height; + const u32 format; + void (*draw_screen)(struct drm_scanout_buffer *sb); + const char *fname; +}; + +/* + * Run all tests for the 3 panic screens: user, kmsg and qr_code + */ +#define DRM_TEST_MODE_LIST(func) \ + DRM_PANIC_TEST_MODE(1024, 768, DRM_FORMAT_XRGB8888, func) \ + DRM_PANIC_TEST_MODE(300, 200, DRM_FORMAT_XRGB8888, func) \ + DRM_PANIC_TEST_MODE(1920, 1080, DRM_FORMAT_XRGB8888, func) \ + DRM_PANIC_TEST_MODE(1024, 768, DRM_FORMAT_RGB565, func) \ + DRM_PANIC_TEST_MODE(1024, 768, DRM_FORMAT_RGB888, func) \ + +#define DRM_PANIC_TEST_MODE(w, h, f, name) { \ + .width =3D w, \ + .height =3D h, \ + .format =3D f, \ + .draw_screen =3D draw_panic_screen_##name, \ + .fname =3D #name, \ + }, \ + +static const struct drm_test_mode drm_test_modes_cases[] =3D { + DRM_TEST_MODE_LIST(user) + DRM_TEST_MODE_LIST(kmsg) + DRM_TEST_MODE_LIST(qr_code) +}; +#undef DRM_PANIC_TEST_MODE + +static int drm_test_panic_init(struct kunit *test) +{ + struct drm_scanout_buffer *priv; + + priv =3D kunit_kzalloc(test, sizeof(*priv), GFP_KERNEL); + KUNIT_ASSERT_NOT_NULL(test, priv); + + test->priv =3D priv; + + drm_panic_set_description("Kunit testing"); + + return 0; +} + +static void drm_test_panic_screen_user_map(struct kunit *test) +{ + struct drm_scanout_buffer *sb =3D test->priv; + const struct drm_test_mode *params =3D test->param_value; + void *fb; + int fb_size; + + sb->format =3D drm_format_info(params->format); + fb_size =3D params->width * params->height * sb->format->cpp[0]; + + fb =3D vmalloc(fb_size); + KUNIT_ASSERT_NOT_NULL(test, fb); + + iosys_map_set_vaddr(&sb->map[0], fb); + sb->width =3D params->width; + sb->height =3D params->height; + sb->pitch[0] =3D params->width * sb->format->cpp[0]; + + params->draw_screen(sb); + vfree(fb); +} + +static void drm_test_panic_screen_user_page(struct kunit *test) +{ + struct drm_scanout_buffer *sb =3D test->priv; + const struct drm_test_mode *params =3D test->param_value; + int fb_size; + struct page **pages; + int i; + int npages; + + sb->format =3D drm_format_info(params->format); + fb_size =3D params->width * params->height * sb->format->cpp[0]; + npages =3D DIV_ROUND_UP(fb_size, PAGE_SIZE); + + pages =3D kmalloc_array(npages, sizeof(struct page *), GFP_KERNEL); + KUNIT_ASSERT_NOT_NULL(test, pages); + + for (i =3D 0; i < npages; i++) { + pages[i] =3D alloc_page(GFP_KERNEL); + KUNIT_ASSERT_NOT_NULL(test, pages[i]); + } + sb->pages =3D pages; + sb->width =3D params->width; + sb->height =3D params->height; + sb->pitch[0] =3D params->width * sb->format->cpp[0]; + + params->draw_screen(sb); + + for (i =3D 0; i < npages; i++) + __free_page(pages[i]); + kfree(pages); +} + +static void drm_test_panic_set_pixel(struct drm_scanout_buffer *sb, + unsigned int x, + unsigned int y, + u32 color) +{ +} + +static void drm_test_panic_screen_user_set_pixel(struct kunit *test) +{ + struct drm_scanout_buffer *sb =3D test->priv; + const struct drm_test_mode *params =3D test->param_value; + + sb->format =3D drm_format_info(params->format); + sb->set_pixel =3D drm_test_panic_set_pixel; + sb->width =3D params->width; + sb->height =3D params->height; + + params->draw_screen(sb); +} + +static void drm_test_panic_desc(const struct drm_test_mode *t, char *desc) +{ + sprintf(desc, "Panic screen %s, mode: %d x %d \t%p4cc", + t->fname, t->width, t->height, &t->format); +} + +KUNIT_ARRAY_PARAM(drm_test_panic_screen_user_map, drm_test_modes_cases, dr= m_test_panic_desc); +KUNIT_ARRAY_PARAM(drm_test_panic_screen_user_page, drm_test_modes_cases, d= rm_test_panic_desc); +KUNIT_ARRAY_PARAM(drm_test_panic_screen_user_set_pixel, drm_test_modes_cas= es, drm_test_panic_desc); + +static struct kunit_case drm_panic_screen_user_test[] =3D { + KUNIT_CASE_PARAM(drm_test_panic_screen_user_map, + drm_test_panic_screen_user_map_gen_params), + KUNIT_CASE_PARAM(drm_test_panic_screen_user_page, + drm_test_panic_screen_user_page_gen_params), + KUNIT_CASE_PARAM(drm_test_panic_screen_user_set_pixel, + drm_test_panic_screen_user_set_pixel_gen_params), + { } +}; + +static struct kunit_suite drm_panic_suite =3D { + .name =3D "drm_panic", + .init =3D drm_test_panic_init, + .test_cases =3D drm_panic_screen_user_test, +}; + +kunit_test_suite(drm_panic_suite); --=20 2.50.1 From nobody Sat Oct 4 01:44:58 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D1EAB2DBF7C for ; Thu, 21 Aug 2025 09:52:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755769977; cv=none; b=frKwCGKgNpcF7kvVN8tKpZ8NjknG8PGYJtyQkHoOJBMCgAquqeWoNElxmGdqDYIOrLf3FC5EY7dT1+VDMtivchlyuIapyIcx+nEcbOw2sOS0zTttw1hBrpSUlsBKW/qPmW3vden5Bguqeq3Wj7Ea+M7OiAEu/B2KiJyO1Vrn3zE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755769977; c=relaxed/simple; bh=bByej5AoCQfD9FvX/vBFcWq7In0h5Eynno/lFzhDY+8=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qyy3lkTIqkeLrWWVu0gAgti1BhySwooXJbPJKqBXGxkRYmpJ3dbO5TlkQ/eJkOztI1/I2ANCeGFqJd7da/i+/QW5UbKKQnZAbBtJGshGlB+T9LNbM1ghIwkeifD9POND4MSHVl1FaPkSA/4xn+u7BM0ZO6OlD6Gub7NzORrRPqA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=OQtTxl2j; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="OQtTxl2j" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1755769974; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+SYzSNImSl+LPKPKIoN+DdHAjnOxi2k0cEcilhLXTaY=; b=OQtTxl2jgUBVjKrDA4rsMJ4lboEGaFZLQVPs5t0kzMc4yEqrhD0RopLoPQGgKprTBphZ/L x5MNisz4ocQhU2clfe7gFtMBRE3yNdb0TJVz0fcSj5cHxrCP/wuFytdnGgomYk7HOuVEZT ICUmWYu+Xys+QTc2P7hlJlZ5uIFkfd0= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-255-HOOafrVsOBe7CguEyxdt0A-1; Thu, 21 Aug 2025 05:52:48 -0400 X-MC-Unique: HOOafrVsOBe7CguEyxdt0A-1 X-Mimecast-MFC-AGG-ID: HOOafrVsOBe7CguEyxdt0A_1755769966 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9773A1956087; Thu, 21 Aug 2025 09:52:46 +0000 (UTC) Received: from hydra.redhat.com (unknown [10.44.33.118]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 98FE9197768D; Thu, 21 Aug 2025 09:52:43 +0000 (UTC) From: Jocelyn Falempe To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Jocelyn Falempe , Javier Martinez Canillas , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH 3/3] drm/panic: Add a kconfig option to dump kunits results to png Date: Thu, 21 Aug 2025 11:49:07 +0200 Message-ID: <20250821095228.648156-4-jfalempe@redhat.com> In-Reply-To: <20250821095228.648156-1-jfalempe@redhat.com> References: <20250821095228.648156-1-jfalempe@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Content-Type: text/plain; charset="utf-8" This is a bit hacky, but very handy if you want to customize the panic screen. It allows to dump the generated images to the logs, and then a python script can convert it to .png files. It makes it easy to check how the panic screen will look on different resolutions, without having to crash a VM. To not pollute the logs, it uses a monochrome framebuffer, compress it with zlib, and base64 encode it. Signed-off-by: Jocelyn Falempe --- drivers/gpu/drm/Kconfig.debug | 14 ++++ drivers/gpu/drm/tests/drm_panic_test.c | 111 +++++++++++++++++++++++++ scripts/kunitpanic2png.py | 53 ++++++++++++ 3 files changed, 178 insertions(+) create mode 100755 scripts/kunitpanic2png.py diff --git a/drivers/gpu/drm/Kconfig.debug b/drivers/gpu/drm/Kconfig.debug index 05dc43c0b8c5..d8ae85132d32 100644 --- a/drivers/gpu/drm/Kconfig.debug +++ b/drivers/gpu/drm/Kconfig.debug @@ -84,6 +84,20 @@ config DRM_KUNIT_TEST =20 If in doubt, say "N". =20 +config DRM_PANIC_KUNIT_TEST_DUMP + bool "Enable screen dump to logs in KUnit tests for drm_panic" + default n + depends on DRM && DRM_PANIC && DRM_KUNIT_TEST + select ZLIB_DEFLATE + help + This allows to dump the panic screen to the KUnit tests logs. + It's possible with a small python script to write pngs from the logs. + + This is only to help developers customizing the drm_panic screen, + checking the result for different resolutions. + + If in doubt, say "N" + config DRM_TTM_KUNIT_TEST tristate "KUnit tests for TTM" if !KUNIT_ALL_TESTS default n diff --git a/drivers/gpu/drm/tests/drm_panic_test.c b/drivers/gpu/drm/tests= /drm_panic_test.c index 46ff3e5e0e5d..8cddb845aea9 100644 --- a/drivers/gpu/drm/tests/drm_panic_test.c +++ b/drivers/gpu/drm/tests/drm_panic_test.c @@ -115,24 +115,135 @@ static void drm_test_panic_screen_user_page(struct k= unit *test) kfree(pages); } =20 +#ifdef CONFIG_DRM_PANIC_KUNIT_TEST_DUMP +#include +#include +#include + +#define LINE_LEN 128 + +#define COMPR_LEVEL 6 +#define WINDOW_BITS 12 +#define MEM_LEVEL 4 + +static int compress_image(u8 *src, int size, u8 *dst) +{ + struct z_stream_s stream; + + stream.workspace =3D kmalloc(zlib_deflate_workspacesize(WINDOW_BITS, MEM_= LEVEL), + GFP_KERNEL); + + if (zlib_deflateInit2(&stream, COMPR_LEVEL, Z_DEFLATED, WINDOW_BITS, + MEM_LEVEL, Z_DEFAULT_STRATEGY) !=3D Z_OK) + return -EINVAL; + + stream.next_in =3D src; + stream.avail_in =3D size; + stream.total_in =3D 0; + stream.next_out =3D dst; + stream.avail_out =3D size; + stream.total_out =3D 0; + + if (zlib_deflate(&stream, Z_FINISH) !=3D Z_STREAM_END) + return -EINVAL; + + if (zlib_deflateEnd(&stream) !=3D Z_OK) + return -EINVAL; + + kfree(stream.workspace); + + return stream.total_out; +} + +static void dump_image(u8 *fb, unsigned int width, unsigned int height) +{ + int len =3D 0; + char *dst; + char *compressed; + int sent =3D 0; + int stride =3D DIV_ROUND_UP(width, 8); + int size =3D stride * height; + + compressed =3D vzalloc(size); + if (!compressed) + return; + len =3D compress_image(fb, size, compressed); + if (len < 0) { + pr_err("Compression failed %d", len); + return; + } + + dst =3D vzalloc(4 * DIV_ROUND_UP(len, 3) + 1); + if (!dst) + return; + + len =3D base64_encode(compressed, len, dst); + + pr_info("KUNIT PANIC IMAGE DUMP START %dx%d", width, height); + while (len > 0) { + char save =3D dst[sent + LINE_LEN]; + + dst[sent + LINE_LEN] =3D 0; + pr_info("%s", dst + sent); + dst[sent + LINE_LEN] =3D save; + sent +=3D LINE_LEN; + len -=3D LINE_LEN; + } + pr_info("KUNIT PANIC IMAGE DUMP END"); + vfree(compressed); + vfree(dst); + +} + +// Ignore pixel format, use 1bit per pixel in monochrome. static void drm_test_panic_set_pixel(struct drm_scanout_buffer *sb, unsigned int x, unsigned int y, u32 color) { + int stride =3D DIV_ROUND_UP(sb->width, 8); + size_t off =3D x / 8 + y * stride; + u8 shift =3D 7 - (x % 8); + u8 *fb =3D (u8 *) sb->private; + + if (color) + fb[off] |=3D 1 << shift; + else + fb[off] &=3D ~(1 << shift); } =20 +#else +static void dump_image(u8 *fb, unsigned int width, unsigned int height) {} +static void drm_test_panic_set_pixel(struct drm_scanout_buffer *sb, + unsigned int x, + unsigned int y, + u32 color) +{ +} +#endif + static void drm_test_panic_screen_user_set_pixel(struct kunit *test) { struct drm_scanout_buffer *sb =3D test->priv; const struct drm_test_mode *params =3D test->param_value; + int fb_size; + u8 *fb; =20 sb->format =3D drm_format_info(params->format); + fb_size =3D DIV_ROUND_UP(params->width, 8) * params->height; + + fb =3D vzalloc(fb_size); + KUNIT_ASSERT_NOT_NULL(test, fb); + sb->private =3D fb; sb->set_pixel =3D drm_test_panic_set_pixel; sb->width =3D params->width; sb->height =3D params->height; =20 params->draw_screen(sb); + if (params->format =3D=3D DRM_FORMAT_XRGB8888) + dump_image(fb, sb->width, sb->height); + + vfree(fb); } =20 static void drm_test_panic_desc(const struct drm_test_mode *t, char *desc) diff --git a/scripts/kunitpanic2png.py b/scripts/kunitpanic2png.py new file mode 100755 index 000000000000..e292afd7422c --- /dev/null +++ b/scripts/kunitpanic2png.py @@ -0,0 +1,53 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: MIT +# +# Copyright (c) 2025 Red Hat. +# Author: Jocelyn Falempe + +from argparse import ArgumentParser +from PIL import Image +import base64 +import zlib + +def get_dim(s): + (w, h) =3D s.split('x') + return (int(w), int(h)) + +def draw_image(img_data, width, height, n_img): + + decoded =3D base64.b64decode(img_data) + unzipped =3D zlib.decompress(decoded) + + img =3D Image.frombytes("1", (width, height), unzipped) + fname =3D f"panic_screen_{n_img}.png" + img.save(fname) + print(f"Image {width}x{height} saved to {fname}") + +def main(): + parser =3D ArgumentParser( + prog=3D"kunitpanic2png", + description=3D"Read drm_panic kunit logs and translate that to png= files") + + parser.add_argument("filename", help=3D"log file from kunit, usually t= est.log") + + parsing_img =3D False + img_data =3D "" + n_img =3D 0 + + args =3D parser.parse_args() + with open(args.filename, "r") as f: + for line in f.readlines(): + if line.startswith("KUNIT PANIC IMAGE DUMP START"): + parsing_img =3D True + width, height =3D get_dim(line.split()[-1]) + continue + if line.startswith("KUNIT PANIC IMAGE DUMP END"): + draw_image(img_data, width, height, n_img) + parsing_img =3D False + img_data =3D "" + n_img +=3D 1 + continue + if parsing_img: + img_data +=3D line.strip() + +main() --=20 2.50.1