Commit 9dd3146f authored by Taimur Hassan's avatar Taimur Hassan Committed by Alex Deucher
Browse files

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



Update DMUB related command structure.

Acked-by: default avatarTom Chung <chiahsuan.chung@amd.com>
Signed-off-by: default avatarTaimur Hassan <Syed.Hassan@amd.com>
Signed-off-by: default avatarWayne Lin <wayne.lin@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 34c9cd82

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

+73 −16
Original line number Diff line number Diff line
@@ -1990,18 +1990,19 @@ struct dmub_cmd_lsdma_data { 
		struct lsdma_tiled_copy_data {

			uint32_t src_addr_lo;

			uint32_t src_addr_hi;



			uint32_t dst_addr_lo;

			uint32_t dst_addr_hi;



			uint32_t src_x            : 16;

			uint32_t src_y            : 16;



			uint32_t src_width        : 16;

			uint32_t src_height       : 16;



			uint32_t dst_x            : 16;

			uint32_t dst_y            : 16;



			uint32_t src_width        : 16;

			uint32_t src_height       : 16;



			uint32_t dst_width        : 16;

			uint32_t dst_height       : 16;
@@ -2034,23 +2035,58 @@ struct dmub_cmd_lsdma_data { 
			uint32_t padding          : 30;

		} tiled_copy_data;

		struct lsdma_linear_copy_data {

			uint32_t src_lo;

			uint32_t src_hi;



			uint32_t dst_lo;

			uint32_t dst_hi;



			uint32_t count            : 30;

			uint32_t cache_policy_dst : 2;



			uint32_t tmz              : 1;

			uint32_t cache_policy_src : 2;

			uint32_t padding          : 29;



		} linear_copy_data;

		struct lsdma_linear_sub_window_copy_data {

			uint32_t src_lo;

			uint32_t src_hi;



			uint32_t dst_lo;

			uint32_t dst_hi;

		} linear_copy_data;



			uint32_t src_x        : 16;

			uint32_t src_y        : 16;



			uint32_t dst_x        : 16;

			uint32_t dst_y        : 16;



			uint32_t rect_x       : 16;

			uint32_t rect_y       : 16;



			uint32_t src_pitch    : 16;

			uint32_t dst_pitch    : 16;



			uint32_t src_slice_pitch;

			uint32_t dst_slice_pitch;



			uint32_t tmz              : 1;

			uint32_t element_size     : 3;

			uint32_t src_cache_policy : 3;

			uint32_t dst_cache_policy : 3;

			uint32_t reserved0        : 22;

		} linear_sub_window_copy_data;

		struct lsdma_reg_write_data {

			uint32_t reg_addr;

			uint32_t reg_data;

		} reg_write_data;

		struct lsdma_pio_copy_data {

			uint32_t src_lo;

			uint32_t src_hi;



			uint32_t dst_lo;

			uint32_t dst_hi;



			union {

				struct {

					uint32_t byte_count      : 26;
@@ -2063,12 +2099,11 @@ struct dmub_cmd_lsdma_data { 
				} fields;

				uint32_t raw;

			} packet;

			uint32_t src_lo;

			uint32_t src_hi;

			uint32_t dst_lo;

			uint32_t dst_hi;

		} pio_copy_data;

		struct lsdma_pio_constfill_data {

			uint32_t dst_lo;

			uint32_t dst_hi;



			union {

				struct {

					uint32_t byte_count      : 26;
@@ -2081,14 +2116,12 @@ struct dmub_cmd_lsdma_data { 
				} fields;

				uint32_t raw;

			} packet;

			uint32_t dst_lo;

			uint32_t dst_hi;



			uint32_t data;

		} pio_constfill_data;



		uint32_t all[14];

	} u;



};



struct dmub_rb_cmd_lsdma {
@@ -4047,6 +4080,14 @@ struct dmub_cmd_replay_copy_settings_data { 
	 * DIG BE HW instance.

	 */

	uint8_t digbe_inst;

	/**

	 * @hpo_stream_enc_inst: HPO stream encoder instance

	 */

	uint8_t hpo_stream_enc_inst;

	/**

	 * @hpo_link_enc_inst: HPO link encoder instance

	 */

	uint8_t hpo_link_enc_inst;

	/**

	 * AUX HW instance.

	 */
@@ -4150,6 +4191,18 @@ struct dmub_rb_cmd_replay_enable_data { 
	 * This does not support HDMI/DP2 for now.

	 */

	uint8_t phy_rate;

	/**

	 * @hpo_stream_enc_inst: HPO stream encoder instance

	 */

	uint8_t hpo_stream_enc_inst;

	/**

	 * @hpo_link_enc_inst: HPO link encoder instance

	 */

	uint8_t hpo_link_enc_inst;

	/**

	 * @pad: Align structure to 4 byte boundary.

	 */

	uint8_t pad[2];

};



/**
@@ -4663,22 +4716,26 @@ enum dmub_cmd_lsdma_type { 
	 * LSDMA copies data from source to destination linearly

	 */

	DMUB_CMD__LSDMA_LINEAR_COPY = 1,

	/**

	* LSDMA copies data from source to destination linearly in sub window

	*/

	DMUB_CMD__LSDMA_LINEAR_SUB_WINDOW_COPY = 2,

	/**

	 * Send the tiled-to-tiled copy command

	 */

	DMUB_CMD__LSDMA_TILED_TO_TILED_COPY = 2,

	DMUB_CMD__LSDMA_TILED_TO_TILED_COPY = 3,

	/**

	 * Send the poll reg write command

	 */

	DMUB_CMD__LSDMA_POLL_REG_WRITE = 3,

	DMUB_CMD__LSDMA_POLL_REG_WRITE = 4,

	/**

	 * Send the pio copy command

	 */

	DMUB_CMD__LSDMA_PIO_COPY = 4,

	DMUB_CMD__LSDMA_PIO_COPY = 5,

	/**

	 * Send the pio constfill command

	 */

	DMUB_CMD__LSDMA_PIO_CONSTFILL = 5,

	DMUB_CMD__LSDMA_PIO_CONSTFILL = 6,

};



struct abm_ace_curve {