From 48d03a4a89f383b0b9d423a97ee0c2afa34093e1 Mon Sep 17 00:00:00 2001 From: Roman Li Date: Wed, 26 Jul 2017 14:42:38 -0400 Subject: [PATCH 0682/4131] drm/amd/display: safeguard compressor api Only call compressor api if it's available. Signed-off-by: Roman Li Reviewed-by: Bhawanpreet Lakha Acked-by: Harry Wentland Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c index 15f6eee..d457730 100644 --- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c @@ -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 } -- 2.7.4