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

Commit d6b66697 authored by Shirish S's avatar Shirish S Committed by Alex Deucher
Browse files

drm/amd/display: check for ipp before calling cursor operations 



Currently all cursor related functions are made to all
pipes that are attached to a particular stream.
This is not applicable to pipes that do not have cursor plane
initialised like underlay.
Hence this patch allows cursor related operations on a pipe
only if ipp in available on that particular pipe.

The check is added to set_cursor_position & set_cursor_attribute.

Signed-off-by: default avatarShirish S <shirish.s@amd.com>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 219b3b22

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

+4 −2
Original line number Diff line number Diff line
@@ -197,7 +197,8 @@ 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))

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

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

			continue;

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

			continue;
@@ -273,7 +274,8 @@ bool dc_stream_set_cursor_position( 
		if (pipe_ctx->stream != stream ||

				(!pipe_ctx->plane_res.mi  && !pipe_ctx->plane_res.hubp) ||

				!pipe_ctx->plane_state ||

				(!pipe_ctx->plane_res.xfm && !pipe_ctx->plane_res.dpp))

				(!pipe_ctx->plane_res.xfm && !pipe_ctx->plane_res.dpp) ||

				!pipe_ctx->plane_res.ipp)

			continue;



		if (pipe_ctx->plane_state->address.type