Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1aaad05 authored by Harry Wentland's avatar Harry Wentland Committed by Alex Deucher
Browse files

drm/amd/display: Check for HW blocks in HWSS, rather than DC core for cursor 



Signed-off-by: default avatarHarry Wentland <harry.wentland@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3760f76c

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

+1 −2
Original line number Diff line number Diff line
@@ -198,8 +198,7 @@ bool dc_stream_set_cursor_attributes( 
	for (i = 0; i < MAX_PIPES; i++) {

		struct pipe_ctx *pipe_ctx = &res_ctx->pipe_ctx[i];



		if (pipe_ctx->stream != stream || (!pipe_ctx->plane_res.xfm &&

		    !pipe_ctx->plane_res.dpp) || !pipe_ctx->plane_res.ipp)

		if (pipe_ctx->stream != stream)

			continue;

		if (pipe_ctx->top_pipe && pipe_ctx->plane_state != pipe_ctx->top_pipe->plane_state)

			continue;

drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c

+6 −3
Original line number Diff line number Diff line
@@ -2937,15 +2937,18 @@ void dce110_set_cursor_attribute(struct pipe_ctx *pipe_ctx) 
{

	struct dc_cursor_attributes *attributes = &pipe_ctx->stream->cursor_attributes;



	if (pipe_ctx->plane_res.ipp->funcs->ipp_cursor_set_attributes)

	if (pipe_ctx->plane_res.ipp &&

	    pipe_ctx->plane_res.ipp->funcs->ipp_cursor_set_attributes)

		pipe_ctx->plane_res.ipp->funcs->ipp_cursor_set_attributes(

				pipe_ctx->plane_res.ipp, attributes);



	if (pipe_ctx->plane_res.mi->funcs->set_cursor_attributes)

	if (pipe_ctx->plane_res.mi &&

	    pipe_ctx->plane_res.mi->funcs->set_cursor_attributes)

		pipe_ctx->plane_res.mi->funcs->set_cursor_attributes(

				pipe_ctx->plane_res.mi, attributes);



	if (pipe_ctx->plane_res.xfm->funcs->set_cursor_attributes)

	if (pipe_ctx->plane_res.xfm &&

	    pipe_ctx->plane_res.xfm->funcs->set_cursor_attributes)

		pipe_ctx->plane_res.xfm->funcs->set_cursor_attributes(

				pipe_ctx->plane_res.xfm, attributes);

}