diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2017-08-10 14:39:49 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-26 18:16:32 -0400 |
| commit | ea062558fd796ecff167ca64282bd2c3e3e2663f (patch) | |
| tree | 273ba68f9f70b9616d0a85a3a35e63ca454d1be8 /drivers/gpu/drm/amd/display | |
| parent | 0d6fbccb22f8af70b729367431a489093aad2ddd (diff) | |
| download | linux-ea062558fd796ecff167ca64282bd2c3e3e2663f.tar.gz linux-ea062558fd796ecff167ca64282bd2c3e3e2663f.tar.bz2 linux-ea062558fd796ecff167ca64282bd2c3e3e2663f.zip | |
drm/amd/display/dc: add DIGG for KV
KV has 7 possible DIG blocks.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c index 5bb2ac71f297..7e9afab8fca0 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c @@ -80,6 +80,7 @@ #define DCE110_DIG_FE_SOURCE_SELECT_DIGD 0x08 #define DCE110_DIG_FE_SOURCE_SELECT_DIGE 0x10 #define DCE110_DIG_FE_SOURCE_SELECT_DIGF 0x20 +#define DCE110_DIG_FE_SOURCE_SELECT_DIGG 0x40 /* all values are in milliseconds */ /* For eDP, after power-up/power/down, @@ -471,6 +472,8 @@ static uint8_t get_frontend_source( return DCE110_DIG_FE_SOURCE_SELECT_DIGE; case ENGINE_ID_DIGF: return DCE110_DIG_FE_SOURCE_SELECT_DIGF; + case ENGINE_ID_DIGG: + return DCE110_DIG_FE_SOURCE_SELECT_DIGG; default: ASSERT_CRITICAL(false); return DCE110_DIG_FE_SOURCE_SELECT_INVALID; @@ -984,6 +987,9 @@ bool dce110_link_encoder_construct( case TRANSMITTER_UNIPHY_F: enc110->base.preferred_engine = ENGINE_ID_DIGF; break; + case TRANSMITTER_UNIPHY_G: + enc110->base.preferred_engine = ENGINE_ID_DIGG; + break; default: ASSERT_CRITICAL(false); enc110->base.preferred_engine = ENGINE_ID_UNKNOWN; diff --git a/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c b/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c index 7473f58584c3..40a9591833aa 100644 --- a/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c @@ -262,7 +262,8 @@ static const struct dce110_stream_enc_registers stream_enc_regs[] = { stream_enc_regs(2), stream_enc_regs(3), stream_enc_regs(4), - stream_enc_regs(5) + stream_enc_regs(5), + stream_enc_regs(6) }; static const struct dce_stream_encoder_shift se_shift = { |