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

drm/amd/display: add addition dc type to translate to dmub fw type 



[Why]
For a type like PSR version, it makes sense for most of the code
to include a dc type, instead of having this a fw type define since
this is a capability and type exposed by dc.

Especially if it doesn't even need to communicate with the fw.

The code that is packing the firmware command message
should be the one who needs to translate the psr version
into a command that the firmware understands.

[How]
Add a dc_psr_version enum.

Signed-off-by: default avatarAnthony Koo <Anthony.Koo@amd.com>
Reviewed-by: default avatarAric Cyr <Aric.Cyr@amd.com>
Acked-by: default avatarAurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 492548dc

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+3 −3
Original line number Diff line number Diff line
@@ -6872,7 +6872,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, 
						     dc_state);



		if ((acrtc_state->update_type > UPDATE_TYPE_FAST) &&

				acrtc_state->stream->link->psr_settings.psr_version != PSR_VERSION_UNSUPPORTED &&

				acrtc_state->stream->link->psr_settings.psr_version != DC_PSR_VERSION_UNSUPPORTED &&

				!acrtc_state->stream->link->psr_settings.psr_feature_enabled)

			amdgpu_dm_link_setup_psr(acrtc_state->stream);

		else if ((acrtc_state->update_type == UPDATE_TYPE_FAST) &&
@@ -8647,10 +8647,10 @@ static void amdgpu_dm_set_psr_caps(struct dc_link *link) 
		link->dpcd_caps.psr_caps.psr_version = dpcd_data[0];



		if (dpcd_data[0] == 0) {

			link->psr_settings.psr_version = PSR_VERSION_UNSUPPORTED;

			link->psr_settings.psr_version = DC_PSR_VERSION_UNSUPPORTED;

			link->psr_settings.psr_feature_enabled = false;

		} else {

			link->psr_settings.psr_version = PSR_VERSION_1;

			link->psr_settings.psr_version = DC_PSR_VERSION_1;

			link->psr_settings.psr_feature_enabled = true;

		}

drivers/gpu/drm/amd/display/dc/core/dc_link.c

+1 −1
Original line number Diff line number Diff line
@@ -1552,7 +1552,7 @@ static bool dc_link_construct(struct dc_link *link, 
	 */

	program_hpd_filter(link);



	link->psr_settings.psr_version = PSR_VERSION_UNSUPPORTED;

	link->psr_settings.psr_version = DC_PSR_VERSION_UNSUPPORTED;



	return true;

device_tag_fail:

drivers/gpu/drm/amd/display/dc/dc_link.h

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ struct link_trace { 
struct psr_settings {

	bool psr_feature_enabled;		// PSR is supported by sink

	bool psr_allow_active;			// PSR is currently active

	enum psr_version psr_version;		// Internal PSR version, determined based on DPCD

	enum dc_psr_version psr_version;		// Internal PSR version, determined based on DPCD



	/* These parameters are calculated in Driver,

	 * based on display timing and Sink capabilities.

drivers/gpu/drm/amd/display/dc/dc_types.h

+5 −0
Original line number Diff line number Diff line
@@ -862,4 +862,9 @@ struct dsc_dec_dpcd_caps { 
	uint32_t branch_max_line_width;

};



enum dc_psr_version {

	DC_PSR_VERSION_1			= 0,

	DC_PSR_VERSION_UNSUPPORTED		= 0xFFFFFFFF,

};



#endif /* DC_TYPES_H_ */

drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c

+10 −2
Original line number Diff line number Diff line
@@ -94,12 +94,20 @@ static bool dmub_psr_set_version(struct dmub_psr *dmub, struct dc_stream_state * 
	union dmub_rb_cmd cmd;

	struct dc_context *dc = dmub->ctx;



	if (stream->link->psr_settings.psr_version == PSR_VERSION_UNSUPPORTED)

	if (stream->link->psr_settings.psr_version == DC_PSR_VERSION_UNSUPPORTED)

		return false;



	cmd.psr_set_version.header.type = DMUB_CMD__PSR;

	cmd.psr_set_version.header.sub_type = DMUB_CMD__PSR_SET_VERSION;

	cmd.psr_set_version.psr_set_version_data.version = stream->link->psr_settings.psr_version;

	switch (stream->link->psr_settings.psr_version) {

	case DC_PSR_VERSION_1:

		cmd.psr_set_version.psr_set_version_data.version = PSR_VERSION_1;

		break;

	case DC_PSR_VERSION_UNSUPPORTED:

	default:

		cmd.psr_set_version.psr_set_version_data.version = PSR_VERSION_UNSUPPORTED;

		break;

	}

	cmd.psr_set_version.header.payload_bytes = sizeof(struct dmub_cmd_psr_set_version_data);



	dc_dmub_srv_cmd_queue(dc->dmub_srv, &cmd);

CRA Git | Maintained and supported by SUSTech CRA and CCSE