Commit 7f74931c authored by Nicholas Kazlauskas's avatar Nicholas Kazlauskas Committed by Alex Deucher
Browse files

drm/amd/display: Support possibly NULL link for should_use_dmub_lock 



[Why]
It's possible to have a stream enabled without a link or link encoder.

There are cases where we'd still like to interlock the driver
programming from firmware programming to ensure that we don't put the
hardware in an undefined (or error) state if two programming sequences
are simultaneously executed on the same hardware blocks.

[How]
Add an explicit DC parameter to should_use_dmub_lock().

Make pointers to should_use_dmub_lock() const since it's a checker
function that shouldn't modify state.

Update the callsites to pass in DC explicitly.

Check that the link is non-NULL before deferencing and performing link
based checks.

Reviewed-by: default avatarAlvin Lee <alvin.lee2@amd.com>
Signed-off-by: default avatarNicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: default avatarRoman Li <roman.li@amd.com>
Tested-by: default avatarDan Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent eeab74ee

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

+2 −2
Original line number Diff line number Diff line
@@ -4149,7 +4149,7 @@ static void commit_planes_for_stream(struct dc *dc, 
	if ((update_type != UPDATE_TYPE_FAST) && stream->update_flags.bits.dsc_changed)

		if (top_pipe_to_program &&

			top_pipe_to_program->stream_res.tg->funcs->lock_doublebuffer_enable) {

			if (should_use_dmub_lock(stream->link)) {

			if (should_use_dmub_lock(dc, stream->link)) {

				union dmub_hw_lock_flags hw_locks = { 0 };

				struct dmub_hw_lock_inst_flags inst_flags = { 0 };
@@ -4419,7 +4419,7 @@ static void commit_planes_for_stream(struct dc *dc, 
				top_pipe_to_program->stream_res.tg,

				CRTC_STATE_VACTIVE);



			if (should_use_dmub_lock(stream->link)) {

			if (should_use_dmub_lock(dc, stream->link)) {

				union dmub_hw_lock_flags hw_locks = { 0 };

				struct dmub_hw_lock_inst_flags inst_flags = { 0 };

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

+16 −13
Original line number Diff line number Diff line
@@ -61,12 +61,14 @@ void dmub_hw_lock_mgr_inbox0_cmd(struct dc_dmub_srv *dmub_srv, 
	dc_dmub_srv_wait_for_inbox0_ack(dmub_srv);

}



bool should_use_dmub_lock(struct dc_link *link)

bool should_use_dmub_lock(const struct dc *dc, const struct dc_link *link)

{

	/* ASIC doesn't support DMUB */

	if (!link->ctx->dmub_srv)

	if (!dc->ctx->dmub_srv)

		return false;



	if (link) {



		if (link->psr_settings.psr_version == DC_PSR_VERSION_SU_1)

			return true;
@@ -78,11 +80,12 @@ bool should_use_dmub_lock(struct dc_link *link) 
			struct dc_link *edp_links[MAX_NUM_EDP];

			int edp_num;



		dc_get_edp_links(link->dc, edp_links, &edp_num);

			dc_get_edp_links(dc, edp_links, &edp_num);



			if (edp_num == 1)

				return true;

		}

	}



	return false;

}

drivers/gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.h

+1 −1
Original line number Diff line number Diff line
@@ -37,6 +37,6 @@ void dmub_hw_lock_mgr_cmd(struct dc_dmub_srv *dmub_srv, 
void dmub_hw_lock_mgr_inbox0_cmd(struct dc_dmub_srv *dmub_srv,

		union dmub_inbox0_cmd_lock_hw hw_lock_cmd);



bool should_use_dmub_lock(struct dc_link *link);

bool should_use_dmub_lock(const struct dc *dc, const struct dc_link *link);



#endif /*_DMUB_HW_LOCK_MGR_H_ */

drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c

+1 −1
Original line number Diff line number Diff line
@@ -2245,7 +2245,7 @@ void dcn10_cursor_lock(struct dc *dc, struct pipe_ctx *pipe, bool lock) 
	if (lock)

		delay_cursor_until_vupdate(dc, pipe);



	if (pipe->stream && should_use_dmub_lock(pipe->stream->link)) {

	if (pipe->stream && should_use_dmub_lock(dc, pipe->stream->link)) {

		union dmub_hw_lock_flags hw_locks = { 0 };

		struct dmub_hw_lock_inst_flags inst_flags = { 0 };

drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c

+1 −1
Original line number Diff line number Diff line
@@ -1449,7 +1449,7 @@ void dcn20_pipe_control_lock( 
		!flip_immediate)

	    dcn20_setup_gsl_group_as_lock(dc, pipe, false);



	if (pipe->stream && should_use_dmub_lock(pipe->stream->link)) {

	if (pipe->stream && should_use_dmub_lock(dc, pipe->stream->link)) {

		union dmub_hw_lock_flags hw_locks = { 0 };

		struct dmub_hw_lock_inst_flags inst_flags = { 0 };