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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 25091C5DF86 for ; Thu, 20 Aug 2026 17:10:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DA61210F13A; Thu, 20 Aug 2026 17:10:34 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="Ya49CE0T"; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7A61110F138 for ; Thu, 20 Aug 2026 17:10:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787245832; 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=8RFOFNhe8dD42ULPXJPC0m4cGSa+x0bKLYsWhLafPUQ=; b=Ya49CE0Tqxvoa3Af6rkEfGfFQVfTc5dtpzNDLxYo4C+Y9X3UuggiemQPUAsl4/X8x89OXP gxconWKK03oHzSVIJCSXQVtIfQpPVndsPsfMfP8FKcXFbYZd9s+7qv0a2dysxLMqVPjeHk +foGw/PHPkq06ymrBIEaP8g+2y1HzFU= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-208-eI4e5z0ePq-cGimW4G6rmQ-1; Thu, 20 Aug 2026 13:10:25 -0400 X-MC-Unique: eI4e5z0ePq-cGimW4G6rmQ-1 X-Mimecast-MFC-AGG-ID: eI4e5z0ePq-cGimW4G6rmQ_1787245824 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-47f726186c4so63913f8f.2 for ; Thu, 20 Aug 2026 10:10:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787245824; x=1787850624; 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=8RFOFNhe8dD42ULPXJPC0m4cGSa+x0bKLYsWhLafPUQ=; b=iX98Y/Cwgc9E5890D2y5RCSryL3wrSKZrBdPydyEyK/rvUTXn0DOzurRnb9KDjCw9w BsfEfDJjtYL0wZCuxTugRBmqNIOfrCj343DE2uciE0e0Pkh9VZA3pIY/XfKMMFwhJJWu rcwwyc85y86pMNXI1UNdHQv55RpS03rpnf9wHb3vDZZogDYJ69M8wKuYGo7dXQc2VW6R aGB7WZJjX28byZRDcs69955s636QYr3uydQbJsUuuAmk4adbbqwTGUXX4mONSaSy9gAw 3EwjmO1CZRpnlMjyi+Pn4W2Xvm4mPHff/oX2seJBRmzgmnTjdUkOpjEtOB//8d2FxL/r eQ/Q== X-Forwarded-Encrypted: i=1; AHgh+RpiqNnwrX5DzHxz8UMgqQQMckg+PeT//lq+LFnV3BZx9nFdHijPEhdHXT9FsjI7JCHYRwPHPDGVcQ==@lists.freedesktop.org X-Gm-Message-State: AOJu0Yx56dgULctHtRQhgbF67iogAGxVPg62UCrjFfeGswwC+rCjuFme lbnz2XJceBKf9dJ0WcaBPptiw+pQ93vsdgzDaYNh7XR1vQUfUhWYhxW4SRZfscFMrwRnxl5whV2 at3bPN2jU6RKun7jOKNULvJtxq/3ARdjLA/xQMnkBeE9VYR9W/Tou5cZUQYHSzr4aMlJx X-Gm-Gg: AR+sD13b2Cfp2G1jadeSgy9ftNfu/pWWLrRGcWCccvFp32jgDQNtmq4WT77AeBpHuP/ bfxCAXZe+vY3n6i1aMsGnQ6ctyYI3yQuni0dV0OW07dMhVJLIBMYQX0jC2vYKGtLqVf94zWwv1k rGoY09X19qGUavlTb1+/w6boxDibASb172OnzPfOGbeYaaO+dC83u7opFIab7RDqvvVFFnfwGHU uXLpAv9NU0gem3LYyenV2Bce9dAxm0JXQ1B/R63Su262W9NPEYNqea+BbXUbLKQ6RbK+wVefUtq BQmizVaPWdl814cuRAA+IypnQoefBayUnsLJM3p8hdd8lHlXam+u2C1YjWqFCgYU1rnMKDVl5lW JVm8u5QW7F2df6ay1t6GWX2T/IsEQ5CPqJT8mCttlWV+gXg== X-Received: by 2002:a05:600c:4744:b0:499:93b3:91ea with SMTP id 5b1f17b1804b1-499b831c0b1mr6516185e9.15.1787245824360; Thu, 20 Aug 2026 10:10:24 -0700 (PDT) X-Received: by 2002:a05:600c:4744:b0:499:93b3:91ea with SMTP id 5b1f17b1804b1-499b831c0b1mr6515045e9.15.1787245823921; Thu, 20 Aug 2026 10:10:23 -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-499a9e805a4sm169531595e9.4.2026.08.20.10.10.22 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 20 Aug 2026 10:10:23 -0700 (PDT) Message-ID: Date: Thu, 20 Aug 2026 19:10:19 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 06/12] drm/panic: Pass global module parameters to drm_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-7-tzimmermann@suse.de> From: Jocelyn Falempe In-Reply-To: <20260818125012.468092-7-tzimmermann@suse.de> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: GjVqTgwNqMT0gqNY_Wzjfb1gFZTLYIA9AHE8AOi3V9Y_1787245824 X-Mimecast-Originator: redhat.com Content-Language: en-US, fr Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" On 18/08/2026 14:28, Thomas Zimmermann wrote: > 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). Thanks, it looks good to me. Reviewed-by: Jocelyn Falempe > > Signed-off-by: Thomas Zimmermann > --- > 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 ede620b27515..12c39217cbcb 100644 > --- a/drivers/gpu/drm/drm_panic.c > +++ b/drivers/gpu/drm/drm_panic.c > @@ -657,7 +657,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]; > @@ -672,7 +672,7 @@ static int drm_panic_get_qr_code_url(u8 **qr_image) > return -EINVAL; > url_len = ret; > > - 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, sizeof(qrbuf1)); > > /* get kmsg to buffer 1 */ > @@ -718,11 +718,11 @@ static int drm_panic_get_qr_code_url(u8 **qr_image) > qrbuf1, sizeof(qrbuf1)); > } > > -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), > sizeof(qrbuf1)); > > kmsg_dump_rewind(&iter); > @@ -735,19 +735,20 @@ static int drm_panic_get_qr_code_raw(u8 **qr_image) > qrbuf2, sizeof(qrbuf2)); > } > > -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; > @@ -774,7 +775,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 -ENOSPC; > > @@ -816,9 +817,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)) > draw_panic_screen_user(sb, fg_color, bg_color); > return 0; > } > @@ -891,17 +894,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: > @@ -951,6 +955,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; > @@ -966,7 +975,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 >