drm/amd/display: Don't use target before null check
authorHarry Wentland <harry.wentland@amd.com>
Fri, 23 Dec 2016 15:53:24 +0000 (10:53 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 26 Sep 2017 21:07:41 +0000 (17:07 -0400)
It might blow up.

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/core/dc_target.c

index d4ecf2da26d2cf1a12ff96838d4efd3e25e5be45..2d25b00b4bff7eae3906ea059eea1b11e2090e29 100644 (file)
@@ -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];