drm/amd/display: Allow cursor position when plane_res.ipp is NULL
authorEric Bernstein <eric.bernstein@amd.com>
Mon, 8 Apr 2019 17:47:10 +0000 (13:47 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 23 Apr 2019 22:28:11 +0000 (17:28 -0500)
[Why]
Starting with DCN1, the input_pixel_processor (ipp) struct has been
replaced by dpp struct (part of DAL3.1 SW architecture change).
Need to update logic to handle cases where ipp is never allocated.

[How]
Only skip cursor position programming if both ipp and dpp resources
are NULL.

Signed-off-by: Eric Bernstein <eric.bernstein@amd.com>
Reviewed-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Acked-by: Leo Li <sunpeng.li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/core/dc_stream.c

index 09d765f359b0cd26e7f99a54845b1809ba3d0cc6..6200df3edcd0d62abf1c3e3909766915f9bbd78b 100644 (file)
@@ -333,7 +333,7 @@ bool dc_stream_set_cursor_position(
                                (!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.ipp)
+                               (!pipe_ctx->plane_res.ipp && !pipe_ctx->plane_res.dpp))
                        continue;
 
                if (!pipe_to_program) {