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

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



- Add options to allow for configurable PHY options during PSR active
state
- Remove unused versioning and git hash

Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Reviewed-by: default avatarAric Cyr <Aric.Cyr@amd.com>
Acked-by: default avatarTom Chung <chiahsuan.chung@amd.com>
Signed-off-by: default avatarAnthony Koo <Anthony.Koo@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 73b1da69

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

+82 −20
Original line number Diff line number Diff line
@@ -44,24 +44,6 @@ 


#endif // defined(_TEST_HARNESS) || defined(FPGA_USB4)



/* Firmware versioning. */

#ifdef DMUB_EXPOSE_VERSION

#define DMUB_FW_VERSION_GIT_HASH 0x19edd13d

#define DMUB_FW_VERSION_MAJOR 0

#define DMUB_FW_VERSION_MINOR 0

#define DMUB_FW_VERSION_REVISION 110

#define DMUB_FW_VERSION_TEST 0

#define DMUB_FW_VERSION_VBIOS 0

#define DMUB_FW_VERSION_HOTFIX 0

#define DMUB_FW_VERSION_UCODE (((DMUB_FW_VERSION_MAJOR & 0xFF) << 24) | \

		((DMUB_FW_VERSION_MINOR & 0xFF) << 16) | \

		((DMUB_FW_VERSION_REVISION & 0xFF) << 8) | \

		((DMUB_FW_VERSION_TEST & 0x1) << 7) | \

		((DMUB_FW_VERSION_VBIOS & 0x1) << 6) | \

		(DMUB_FW_VERSION_HOTFIX & 0x3F))



#endif



//<DMUB_TYPES>==================================================================

/* Basic type definitions. */
@@ -1450,6 +1432,79 @@ enum dmub_cmd_mall_type { 
	DMUB_CMD__MALL_ACTION_NO_DF_REQ = 3,

};



/**

 * PHY Link rate for DP.

 */

enum phy_link_rate {

	/**

	 * not supported.

	 */

	PHY_RATE_UNKNOWN = 0,

	/**

	 * Rate_1 (RBR)	- 1.62 Gbps/Lane

	 */

	PHY_RATE_162 = 1,

	/**

	 * Rate_2		- 2.16 Gbps/Lane

	 */

	PHY_RATE_216 = 2,

	/**

	 * Rate_3		- 2.43 Gbps/Lane

	 */

	PHY_RATE_243 = 3,

	/**

	 * Rate_4 (HBR)	- 2.70 Gbps/Lane

	 */

	PHY_RATE_270 = 4,

	/**

	 * Rate_5 (RBR2)- 3.24 Gbps/Lane

	 */

	PHY_RATE_324 = 5,

	/**

	 * Rate_6		- 4.32 Gbps/Lane

	 */

	PHY_RATE_432 = 6,

	/**

	 * Rate_7 (HBR2)- 5.40 Gbps/Lane

	 */

	PHY_RATE_540 = 7,

	/**

	 * Rate_8 (HBR3)- 8.10 Gbps/Lane

	 */

	PHY_RATE_810 = 8,

	/**

	 * UHBR10 - 10.0 Gbps/Lane

	 */

	PHY_RATE_1000 = 9,

	/**

	 * UHBR13.5 - 13.5 Gbps/Lane

	 */

	PHY_RATE_1350 = 10,

	/**

	 * UHBR10 - 20.0 Gbps/Lane

	 */

	PHY_RATE_2000 = 11,

};



/**

 * enum dmub_phy_fsm_state - PHY FSM states.

 * PHY FSM state to transit to during PSR enable/disable.

 */

enum dmub_phy_fsm_state {

	DMUB_PHY_FSM_POWER_UP_DEFAULT = 0,

	DMUB_PHY_FSM_RESET,

	DMUB_PHY_FSM_RESET_RELEASED,

	DMUB_PHY_FSM_SRAM_LOAD_DONE,

	DMUB_PHY_FSM_INITIALIZED,

	DMUB_PHY_FSM_CALIBRATED,

	DMUB_PHY_FSM_CALIBRATED_LP,

	DMUB_PHY_FSM_CALIBRATED_PG,

	DMUB_PHY_FSM_POWER_DOWN,

	DMUB_PHY_FSM_PLL_EN,

	DMUB_PHY_FSM_TX_EN,

	DMUB_PHY_FSM_FAST_LP,

};



/**

 * Data passed from driver to FW in a DMUB_CMD__PSR_COPY_SETTINGS command.

 */
@@ -1629,9 +1684,16 @@ struct dmub_rb_cmd_psr_enable_data { 
	 */

	uint8_t panel_inst;

	/**

	 * Explicit padding to 4 byte boundary.

	 * Phy state to enter.

	 * Values to use are defined in dmub_phy_fsm_state

	 */

	uint8_t pad[2];

	uint8_t phy_fsm_state;

	/**

	 * Phy rate for DP - RBR/HBR/HBR2/HBR3.

	 * Set this using enum phy_link_rate.

	 * This does not support HDMI/DP2 for now.

	 */

	uint8_t phy_rate;

};



/**