drm/amd/display: Remove redundant checks in set_default_colors
authorHarry Wentland <harry.wentland@amd.com>
Fri, 10 Nov 2017 17:08:13 +0000 (12:08 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 14 Dec 2017 15:52:06 +0000 (10:52 -0500)
pipe_ctx->stream and pipe_ctx->plane_state are never NULL

Found by smatch:
drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_hw_sequencer.c:2111
set_default_colors() error: we previously assumed 'pipe_ctx->stream'
could be null (see line 2101)

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 da2e440..981bcd2 100644 (file)
@@ -2095,16 +2095,8 @@ static void set_default_colors(struct pipe_ctx *pipe_ctx)
        struct default_adjustment default_adjust = { 0 };
 
        default_adjust.force_hw_default = false;
-       if (pipe_ctx->plane_state == NULL)
-               default_adjust.in_color_space = COLOR_SPACE_SRGB;
-       else
-               default_adjust.in_color_space =
-                               pipe_ctx->plane_state->color_space;
-       if (pipe_ctx->stream == NULL)
-               default_adjust.out_color_space = COLOR_SPACE_SRGB;
-       else
-               default_adjust.out_color_space =
-                               pipe_ctx->stream->output_color_space;
+       default_adjust.in_color_space = pipe_ctx->plane_state->color_space;
+       default_adjust.out_color_space = pipe_ctx->stream->output_color_space;
        default_adjust.csc_adjust_type = GRAPHICS_CSC_ADJUST_TYPE_SW;
        default_adjust.surface_pixel_format = pipe_ctx->plane_res.scl_data.format;