drm/amd/display: Remove plane_res.mi check in dce110_apply_ctx_for_surface
authorHarry Wentland <harry.wentland@amd.com>
Fri, 10 Nov 2017 17:00:41 +0000 (12:00 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 14 Dec 2017 15:51:59 +0000 (10:51 -0500)
plane_res.mi (memory interface) can never be NULL for DCE110

Found by smatch:
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_hw_sequencer.c:2881
dce110_apply_ctx_for_surface() error: we previously assumed
'pipe_ctx->plane_res.mi' could be null (see line 2873)

Signed-off-by: Harry Wentland <harry.wentland@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>
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c

index e650bdc..da2e440 100644 (file)
@@ -2872,13 +2872,12 @@ static void dce110_apply_ctx_for_surface(
                        continue;
 
                /* Need to allocate mem before program front end for Fiji */
-               if (pipe_ctx->plane_res.mi != NULL)
-                       pipe_ctx->plane_res.mi->funcs->allocate_mem_input(
-                                       pipe_ctx->plane_res.mi,
-                                       pipe_ctx->stream->timing.h_total,
-                                       pipe_ctx->stream->timing.v_total,
-                                       pipe_ctx->stream->timing.pix_clk_khz,
-                                       context->stream_count);
+               pipe_ctx->plane_res.mi->funcs->allocate_mem_input(
+                               pipe_ctx->plane_res.mi,
+                               pipe_ctx->stream->timing.h_total,
+                               pipe_ctx->stream->timing.v_total,
+                               pipe_ctx->stream->timing.pix_clk_khz,
+                               context->stream_count);
 
                dce110_program_front_end_for_pipe(dc, pipe_ctx);