drm/amd/display: Fix null-derefs on non-dcn builds

Fixing regression introduced by
'Use real BE and FE index to program regs.'

Signed-off-by: Roman Li <Roman.Li@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
index ba88284d305ac0cbf5db64f710ddce3ed432e303..a215c5b74cbd01989e680f4dce7f0ad737725c09 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -1407,7 +1407,8 @@ static int acquire_first_free_pipe(
                        pipe_ctx->plane_res.xfm = pool->transforms[i];
                        pipe_ctx->plane_res.dpp = pool->dpps[i];
                        pipe_ctx->stream_res.opp = pool->opps[i];
-                       pipe_ctx->plane_res.mpcc_inst = pool->dpps[i]->inst;
+                       if (pool->dpps[i])
+                               pipe_ctx->plane_res.mpcc_inst = pool->dpps[i]->inst;
                        pipe_ctx->pipe_idx = i;
 
 

diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
index 58823bafdbe681e805c5c607db923a18ff0a04f7..d036d1da03e3ddd890d8c5e8e0794d71b79b41d5 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
@@ -2819,7 +2819,8 @@ static void dce110_apply_ctx_for_surface(
 
 static void dce110_power_down_fe(struct dc *dc, struct pipe_ctx *pipe_ctx)
 {
-       int fe_idx = pipe_ctx->plane_res.mi->inst;
+       int fe_idx = pipe_ctx->plane_res.mi ?
+               pipe_ctx->plane_res.mi->inst : pipe_ctx->pipe_idx;
 
        /* Do not power down fe when stream is active on dce*/
        if (dc->current_state->res_ctx.pipe_ctx[fe_idx].stream)