Commit 0825d965 authored by Eric Yang's avatar Eric Yang Committed by Alex Deucher
Browse files

drm/amd/display: implement notify stream mask 



[Why]
Send stream active state info to DMUB

[How]
Implement GPINT to notify stream mask

Signed-off-by: default avatarEric Yang <Eric.Yang2@amd.com>
Acked-by: default avatarAurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a4832640

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

+18 −0
Original line number Diff line number Diff line
@@ -1246,6 +1246,19 @@ void dc_trigger_sync(struct dc *dc, struct dc_state *context) 
	}

}



static uint8_t get_stream_mask(struct dc *dc, struct dc_state *context)

{

	int i;

	unsigned int stream_mask = 0;



	for (i = 0; i < dc->res_pool->pipe_count; i++) {

		if (context->res_ctx.pipe_ctx[i].stream)

			stream_mask |= 1 << i;

	}



	return stream_mask;

}



/*

 * Applies given context to HW and copy it into current context.

 * It's up to the user to release the src context afterwards.
@@ -1362,6 +1375,11 @@ static enum dc_status dc_commit_state_no_check(struct dc *dc, struct dc_state *c 
		dc->hwss.optimize_bandwidth(dc, context);

	}



	context->stream_mask = get_stream_mask(dc, context);



	if (context->stream_mask != dc->current_state->stream_mask)

		dc_dmub_srv_notify_stream_mask(dc->ctx->dmub_srv, context->stream_mask);



	for (i = 0; i < context->stream_count; i++)

		context->streams[i]->mode_changed = false;

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

+16 −0
Original line number Diff line number Diff line
@@ -132,3 +132,19 @@ void dc_dmub_srv_wait_phy_init(struct dc_dmub_srv *dc_dmub_srv) 
		/* Continue spinning so we don't hang the ASIC. */

	}

}



bool dc_dmub_srv_notify_stream_mask(struct dc_dmub_srv *dc_dmub_srv,

				    unsigned int stream_mask)

{

	struct dmub_srv *dmub;

	const uint32_t timeout = 30;



	if (!dc_dmub_srv || !dc_dmub_srv->dmub)

		return false;



	dmub = dc_dmub_srv->dmub;



	return dmub_srv_send_gpint_command(

		       dmub, DMUB_GPINT__IDLE_OPT_NOTIFY_STREAM_MASK,

		       stream_mask, timeout) == DMUB_STATUS_OK;

}

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

+2 −0
Original line number Diff line number Diff line
@@ -56,4 +56,6 @@ void dc_dmub_srv_wait_idle(struct dc_dmub_srv *dc_dmub_srv); 


void dc_dmub_srv_wait_phy_init(struct dc_dmub_srv *dc_dmub_srv);



bool dc_dmub_srv_notify_stream_mask(struct dc_dmub_srv *dc_dmub_srv,

				    unsigned int stream_mask);

#endif /* _DMUB_DC_SRV_H_ */

drivers/gpu/drm/amd/display/dc/inc/core_types.h

+1 −0
Original line number Diff line number Diff line
@@ -397,6 +397,7 @@ struct dc_state { 
	struct dc_stream_state *streams[MAX_PIPES];

	struct dc_stream_status stream_status[MAX_PIPES];

	uint8_t stream_count;

	uint8_t stream_mask;



	struct resource_context res_ctx;