From: Harry Wentland Date: Fri, 23 Dec 2016 10:53:24 -0500 Subject: drm/amd/display: Don't use target before null check Git-commit: f79d7749e7381b0ff9d26733f338ad767d75539c Patch-mainline: v4.15-rc1 References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166 It might blow up. Signed-off-by: Harry Wentland Reviewed-by: Tony Cheng Acked-by: Harry Wentland Signed-off-by: Alex Deucher Acked-by: Petr Tesarik --- drivers/gpu/drm/amd/display/dc/core/dc_target.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) --- a/drivers/gpu/drm/amd/display/dc/core/dc_target.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_target.c @@ -151,9 +151,9 @@ bool dc_target_set_cursor_attributes( const struct dc_cursor_attributes *attributes) { int i, j; - struct core_target *target = DC_TARGET_TO_CORE(dc_target); - struct core_dc *core_dc = DC_TO_CORE(target->ctx->dc); - struct resource_context *res_ctx = &core_dc->current_context->res_ctx; + struct core_target *target; + struct core_dc *core_dc; + struct resource_context *res_ctx; bool ret = false; if (NULL == dc_target) { @@ -165,6 +165,10 @@ bool dc_target_set_cursor_attributes( return false; } + target = DC_TARGET_TO_CORE(dc_target); + core_dc = DC_TO_CORE(target->ctx->dc); + res_ctx = &core_dc->current_context->res_ctx; + for (i = 0; i < dc_target->stream_count; i++) { const struct dc_stream *stream = dc_target->streams[i];