OSDN Git Service

drm/amd/display: safeguard compressor api
authorRoman Li <Roman.Li@amd.com>
Wed, 26 Jul 2017 18:42:38 +0000 (14:42 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 26 Sep 2017 22:15:48 +0000 (18:15 -0400)
Only call compressor api if it's available.

Signed-off-by: Roman Li <Roman.Li@amd.com>
Reviewed-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@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 15f6eee..d457730 100644 (file)
@@ -1185,7 +1185,8 @@ static void power_down_all_hw_blocks(struct core_dc *dc)
        power_down_clock_sources(dc);
 
 #ifdef ENABLE_FBC
-       dc->fbc_compressor->funcs->disable_fbc(dc->fbc_compressor);
+       if (dc->fbc_compressor)
+               dc->fbc_compressor->funcs->disable_fbc(dc->fbc_compressor);
 #endif
 }
 
@@ -1658,7 +1659,8 @@ enum dc_status dce110_apply_ctx_to_hw(
        set_safe_displaymarks(&context->res_ctx, dc->res_pool);
 
 #ifdef ENABLE_FBC
-       dc->fbc_compressor->funcs->disable_fbc(dc->fbc_compressor);
+       if (dc->fbc_compressor)
+               dc->fbc_compressor->funcs->disable_fbc(dc->fbc_compressor);
 #endif
        /*TODO: when pplib works*/
        apply_min_clocks(dc, context, &clocks_state, true);
@@ -2246,7 +2248,8 @@ static void init_hw(struct core_dc *dc)
                abm->funcs->abm_init(abm);
        }
 #ifdef ENABLE_FBC
-       dc->fbc_compressor->funcs->power_up_fbc(dc->fbc_compressor);
+       if (dc->fbc_compressor)
+               dc->fbc_compressor->funcs->power_up_fbc(dc->fbc_compressor);
 #endif
 }