aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo (Sunpeng) Li <sunpeng.li@amd.com>2017-10-31 16:28:57 -0400
committerAlex Deucher <alexander.deucher@amd.com>2017-11-02 13:05:04 -0400
commitb7fa8519057319aef8405923dc8fa6782fce969f (patch)
tree117c6c99db1e58661aaae462dce5a4a9c4489d56
parent96719c5439b4d75bfd6b3c5cb24f1a8e537125bb (diff)
drm/amd: Add DCE12 resource strap registers
We need them for initializing audio properly. Signed-off-by: Leo (Sunpeng) Li <sunpeng.li@amd.com> Reviewed-by: Harry Wentland <harry.wentland@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/include/asic_reg/vega10/DC/dce_12_0_offset.h4
-rw-r--r--drivers/gpu/drm/amd/include/asic_reg/vega10/DC/dce_12_0_sh_mask.h8
2 files changed, 12 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/include/asic_reg/vega10/DC/dce_12_0_offset.h b/drivers/gpu/drm/amd/include/asic_reg/vega10/DC/dce_12_0_offset.h
index 75b660d57bdf..f730d0629020 100644
--- a/drivers/gpu/drm/amd/include/asic_reg/vega10/DC/dce_12_0_offset.h
+++ b/drivers/gpu/drm/amd/include/asic_reg/vega10/DC/dce_12_0_offset.h
@@ -1841,6 +1841,10 @@
1841#define mmUNIPHYG_CHANNEL_XBAR_CNTL_BASE_IDX 2 1841#define mmUNIPHYG_CHANNEL_XBAR_CNTL_BASE_IDX 2
1842#define mmDCIO_WRCMD_DELAY 0x2094 1842#define mmDCIO_WRCMD_DELAY 0x2094
1843#define mmDCIO_WRCMD_DELAY_BASE_IDX 2 1843#define mmDCIO_WRCMD_DELAY_BASE_IDX 2
1844#define mmDC_PINSTRAPS 0x2096
1845#define mmDC_PINSTRAPS_BASE_IDX 2
1846#define mmCC_DC_MISC_STRAPS 0x2097
1847#define mmCC_DC_MISC_STRAPS_BASE_IDX 2
1844#define mmDC_DVODATA_CONFIG 0x2098 1848#define mmDC_DVODATA_CONFIG 0x2098
1845#define mmDC_DVODATA_CONFIG_BASE_IDX 2 1849#define mmDC_DVODATA_CONFIG_BASE_IDX 2
1846#define mmLVTMA_PWRSEQ_CNTL 0x2099 1850#define mmLVTMA_PWRSEQ_CNTL 0x2099
diff --git a/drivers/gpu/drm/amd/include/asic_reg/vega10/DC/dce_12_0_sh_mask.h b/drivers/gpu/drm/amd/include/asic_reg/vega10/DC/dce_12_0_sh_mask.h
index d8ad862b3a74..6d3162c42957 100644
--- a/drivers/gpu/drm/amd/include/asic_reg/vega10/DC/dce_12_0_sh_mask.h
+++ b/drivers/gpu/drm/amd/include/asic_reg/vega10/DC/dce_12_0_sh_mask.h
@@ -2447,6 +2447,14 @@
2447//DCCG_CBUS_WRCMD_DELAY 2447//DCCG_CBUS_WRCMD_DELAY
2448#define DCCG_CBUS_WRCMD_DELAY__CBUS_PLL_WRCMD_DELAY__SHIFT 0x0 2448#define DCCG_CBUS_WRCMD_DELAY__CBUS_PLL_WRCMD_DELAY__SHIFT 0x0
2449#define DCCG_CBUS_WRCMD_DELAY__CBUS_PLL_WRCMD_DELAY_MASK 0x0000000FL 2449#define DCCG_CBUS_WRCMD_DELAY__CBUS_PLL_WRCMD_DELAY_MASK 0x0000000FL
2450//DC_PINSTRAPS
2451#define DC_PINSTRAPS__DC_PINSTRAPS_AUDIO__SHIFT 0xe
2452#define DC_PINSTRAPS__DC_PINSTRAPS_AUDIO_MASK 0x0000C000L
2453//CC_DC_MISC_STRAPS
2454#define CC_DC_MISC_STRAPS__HDMI_DISABLE__SHIFT 0x6
2455#define CC_DC_MISC_STRAPS__AUDIO_STREAM_NUMBER__SHIFT 0x8
2456#define CC_DC_MISC_STRAPS__HDMI_DISABLE_MASK 0x00000040L
2457#define CC_DC_MISC_STRAPS__AUDIO_STREAM_NUMBER_MASK 0x00000700L
2450//DCCG_DS_DTO_INCR 2458//DCCG_DS_DTO_INCR
2451#define DCCG_DS_DTO_INCR__DCCG_DS_DTO_INCR__SHIFT 0x0 2459#define DCCG_DS_DTO_INCR__DCCG_DS_DTO_INCR__SHIFT 0x0
2452#define DCCG_DS_DTO_INCR__DCCG_DS_DTO_INCR_MASK 0xFFFFFFFFL 2460#define DCCG_DS_DTO_INCR__DCCG_DS_DTO_INCR_MASK 0xFFFFFFFFL