]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
drm/amd/display: Properly define DPCS related info for DCN301
authorZhan Liu <zhan.liu@amd.com>
Fri, 20 Nov 2020 03:48:29 +0000 (22:48 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 1 Dec 2020 21:03:52 +0000 (16:03 -0500)
[Why]
DPCS related info needs to be properly defined within code.

[How]
Add missing DPCS related info to code.

Signed-off-by: Zhan Liu <zhan.liu@amd.com>
Reviewed-by: Nikola Cornij <nikola.cornij@amd.com>
Acked-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c

index 7e95bd1e9e53bd1985cd2bea7d8888608a075fd4..4825c5c1c6ed686217ec3f9850a75fd080091bdc 100644 (file)
@@ -73,6 +73,9 @@
 
 #include "nbio/nbio_7_2_0_offset.h"
 
+#include "dcn/dpcs_3_0_0_offset.h"
+#include "dcn/dpcs_3_0_0_sh_mask.h"
+
 #include "reg_helper.h"
 #include "dce/dmub_abm.h"
 #include "dce/dce_aux.h"
@@ -517,10 +520,12 @@ static const struct dcn10_link_enc_hpd_registers link_enc_hpd_regs[] = {
                hpd_regs(3),
 };
 
+
 #define link_regs(id, phyid)\
 [id] = {\
        LE_DCN301_REG_LIST(id), \
        UNIPHY_DCN2_REG_LIST(phyid), \
+       DPCS_DCN2_REG_LIST(id), \
        SRI(DP_DPHY_INTERNAL_CTRL, DP, id) \
 }
 
@@ -540,11 +545,13 @@ static const struct dcn10_link_enc_registers link_enc_regs[] = {
 };
 
 static const struct dcn10_link_enc_shift le_shift = {
-       LINK_ENCODER_MASK_SH_LIST_DCN301(__SHIFT)
+       LINK_ENCODER_MASK_SH_LIST_DCN301(__SHIFT),\
+       DPCS_DCN2_MASK_SH_LIST(__SHIFT)
 };
 
 static const struct dcn10_link_enc_mask le_mask = {
-       LINK_ENCODER_MASK_SH_LIST_DCN301(_MASK)
+       LINK_ENCODER_MASK_SH_LIST_DCN301(_MASK),\
+       DPCS_DCN2_MASK_SH_LIST(_MASK)
 };
 
 #define panel_cntl_regs(id)\