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 B267A21420B for ; Tue, 6 Jan 2026 21:34:09 +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=1767735251; cv=none; b=WEfGA2TlYYJiH2gD9QfWp2SWXIGe0lYbxTvhUfZBte4uBNMa8fhYsOQipMStJfL1Tq/Q5k3u7QRExcao16Yhv/nsV6Ry9Gnkg47XfcHKWoB2EI/HS44KR/5EoA2GWGJOk7leULq2mxKUiPzbfQqQUzqDuHWHsHJwN/uUnOo5PjI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767735251; c=relaxed/simple; bh=l3p/8l09gmRFblnxl+2nAt+LShJkV0QIBJMgAEEdW/0=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=mp7PMq6LremDiSIDO2CyLmhIEms/hLDUyMyCZqihJvpA1IV8KYRtRM/Vqk5yIGbRA7KAJ4id5L4jZPoPX3gvwYak+ApGkDhq9iCR5Jy1T5jHHJhyv6VluaoJbqH+boWCHbxkLrlSNWYSvu3NaT6uX5m1CnBaugAuS7TwTOg4ks4= 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=Y7dW2IRp; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=ks48FAf2; 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="Y7dW2IRp"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="ks48FAf2" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1767735248; 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=DcTHFezLYAepuiXH8kmv0jIcRFZzwNR3RLpr3vIzDAI=; b=Y7dW2IRpkunX0JI0oadsafI9ZodjublAbNTYZ3WN33ssO9dTp4btpeF96l/z2bBLzBpPKr HkhZ3OlU1UJOxRy/Ctybifv/5ae5io0eFWLltdnOqf8K/3LfoueHNOGNrvTa99P07wvfp0 B4ZrdW1E59zoPDwZmfMz86dkLannoZ8= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-396-fulVwseEPtOKwK-h9E3jaQ-1; Tue, 06 Jan 2026 16:34:07 -0500 X-MC-Unique: fulVwseEPtOKwK-h9E3jaQ-1 X-Mimecast-MFC-AGG-ID: fulVwseEPtOKwK-h9E3jaQ_1767735246 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-43102ac1da8so937158f8f.2 for ; Tue, 06 Jan 2026 13:34:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1767735246; x=1768340046; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=DcTHFezLYAepuiXH8kmv0jIcRFZzwNR3RLpr3vIzDAI=; b=ks48FAf2D6myXA3EYHsneyMrIXbjy5TkB8XtGVb4v1hs7NGjvK4JZfUxtag/ife/P+ cS7GE9lrP/n3Su9oS4N9Jk3rgoOP7ztgiPbd5nRgcJH+++qzWUx/6riDZcwRF/+TU4a2 PolDR6wGqiYDtFnLRHcny8iYkcsdXWrsirGyk64N2YTNHnYSu3u1a0y+RW4B+fUVi0au WNPYux6cJw9VmaBdB3IHDBJ3DQl9votdpvsna+yUepHSuPbjGaQbOOFOn4Vg5MxvKeBS ifxRz/+eCdemO2LlmfPilCFw/jpAR6OGWyY+7Aldfp3/BM9XrZe89lfJA6wOhK6fEtpj Al9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767735246; x=1768340046; h=content-transfer-encoding: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; bh=DcTHFezLYAepuiXH8kmv0jIcRFZzwNR3RLpr3vIzDAI=; b=BEkJrenxVQCu5p4+RgR7bk+XI/++5FHJnoeQ/GuEdXHGB1ocNMz9u6E4j/j92yr/qg k42y/SfXixu49PTgpWBgnrLq7/KO32sbHspYTwYSHeg3CU3odJIvtuZ7jMN5psbkJZuF juO1MvAPZk7Eh/E0W9ut3WuIGkvqRc4wX+93XL2RWg4Ckbk31nCMHbZH2T8INuzJZmM3 ev2iy5JXW7Ekuhhr+wa+g3m/TluAUXWrscQ8gWFajo9b/RqWC9U0wNPyF8xMJQcAx2fv MQaYuzA2GPE/gPa/TU4yKCVFnxTm/FOvD2AsBI+cUr2L2IVrAUComAlDJFqlVVamgmT2 0sTw== X-Forwarded-Encrypted: i=1; AJvYcCUxwbd6Qkrx8BwbXAdIgIMs80o1Q8RiYvnL6JKSwjPRqY4EQY1XkDQXMgDZyvLV1BhUlJw5/wRBZO7ovxg=@vger.kernel.org X-Gm-Message-State: AOJu0YxU1yHvjbFC3qafKCC16zY1estTEN7MyKORzDs6T+bsund0lJ5Y pCWGDwNxJxe8QomyU/OZZGVg654tRSb7i1uQfXwDlrdxGDigCEgPkBQqMYf7axCX9ahH/jW9SQE Cat4D92cgJ4NVIcR3j+VdyTFqaoAK/Bk3T5xCcmhGQz+YLWzfErU6XsvnDKBYAGit5g== X-Gm-Gg: AY/fxX7u+NbzlHmqMRQ0HTy+IpZfoJpzuhTfwBfiOHEg69JDNuUwq3uF8/kJjfriKfS rLtFhDrPR8iLCve7x0UcsF8S4S9SpFew9Q2Yyr86TjshSgRu4aVx2P81ok7AZ0Ah0gS9JDXVYUH eGEIe1SH6tp+EyN0DwpyIrebeXfFU/7wTkPFM856kGr/MjEuU9aKS9EpmIlv+ltNCFzoZYRUs/r yndL7edfym7v0qSc2DsuppDANgAL1yVEaWX0P1V4VqZfQP3bkekBuXlfKmxPuu4+ktyWvlpythO 9H2b/BRbjjLTYou6MuH8oBTA3Te7CvASCoAzlnPXSzqd1fHusIxdfsn10gM0jdcHMKl1+kjszCH taAjPwK2hrsLQnwB/BT+XLk5BGePKoKPyuUvIkMMwIUb4CHVe/A== X-Received: by 2002:a05:6000:26d3:b0:430:f463:b6a7 with SMTP id ffacd0b85a97d-432c379f1a6mr549051f8f.45.1767735245924; Tue, 06 Jan 2026 13:34:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IHrEMiRil/nYooMCe9+cX4W6RJqywEUrdaqsMMWtF2V6HwIkXL5LVxp+oB41Tj1FnUsqWsV2Q== X-Received: by 2002:a05:6000:26d3:b0:430:f463:b6a7 with SMTP id ffacd0b85a97d-432c379f1a6mr549032f8f.45.1767735245502; Tue, 06 Jan 2026 13:34:05 -0800 (PST) Received: from ?IPV6:2a01:e0a:c:37e0:8998:e0cf:68cc:1b62? ([2a01:e0a:c:37e0:8998:e0cf:68cc:1b62]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-432bd5df939sm6488606f8f.21.2026.01.06.13.34.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 06 Jan 2026 13:34:05 -0800 (PST) Message-ID: Date: Tue, 6 Jan 2026 22:34:04 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 2/2] drm/panic: Fix expected string for QR_CODE in drm_panic_type_map To: Nathan Chancellor , Javier Martinez Canillas , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Tvrtko Ursulin Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org References: <20260105-drm_panic-handle-invalid-drm_panic_screen-v1-0-55228bd4b0f8@kernel.org> <20260105-drm_panic-handle-invalid-drm_panic_screen-v1-2-55228bd4b0f8@kernel.org> Content-Language: en-US, fr From: Jocelyn Falempe In-Reply-To: <20260105-drm_panic-handle-invalid-drm_panic_screen-v1-2-55228bd4b0f8@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 06/01/2026 07:19, Nathan Chancellor wrote: > The help text of CONFIG_DRM_PANIC_SCREEN_QR_CODE documents the expected > value to CONFIG_DRM_PANIC_SCREEN as "qr_code" but drm_panic_type_map > checks for "qr". Adjust drm_panic_type_map and the module description to > match so that existing configurations do not stop working. Good catch, thanks for the fix. Reviewed-by: Jocelyn Falempe > > Fixes: e85e9ccf3f84 ("drm/panic: Report invalid or unsupported panic modes") > Signed-off-by: Nathan Chancellor > --- > drivers/gpu/drm/drm_panic.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/drm_panic.c b/drivers/gpu/drm/drm_panic.c > index 0cd574dd9d88..d6d3b8d85dea 100644 > --- a/drivers/gpu/drm/drm_panic.c > +++ b/drivers/gpu/drm/drm_panic.c > @@ -823,7 +823,7 @@ static const char *drm_panic_type_map[] = { > [DRM_PANIC_TYPE_KMSG] = "kmsg", > [DRM_PANIC_TYPE_USER] = "user", > #if IS_ENABLED(CONFIG_DRM_PANIC_SCREEN_QR_CODE) > - [DRM_PANIC_TYPE_QR] = "qr", > + [DRM_PANIC_TYPE_QR] = "qr_code", > #endif > }; > > @@ -855,7 +855,7 @@ static const struct kernel_param_ops drm_panic_ops = { > module_param_cb(panic_screen, &drm_panic_ops, NULL, 0644); > MODULE_PARM_DESC(panic_screen, > #if IS_ENABLED(CONFIG_DRM_PANIC_SCREEN_QR_CODE) > - "Choose what will be displayed by drm_panic, 'user', 'kmsg' or 'qr' [default=" > + "Choose what will be displayed by drm_panic, 'user', 'kmsg' or 'qr_code' [default=" > #else > "Choose what will be displayed by drm_panic, 'user' or 'kmsg' [default=" > #endif >