From mboxrd@z Thu Jan 1 00:00:00 1970 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 12733361DDA for ; Thu, 20 Aug 2026 17:08:18 +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=1787245700; cv=none; b=gtjf8LOJL4rHbkMSjli2shg4eK/8pLgP1M7SLtSPVI+Nc9DPidun4YTq7sM2WfMSvxyRCUI4phC1uimJT2coIKbfX+WOXwIJE5xkghEzu27T9avIrK/U1sZKphdxi12SP/Y96jkhkBUTxfZY9Mrk8FGlkALZ4rbv3dR4naWTE1M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787245700; c=relaxed/simple; bh=UBLd1IGoN3hKD6kq+J9btXca7d2xcuTE0qYOvjMrqko=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=a+RQ0yIIx7Pi5ztlb3XxTrJIzxCgWmc5UzCGVSu81L3NTAJ6yoy8UX5mdGLDpU4Rh1utVGAdnY3A4xfrD9bm9Z9YuvSPSe8pWwCdW8chxCLOOJFwObzUmoUimm5ozLXWwJ3y+iGR89KL0gGwfFFpHXlZYQhRtpMEWFY7y2xSsKg= 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=MDKfAVqN; 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="MDKfAVqN" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787245698; 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=MDKfAVqNicaOOjWHhqRcQTv0Sb1UkfjawSx3r4B2tpcWi9kvchKSyrMhJECtBT5oXcZVak Y5JrV5B1O+fQRjDkhIEHApSxYNLxeuVnOwMKBOIRw8zO2KMEjDVtL8ETAvMI4s937g0dEr lLo9YATHbf0JFX/GcebU1f55i3Ox2iM= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-390-3MFrVdy5M9e-92fQIB_tuQ-1; Thu, 20 Aug 2026 13:08:10 -0400 X-MC-Unique: 3MFrVdy5M9e-92fQIB_tuQ-1 X-Mimecast-MFC-AGG-ID: 3MFrVdy5M9e-92fQIB_tuQ_1787245689 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-495689bfcc8so243165e9.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=dEvE3i8dxFrO/YPMr0rsKmUAGIzXvxwqwV70tu+qiiJbk/ZtpRZVlyNmjVUmsVUN5R g9rsqYqR+oK8vhb0vhhqcpuUOqyoNfRCgl8uJPQpLY8sC0JDscNkq5d4z+Agqep9+LTO 6b2OrNHijBJtyMsB5aaBgZAPfCJYTteZJUk37TzNB5sqUOYzyF8dzb/IfCfkOuQjhoBS 6f6CBJ04yA0JiiMZaWZv/shOvy8GG7qIJOyTho9ITDHcZORTjlkBXhlt6kzXwnR12nul 4dRL/l8h846TC4gOb1P1yEqurwJmHOFMCqzX5jRQs9X/TgVZtrRruZdvM/trvfLUUunJ MrAQ== X-Forwarded-Encrypted: i=1; AHgh+Rqwp5m0Bxo4KJ9l8lZGBklQn70BY59FXu154xV43upCQgJOcFo3pL03UTJSf3NICfxc2lc=@lists.linux.dev X-Gm-Message-State: AOJu0Yx07VvF91+O504jDq+3Rc+EdsSpvH8ApSBXUCEjbNBH8VP4Mb55 CsrgcMkEywZHbqktvHTrPBG+be0eIY/VlGG36zQN45uykbZkGRl9AtqFylGWQULK/IP9B2ctUga dPBeQudaDwj+2XpJtNGDuvxJWp8BGcgtO03ej9plotXPGYEzoH0vwzg== X-Gm-Gg: AR+sD117l6sbkmua931reKlIHejCrHgGsUcrAPp3gBgPDfVQ8zbc1tbYb4ExWn8qgdh zGo/KpiC9/P9YxSzM6JrlBs2AC8psHgNcCYH1hHLRfQxOfOqFOK6uNB7Gh1rl6lk0Z8SliR2Ho9 +QxNIVxm3r7Egg301zhwoe+POdpaJ85gBuNffZvdcT0tYiE6aPEKmgnITEbrSW7TI24sV8yaEOv D58+jsXhqm/jOboGu9cVoVgaH8GsSkC0Pw+JSOtcbJwWQuALSC8IgyqvYnB1rbBP92vpKjiG5hY w+ZWzNYYOILr18McUTf+LZaBgkR96Ww96kZQT7755rUvsYnkpzZr4I1J6GJNKJkGGNAuQ1jsOvx u8mxrCeQWXnohQFYzIyCD97yfmbXgWHUaFSlQjP1fmTgeDg== X-Received: by 2002:a05:600c:19cc:b0:499:9240:9a1c with SMTP id 5b1f17b1804b1-499b847725emr5442745e9.15.1787245689200; 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 Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: 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: RP75EyKPjGPEp8ujdEKz247nymsOD8j5gDTcdzToI4k_1787245689 X-Mimecast-Originator: redhat.com Content-Language: en-US, fr Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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)