Commit 327aba7f authored by Ovidiu Bunea's avatar Ovidiu Bunea Committed by Alex Deucher
Browse files

drm/amd/display: Fix dmub_cmd header alignment 



[why & how]
Header misalignment in struct dmub_cmd_replay_copy_settings_data and
struct dmub_alpm_auxless_data causes incorrect data read between driver
and dmub.
Fix the misalignment and ensure that everything is aligned to 4-byte
boundaries.

Reviewed-by: default avatarNicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: default avatarOvidiu Bunea <ovidiu.bunea@amd.com>
Signed-off-by: default avatarIvan Lipski <ivan.lipski@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 640cd296

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

+12 −8
Original line number Diff line number Diff line
@@ -4048,6 +4048,10 @@ struct dmub_alpm_auxless_data { 
	uint16_t lfps_t1_t2_override_us;

	short lfps_t1_t2_offset_us;

	uint8_t lttpr_count;

	/*

	 * Padding to align structure to 4 byte boundary.

	 */

	uint8_t pad[1];

};



/**
@@ -4080,14 +4084,6 @@ 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.

	 */
@@ -4132,6 +4128,14 @@ struct dmub_cmd_replay_copy_settings_data { 
	 * Use for AUX-less ALPM LFPS wake operation

	 */

	struct dmub_alpm_auxless_data auxless_alpm_data;

	/**

	 * @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.

	 */