diff options
| author | Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com> | 2017-06-28 18:58:27 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-26 18:08:31 -0400 |
| commit | 35ce37d6a4d140ba7e2870d7c0bc4a6b866f1d8d (patch) | |
| tree | 4b266e99cbe33f103f7b5cf3826dd890da05a66e /drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.c | |
| parent | 13066f9f648084b5016cebfa7930ce4c056ab9d6 (diff) | |
| download | linux-stable-35ce37d6a4d140ba7e2870d7c0bc4a6b866f1d8d.tar.gz linux-stable-35ce37d6a4d140ba7e2870d7c0bc4a6b866f1d8d.tar.bz2 linux-stable-35ce37d6a4d140ba7e2870d7c0bc4a6b866f1d8d.zip | |
drm/amd/display: Enable ipp compilation
Update relevant registers
Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.c')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.c index 1e7a55d9e9ec..a09226c0d903 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.c +++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.c @@ -421,7 +421,10 @@ static void dcn10_ipp_enable_cm_block( struct dcn10_ipp *ippn10 = TO_DCN10_IPP(ipp); REG_UPDATE(DPP_CONTROL, DPP_CLOCK_ENABLE, 1); - REG_UPDATE(CM_CONTROL, CM_BYPASS_EN, 0); + if (ippn10->ipp_mask->CM_BYPASS_EN) + REG_UPDATE(CM_CONTROL, CM_BYPASS_EN, 0); + else + REG_UPDATE(CM_CONTROL, CM_BYPASS, 0); } @@ -484,7 +487,7 @@ static bool dcn10_cursor_program_control( REG_UPDATE_2(CURSOR0_CONTROL, CUR0_MODE, color_format, - CUR0_INVERT_MODE, 0); + CUR0_EXPANSION_MODE, 0); if (color_format == CURSOR_MODE_MONO) { /* todo: clarify what to program these to */ @@ -501,18 +504,6 @@ static bool dcn10_cursor_program_control( ALPHA_EN, 1, FORMAT_EXPANSION_MODE, 0); - REG_UPDATE(CURSOR0_CONTROL, - CUR0_EXPANSION_MODE, 0); - - if (0 /*attributes->attribute_flags.bits.MIN_MAX_INVERT*/) { - REG_UPDATE(CURSOR0_CONTROL, - CUR0_MAX, - 0 /* TODO */); - REG_UPDATE(CURSOR0_CONTROL, - CUR0_MIN, - 0 /* TODO */); - } - return true; } |