Commit b2265774 authored by Anthony Koo's avatar Anthony Koo Committed by Alex Deucher
Browse files

drm/amd/display: [FW Promotion] Release 0.0.23 



[Header Changes]
- Drop unused firmware SCRATCH bits from interface

Signed-off-by: default avatarAnthony Koo <Anthony.Koo@amd.com>
Acked-by: default avatarEryk Brol <eryk.brol@amd.com>
Acked-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8a488f5d

drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h

+6 −12
Original line number Diff line number Diff line
@@ -36,10 +36,10 @@ 


/* Firmware versioning. */

#ifdef DMUB_EXPOSE_VERSION

#define DMUB_FW_VERSION_GIT_HASH 0x5b1691c92

#define DMUB_FW_VERSION_MAJOR 1

#define DMUB_FW_VERSION_GIT_HASH 0x5ad38d883

#define DMUB_FW_VERSION_MAJOR 0

#define DMUB_FW_VERSION_MINOR 0

#define DMUB_FW_VERSION_REVISION 22

#define DMUB_FW_VERSION_REVISION 23

#define DMUB_FW_VERSION_UCODE ((DMUB_FW_VERSION_MAJOR << 24) | (DMUB_FW_VERSION_MINOR << 16) | DMUB_FW_VERSION_REVISION)

#endif
@@ -123,12 +123,15 @@ union dmub_psr_debug_flags { 
 * @fw_region_size: size of the firmware state region

 * @trace_buffer_size: size of the tracebuffer region

 * @fw_version: the firmware version information

 * @dal_fw: 1 if the firmware is DAL

 */

struct dmub_fw_meta_info {

	uint32_t magic_value;

	uint32_t fw_region_size;

	uint32_t trace_buffer_size;

	uint32_t fw_version;

	uint8_t dal_fw;

	uint8_t reserved[3];

};



/* Ensure that the structure remains 64 bytes. */
@@ -151,15 +154,6 @@ union dmub_fw_meta { 
 * SCRATCH15: FW Boot Options register

 */



/**

 * DMCUB firmware status bits for SCRATCH2.

 */

enum dmub_fw_status_bit {

	DMUB_FW_STATUS_BIT_DAL_FIRMWARE = (1 << 0),

	DMUB_FW_STATUS_BIT_COMMAND_TABLE_READY = (1 << 1),

};





/* Register bit definition for SCRATCH0 */

union dmub_fw_boot_status {

	struct {