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>

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 5bb2ac71f2975c1727cc3d07bb9e44039ebdc865..7e9afab8fca039dc9ea635a5df06630d8fb345b0 100644 (file)
--- 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 7473f58584c3479208b56b5f2bd9bba6ebef7f16..40a9591833aaed3211ddd47b99ce0281fbaa626c 100644 (file)
--- 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 = {