This is a note to let you know that I've just added the patch titled
drm/amd/display: Correct `DMUB_FW_VERSION` macro
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-amd-display-correct-dmub_fw_version-macro.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 274d205cb59f43815542e04b42a9e6d0b9b95eff Mon Sep 17 00:00:00 2001
From: Mario Limonciello <mario.limonciello@xxxxxxx>
Date: Fri, 23 Jun 2023 10:05:19 -0500
Subject: drm/amd/display: Correct `DMUB_FW_VERSION` macro
From: Mario Limonciello <mario.limonciello@xxxxxxx>
commit 274d205cb59f43815542e04b42a9e6d0b9b95eff upstream.
The `DMUB_FW_VERSION` macro has a mistake in that the revision field
is off by one byte. The last byte is typically used for other purposes
and not a revision.
Cc: stable@xxxxxxxxxxxxxxx
Cc: Sean Wang <sean.ns.wang@xxxxxxx>
Cc: Marc Rossi <Marc.Rossi@xxxxxxx>
Cc: Hamza Mahfooz <Hamza.Mahfooz@xxxxxxx>
Cc: Tsung-hua (Ryan) Lin <Tsung-hua.Lin@xxxxxxx>
Reviewed-by: Leo Li <sunpeng.li@xxxxxxx>
Signed-off-by: Mario Limonciello <mario.limonciello@xxxxxxx>
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/gpu/drm/amd/display/dmub/dmub_srv.h
+++ b/drivers/gpu/drm/amd/display/dmub/dmub_srv.h
@@ -347,7 +347,7 @@ struct dmub_srv {
* of a firmware to know if feature or functionality is supported or present.
*/
#define DMUB_FW_VERSION(major, minor, revision) \
- ((((major) & 0xFF) << 24) | (((minor) & 0xFF) << 16) | ((revision) & 0xFFFF))
+ ((((major) & 0xFF) << 24) | (((minor) & 0xFF) << 16) | (((revision) & 0xFF) << 8))
/**
* dmub_srv_create() - creates the DMUB service.
Patches currently in stable-queue which might be from mario.limonciello@xxxxxxx are
queue-5.10/pinctrl-amd-detect-internal-gpio0-debounce-handling.patch
queue-5.10/pinctrl-amd-only-use-special-debounce-behavior-for-gpio-0.patch
queue-5.10/pinctrl-amd-fix-mistake-in-handling-clearing-pins-at-startup.patch
queue-5.10/drm-amd-display-correct-dmub_fw_version-macro.patch
