FAILED: patch "[PATCH] drm/amd/display: check for ipp before calling cursor" failed to apply to 4.16-stable tree
[email protected]
maintainerThe patch below does not apply to the 4.16-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
5d447f09b8d8346c64f4c952a67c61f7ce88d3c1Mon Sep 17 00:00:00 2001
From: Shirish S <[email protected]>
Date: Wed, 21 Feb 2018 16:10:33 +0530
Subject: [PATCH] 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.
drivers/gpu/drm/amd/display/dc/core/dc_stream.c +4 -2
@@ -198,7 +198,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 ;
@@ -237,7 +238,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 ; core_dc->hwss.set_cursor_position (pipe_ctx);