From: Anthony Koo Date: Fri, 12 Jun 2020 23:48:56 +0000 (-0400) Subject: drm/amd/display: [FW Promotion] Release 1.0.19 X-Git-Tag: howlett/maple_spf/20210104~1335^2~19^2~15 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=447f3d0f387b1048295d58832b0e041a3ed67df8;p=users%2Fjedix%2Flinux-maple.git drm/amd/display: [FW Promotion] Release 1.0.19 [Header Changes] - Add debug flag for psr to use hw locking mgr state machine Signed-off-by: Anthony Koo Acked-by: Rodrigo Siqueira Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h b/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h index 96e1379c4cf8..68b5fd811d26 100644 --- a/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h +++ b/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h @@ -36,10 +36,10 @@ /* Firmware versioning. */ #ifdef DMUB_EXPOSE_VERSION -#define DMUB_FW_VERSION_GIT_HASH 0x67e8928df +#define DMUB_FW_VERSION_GIT_HASH 0xf87bb940b #define DMUB_FW_VERSION_MAJOR 1 #define DMUB_FW_VERSION_MINOR 0 -#define DMUB_FW_VERSION_REVISION 18 +#define DMUB_FW_VERSION_REVISION 19 #define DMUB_FW_VERSION_UCODE ((DMUB_FW_VERSION_MAJOR << 24) | (DMUB_FW_VERSION_MINOR << 16) | DMUB_FW_VERSION_REVISION) #endif @@ -86,10 +86,11 @@ union dmub_addr { union dmub_psr_debug_flags { struct { - uint8_t visual_confirm : 1; + uint32_t visual_confirm : 1; + uint32_t use_hw_lock_mgr : 1; } bitfields; - unsigned int u32All; + uint32_t u32All; }; #if defined(__cplusplus)