Commit 72f0281d authored by Roman Li's avatar Roman Li Committed by Alex Deucher

drm/amd/display: fix index and union overwrite in compressor

  Fixing 2 bugs in compressor:
- array out of bounds due to incorrect index
- compressor options always 0 due to union overwrite
Signed-off-by: default avatarRoman Li <Roman.Li@amd.com>
Reviewed-by: default avatarBhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Acked-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8ee65d7c
...@@ -198,7 +198,7 @@ void dce110_compressor_enable_fbc( ...@@ -198,7 +198,7 @@ void dce110_compressor_enable_fbc(
/* Keep track of enum controller_id FBC is attached to */ /* Keep track of enum controller_id FBC is attached to */
compressor->is_enabled = true; compressor->is_enabled = true;
compressor->attached_inst = params->inst; compressor->attached_inst = params->inst;
cp110->offsets = reg_offsets[params->inst - 1]; cp110->offsets = reg_offsets[params->inst];
/*Toggle it as there is bug in HW */ /*Toggle it as there is bug in HW */
set_reg_field_value(value, 0, FBC_CNTL, FBC_GRPH_COMP_EN); set_reg_field_value(value, 0, FBC_CNTL, FBC_GRPH_COMP_EN);
...@@ -469,6 +469,7 @@ bool dce110_compressor_construct(struct dce110_compressor *compressor, ...@@ -469,6 +469,7 @@ bool dce110_compressor_construct(struct dce110_compressor *compressor,
struct dc_context *ctx) struct dc_context *ctx)
{ {
compressor->base.options.raw = 0;
compressor->base.options.bits.FBC_SUPPORT = true; compressor->base.options.bits.FBC_SUPPORT = true;
/* for dce 11 always use one dram channel for lpt */ /* for dce 11 always use one dram channel for lpt */
...@@ -490,7 +491,6 @@ bool dce110_compressor_construct(struct dce110_compressor *compressor, ...@@ -490,7 +491,6 @@ bool dce110_compressor_construct(struct dce110_compressor *compressor,
compressor->base.allocated_size = 0; compressor->base.allocated_size = 0;
compressor->base.preferred_requested_size = 0; compressor->base.preferred_requested_size = 0;
compressor->base.min_compress_ratio = FBC_COMPRESS_RATIO_INVALID; compressor->base.min_compress_ratio = FBC_COMPRESS_RATIO_INVALID;
compressor->base.options.raw = 0;
compressor->base.banks_num = 0; compressor->base.banks_num = 0;
compressor->base.raw_size = 0; compressor->base.raw_size = 0;
compressor->base.channel_interleave_size = 0; compressor->base.channel_interleave_size = 0;
......
...@@ -404,7 +404,7 @@ void dce112_compressor_enable_fbc( ...@@ -404,7 +404,7 @@ void dce112_compressor_enable_fbc(
/* Keep track of enum controller_id FBC is attached to */ /* Keep track of enum controller_id FBC is attached to */
compressor->is_enabled = true; compressor->is_enabled = true;
compressor->attached_inst = params->inst; compressor->attached_inst = params->inst;
cp110->offsets = reg_offsets[params->inst - 1]; cp110->offsets = reg_offsets[params->inst];
/*Toggle it as there is bug in HW */ /*Toggle it as there is bug in HW */
set_reg_field_value(value, 0, FBC_CNTL, FBC_GRPH_COMP_EN); set_reg_field_value(value, 0, FBC_CNTL, FBC_GRPH_COMP_EN);
...@@ -797,6 +797,7 @@ bool dce112_compressor_construct(struct dce112_compressor *compressor, ...@@ -797,6 +797,7 @@ bool dce112_compressor_construct(struct dce112_compressor *compressor,
struct dc_bios *bp = ctx->dc_bios; struct dc_bios *bp = ctx->dc_bios;
struct embedded_panel_info panel_info; struct embedded_panel_info panel_info;
compressor->base.options.raw = 0;
compressor->base.options.bits.FBC_SUPPORT = true; compressor->base.options.bits.FBC_SUPPORT = true;
compressor->base.options.bits.LPT_SUPPORT = true; compressor->base.options.bits.LPT_SUPPORT = true;
/* For DCE 11 always use one DRAM channel for LPT */ /* For DCE 11 always use one DRAM channel for LPT */
...@@ -817,7 +818,6 @@ bool dce112_compressor_construct(struct dce112_compressor *compressor, ...@@ -817,7 +818,6 @@ bool dce112_compressor_construct(struct dce112_compressor *compressor,
compressor->base.allocated_size = 0; compressor->base.allocated_size = 0;
compressor->base.preferred_requested_size = 0; compressor->base.preferred_requested_size = 0;
compressor->base.min_compress_ratio = FBC_COMPRESS_RATIO_INVALID; compressor->base.min_compress_ratio = FBC_COMPRESS_RATIO_INVALID;
compressor->base.options.raw = 0;
compressor->base.banks_num = 0; compressor->base.banks_num = 0;
compressor->base.raw_size = 0; compressor->base.raw_size = 0;
compressor->base.channel_interleave_size = 0; compressor->base.channel_interleave_size = 0;
......
...@@ -407,7 +407,7 @@ void dce80_compressor_enable_fbc( ...@@ -407,7 +407,7 @@ void dce80_compressor_enable_fbc(
/* Keep track of enum controller_id FBC is attached to */ /* Keep track of enum controller_id FBC is attached to */
compressor->is_enabled = true; compressor->is_enabled = true;
compressor->attached_inst = params->inst; compressor->attached_inst = params->inst;
cp80->offsets = reg_offsets[params->inst - 1]; cp80->offsets = reg_offsets[params->inst];
/*Toggle it as there is bug in HW */ /*Toggle it as there is bug in HW */
set_reg_field_value(value, 0, FBC_CNTL, FBC_GRPH_COMP_EN); set_reg_field_value(value, 0, FBC_CNTL, FBC_GRPH_COMP_EN);
...@@ -777,6 +777,7 @@ bool dce80_compressor_construct(struct dce80_compressor *compressor, ...@@ -777,6 +777,7 @@ bool dce80_compressor_construct(struct dce80_compressor *compressor,
struct dc_bios *bp = ctx->dc_bios; struct dc_bios *bp = ctx->dc_bios;
struct embedded_panel_info panel_info; struct embedded_panel_info panel_info;
compressor->base.options.raw = 0;
compressor->base.options.bits.FBC_SUPPORT = true; compressor->base.options.bits.FBC_SUPPORT = true;
compressor->base.options.bits.LPT_SUPPORT = true; compressor->base.options.bits.LPT_SUPPORT = true;
/* For DCE 11 always use one DRAM channel for LPT */ /* For DCE 11 always use one DRAM channel for LPT */
...@@ -797,7 +798,6 @@ bool dce80_compressor_construct(struct dce80_compressor *compressor, ...@@ -797,7 +798,6 @@ bool dce80_compressor_construct(struct dce80_compressor *compressor,
compressor->base.allocated_size = 0; compressor->base.allocated_size = 0;
compressor->base.preferred_requested_size = 0; compressor->base.preferred_requested_size = 0;
compressor->base.min_compress_ratio = FBC_COMPRESS_RATIO_INVALID; compressor->base.min_compress_ratio = FBC_COMPRESS_RATIO_INVALID;
compressor->base.options.raw = 0;
compressor->base.banks_num = 0; compressor->base.banks_num = 0;
compressor->base.raw_size = 0; compressor->base.raw_size = 0;
compressor->base.channel_interleave_size = 0; compressor->base.channel_interleave_size = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment