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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 AFADCC5DF86 for ; Thu, 20 Aug 2026 17:08:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date: Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=uLiaqJfdZPiVkLiAyQhGsqALdMhxud7zy/2Rp0UqKa4=; b=OXP6rDn4RUz+1JZIN9BS5xQCYG hIyghV65Cy9gsnAcJJKY+pd5420kZ43Y6sSAtA32YA71LiuIx+X/v50QtcIV/RRfFSerV3uIU2jht s+XSQYfkxpdKQcFxE+JNGbjA8c7PIPjaVNxf+Q2IiDGVZOtyN1P/PjzA4Xa+Ic5D5R9qZQriEf6Q1 tVlrq6nQBO71QSbEmQnbMzkuCarlq38UMmjVe6V5Glq59+Id5WKhDKDZ+51SpknZARWxuQ776ekuo E0egaKP1yU9P4wl15oYv2BxL2m4utwVgpkxt+5tEDukvvR5WEAnGrUquzoqewwoLJZw2SCvu2qi1x cbsPNzZg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wx6FU-0000000BwKU-1b9N; Thu, 20 Aug 2026 17:08:16 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wx6FR-0000000BwJv-1s91 for linux-arm-kernel@lists.infradead.org; Thu, 20 Aug 2026 17:08:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787245692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uLiaqJfdZPiVkLiAyQhGsqALdMhxud7zy/2Rp0UqKa4=; b=WtM0B5W42uyi3iTNdKRggHpyFN9bJSXYn83++OAaoXBlDnKsi9uxP5dM/a71BM869H8cfT R0NSVQgDmQ1q36BeX2l9taKK4Ysn6SLWBiYryIY/y8RzHlH57HJCpLHn8dQS2yyhF17rWi heJUW7Y9XdQ2OWu1jbD/VDz5l2/4F7U= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-463-ME7oUXYHP8msiSWNdM_sOQ-1; Thu, 20 Aug 2026 13:08:10 -0400 X-MC-Unique: ME7oUXYHP8msiSWNdM_sOQ-1 X-Mimecast-MFC-AGG-ID: ME7oUXYHP8msiSWNdM_sOQ_1787245689 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-47f81362fb1so77746f8f.1 for ; Thu, 20 Aug 2026 10:08:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787245689; x=1787850489; h=content-transfer-encoding:content-type:in-reply-to:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=uLiaqJfdZPiVkLiAyQhGsqALdMhxud7zy/2Rp0UqKa4=; b=QnzwvWNIEZBQTRbsvAgM0+t6WoGR6PQ0qPdomWwZTgQEgoPwi9Evx94sQ5MvKMuUfJ 6P+3OIpg3A4PzaRv0YtYePN5rkHkLtkKVxM23u6nPXja13aaNrsdVJFcmMeL4WF1bheL WCRq9P+scV8l5Kal1hLtw9LFlgd2dBg13WGlrvzwiSV3fk42zL0LDFHy9L7AUewxTm4d E2bgYivoxwCvUKkQRS8PQo+LxA6jHznnjoHmsz3vnYmkjJFokZldLtrtKcFGTmxe0ouP hy+zvP4ojNjPs0eS9/pNtKlnVZ3rjJGLoxMWKKaaKhXW+pUIS7KVHcaSuMFRJvWK500K ueug== X-Forwarded-Encrypted: i=1; AHgh+RoSrEW1ATjMAFHYG1+bEAiMuDhjCbg9shEHPKPQeXzDK8YS3wmXh0onBufjE4iODH+vwToY7LGfUUDbCodupb1o@lists.infradead.org X-Gm-Message-State: AOJu0YzG3JFRdZj1X3+UEPw+zYh7JK6HZNgzIPqaaQ82bDJFnALevyu/ vt35XOkJY2VVDZrYLUU3IMB7VmfIdaqtUm7xuc+z4K2YIOaQcjz7rl9jRHC1PdK4//9zF8/hw4S XDmiRttFSbLwS7U537KkuQIP6SrXFvm8+97hnotdPVxbzbRofQ55TWUA5ndEU4j0TJIVOV5gLeA Mt X-Gm-Gg: AR+sD12x/mCNraHGrLbJPWsdz5u+um39knoFAkIJfnyXEWQF5JUTvuPJ+gJOXFyouZS Si5DTcSVBUoMpZKrkRhsPbfyjVPM/KqQvd2BGzRv5+BLkahxJN4b4BTtI2G07wy+hcGuayx7ba5 1bXf1lbXmvAMrG1UvDzSPiRJBeKVvdDQSfMaL9V7M24p/AMGsOzwj6pDXPTFRhK0tM6a9u9nnDX NwpUB0uWk7on529D0r3J9DibgtS7dJZ9Qk8EO5daZH85lO+5V56mi3DpqYL+n1avHWtquPhts3s phX3gGdZdjq75N4/MT9ULp0cMqAiR86Cl8safw/bH6ThW3MP0pbvC8zRo1aKYqcycdR3ZflHVld ABf7HpbnkVPA/3Vlb0kE69CF8YTLketXS4TBFUca8/xzUJA== X-Received: by 2002:a05:600c:19cc:b0:499:9240:9a1c with SMTP id 5b1f17b1804b1-499b847725emr5442835e9.15.1787245689208; Thu, 20 Aug 2026 10:08:09 -0700 (PDT) X-Received: by 2002:a05:600c:19cc:b0:499:9240:9a1c with SMTP id 5b1f17b1804b1-499b847725emr5441695e9.15.1787245688826; Thu, 20 Aug 2026 10:08:08 -0700 (PDT) Received: from ?IPV6:2a01:e0a:11aa:87f0:935:4f8e:b423:64eb? ([2a01:e0a:11aa:87f0:935:4f8e:b423:64eb]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-499affa25acsm96595825e9.4.2026.08.20.10.08.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 20 Aug 2026 10:08:08 -0700 (PDT) Message-ID: <9598769e-597b-45da-b8d6-710c11227858@redhat.com> Date: Thu, 20 Aug 2026 19:08:04 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 05/12] drm/panic: Pass colors to draw_panic_dispatch() To: Thomas Zimmermann , javierm@redhat.com, airlied@gmail.com, simona@ffwll.ch, maarten.lankhorst@linux.intel.com, mripard@kernel.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 References: <20260818125012.468092-1-tzimmermann@suse.de> <20260818125012.468092-6-tzimmermann@suse.de> From: Jocelyn Falempe In-Reply-To: <20260818125012.468092-6-tzimmermann@suse.de> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: bwwn6-u06j0WRKZoaOIq97oXalHUTjrQOVzyEqqnqTU_1787245689 X-Mimecast-Originator: redhat.com Content-Language: en-US, fr Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260820_100813_591582_0CC9E3C1 X-CRM114-Status: GOOD ( 26.14 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 18/08/2026 14:28, Thomas Zimmermann wrote: > Set the panic-screen colors in draw_panic_plane() as a single point > of truth. Pass the values into the individual drawing functions. > > In the test cases, replace the Kconfig-defined colors with white and > black. Allows for removal of the tests' limitations and dependency on > the exact values. All tests now always verify the generated output. > > Hardcoding the test colors will later also allow for building the > test case without having DRM panic handling enabled. Thanks, that makes sense, I should've think about it, as this colors was a bit painful when writing the KUnit tests. Reviewed-by: Jocelyn Falempe > > Signed-off-by: Thomas Zimmermann > --- > drivers/gpu/drm/drm_panic.c | 54 +++++++++++++++----------- > drivers/gpu/drm/tests/drm_panic_test.c | 26 +++++++++---- > 2 files changed, 49 insertions(+), 31 deletions(-) > > diff --git a/drivers/gpu/drm/drm_panic.c b/drivers/gpu/drm/drm_panic.c > index 594235661710..ede620b27515 100644 > --- a/drivers/gpu/drm/drm_panic.c > +++ b/drivers/gpu/drm/drm_panic.c > @@ -478,12 +478,8 @@ static void drm_panic_logo_draw(struct drm_scanout_buffer *sb, struct drm_rect * > fg_color); > } > > -static int draw_panic_screen_user(struct drm_scanout_buffer *sb) > +static int draw_panic_screen_user(struct drm_scanout_buffer *sb, u32 fg_color, u32 bg_color) > { > - u32 fg_color = drm_draw_color_from_xrgb8888(CONFIG_DRM_PANIC_FOREGROUND_COLOR, > - sb->format->format); > - u32 bg_color = drm_draw_color_from_xrgb8888(CONFIG_DRM_PANIC_BACKGROUND_COLOR, > - sb->format->format); > const struct font_desc *font = get_default_font(sb->width, sb->height, NULL, NULL); > struct drm_rect r_screen, r_logo, r_msg; > unsigned int msg_width, msg_height; > @@ -491,6 +487,9 @@ static int draw_panic_screen_user(struct drm_scanout_buffer *sb) > if (!font) > return -EINVAL; > > + fg_color = drm_draw_color_from_xrgb8888(fg_color, sb->format->format); > + bg_color = drm_draw_color_from_xrgb8888(bg_color, sb->format->format); > + > r_screen = DRM_RECT_INIT(0, 0, sb->width, sb->height); > drm_panic_logo_rect(&r_logo, font); > > @@ -549,12 +548,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 draw_panic_screen_kmsg(struct drm_scanout_buffer *sb) > +static int draw_panic_screen_kmsg(struct drm_scanout_buffer *sb, u32 fg_color, u32 bg_color) > { > - u32 fg_color = drm_draw_color_from_xrgb8888(CONFIG_DRM_PANIC_FOREGROUND_COLOR, > - sb->format->format); > - u32 bg_color = drm_draw_color_from_xrgb8888(CONFIG_DRM_PANIC_BACKGROUND_COLOR, > - sb->format->format); > 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); > struct kmsg_dump_iter iter; > @@ -566,6 +561,9 @@ static int draw_panic_screen_kmsg(struct drm_scanout_buffer *sb) > if (!font || font->width > sb->width) > return -EINVAL; > > + fg_color = drm_draw_color_from_xrgb8888(fg_color, sb->format->format); > + bg_color = drm_draw_color_from_xrgb8888(bg_color, sb->format->format); > + > yoffset = sb->height - font->height - (sb->height % font->height) / 2; > > /* Fill with the background color, and draw text on top */ > @@ -748,12 +746,9 @@ 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_screen_qr_code(struct drm_scanout_buffer *sb) > +static int _draw_panic_screen_qr_code(struct drm_scanout_buffer *sb, > + u32 fg_color, u32 bg_color) > { > - u32 fg_color = drm_draw_color_from_xrgb8888(CONFIG_DRM_PANIC_FOREGROUND_COLOR, > - sb->format->format); > - u32 bg_color = drm_draw_color_from_xrgb8888(CONFIG_DRM_PANIC_BACKGROUND_COLOR, > - sb->format->format); > 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; > unsigned int max_qr_size, scale; > @@ -766,6 +761,9 @@ static int _draw_panic_screen_qr_code(struct drm_scanout_buffer *sb) > if (!font) > return -EINVAL; > > + fg_color = drm_draw_color_from_xrgb8888(fg_color, sb->format->format); > + bg_color = drm_draw_color_from_xrgb8888(bg_color, sb->format->format); > + > r_screen = DRM_RECT_INIT(0, 0, sb->width, sb->height); > > drm_panic_logo_rect(&r_logo, font); > @@ -818,10 +816,10 @@ 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) > +static int draw_panic_screen_qr_code(struct drm_scanout_buffer *sb, u32 fg_color, u32 bg_color) > { > - if (_draw_panic_screen_qr_code(sb)) > - draw_panic_screen_user(sb); > + if (_draw_panic_screen_qr_code(sb, fg_color, bg_color)) > + draw_panic_screen_user(sb, fg_color, bg_color); > return 0; > } > #else > @@ -893,22 +891,22 @@ 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) > +static int draw_panic_dispatch(struct drm_scanout_buffer *sb, u32 fg_color, u32 bg_color) > { > int ret; > > switch (drm_panic_type) { > case DRM_PANIC_TYPE_KMSG: > - ret = draw_panic_screen_kmsg(sb); > + 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); > + ret = draw_panic_screen_qr_code(sb, fg_color, bg_color); > break; > #endif > case DRM_PANIC_TYPE_USER: > default: > - ret = draw_panic_screen_user(sb); > + ret = draw_panic_screen_user(sb, fg_color, bg_color); > } > > return ret; > @@ -943,6 +941,16 @@ static void draw_panic_plane(struct drm_plane *plane, const char *description) > 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 (!drm_panic_trylock(plane->dev, flags)) > return; > @@ -958,7 +966,7 @@ static void draw_panic_plane(struct drm_plane *plane, const char *description) > > drm_panic_set_description(description); > > - ret = draw_panic_dispatch(&sb); > + ret = draw_panic_dispatch(&sb, fg_color, bg_color); > 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 fdd77b0cc54c..969a096ec840 100644 > --- a/drivers/gpu/drm/tests/drm_panic_test.c > +++ b/drivers/gpu/drm/tests/drm_panic_test.c > @@ -14,17 +14,10 @@ > #include > #include > > -/* Check the framebuffer color only if the panic colors are the default */ > -#if (CONFIG_DRM_PANIC_BACKGROUND_COLOR == 0 && \ > - CONFIG_DRM_PANIC_FOREGROUND_COLOR == 0xffffff) > - > static void drm_panic_check_color_byte(struct kunit *test, u8 b) > { > KUNIT_EXPECT_TRUE(test, (b == 0 || b == 0xff)); > } > -#else > -static void drm_panic_check_color_byte(struct kunit *test, u8 b) {} > -#endif > > struct drm_test_mode { > const int width; > @@ -48,10 +41,27 @@ struct drm_test_mode { > .width = w, \ > .height = h, \ > .format = f, \ > - .draw_screen = draw_panic_screen_##name, \ > + .draw_screen = draw_panic_screen_ ## name ## _default, \ > .fname = #name, \ > }, \ > > +static int draw_panic_screen_user_default(struct drm_scanout_buffer *sb) > +{ > + return draw_panic_screen_user(sb, 0x00ffffff, 0x00000000); > +} > + > +static int draw_panic_screen_kmsg_default(struct drm_scanout_buffer *sb) > +{ > + return draw_panic_screen_kmsg(sb, 0x00ffffff, 0x00000000); > +} > + > +#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); > +} > +#endif > + > static const struct drm_test_mode drm_test_modes_cases[] = { > DRM_TEST_MODE_LIST(user) > DRM_TEST_MODE_LIST(kmsg)