aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2247-drm-amd-include-cleanup-vega10-hdp-header-files.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2247-drm-amd-include-cleanup-vega10-hdp-header-files.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2247-drm-amd-include-cleanup-vega10-hdp-header-files.patch1882
1 files changed, 1882 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2247-drm-amd-include-cleanup-vega10-hdp-header-files.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2247-drm-amd-include-cleanup-vega10-hdp-header-files.patch
new file mode 100644
index 00000000..d5118219
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2247-drm-amd-include-cleanup-vega10-hdp-header-files.patch
@@ -0,0 +1,1882 @@
+From 8d50320955c427ebe7c639b2cd7fdac1d8b08d59 Mon Sep 17 00:00:00 2001
+From: Feifei Xu <Feifei.Xu@amd.com>
+Date: Wed, 15 Nov 2017 18:09:33 +0800
+Subject: [PATCH 2247/4131] drm/amd/include:cleanup vega10 hdp header files.
+
+To remove include/asic_reg/vega10 folder,create IP folder hdp.
+This patch cleanup asic_reg/vega10/HDP folder, and remove
+unused hdp_4_0_default.h file.
+
+Change-Id: Ia7cd2e660ceb89a1096c195c6a67677714ccbd69
+Signed-off-by: Feifei Xu <Feifei.Xu@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/soc15.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 2 +-
+ .../drm/amd/include/asic_reg/hdp/hdp_4_0_offset.h | 209 +++++++
+ .../drm/amd/include/asic_reg/hdp/hdp_4_0_sh_mask.h | 601 +++++++++++++++++++++
+ .../include/asic_reg/vega10/HDP/hdp_4_0_default.h | 117 ----
+ .../include/asic_reg/vega10/HDP/hdp_4_0_offset.h | 209 -------
+ .../include/asic_reg/vega10/HDP/hdp_4_0_sh_mask.h | 601 ---------------------
+ 11 files changed, 818 insertions(+), 935 deletions(-)
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_4_0_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_4_0_sh_mask.h
+ delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/HDP/hdp_4_0_default.h
+ delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/HDP/hdp_4_0_offset.h
+ delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/HDP/hdp_4_0_sh_mask.h
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+index bb60efa..fc08a5e 100644
+--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+@@ -32,7 +32,7 @@
+ #include "vega10/GC/gc_9_0_offset.h"
+ #include "vega10/GC/gc_9_0_sh_mask.h"
+ #include "vega10/vega10_enum.h"
+-#include "vega10/HDP/hdp_4_0_offset.h"
++#include "hdp/hdp_4_0_offset.h"
+
+ #include "soc15_common.h"
+ #include "clearstate_gfx9.h"
+diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+index 085288f..6edac48 100644
+--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+@@ -26,8 +26,8 @@
+ #include "amdgpu_atomfirmware.h"
+
+ #include "vega10/soc15ip.h"
+-#include "vega10/HDP/hdp_4_0_offset.h"
+-#include "vega10/HDP/hdp_4_0_sh_mask.h"
++#include "hdp/hdp_4_0_offset.h"
++#include "hdp/hdp_4_0_sh_mask.h"
+ #include "vega10/GC/gc_9_0_sh_mask.h"
+ #include "vega10/DC/dce_12_0_offset.h"
+ #include "vega10/DC/dce_12_0_sh_mask.h"
+diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
+index 4ccd918..9f27010 100644
+--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
+@@ -34,7 +34,7 @@
+ #include "sdma1/sdma1_4_0_sh_mask.h"
+ #include "vega10/MMHUB/mmhub_1_0_offset.h"
+ #include "vega10/MMHUB/mmhub_1_0_sh_mask.h"
+-#include "vega10/HDP/hdp_4_0_offset.h"
++#include "hdp/hdp_4_0_offset.h"
+ #include "raven1/SDMA0/sdma0_4_1_default.h"
+
+ #include "soc15_common.h"
+diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
+index 99f2ae5..a3f67cf 100644
+--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
++++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
+@@ -40,8 +40,8 @@
+ #include "vega10/GC/gc_9_0_sh_mask.h"
+ #include "sdma0/sdma0_4_0_offset.h"
+ #include "sdma1/sdma1_4_0_offset.h"
+-#include "vega10/HDP/hdp_4_0_offset.h"
+-#include "vega10/HDP/hdp_4_0_sh_mask.h"
++#include "hdp/hdp_4_0_offset.h"
++#include "hdp/hdp_4_0_sh_mask.h"
+ #include "vega10/MP/mp_9_0_offset.h"
+ #include "vega10/MP/mp_9_0_sh_mask.h"
+ #include "vega10/SMUIO/smuio_9_0_offset.h"
+diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
+index 6d44706..2f68f98 100644
+--- a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
+@@ -36,7 +36,7 @@
+ #include "vega10/VCE/vce_4_0_default.h"
+ #include "vega10/VCE/vce_4_0_sh_mask.h"
+ #include "vega10/NBIF/nbif_6_1_offset.h"
+-#include "vega10/HDP/hdp_4_0_offset.h"
++#include "hdp/hdp_4_0_offset.h"
+ #include "vega10/MMHUB/mmhub_1_0_offset.h"
+ #include "vega10/MMHUB/mmhub_1_0_sh_mask.h"
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
+index e80bcfa..972c0c8 100644
+--- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
+@@ -31,7 +31,7 @@
+ #include "vega10/soc15ip.h"
+ #include "raven1/VCN/vcn_1_0_offset.h"
+ #include "raven1/VCN/vcn_1_0_sh_mask.h"
+-#include "vega10/HDP/hdp_4_0_offset.h"
++#include "hdp/hdp_4_0_offset.h"
+ #include "raven1/MMHUB/mmhub_9_1_offset.h"
+ #include "raven1/MMHUB/mmhub_9_1_sh_mask.h"
+
+diff --git a/drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_4_0_offset.h b/drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_4_0_offset.h
+new file mode 100644
+index 0000000..fbad771
+--- /dev/null
++++ b/drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_4_0_offset.h
+@@ -0,0 +1,209 @@
++/*
++ * Copyright (C) 2017 Advanced Micro Devices, Inc.
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a
++ * copy of this software and associated documentation files (the "Software"),
++ * to deal in the Software without restriction, including without limitation
++ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
++ * and/or sell copies of the Software, and to permit persons to whom the
++ * Software is furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included
++ * in all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
++ * THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++#ifndef _hdp_4_0_OFFSET_HEADER
++#define _hdp_4_0_OFFSET_HEADER
++
++
++
++// addressBlock: hdp_hdpdec
++// base address: 0x3c80
++#define mmHDP_MMHUB_TLVL 0x0000
++#define mmHDP_MMHUB_TLVL_BASE_IDX 0
++#define mmHDP_MMHUB_UNITID 0x0001
++#define mmHDP_MMHUB_UNITID_BASE_IDX 0
++#define mmHDP_NONSURFACE_BASE 0x0040
++#define mmHDP_NONSURFACE_BASE_BASE_IDX 0
++#define mmHDP_NONSURFACE_INFO 0x0041
++#define mmHDP_NONSURFACE_INFO_BASE_IDX 0
++#define mmHDP_NONSURFACE_BASE_HI 0x0042
++#define mmHDP_NONSURFACE_BASE_HI_BASE_IDX 0
++#define mmHDP_NONSURF_FLAGS 0x00c8
++#define mmHDP_NONSURF_FLAGS_BASE_IDX 0
++#define mmHDP_NONSURF_FLAGS_CLR 0x00c9
++#define mmHDP_NONSURF_FLAGS_CLR_BASE_IDX 0
++#define mmHDP_HOST_PATH_CNTL 0x00cc
++#define mmHDP_HOST_PATH_CNTL_BASE_IDX 0
++#define mmHDP_SW_SEMAPHORE 0x00cd
++#define mmHDP_SW_SEMAPHORE_BASE_IDX 0
++#define mmHDP_DEBUG0 0x00ce
++#define mmHDP_DEBUG0_BASE_IDX 0
++#define mmHDP_LAST_SURFACE_HIT 0x00d0
++#define mmHDP_LAST_SURFACE_HIT_BASE_IDX 0
++#define mmHDP_READ_CACHE_INVALIDATE 0x00d1
++#define mmHDP_READ_CACHE_INVALIDATE_BASE_IDX 0
++#define mmHDP_OUTSTANDING_REQ 0x00d2
++#define mmHDP_OUTSTANDING_REQ_BASE_IDX 0
++#define mmHDP_MISC_CNTL 0x00d3
++#define mmHDP_MISC_CNTL_BASE_IDX 0
++#define mmHDP_MEM_POWER_LS 0x00d4
++#define mmHDP_MEM_POWER_LS_BASE_IDX 0
++#define mmHDP_MMHUB_CNTL 0x00d5
++#define mmHDP_MMHUB_CNTL_BASE_IDX 0
++#define mmHDP_EDC_CNT 0x00d6
++#define mmHDP_EDC_CNT_BASE_IDX 0
++#define mmHDP_VERSION 0x00d7
++#define mmHDP_VERSION_BASE_IDX 0
++#define mmHDP_CLK_CNTL 0x00d8
++#define mmHDP_CLK_CNTL_BASE_IDX 0
++#define mmHDP_MEMIO_CNTL 0x00f6
++#define mmHDP_MEMIO_CNTL_BASE_IDX 0
++#define mmHDP_MEMIO_ADDR 0x00f7
++#define mmHDP_MEMIO_ADDR_BASE_IDX 0
++#define mmHDP_MEMIO_STATUS 0x00f8
++#define mmHDP_MEMIO_STATUS_BASE_IDX 0
++#define mmHDP_MEMIO_WR_DATA 0x00f9
++#define mmHDP_MEMIO_WR_DATA_BASE_IDX 0
++#define mmHDP_MEMIO_RD_DATA 0x00fa
++#define mmHDP_MEMIO_RD_DATA_BASE_IDX 0
++#define mmHDP_XDP_DIRECT2HDP_FIRST 0x0100
++#define mmHDP_XDP_DIRECT2HDP_FIRST_BASE_IDX 0
++#define mmHDP_XDP_D2H_FLUSH 0x0101
++#define mmHDP_XDP_D2H_FLUSH_BASE_IDX 0
++#define mmHDP_XDP_D2H_BAR_UPDATE 0x0102
++#define mmHDP_XDP_D2H_BAR_UPDATE_BASE_IDX 0
++#define mmHDP_XDP_D2H_RSVD_3 0x0103
++#define mmHDP_XDP_D2H_RSVD_3_BASE_IDX 0
++#define mmHDP_XDP_D2H_RSVD_4 0x0104
++#define mmHDP_XDP_D2H_RSVD_4_BASE_IDX 0
++#define mmHDP_XDP_D2H_RSVD_5 0x0105
++#define mmHDP_XDP_D2H_RSVD_5_BASE_IDX 0
++#define mmHDP_XDP_D2H_RSVD_6 0x0106
++#define mmHDP_XDP_D2H_RSVD_6_BASE_IDX 0
++#define mmHDP_XDP_D2H_RSVD_7 0x0107
++#define mmHDP_XDP_D2H_RSVD_7_BASE_IDX 0
++#define mmHDP_XDP_D2H_RSVD_8 0x0108
++#define mmHDP_XDP_D2H_RSVD_8_BASE_IDX 0
++#define mmHDP_XDP_D2H_RSVD_9 0x0109
++#define mmHDP_XDP_D2H_RSVD_9_BASE_IDX 0
++#define mmHDP_XDP_D2H_RSVD_10 0x010a
++#define mmHDP_XDP_D2H_RSVD_10_BASE_IDX 0
++#define mmHDP_XDP_D2H_RSVD_11 0x010b
++#define mmHDP_XDP_D2H_RSVD_11_BASE_IDX 0
++#define mmHDP_XDP_D2H_RSVD_12 0x010c
++#define mmHDP_XDP_D2H_RSVD_12_BASE_IDX 0
++#define mmHDP_XDP_D2H_RSVD_13 0x010d
++#define mmHDP_XDP_D2H_RSVD_13_BASE_IDX 0
++#define mmHDP_XDP_D2H_RSVD_14 0x010e
++#define mmHDP_XDP_D2H_RSVD_14_BASE_IDX 0
++#define mmHDP_XDP_D2H_RSVD_15 0x010f
++#define mmHDP_XDP_D2H_RSVD_15_BASE_IDX 0
++#define mmHDP_XDP_D2H_RSVD_16 0x0110
++#define mmHDP_XDP_D2H_RSVD_16_BASE_IDX 0
++#define mmHDP_XDP_D2H_RSVD_17 0x0111
++#define mmHDP_XDP_D2H_RSVD_17_BASE_IDX 0
++#define mmHDP_XDP_D2H_RSVD_18 0x0112
++#define mmHDP_XDP_D2H_RSVD_18_BASE_IDX 0
++#define mmHDP_XDP_D2H_RSVD_19 0x0113
++#define mmHDP_XDP_D2H_RSVD_19_BASE_IDX 0
++#define mmHDP_XDP_D2H_RSVD_20 0x0114
++#define mmHDP_XDP_D2H_RSVD_20_BASE_IDX 0
++#define mmHDP_XDP_D2H_RSVD_21 0x0115
++#define mmHDP_XDP_D2H_RSVD_21_BASE_IDX 0
++#define mmHDP_XDP_D2H_RSVD_22 0x0116
++#define mmHDP_XDP_D2H_RSVD_22_BASE_IDX 0
++#define mmHDP_XDP_D2H_RSVD_23 0x0117
++#define mmHDP_XDP_D2H_RSVD_23_BASE_IDX 0
++#define mmHDP_XDP_D2H_RSVD_24 0x0118
++#define mmHDP_XDP_D2H_RSVD_24_BASE_IDX 0
++#define mmHDP_XDP_D2H_RSVD_25 0x0119
++#define mmHDP_XDP_D2H_RSVD_25_BASE_IDX 0
++#define mmHDP_XDP_D2H_RSVD_26 0x011a
++#define mmHDP_XDP_D2H_RSVD_26_BASE_IDX 0
++#define mmHDP_XDP_D2H_RSVD_27 0x011b
++#define mmHDP_XDP_D2H_RSVD_27_BASE_IDX 0
++#define mmHDP_XDP_D2H_RSVD_28 0x011c
++#define mmHDP_XDP_D2H_RSVD_28_BASE_IDX 0
++#define mmHDP_XDP_D2H_RSVD_29 0x011d
++#define mmHDP_XDP_D2H_RSVD_29_BASE_IDX 0
++#define mmHDP_XDP_D2H_RSVD_30 0x011e
++#define mmHDP_XDP_D2H_RSVD_30_BASE_IDX 0
++#define mmHDP_XDP_D2H_RSVD_31 0x011f
++#define mmHDP_XDP_D2H_RSVD_31_BASE_IDX 0
++#define mmHDP_XDP_D2H_RSVD_32 0x0120
++#define mmHDP_XDP_D2H_RSVD_32_BASE_IDX 0
++#define mmHDP_XDP_D2H_RSVD_33 0x0121
++#define mmHDP_XDP_D2H_RSVD_33_BASE_IDX 0
++#define mmHDP_XDP_D2H_RSVD_34 0x0122
++#define mmHDP_XDP_D2H_RSVD_34_BASE_IDX 0
++#define mmHDP_XDP_DIRECT2HDP_LAST 0x0123
++#define mmHDP_XDP_DIRECT2HDP_LAST_BASE_IDX 0
++#define mmHDP_XDP_P2P_BAR_CFG 0x0124
++#define mmHDP_XDP_P2P_BAR_CFG_BASE_IDX 0
++#define mmHDP_XDP_P2P_MBX_OFFSET 0x0125
++#define mmHDP_XDP_P2P_MBX_OFFSET_BASE_IDX 0
++#define mmHDP_XDP_P2P_MBX_ADDR0 0x0126
++#define mmHDP_XDP_P2P_MBX_ADDR0_BASE_IDX 0
++#define mmHDP_XDP_P2P_MBX_ADDR1 0x0127
++#define mmHDP_XDP_P2P_MBX_ADDR1_BASE_IDX 0
++#define mmHDP_XDP_P2P_MBX_ADDR2 0x0128
++#define mmHDP_XDP_P2P_MBX_ADDR2_BASE_IDX 0
++#define mmHDP_XDP_P2P_MBX_ADDR3 0x0129
++#define mmHDP_XDP_P2P_MBX_ADDR3_BASE_IDX 0
++#define mmHDP_XDP_P2P_MBX_ADDR4 0x012a
++#define mmHDP_XDP_P2P_MBX_ADDR4_BASE_IDX 0
++#define mmHDP_XDP_P2P_MBX_ADDR5 0x012b
++#define mmHDP_XDP_P2P_MBX_ADDR5_BASE_IDX 0
++#define mmHDP_XDP_P2P_MBX_ADDR6 0x012c
++#define mmHDP_XDP_P2P_MBX_ADDR6_BASE_IDX 0
++#define mmHDP_XDP_HDP_MBX_MC_CFG 0x012d
++#define mmHDP_XDP_HDP_MBX_MC_CFG_BASE_IDX 0
++#define mmHDP_XDP_HDP_MC_CFG 0x012e
++#define mmHDP_XDP_HDP_MC_CFG_BASE_IDX 0
++#define mmHDP_XDP_HST_CFG 0x012f
++#define mmHDP_XDP_HST_CFG_BASE_IDX 0
++#define mmHDP_XDP_HDP_IPH_CFG 0x0131
++#define mmHDP_XDP_HDP_IPH_CFG_BASE_IDX 0
++#define mmHDP_XDP_P2P_BAR0 0x0134
++#define mmHDP_XDP_P2P_BAR0_BASE_IDX 0
++#define mmHDP_XDP_P2P_BAR1 0x0135
++#define mmHDP_XDP_P2P_BAR1_BASE_IDX 0
++#define mmHDP_XDP_P2P_BAR2 0x0136
++#define mmHDP_XDP_P2P_BAR2_BASE_IDX 0
++#define mmHDP_XDP_P2P_BAR3 0x0137
++#define mmHDP_XDP_P2P_BAR3_BASE_IDX 0
++#define mmHDP_XDP_P2P_BAR4 0x0138
++#define mmHDP_XDP_P2P_BAR4_BASE_IDX 0
++#define mmHDP_XDP_P2P_BAR5 0x0139
++#define mmHDP_XDP_P2P_BAR5_BASE_IDX 0
++#define mmHDP_XDP_P2P_BAR6 0x013a
++#define mmHDP_XDP_P2P_BAR6_BASE_IDX 0
++#define mmHDP_XDP_P2P_BAR7 0x013b
++#define mmHDP_XDP_P2P_BAR7_BASE_IDX 0
++#define mmHDP_XDP_FLUSH_ARMED_STS 0x013c
++#define mmHDP_XDP_FLUSH_ARMED_STS_BASE_IDX 0
++#define mmHDP_XDP_FLUSH_CNTR0_STS 0x013d
++#define mmHDP_XDP_FLUSH_CNTR0_STS_BASE_IDX 0
++#define mmHDP_XDP_BUSY_STS 0x013e
++#define mmHDP_XDP_BUSY_STS_BASE_IDX 0
++#define mmHDP_XDP_STICKY 0x013f
++#define mmHDP_XDP_STICKY_BASE_IDX 0
++#define mmHDP_XDP_CHKN 0x0140
++#define mmHDP_XDP_CHKN_BASE_IDX 0
++#define mmHDP_XDP_BARS_ADDR_39_36 0x0144
++#define mmHDP_XDP_BARS_ADDR_39_36_BASE_IDX 0
++#define mmHDP_XDP_MC_VM_FB_LOCATION_BASE 0x0145
++#define mmHDP_XDP_MC_VM_FB_LOCATION_BASE_BASE_IDX 0
++#define mmHDP_XDP_GPU_IOV_VIOLATION_LOG 0x0148
++#define mmHDP_XDP_GPU_IOV_VIOLATION_LOG_BASE_IDX 0
++#define mmHDP_XDP_MMHUB_ERROR 0x0149
++#define mmHDP_XDP_MMHUB_ERROR_BASE_IDX 0
++
++#endif
+diff --git a/drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_4_0_sh_mask.h b/drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_4_0_sh_mask.h
+new file mode 100644
+index 0000000..5861875
+--- /dev/null
++++ b/drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_4_0_sh_mask.h
+@@ -0,0 +1,601 @@
++/*
++ * Copyright (C) 2017 Advanced Micro Devices, Inc.
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a
++ * copy of this software and associated documentation files (the "Software"),
++ * to deal in the Software without restriction, including without limitation
++ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
++ * and/or sell copies of the Software, and to permit persons to whom the
++ * Software is furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included
++ * in all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
++ * THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++#ifndef _hdp_4_0_SH_MASK_HEADER
++#define _hdp_4_0_SH_MASK_HEADER
++
++
++// addressBlock: hdp_hdpdec
++//HDP_MMHUB_TLVL
++#define HDP_MMHUB_TLVL__HDP_WR_TLVL__SHIFT 0x0
++#define HDP_MMHUB_TLVL__HDP_RD_TLVL__SHIFT 0x4
++#define HDP_MMHUB_TLVL__XDP_WR_TLVL__SHIFT 0x8
++#define HDP_MMHUB_TLVL__XDP_RD_TLVL__SHIFT 0xc
++#define HDP_MMHUB_TLVL__XDP_MBX_WR_TLVL__SHIFT 0x10
++#define HDP_MMHUB_TLVL__HDP_WR_TLVL_MASK 0x00000007L
++#define HDP_MMHUB_TLVL__HDP_RD_TLVL_MASK 0x00000070L
++#define HDP_MMHUB_TLVL__XDP_WR_TLVL_MASK 0x00000700L
++#define HDP_MMHUB_TLVL__XDP_RD_TLVL_MASK 0x00007000L
++#define HDP_MMHUB_TLVL__XDP_MBX_WR_TLVL_MASK 0x00070000L
++//HDP_MMHUB_UNITID
++#define HDP_MMHUB_UNITID__HDP_UNITID__SHIFT 0x0
++#define HDP_MMHUB_UNITID__XDP_UNITID__SHIFT 0x8
++#define HDP_MMHUB_UNITID__XDP_MBX_UNITID__SHIFT 0x10
++#define HDP_MMHUB_UNITID__HDP_UNITID_MASK 0x0000003FL
++#define HDP_MMHUB_UNITID__XDP_UNITID_MASK 0x00003F00L
++#define HDP_MMHUB_UNITID__XDP_MBX_UNITID_MASK 0x003F0000L
++//HDP_NONSURFACE_BASE
++#define HDP_NONSURFACE_BASE__NONSURF_BASE_39_8__SHIFT 0x0
++#define HDP_NONSURFACE_BASE__NONSURF_BASE_39_8_MASK 0xFFFFFFFFL
++//HDP_NONSURFACE_INFO
++#define HDP_NONSURFACE_INFO__NONSURF_SWAP__SHIFT 0x4
++#define HDP_NONSURFACE_INFO__NONSURF_VMID__SHIFT 0x8
++#define HDP_NONSURFACE_INFO__NONSURF_SWAP_MASK 0x00000030L
++#define HDP_NONSURFACE_INFO__NONSURF_VMID_MASK 0x00000F00L
++//HDP_NONSURFACE_BASE_HI
++#define HDP_NONSURFACE_BASE_HI__NONSURF_BASE_47_40__SHIFT 0x0
++#define HDP_NONSURFACE_BASE_HI__NONSURF_BASE_47_40_MASK 0x000000FFL
++//HDP_NONSURF_FLAGS
++#define HDP_NONSURF_FLAGS__NONSURF_WRITE_FLAG__SHIFT 0x0
++#define HDP_NONSURF_FLAGS__NONSURF_READ_FLAG__SHIFT 0x1
++#define HDP_NONSURF_FLAGS__NONSURF_WRITE_FLAG_MASK 0x00000001L
++#define HDP_NONSURF_FLAGS__NONSURF_READ_FLAG_MASK 0x00000002L
++//HDP_NONSURF_FLAGS_CLR
++#define HDP_NONSURF_FLAGS_CLR__NONSURF_WRITE_FLAG_CLR__SHIFT 0x0
++#define HDP_NONSURF_FLAGS_CLR__NONSURF_READ_FLAG_CLR__SHIFT 0x1
++#define HDP_NONSURF_FLAGS_CLR__NONSURF_WRITE_FLAG_CLR_MASK 0x00000001L
++#define HDP_NONSURF_FLAGS_CLR__NONSURF_READ_FLAG_CLR_MASK 0x00000002L
++//HDP_HOST_PATH_CNTL
++#define HDP_HOST_PATH_CNTL__WR_STALL_TIMER__SHIFT 0x9
++#define HDP_HOST_PATH_CNTL__RD_STALL_TIMER__SHIFT 0xb
++#define HDP_HOST_PATH_CNTL__WRITE_COMBINE_TIMER_PRELOAD_CFG__SHIFT 0x12
++#define HDP_HOST_PATH_CNTL__WRITE_COMBINE_TIMER__SHIFT 0x13
++#define HDP_HOST_PATH_CNTL__WRITE_COMBINE_EN__SHIFT 0x15
++#define HDP_HOST_PATH_CNTL__WRITE_COMBINE_64B_EN__SHIFT 0x16
++#define HDP_HOST_PATH_CNTL__ALL_SURFACES_DIS__SHIFT 0x1d
++#define HDP_HOST_PATH_CNTL__WRITE_THROUGH_CACHE_DIS__SHIFT 0x1e
++#define HDP_HOST_PATH_CNTL__LIN_RD_CACHE_DIS__SHIFT 0x1f
++#define HDP_HOST_PATH_CNTL__WR_STALL_TIMER_MASK 0x00000600L
++#define HDP_HOST_PATH_CNTL__RD_STALL_TIMER_MASK 0x00001800L
++#define HDP_HOST_PATH_CNTL__WRITE_COMBINE_TIMER_PRELOAD_CFG_MASK 0x00040000L
++#define HDP_HOST_PATH_CNTL__WRITE_COMBINE_TIMER_MASK 0x00180000L
++#define HDP_HOST_PATH_CNTL__WRITE_COMBINE_EN_MASK 0x00200000L
++#define HDP_HOST_PATH_CNTL__WRITE_COMBINE_64B_EN_MASK 0x00400000L
++#define HDP_HOST_PATH_CNTL__ALL_SURFACES_DIS_MASK 0x20000000L
++#define HDP_HOST_PATH_CNTL__WRITE_THROUGH_CACHE_DIS_MASK 0x40000000L
++#define HDP_HOST_PATH_CNTL__LIN_RD_CACHE_DIS_MASK 0x80000000L
++//HDP_SW_SEMAPHORE
++#define HDP_SW_SEMAPHORE__SW_SEMAPHORE__SHIFT 0x0
++#define HDP_SW_SEMAPHORE__SW_SEMAPHORE_MASK 0xFFFFFFFFL
++//HDP_DEBUG0
++#define HDP_DEBUG0__HDP_DEBUG__SHIFT 0x0
++#define HDP_DEBUG0__HDP_DEBUG_MASK 0xFFFFFFFFL
++//HDP_LAST_SURFACE_HIT
++#define HDP_LAST_SURFACE_HIT__LAST_SURFACE_HIT__SHIFT 0x0
++#define HDP_LAST_SURFACE_HIT__LAST_SURFACE_HIT_MASK 0x00000003L
++//HDP_READ_CACHE_INVALIDATE
++#define HDP_READ_CACHE_INVALIDATE__READ_CACHE_INVALIDATE__SHIFT 0x0
++#define HDP_READ_CACHE_INVALIDATE__READ_CACHE_INVALIDATE_MASK 0x00000001L
++//HDP_OUTSTANDING_REQ
++#define HDP_OUTSTANDING_REQ__WRITE_REQ__SHIFT 0x0
++#define HDP_OUTSTANDING_REQ__READ_REQ__SHIFT 0x8
++#define HDP_OUTSTANDING_REQ__WRITE_REQ_MASK 0x000000FFL
++#define HDP_OUTSTANDING_REQ__READ_REQ_MASK 0x0000FF00L
++//HDP_MISC_CNTL
++#define HDP_MISC_CNTL__FLUSH_INVALIDATE_CACHE__SHIFT 0x0
++#define HDP_MISC_CNTL__IDLE_HYSTERESIS_CNTL__SHIFT 0x2
++#define HDP_MISC_CNTL__OUTSTANDING_WRITE_COUNT_1024__SHIFT 0x5
++#define HDP_MISC_CNTL__MULTIPLE_READS__SHIFT 0x6
++#define HDP_MISC_CNTL__SIMULTANEOUS_READS_WRITES__SHIFT 0xb
++#define HDP_MISC_CNTL__FED_ENABLE__SHIFT 0x15
++#define HDP_MISC_CNTL__SYSHUB_CHANNEL_PRIORITY__SHIFT 0x17
++#define HDP_MISC_CNTL__MMHUB_WRBURST_ENABLE__SHIFT 0x18
++#define HDP_MISC_CNTL__ALL_FUNCTION_CACHELINE_INVALID__SHIFT 0x19
++#define HDP_MISC_CNTL__HDP_MMHUB_PENDING_WR_TAG_CHECK__SHIFT 0x1a
++#define HDP_MISC_CNTL__XDP_MMHUB_PENDING_WR_TAG_CHECK__SHIFT 0x1b
++#define HDP_MISC_CNTL__VARIABLE_CACHELINE_SIZE__SHIFT 0x1c
++#define HDP_MISC_CNTL__ADAPTIVE_CACHELINE_SIZE__SHIFT 0x1d
++#define HDP_MISC_CNTL__MMHUB_WRBURST_SIZE__SHIFT 0x1e
++#define HDP_MISC_CNTL__FLUSH_INVALIDATE_CACHE_MASK 0x00000001L
++#define HDP_MISC_CNTL__IDLE_HYSTERESIS_CNTL_MASK 0x0000000CL
++#define HDP_MISC_CNTL__OUTSTANDING_WRITE_COUNT_1024_MASK 0x00000020L
++#define HDP_MISC_CNTL__MULTIPLE_READS_MASK 0x00000040L
++#define HDP_MISC_CNTL__SIMULTANEOUS_READS_WRITES_MASK 0x00000800L
++#define HDP_MISC_CNTL__FED_ENABLE_MASK 0x00200000L
++#define HDP_MISC_CNTL__SYSHUB_CHANNEL_PRIORITY_MASK 0x00800000L
++#define HDP_MISC_CNTL__MMHUB_WRBURST_ENABLE_MASK 0x01000000L
++#define HDP_MISC_CNTL__ALL_FUNCTION_CACHELINE_INVALID_MASK 0x02000000L
++#define HDP_MISC_CNTL__HDP_MMHUB_PENDING_WR_TAG_CHECK_MASK 0x04000000L
++#define HDP_MISC_CNTL__XDP_MMHUB_PENDING_WR_TAG_CHECK_MASK 0x08000000L
++#define HDP_MISC_CNTL__VARIABLE_CACHELINE_SIZE_MASK 0x10000000L
++#define HDP_MISC_CNTL__ADAPTIVE_CACHELINE_SIZE_MASK 0x20000000L
++#define HDP_MISC_CNTL__MMHUB_WRBURST_SIZE_MASK 0x40000000L
++//HDP_MEM_POWER_LS
++#define HDP_MEM_POWER_LS__LS_ENABLE__SHIFT 0x0
++#define HDP_MEM_POWER_LS__LS_HOLD__SHIFT 0x7
++#define HDP_MEM_POWER_LS__LS_ENABLE_MASK 0x00000001L
++#define HDP_MEM_POWER_LS__LS_HOLD_MASK 0x00001F80L
++//HDP_MMHUB_CNTL
++#define HDP_MMHUB_CNTL__HDP_MMHUB_RO__SHIFT 0x0
++#define HDP_MMHUB_CNTL__HDP_MMHUB_GCC__SHIFT 0x1
++#define HDP_MMHUB_CNTL__HDP_MMHUB_SNOOP__SHIFT 0x2
++#define HDP_MMHUB_CNTL__HDP_MMHUB_RO_MASK 0x00000001L
++#define HDP_MMHUB_CNTL__HDP_MMHUB_GCC_MASK 0x00000002L
++#define HDP_MMHUB_CNTL__HDP_MMHUB_SNOOP_MASK 0x00000004L
++//HDP_EDC_CNT
++#define HDP_EDC_CNT__MEM0_SED_COUNT__SHIFT 0x0
++#define HDP_EDC_CNT__MEM1_SED_COUNT__SHIFT 0x2
++#define HDP_EDC_CNT__MEM0_SED_COUNT_MASK 0x00000003L
++#define HDP_EDC_CNT__MEM1_SED_COUNT_MASK 0x0000000CL
++//HDP_VERSION
++#define HDP_VERSION__MINVER__SHIFT 0x0
++#define HDP_VERSION__MAJVER__SHIFT 0x8
++#define HDP_VERSION__REV__SHIFT 0x10
++#define HDP_VERSION__MINVER_MASK 0x000000FFL
++#define HDP_VERSION__MAJVER_MASK 0x0000FF00L
++#define HDP_VERSION__REV_MASK 0x00FF0000L
++//HDP_CLK_CNTL
++#define HDP_CLK_CNTL__REG_CLK_ENABLE_COUNT__SHIFT 0x0
++#define HDP_CLK_CNTL__REG_WAKE_DYN_CLK__SHIFT 0x4
++#define HDP_CLK_CNTL__DBUS_CLK_SOFT_OVERRIDE__SHIFT 0x1c
++#define HDP_CLK_CNTL__DYN_CLK_SOFT_OVERRIDE__SHIFT 0x1d
++#define HDP_CLK_CNTL__XDP_REG_CLK_SOFT_OVERRIDE__SHIFT 0x1e
++#define HDP_CLK_CNTL__HDP_REG_CLK_SOFT_OVERRIDE__SHIFT 0x1f
++#define HDP_CLK_CNTL__REG_CLK_ENABLE_COUNT_MASK 0x0000000FL
++#define HDP_CLK_CNTL__REG_WAKE_DYN_CLK_MASK 0x00000010L
++#define HDP_CLK_CNTL__DBUS_CLK_SOFT_OVERRIDE_MASK 0x10000000L
++#define HDP_CLK_CNTL__DYN_CLK_SOFT_OVERRIDE_MASK 0x20000000L
++#define HDP_CLK_CNTL__XDP_REG_CLK_SOFT_OVERRIDE_MASK 0x40000000L
++#define HDP_CLK_CNTL__HDP_REG_CLK_SOFT_OVERRIDE_MASK 0x80000000L
++//HDP_MEMIO_CNTL
++#define HDP_MEMIO_CNTL__MEMIO_SEND__SHIFT 0x0
++#define HDP_MEMIO_CNTL__MEMIO_OP__SHIFT 0x1
++#define HDP_MEMIO_CNTL__MEMIO_BE__SHIFT 0x2
++#define HDP_MEMIO_CNTL__MEMIO_WR_STROBE__SHIFT 0x6
++#define HDP_MEMIO_CNTL__MEMIO_RD_STROBE__SHIFT 0x7
++#define HDP_MEMIO_CNTL__MEMIO_ADDR_UPPER__SHIFT 0x8
++#define HDP_MEMIO_CNTL__MEMIO_CLR_WR_ERROR__SHIFT 0xe
++#define HDP_MEMIO_CNTL__MEMIO_CLR_RD_ERROR__SHIFT 0xf
++#define HDP_MEMIO_CNTL__MEMIO_VF__SHIFT 0x10
++#define HDP_MEMIO_CNTL__MEMIO_VFID__SHIFT 0x11
++#define HDP_MEMIO_CNTL__MEMIO_SEND_MASK 0x00000001L
++#define HDP_MEMIO_CNTL__MEMIO_OP_MASK 0x00000002L
++#define HDP_MEMIO_CNTL__MEMIO_BE_MASK 0x0000003CL
++#define HDP_MEMIO_CNTL__MEMIO_WR_STROBE_MASK 0x00000040L
++#define HDP_MEMIO_CNTL__MEMIO_RD_STROBE_MASK 0x00000080L
++#define HDP_MEMIO_CNTL__MEMIO_ADDR_UPPER_MASK 0x00003F00L
++#define HDP_MEMIO_CNTL__MEMIO_CLR_WR_ERROR_MASK 0x00004000L
++#define HDP_MEMIO_CNTL__MEMIO_CLR_RD_ERROR_MASK 0x00008000L
++#define HDP_MEMIO_CNTL__MEMIO_VF_MASK 0x00010000L
++#define HDP_MEMIO_CNTL__MEMIO_VFID_MASK 0x003E0000L
++//HDP_MEMIO_ADDR
++#define HDP_MEMIO_ADDR__MEMIO_ADDR_LOWER__SHIFT 0x0
++#define HDP_MEMIO_ADDR__MEMIO_ADDR_LOWER_MASK 0xFFFFFFFFL
++//HDP_MEMIO_STATUS
++#define HDP_MEMIO_STATUS__MEMIO_WR_STATUS__SHIFT 0x0
++#define HDP_MEMIO_STATUS__MEMIO_RD_STATUS__SHIFT 0x1
++#define HDP_MEMIO_STATUS__MEMIO_WR_ERROR__SHIFT 0x2
++#define HDP_MEMIO_STATUS__MEMIO_RD_ERROR__SHIFT 0x3
++#define HDP_MEMIO_STATUS__MEMIO_WR_STATUS_MASK 0x00000001L
++#define HDP_MEMIO_STATUS__MEMIO_RD_STATUS_MASK 0x00000002L
++#define HDP_MEMIO_STATUS__MEMIO_WR_ERROR_MASK 0x00000004L
++#define HDP_MEMIO_STATUS__MEMIO_RD_ERROR_MASK 0x00000008L
++//HDP_MEMIO_WR_DATA
++#define HDP_MEMIO_WR_DATA__MEMIO_WR_DATA__SHIFT 0x0
++#define HDP_MEMIO_WR_DATA__MEMIO_WR_DATA_MASK 0xFFFFFFFFL
++//HDP_MEMIO_RD_DATA
++#define HDP_MEMIO_RD_DATA__MEMIO_RD_DATA__SHIFT 0x0
++#define HDP_MEMIO_RD_DATA__MEMIO_RD_DATA_MASK 0xFFFFFFFFL
++//HDP_XDP_DIRECT2HDP_FIRST
++#define HDP_XDP_DIRECT2HDP_FIRST__RESERVED__SHIFT 0x0
++#define HDP_XDP_DIRECT2HDP_FIRST__RESERVED_MASK 0xFFFFFFFFL
++//HDP_XDP_D2H_FLUSH
++#define HDP_XDP_D2H_FLUSH__D2H_FLUSH_FLUSH_NUM__SHIFT 0x0
++#define HDP_XDP_D2H_FLUSH__D2H_FLUSH_MBX_ENC_DATA__SHIFT 0x4
++#define HDP_XDP_D2H_FLUSH__D2H_FLUSH_MBX_ADDR_SEL__SHIFT 0x8
++#define HDP_XDP_D2H_FLUSH__D2H_FLUSH_XPB_CLG__SHIFT 0xb
++#define HDP_XDP_D2H_FLUSH__D2H_FLUSH_SEND_HOST__SHIFT 0x10
++#define HDP_XDP_D2H_FLUSH__D2H_FLUSH_ALTER_FLUSH_NUM__SHIFT 0x12
++#define HDP_XDP_D2H_FLUSH__D2H_FLUSH_RSVD_0__SHIFT 0x13
++#define HDP_XDP_D2H_FLUSH__D2H_FLUSH_RSVD_1__SHIFT 0x14
++#define HDP_XDP_D2H_FLUSH__D2H_FLUSH_FLUSH_NUM_MASK 0x0000000FL
++#define HDP_XDP_D2H_FLUSH__D2H_FLUSH_MBX_ENC_DATA_MASK 0x000000F0L
++#define HDP_XDP_D2H_FLUSH__D2H_FLUSH_MBX_ADDR_SEL_MASK 0x00000700L
++#define HDP_XDP_D2H_FLUSH__D2H_FLUSH_XPB_CLG_MASK 0x0000F800L
++#define HDP_XDP_D2H_FLUSH__D2H_FLUSH_SEND_HOST_MASK 0x00010000L
++#define HDP_XDP_D2H_FLUSH__D2H_FLUSH_ALTER_FLUSH_NUM_MASK 0x00040000L
++#define HDP_XDP_D2H_FLUSH__D2H_FLUSH_RSVD_0_MASK 0x00080000L
++#define HDP_XDP_D2H_FLUSH__D2H_FLUSH_RSVD_1_MASK 0x00100000L
++//HDP_XDP_D2H_BAR_UPDATE
++#define HDP_XDP_D2H_BAR_UPDATE__D2H_BAR_UPDATE_ADDR__SHIFT 0x0
++#define HDP_XDP_D2H_BAR_UPDATE__D2H_BAR_UPDATE_FLUSH_NUM__SHIFT 0x10
++#define HDP_XDP_D2H_BAR_UPDATE__D2H_BAR_UPDATE_BAR_NUM__SHIFT 0x14
++#define HDP_XDP_D2H_BAR_UPDATE__D2H_BAR_UPDATE_ADDR_MASK 0x0000FFFFL
++#define HDP_XDP_D2H_BAR_UPDATE__D2H_BAR_UPDATE_FLUSH_NUM_MASK 0x000F0000L
++#define HDP_XDP_D2H_BAR_UPDATE__D2H_BAR_UPDATE_BAR_NUM_MASK 0x00700000L
++//HDP_XDP_D2H_RSVD_3
++#define HDP_XDP_D2H_RSVD_3__RESERVED__SHIFT 0x0
++#define HDP_XDP_D2H_RSVD_3__RESERVED_MASK 0xFFFFFFFFL
++//HDP_XDP_D2H_RSVD_4
++#define HDP_XDP_D2H_RSVD_4__RESERVED__SHIFT 0x0
++#define HDP_XDP_D2H_RSVD_4__RESERVED_MASK 0xFFFFFFFFL
++//HDP_XDP_D2H_RSVD_5
++#define HDP_XDP_D2H_RSVD_5__RESERVED__SHIFT 0x0
++#define HDP_XDP_D2H_RSVD_5__RESERVED_MASK 0xFFFFFFFFL
++//HDP_XDP_D2H_RSVD_6
++#define HDP_XDP_D2H_RSVD_6__RESERVED__SHIFT 0x0
++#define HDP_XDP_D2H_RSVD_6__RESERVED_MASK 0xFFFFFFFFL
++//HDP_XDP_D2H_RSVD_7
++#define HDP_XDP_D2H_RSVD_7__RESERVED__SHIFT 0x0
++#define HDP_XDP_D2H_RSVD_7__RESERVED_MASK 0xFFFFFFFFL
++//HDP_XDP_D2H_RSVD_8
++#define HDP_XDP_D2H_RSVD_8__RESERVED__SHIFT 0x0
++#define HDP_XDP_D2H_RSVD_8__RESERVED_MASK 0xFFFFFFFFL
++//HDP_XDP_D2H_RSVD_9
++#define HDP_XDP_D2H_RSVD_9__RESERVED__SHIFT 0x0
++#define HDP_XDP_D2H_RSVD_9__RESERVED_MASK 0xFFFFFFFFL
++//HDP_XDP_D2H_RSVD_10
++#define HDP_XDP_D2H_RSVD_10__RESERVED__SHIFT 0x0
++#define HDP_XDP_D2H_RSVD_10__RESERVED_MASK 0xFFFFFFFFL
++//HDP_XDP_D2H_RSVD_11
++#define HDP_XDP_D2H_RSVD_11__RESERVED__SHIFT 0x0
++#define HDP_XDP_D2H_RSVD_11__RESERVED_MASK 0xFFFFFFFFL
++//HDP_XDP_D2H_RSVD_12
++#define HDP_XDP_D2H_RSVD_12__RESERVED__SHIFT 0x0
++#define HDP_XDP_D2H_RSVD_12__RESERVED_MASK 0xFFFFFFFFL
++//HDP_XDP_D2H_RSVD_13
++#define HDP_XDP_D2H_RSVD_13__RESERVED__SHIFT 0x0
++#define HDP_XDP_D2H_RSVD_13__RESERVED_MASK 0xFFFFFFFFL
++//HDP_XDP_D2H_RSVD_14
++#define HDP_XDP_D2H_RSVD_14__RESERVED__SHIFT 0x0
++#define HDP_XDP_D2H_RSVD_14__RESERVED_MASK 0xFFFFFFFFL
++//HDP_XDP_D2H_RSVD_15
++#define HDP_XDP_D2H_RSVD_15__RESERVED__SHIFT 0x0
++#define HDP_XDP_D2H_RSVD_15__RESERVED_MASK 0xFFFFFFFFL
++//HDP_XDP_D2H_RSVD_16
++#define HDP_XDP_D2H_RSVD_16__RESERVED__SHIFT 0x0
++#define HDP_XDP_D2H_RSVD_16__RESERVED_MASK 0xFFFFFFFFL
++//HDP_XDP_D2H_RSVD_17
++#define HDP_XDP_D2H_RSVD_17__RESERVED__SHIFT 0x0
++#define HDP_XDP_D2H_RSVD_17__RESERVED_MASK 0xFFFFFFFFL
++//HDP_XDP_D2H_RSVD_18
++#define HDP_XDP_D2H_RSVD_18__RESERVED__SHIFT 0x0
++#define HDP_XDP_D2H_RSVD_18__RESERVED_MASK 0xFFFFFFFFL
++//HDP_XDP_D2H_RSVD_19
++#define HDP_XDP_D2H_RSVD_19__RESERVED__SHIFT 0x0
++#define HDP_XDP_D2H_RSVD_19__RESERVED_MASK 0xFFFFFFFFL
++//HDP_XDP_D2H_RSVD_20
++#define HDP_XDP_D2H_RSVD_20__RESERVED__SHIFT 0x0
++#define HDP_XDP_D2H_RSVD_20__RESERVED_MASK 0xFFFFFFFFL
++//HDP_XDP_D2H_RSVD_21
++#define HDP_XDP_D2H_RSVD_21__RESERVED__SHIFT 0x0
++#define HDP_XDP_D2H_RSVD_21__RESERVED_MASK 0xFFFFFFFFL
++//HDP_XDP_D2H_RSVD_22
++#define HDP_XDP_D2H_RSVD_22__RESERVED__SHIFT 0x0
++#define HDP_XDP_D2H_RSVD_22__RESERVED_MASK 0xFFFFFFFFL
++//HDP_XDP_D2H_RSVD_23
++#define HDP_XDP_D2H_RSVD_23__RESERVED__SHIFT 0x0
++#define HDP_XDP_D2H_RSVD_23__RESERVED_MASK 0xFFFFFFFFL
++//HDP_XDP_D2H_RSVD_24
++#define HDP_XDP_D2H_RSVD_24__RESERVED__SHIFT 0x0
++#define HDP_XDP_D2H_RSVD_24__RESERVED_MASK 0xFFFFFFFFL
++//HDP_XDP_D2H_RSVD_25
++#define HDP_XDP_D2H_RSVD_25__RESERVED__SHIFT 0x0
++#define HDP_XDP_D2H_RSVD_25__RESERVED_MASK 0xFFFFFFFFL
++//HDP_XDP_D2H_RSVD_26
++#define HDP_XDP_D2H_RSVD_26__RESERVED__SHIFT 0x0
++#define HDP_XDP_D2H_RSVD_26__RESERVED_MASK 0xFFFFFFFFL
++//HDP_XDP_D2H_RSVD_27
++#define HDP_XDP_D2H_RSVD_27__RESERVED__SHIFT 0x0
++#define HDP_XDP_D2H_RSVD_27__RESERVED_MASK 0xFFFFFFFFL
++//HDP_XDP_D2H_RSVD_28
++#define HDP_XDP_D2H_RSVD_28__RESERVED__SHIFT 0x0
++#define HDP_XDP_D2H_RSVD_28__RESERVED_MASK 0xFFFFFFFFL
++//HDP_XDP_D2H_RSVD_29
++#define HDP_XDP_D2H_RSVD_29__RESERVED__SHIFT 0x0
++#define HDP_XDP_D2H_RSVD_29__RESERVED_MASK 0xFFFFFFFFL
++//HDP_XDP_D2H_RSVD_30
++#define HDP_XDP_D2H_RSVD_30__RESERVED__SHIFT 0x0
++#define HDP_XDP_D2H_RSVD_30__RESERVED_MASK 0xFFFFFFFFL
++//HDP_XDP_D2H_RSVD_31
++#define HDP_XDP_D2H_RSVD_31__RESERVED__SHIFT 0x0
++#define HDP_XDP_D2H_RSVD_31__RESERVED_MASK 0xFFFFFFFFL
++//HDP_XDP_D2H_RSVD_32
++#define HDP_XDP_D2H_RSVD_32__RESERVED__SHIFT 0x0
++#define HDP_XDP_D2H_RSVD_32__RESERVED_MASK 0xFFFFFFFFL
++//HDP_XDP_D2H_RSVD_33
++#define HDP_XDP_D2H_RSVD_33__RESERVED__SHIFT 0x0
++#define HDP_XDP_D2H_RSVD_33__RESERVED_MASK 0xFFFFFFFFL
++//HDP_XDP_D2H_RSVD_34
++#define HDP_XDP_D2H_RSVD_34__RESERVED__SHIFT 0x0
++#define HDP_XDP_D2H_RSVD_34__RESERVED_MASK 0xFFFFFFFFL
++//HDP_XDP_DIRECT2HDP_LAST
++#define HDP_XDP_DIRECT2HDP_LAST__RESERVED__SHIFT 0x0
++#define HDP_XDP_DIRECT2HDP_LAST__RESERVED_MASK 0xFFFFFFFFL
++//HDP_XDP_P2P_BAR_CFG
++#define HDP_XDP_P2P_BAR_CFG__P2P_BAR_CFG_ADDR_SIZE__SHIFT 0x0
++#define HDP_XDP_P2P_BAR_CFG__P2P_BAR_CFG_BAR_FROM__SHIFT 0x4
++#define HDP_XDP_P2P_BAR_CFG__P2P_BAR_CFG_ADDR_SIZE_MASK 0x0000000FL
++#define HDP_XDP_P2P_BAR_CFG__P2P_BAR_CFG_BAR_FROM_MASK 0x00000030L
++//HDP_XDP_P2P_MBX_OFFSET
++#define HDP_XDP_P2P_MBX_OFFSET__P2P_MBX_OFFSET__SHIFT 0x0
++#define HDP_XDP_P2P_MBX_OFFSET__P2P_MBX_OFFSET_MASK 0x0001FFFFL
++//HDP_XDP_P2P_MBX_ADDR0
++#define HDP_XDP_P2P_MBX_ADDR0__VALID__SHIFT 0x0
++#define HDP_XDP_P2P_MBX_ADDR0__ADDR_35_19__SHIFT 0x3
++#define HDP_XDP_P2P_MBX_ADDR0__ADDR_39_36__SHIFT 0x14
++#define HDP_XDP_P2P_MBX_ADDR0__ADDR_47_40__SHIFT 0x18
++#define HDP_XDP_P2P_MBX_ADDR0__VALID_MASK 0x00000001L
++#define HDP_XDP_P2P_MBX_ADDR0__ADDR_35_19_MASK 0x000FFFF8L
++#define HDP_XDP_P2P_MBX_ADDR0__ADDR_39_36_MASK 0x00F00000L
++#define HDP_XDP_P2P_MBX_ADDR0__ADDR_47_40_MASK 0xFF000000L
++//HDP_XDP_P2P_MBX_ADDR1
++#define HDP_XDP_P2P_MBX_ADDR1__VALID__SHIFT 0x0
++#define HDP_XDP_P2P_MBX_ADDR1__ADDR_35_19__SHIFT 0x3
++#define HDP_XDP_P2P_MBX_ADDR1__ADDR_39_36__SHIFT 0x14
++#define HDP_XDP_P2P_MBX_ADDR1__ADDR_47_40__SHIFT 0x18
++#define HDP_XDP_P2P_MBX_ADDR1__VALID_MASK 0x00000001L
++#define HDP_XDP_P2P_MBX_ADDR1__ADDR_35_19_MASK 0x000FFFF8L
++#define HDP_XDP_P2P_MBX_ADDR1__ADDR_39_36_MASK 0x00F00000L
++#define HDP_XDP_P2P_MBX_ADDR1__ADDR_47_40_MASK 0xFF000000L
++//HDP_XDP_P2P_MBX_ADDR2
++#define HDP_XDP_P2P_MBX_ADDR2__VALID__SHIFT 0x0
++#define HDP_XDP_P2P_MBX_ADDR2__ADDR_35_19__SHIFT 0x3
++#define HDP_XDP_P2P_MBX_ADDR2__ADDR_39_36__SHIFT 0x14
++#define HDP_XDP_P2P_MBX_ADDR2__ADDR_47_40__SHIFT 0x18
++#define HDP_XDP_P2P_MBX_ADDR2__VALID_MASK 0x00000001L
++#define HDP_XDP_P2P_MBX_ADDR2__ADDR_35_19_MASK 0x000FFFF8L
++#define HDP_XDP_P2P_MBX_ADDR2__ADDR_39_36_MASK 0x00F00000L
++#define HDP_XDP_P2P_MBX_ADDR2__ADDR_47_40_MASK 0xFF000000L
++//HDP_XDP_P2P_MBX_ADDR3
++#define HDP_XDP_P2P_MBX_ADDR3__VALID__SHIFT 0x0
++#define HDP_XDP_P2P_MBX_ADDR3__ADDR_35_19__SHIFT 0x3
++#define HDP_XDP_P2P_MBX_ADDR3__ADDR_39_36__SHIFT 0x14
++#define HDP_XDP_P2P_MBX_ADDR3__ADDR_47_40__SHIFT 0x18
++#define HDP_XDP_P2P_MBX_ADDR3__VALID_MASK 0x00000001L
++#define HDP_XDP_P2P_MBX_ADDR3__ADDR_35_19_MASK 0x000FFFF8L
++#define HDP_XDP_P2P_MBX_ADDR3__ADDR_39_36_MASK 0x00F00000L
++#define HDP_XDP_P2P_MBX_ADDR3__ADDR_47_40_MASK 0xFF000000L
++//HDP_XDP_P2P_MBX_ADDR4
++#define HDP_XDP_P2P_MBX_ADDR4__VALID__SHIFT 0x0
++#define HDP_XDP_P2P_MBX_ADDR4__ADDR_35_19__SHIFT 0x3
++#define HDP_XDP_P2P_MBX_ADDR4__ADDR_39_36__SHIFT 0x14
++#define HDP_XDP_P2P_MBX_ADDR4__ADDR_47_40__SHIFT 0x18
++#define HDP_XDP_P2P_MBX_ADDR4__VALID_MASK 0x00000001L
++#define HDP_XDP_P2P_MBX_ADDR4__ADDR_35_19_MASK 0x000FFFF8L
++#define HDP_XDP_P2P_MBX_ADDR4__ADDR_39_36_MASK 0x00F00000L
++#define HDP_XDP_P2P_MBX_ADDR4__ADDR_47_40_MASK 0xFF000000L
++//HDP_XDP_P2P_MBX_ADDR5
++#define HDP_XDP_P2P_MBX_ADDR5__VALID__SHIFT 0x0
++#define HDP_XDP_P2P_MBX_ADDR5__ADDR_35_19__SHIFT 0x3
++#define HDP_XDP_P2P_MBX_ADDR5__ADDR_39_36__SHIFT 0x14
++#define HDP_XDP_P2P_MBX_ADDR5__ADDR_47_40__SHIFT 0x18
++#define HDP_XDP_P2P_MBX_ADDR5__VALID_MASK 0x00000001L
++#define HDP_XDP_P2P_MBX_ADDR5__ADDR_35_19_MASK 0x000FFFF8L
++#define HDP_XDP_P2P_MBX_ADDR5__ADDR_39_36_MASK 0x00F00000L
++#define HDP_XDP_P2P_MBX_ADDR5__ADDR_47_40_MASK 0xFF000000L
++//HDP_XDP_P2P_MBX_ADDR6
++#define HDP_XDP_P2P_MBX_ADDR6__VALID__SHIFT 0x0
++#define HDP_XDP_P2P_MBX_ADDR6__ADDR_35_19__SHIFT 0x3
++#define HDP_XDP_P2P_MBX_ADDR6__ADDR_39_36__SHIFT 0x14
++#define HDP_XDP_P2P_MBX_ADDR6__ADDR_47_40__SHIFT 0x18
++#define HDP_XDP_P2P_MBX_ADDR6__VALID_MASK 0x00000001L
++#define HDP_XDP_P2P_MBX_ADDR6__ADDR_35_19_MASK 0x000FFFF8L
++#define HDP_XDP_P2P_MBX_ADDR6__ADDR_39_36_MASK 0x00F00000L
++#define HDP_XDP_P2P_MBX_ADDR6__ADDR_47_40_MASK 0xFF000000L
++//HDP_XDP_HDP_MBX_MC_CFG
++#define HDP_XDP_HDP_MBX_MC_CFG__HDP_MBX_MC_CFG_TAP_WRREQ_QOS__SHIFT 0x0
++#define HDP_XDP_HDP_MBX_MC_CFG__HDP_MBX_MC_CFG_TAP_WRREQ_SWAP__SHIFT 0x4
++#define HDP_XDP_HDP_MBX_MC_CFG__HDP_MBX_MC_CFG_TAP_WRREQ_VMID__SHIFT 0x8
++#define HDP_XDP_HDP_MBX_MC_CFG__HDP_MBX_MC_CFG_TAP_WRREQ_RO__SHIFT 0xc
++#define HDP_XDP_HDP_MBX_MC_CFG__HDP_MBX_MC_CFG_TAP_WRREQ_GCC__SHIFT 0xd
++#define HDP_XDP_HDP_MBX_MC_CFG__HDP_MBX_MC_CFG_TAP_WRREQ_SNOOP__SHIFT 0xe
++#define HDP_XDP_HDP_MBX_MC_CFG__HDP_MBX_MC_CFG_TAP_WRREQ_QOS_MASK 0x0000000FL
++#define HDP_XDP_HDP_MBX_MC_CFG__HDP_MBX_MC_CFG_TAP_WRREQ_SWAP_MASK 0x00000030L
++#define HDP_XDP_HDP_MBX_MC_CFG__HDP_MBX_MC_CFG_TAP_WRREQ_VMID_MASK 0x00000F00L
++#define HDP_XDP_HDP_MBX_MC_CFG__HDP_MBX_MC_CFG_TAP_WRREQ_RO_MASK 0x00001000L
++#define HDP_XDP_HDP_MBX_MC_CFG__HDP_MBX_MC_CFG_TAP_WRREQ_GCC_MASK 0x00002000L
++#define HDP_XDP_HDP_MBX_MC_CFG__HDP_MBX_MC_CFG_TAP_WRREQ_SNOOP_MASK 0x00004000L
++//HDP_XDP_HDP_MC_CFG
++#define HDP_XDP_HDP_MC_CFG__HDP_MC_CFG_HST_TAP_REQ_SNOOP__SHIFT 0x3
++#define HDP_XDP_HDP_MC_CFG__HDP_MC_CFG_HST_TAP_REQ_SWAP__SHIFT 0x4
++#define HDP_XDP_HDP_MC_CFG__HDP_MC_CFG_HST_TAP_REQ_VMID__SHIFT 0x8
++#define HDP_XDP_HDP_MC_CFG__HDP_MC_CFG_HST_TAP_REQ_RO__SHIFT 0xc
++#define HDP_XDP_HDP_MC_CFG__HDP_MC_CFG_HST_TAP_REQ_GCC__SHIFT 0xd
++#define HDP_XDP_HDP_MC_CFG__HDP_MC_CFG_XDP_HIGHER_PRI_THRESH__SHIFT 0xe
++#define HDP_XDP_HDP_MC_CFG__HDP_MC_CFG_HST_TAP_REQ_SNOOP_MASK 0x00000008L
++#define HDP_XDP_HDP_MC_CFG__HDP_MC_CFG_HST_TAP_REQ_SWAP_MASK 0x00000030L
++#define HDP_XDP_HDP_MC_CFG__HDP_MC_CFG_HST_TAP_REQ_VMID_MASK 0x00000F00L
++#define HDP_XDP_HDP_MC_CFG__HDP_MC_CFG_HST_TAP_REQ_RO_MASK 0x00001000L
++#define HDP_XDP_HDP_MC_CFG__HDP_MC_CFG_HST_TAP_REQ_GCC_MASK 0x00002000L
++#define HDP_XDP_HDP_MC_CFG__HDP_MC_CFG_XDP_HIGHER_PRI_THRESH_MASK 0x000FC000L
++//HDP_XDP_HST_CFG
++#define HDP_XDP_HST_CFG__HST_CFG_WR_COMBINE_EN__SHIFT 0x0
++#define HDP_XDP_HST_CFG__HST_CFG_WR_COMBINE_TIMER__SHIFT 0x1
++#define HDP_XDP_HST_CFG__HST_CFG_WR_BURST_EN__SHIFT 0x3
++#define HDP_XDP_HST_CFG__HST_CFG_WR_COMBINE_64B_EN__SHIFT 0x4
++#define HDP_XDP_HST_CFG__HST_CFG_WR_COMBINE_TIMER_PRELOAD_CFG__SHIFT 0x5
++#define HDP_XDP_HST_CFG__HST_CFG_WR_COMBINE_EN_MASK 0x00000001L
++#define HDP_XDP_HST_CFG__HST_CFG_WR_COMBINE_TIMER_MASK 0x00000006L
++#define HDP_XDP_HST_CFG__HST_CFG_WR_BURST_EN_MASK 0x00000008L
++#define HDP_XDP_HST_CFG__HST_CFG_WR_COMBINE_64B_EN_MASK 0x00000010L
++#define HDP_XDP_HST_CFG__HST_CFG_WR_COMBINE_TIMER_PRELOAD_CFG_MASK 0x00000020L
++//HDP_XDP_HDP_IPH_CFG
++#define HDP_XDP_HDP_IPH_CFG__HDP_IPH_CFG_SYS_FIFO_DEPTH_OVERRIDE__SHIFT 0x0
++#define HDP_XDP_HDP_IPH_CFG__HDP_IPH_CFG_XDP_FIFO_DEPTH_OVERRIDE__SHIFT 0x6
++#define HDP_XDP_HDP_IPH_CFG__HDP_IPH_CFG_INVERSE_PEER_TAG_MATCHING__SHIFT 0xc
++#define HDP_XDP_HDP_IPH_CFG__HDP_IPH_CFG_P2P_RD_EN__SHIFT 0xd
++#define HDP_XDP_HDP_IPH_CFG__HDP_IPH_CFG_SYS_FIFO_DEPTH_OVERRIDE_MASK 0x0000003FL
++#define HDP_XDP_HDP_IPH_CFG__HDP_IPH_CFG_XDP_FIFO_DEPTH_OVERRIDE_MASK 0x00000FC0L
++#define HDP_XDP_HDP_IPH_CFG__HDP_IPH_CFG_INVERSE_PEER_TAG_MATCHING_MASK 0x00001000L
++#define HDP_XDP_HDP_IPH_CFG__HDP_IPH_CFG_P2P_RD_EN_MASK 0x00002000L
++//HDP_XDP_P2P_BAR0
++#define HDP_XDP_P2P_BAR0__ADDR__SHIFT 0x0
++#define HDP_XDP_P2P_BAR0__FLUSH__SHIFT 0x10
++#define HDP_XDP_P2P_BAR0__VALID__SHIFT 0x14
++#define HDP_XDP_P2P_BAR0__ADDR_MASK 0x0000FFFFL
++#define HDP_XDP_P2P_BAR0__FLUSH_MASK 0x000F0000L
++#define HDP_XDP_P2P_BAR0__VALID_MASK 0x00100000L
++//HDP_XDP_P2P_BAR1
++#define HDP_XDP_P2P_BAR1__ADDR__SHIFT 0x0
++#define HDP_XDP_P2P_BAR1__FLUSH__SHIFT 0x10
++#define HDP_XDP_P2P_BAR1__VALID__SHIFT 0x14
++#define HDP_XDP_P2P_BAR1__ADDR_MASK 0x0000FFFFL
++#define HDP_XDP_P2P_BAR1__FLUSH_MASK 0x000F0000L
++#define HDP_XDP_P2P_BAR1__VALID_MASK 0x00100000L
++//HDP_XDP_P2P_BAR2
++#define HDP_XDP_P2P_BAR2__ADDR__SHIFT 0x0
++#define HDP_XDP_P2P_BAR2__FLUSH__SHIFT 0x10
++#define HDP_XDP_P2P_BAR2__VALID__SHIFT 0x14
++#define HDP_XDP_P2P_BAR2__ADDR_MASK 0x0000FFFFL
++#define HDP_XDP_P2P_BAR2__FLUSH_MASK 0x000F0000L
++#define HDP_XDP_P2P_BAR2__VALID_MASK 0x00100000L
++//HDP_XDP_P2P_BAR3
++#define HDP_XDP_P2P_BAR3__ADDR__SHIFT 0x0
++#define HDP_XDP_P2P_BAR3__FLUSH__SHIFT 0x10
++#define HDP_XDP_P2P_BAR3__VALID__SHIFT 0x14
++#define HDP_XDP_P2P_BAR3__ADDR_MASK 0x0000FFFFL
++#define HDP_XDP_P2P_BAR3__FLUSH_MASK 0x000F0000L
++#define HDP_XDP_P2P_BAR3__VALID_MASK 0x00100000L
++//HDP_XDP_P2P_BAR4
++#define HDP_XDP_P2P_BAR4__ADDR__SHIFT 0x0
++#define HDP_XDP_P2P_BAR4__FLUSH__SHIFT 0x10
++#define HDP_XDP_P2P_BAR4__VALID__SHIFT 0x14
++#define HDP_XDP_P2P_BAR4__ADDR_MASK 0x0000FFFFL
++#define HDP_XDP_P2P_BAR4__FLUSH_MASK 0x000F0000L
++#define HDP_XDP_P2P_BAR4__VALID_MASK 0x00100000L
++//HDP_XDP_P2P_BAR5
++#define HDP_XDP_P2P_BAR5__ADDR__SHIFT 0x0
++#define HDP_XDP_P2P_BAR5__FLUSH__SHIFT 0x10
++#define HDP_XDP_P2P_BAR5__VALID__SHIFT 0x14
++#define HDP_XDP_P2P_BAR5__ADDR_MASK 0x0000FFFFL
++#define HDP_XDP_P2P_BAR5__FLUSH_MASK 0x000F0000L
++#define HDP_XDP_P2P_BAR5__VALID_MASK 0x00100000L
++//HDP_XDP_P2P_BAR6
++#define HDP_XDP_P2P_BAR6__ADDR__SHIFT 0x0
++#define HDP_XDP_P2P_BAR6__FLUSH__SHIFT 0x10
++#define HDP_XDP_P2P_BAR6__VALID__SHIFT 0x14
++#define HDP_XDP_P2P_BAR6__ADDR_MASK 0x0000FFFFL
++#define HDP_XDP_P2P_BAR6__FLUSH_MASK 0x000F0000L
++#define HDP_XDP_P2P_BAR6__VALID_MASK 0x00100000L
++//HDP_XDP_P2P_BAR7
++#define HDP_XDP_P2P_BAR7__ADDR__SHIFT 0x0
++#define HDP_XDP_P2P_BAR7__FLUSH__SHIFT 0x10
++#define HDP_XDP_P2P_BAR7__VALID__SHIFT 0x14
++#define HDP_XDP_P2P_BAR7__ADDR_MASK 0x0000FFFFL
++#define HDP_XDP_P2P_BAR7__FLUSH_MASK 0x000F0000L
++#define HDP_XDP_P2P_BAR7__VALID_MASK 0x00100000L
++//HDP_XDP_FLUSH_ARMED_STS
++#define HDP_XDP_FLUSH_ARMED_STS__FLUSH_ARMED_STS__SHIFT 0x0
++#define HDP_XDP_FLUSH_ARMED_STS__FLUSH_ARMED_STS_MASK 0xFFFFFFFFL
++//HDP_XDP_FLUSH_CNTR0_STS
++#define HDP_XDP_FLUSH_CNTR0_STS__FLUSH_CNTR0_STS__SHIFT 0x0
++#define HDP_XDP_FLUSH_CNTR0_STS__FLUSH_CNTR0_STS_MASK 0x03FFFFFFL
++//HDP_XDP_BUSY_STS
++#define HDP_XDP_BUSY_STS__BUSY_BITS__SHIFT 0x0
++#define HDP_XDP_BUSY_STS__BUSY_BITS_MASK 0x0003FFFFL
++//HDP_XDP_STICKY
++#define HDP_XDP_STICKY__STICKY_STS__SHIFT 0x0
++#define HDP_XDP_STICKY__STICKY_W1C__SHIFT 0x10
++#define HDP_XDP_STICKY__STICKY_STS_MASK 0x0000FFFFL
++#define HDP_XDP_STICKY__STICKY_W1C_MASK 0xFFFF0000L
++//HDP_XDP_CHKN
++#define HDP_XDP_CHKN__CHKN_0_RSVD__SHIFT 0x0
++#define HDP_XDP_CHKN__CHKN_1_RSVD__SHIFT 0x8
++#define HDP_XDP_CHKN__CHKN_2_RSVD__SHIFT 0x10
++#define HDP_XDP_CHKN__CHKN_3_RSVD__SHIFT 0x18
++#define HDP_XDP_CHKN__CHKN_0_RSVD_MASK 0x000000FFL
++#define HDP_XDP_CHKN__CHKN_1_RSVD_MASK 0x0000FF00L
++#define HDP_XDP_CHKN__CHKN_2_RSVD_MASK 0x00FF0000L
++#define HDP_XDP_CHKN__CHKN_3_RSVD_MASK 0xFF000000L
++//HDP_XDP_BARS_ADDR_39_36
++#define HDP_XDP_BARS_ADDR_39_36__BAR0_ADDR_39_36__SHIFT 0x0
++#define HDP_XDP_BARS_ADDR_39_36__BAR1_ADDR_39_36__SHIFT 0x4
++#define HDP_XDP_BARS_ADDR_39_36__BAR2_ADDR_39_36__SHIFT 0x8
++#define HDP_XDP_BARS_ADDR_39_36__BAR3_ADDR_39_36__SHIFT 0xc
++#define HDP_XDP_BARS_ADDR_39_36__BAR4_ADDR_39_36__SHIFT 0x10
++#define HDP_XDP_BARS_ADDR_39_36__BAR5_ADDR_39_36__SHIFT 0x14
++#define HDP_XDP_BARS_ADDR_39_36__BAR6_ADDR_39_36__SHIFT 0x18
++#define HDP_XDP_BARS_ADDR_39_36__BAR7_ADDR_39_36__SHIFT 0x1c
++#define HDP_XDP_BARS_ADDR_39_36__BAR0_ADDR_39_36_MASK 0x0000000FL
++#define HDP_XDP_BARS_ADDR_39_36__BAR1_ADDR_39_36_MASK 0x000000F0L
++#define HDP_XDP_BARS_ADDR_39_36__BAR2_ADDR_39_36_MASK 0x00000F00L
++#define HDP_XDP_BARS_ADDR_39_36__BAR3_ADDR_39_36_MASK 0x0000F000L
++#define HDP_XDP_BARS_ADDR_39_36__BAR4_ADDR_39_36_MASK 0x000F0000L
++#define HDP_XDP_BARS_ADDR_39_36__BAR5_ADDR_39_36_MASK 0x00F00000L
++#define HDP_XDP_BARS_ADDR_39_36__BAR6_ADDR_39_36_MASK 0x0F000000L
++#define HDP_XDP_BARS_ADDR_39_36__BAR7_ADDR_39_36_MASK 0xF0000000L
++//HDP_XDP_MC_VM_FB_LOCATION_BASE
++#define HDP_XDP_MC_VM_FB_LOCATION_BASE__FB_BASE__SHIFT 0x0
++#define HDP_XDP_MC_VM_FB_LOCATION_BASE__FB_BASE_MASK 0x03FFFFFFL
++//HDP_XDP_GPU_IOV_VIOLATION_LOG
++#define HDP_XDP_GPU_IOV_VIOLATION_LOG__VIOLATION_STATUS__SHIFT 0x0
++#define HDP_XDP_GPU_IOV_VIOLATION_LOG__MULTIPLE_VIOLATION_STATUS__SHIFT 0x1
++#define HDP_XDP_GPU_IOV_VIOLATION_LOG__ADDRESS__SHIFT 0x2
++#define HDP_XDP_GPU_IOV_VIOLATION_LOG__OPCODE__SHIFT 0x12
++#define HDP_XDP_GPU_IOV_VIOLATION_LOG__VF__SHIFT 0x13
++#define HDP_XDP_GPU_IOV_VIOLATION_LOG__VFID__SHIFT 0x14
++#define HDP_XDP_GPU_IOV_VIOLATION_LOG__INITIATOR_ID__SHIFT 0x18
++#define HDP_XDP_GPU_IOV_VIOLATION_LOG__VIOLATION_STATUS_MASK 0x00000001L
++#define HDP_XDP_GPU_IOV_VIOLATION_LOG__MULTIPLE_VIOLATION_STATUS_MASK 0x00000002L
++#define HDP_XDP_GPU_IOV_VIOLATION_LOG__ADDRESS_MASK 0x0003FFFCL
++#define HDP_XDP_GPU_IOV_VIOLATION_LOG__OPCODE_MASK 0x00040000L
++#define HDP_XDP_GPU_IOV_VIOLATION_LOG__VF_MASK 0x00080000L
++#define HDP_XDP_GPU_IOV_VIOLATION_LOG__VFID_MASK 0x00F00000L
++#define HDP_XDP_GPU_IOV_VIOLATION_LOG__INITIATOR_ID_MASK 0xFF000000L
++//HDP_XDP_MMHUB_ERROR
++#define HDP_XDP_MMHUB_ERROR__HDP_BRESP_01__SHIFT 0x1
++#define HDP_XDP_MMHUB_ERROR__HDP_BRESP_10__SHIFT 0x2
++#define HDP_XDP_MMHUB_ERROR__HDP_BRESP_11__SHIFT 0x3
++#define HDP_XDP_MMHUB_ERROR__HDP_BUSER_NACK_01__SHIFT 0x5
++#define HDP_XDP_MMHUB_ERROR__HDP_BUSER_NACK_10__SHIFT 0x6
++#define HDP_XDP_MMHUB_ERROR__HDP_BUSER_NACK_11__SHIFT 0x7
++#define HDP_XDP_MMHUB_ERROR__HDP_RRESP_01__SHIFT 0x9
++#define HDP_XDP_MMHUB_ERROR__HDP_RRESP_10__SHIFT 0xa
++#define HDP_XDP_MMHUB_ERROR__HDP_RRESP_11__SHIFT 0xb
++#define HDP_XDP_MMHUB_ERROR__HDP_RUSER_NACK_01__SHIFT 0xd
++#define HDP_XDP_MMHUB_ERROR__HDP_RUSER_NACK_10__SHIFT 0xe
++#define HDP_XDP_MMHUB_ERROR__HDP_RUSER_NACK_11__SHIFT 0xf
++#define HDP_XDP_MMHUB_ERROR__XDP_BRESP_01__SHIFT 0x11
++#define HDP_XDP_MMHUB_ERROR__XDP_BRESP_10__SHIFT 0x12
++#define HDP_XDP_MMHUB_ERROR__XDP_BRESP_11__SHIFT 0x13
++#define HDP_XDP_MMHUB_ERROR__XDP_BUSER_NACK_01__SHIFT 0x15
++#define HDP_XDP_MMHUB_ERROR__XDP_BUSER_NACK_10__SHIFT 0x16
++#define HDP_XDP_MMHUB_ERROR__XDP_BUSER_NACK_11__SHIFT 0x17
++#define HDP_XDP_MMHUB_ERROR__HDP_BRESP_01_MASK 0x00000002L
++#define HDP_XDP_MMHUB_ERROR__HDP_BRESP_10_MASK 0x00000004L
++#define HDP_XDP_MMHUB_ERROR__HDP_BRESP_11_MASK 0x00000008L
++#define HDP_XDP_MMHUB_ERROR__HDP_BUSER_NACK_01_MASK 0x00000020L
++#define HDP_XDP_MMHUB_ERROR__HDP_BUSER_NACK_10_MASK 0x00000040L
++#define HDP_XDP_MMHUB_ERROR__HDP_BUSER_NACK_11_MASK 0x00000080L
++#define HDP_XDP_MMHUB_ERROR__HDP_RRESP_01_MASK 0x00000200L
++#define HDP_XDP_MMHUB_ERROR__HDP_RRESP_10_MASK 0x00000400L
++#define HDP_XDP_MMHUB_ERROR__HDP_RRESP_11_MASK 0x00000800L
++#define HDP_XDP_MMHUB_ERROR__HDP_RUSER_NACK_01_MASK 0x00002000L
++#define HDP_XDP_MMHUB_ERROR__HDP_RUSER_NACK_10_MASK 0x00004000L
++#define HDP_XDP_MMHUB_ERROR__HDP_RUSER_NACK_11_MASK 0x00008000L
++#define HDP_XDP_MMHUB_ERROR__XDP_BRESP_01_MASK 0x00020000L
++#define HDP_XDP_MMHUB_ERROR__XDP_BRESP_10_MASK 0x00040000L
++#define HDP_XDP_MMHUB_ERROR__XDP_BRESP_11_MASK 0x00080000L
++#define HDP_XDP_MMHUB_ERROR__XDP_BUSER_NACK_01_MASK 0x00200000L
++#define HDP_XDP_MMHUB_ERROR__XDP_BUSER_NACK_10_MASK 0x00400000L
++#define HDP_XDP_MMHUB_ERROR__XDP_BUSER_NACK_11_MASK 0x00800000L
++
++#endif
+diff --git a/drivers/gpu/drm/amd/include/asic_reg/vega10/HDP/hdp_4_0_default.h b/drivers/gpu/drm/amd/include/asic_reg/vega10/HDP/hdp_4_0_default.h
+deleted file mode 100644
+index 864690c..0000000
+--- a/drivers/gpu/drm/amd/include/asic_reg/vega10/HDP/hdp_4_0_default.h
++++ /dev/null
+@@ -1,117 +0,0 @@
+-/*
+- * Copyright (C) 2017 Advanced Micro Devices, Inc.
+- *
+- * Permission is hereby granted, free of charge, to any person obtaining a
+- * copy of this software and associated documentation files (the "Software"),
+- * to deal in the Software without restriction, including without limitation
+- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+- * and/or sell copies of the Software, and to permit persons to whom the
+- * Software is furnished to do so, subject to the following conditions:
+- *
+- * The above copyright notice and this permission notice shall be included
+- * in all copies or substantial portions of the Software.
+- *
+- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+- * THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+- */
+-#ifndef _hdp_4_0_DEFAULT_HEADER
+-#define _hdp_4_0_DEFAULT_HEADER
+-
+-
+-// addressBlock: hdp_hdpdec
+-#define mmHDP_MMHUB_TLVL_DEFAULT 0x00006666
+-#define mmHDP_MMHUB_UNITID_DEFAULT 0x00000000
+-#define mmHDP_NONSURFACE_BASE_DEFAULT 0x00000000
+-#define mmHDP_NONSURFACE_INFO_DEFAULT 0x00000000
+-#define mmHDP_NONSURFACE_BASE_HI_DEFAULT 0x00000000
+-#define mmHDP_NONSURF_FLAGS_DEFAULT 0x00000000
+-#define mmHDP_NONSURF_FLAGS_CLR_DEFAULT 0x00000000
+-#define mmHDP_HOST_PATH_CNTL_DEFAULT 0x00680000
+-#define mmHDP_SW_SEMAPHORE_DEFAULT 0x00000000
+-#define mmHDP_DEBUG0_DEFAULT 0x00000000
+-#define mmHDP_LAST_SURFACE_HIT_DEFAULT 0x00000003
+-#define mmHDP_READ_CACHE_INVALIDATE_DEFAULT 0x00000000
+-#define mmHDP_OUTSTANDING_REQ_DEFAULT 0x00000000
+-#define mmHDP_MISC_CNTL_DEFAULT 0x2d200861
+-#define mmHDP_MEM_POWER_LS_DEFAULT 0x00000901
+-#define mmHDP_MMHUB_CNTL_DEFAULT 0x00000000
+-#define mmHDP_EDC_CNT_DEFAULT 0x00000000
+-#define mmHDP_VERSION_DEFAULT 0x00000400
+-#define mmHDP_CLK_CNTL_DEFAULT 0x0000000f
+-#define mmHDP_MEMIO_CNTL_DEFAULT 0x00000000
+-#define mmHDP_MEMIO_ADDR_DEFAULT 0x00000000
+-#define mmHDP_MEMIO_STATUS_DEFAULT 0x00000000
+-#define mmHDP_MEMIO_WR_DATA_DEFAULT 0x00000000
+-#define mmHDP_MEMIO_RD_DATA_DEFAULT 0xdeadbeef
+-#define mmHDP_XDP_DIRECT2HDP_FIRST_DEFAULT 0x00000000
+-#define mmHDP_XDP_D2H_FLUSH_DEFAULT 0x00000000
+-#define mmHDP_XDP_D2H_BAR_UPDATE_DEFAULT 0x00000000
+-#define mmHDP_XDP_D2H_RSVD_3_DEFAULT 0x00000000
+-#define mmHDP_XDP_D2H_RSVD_4_DEFAULT 0x00000000
+-#define mmHDP_XDP_D2H_RSVD_5_DEFAULT 0x00000000
+-#define mmHDP_XDP_D2H_RSVD_6_DEFAULT 0x00000000
+-#define mmHDP_XDP_D2H_RSVD_7_DEFAULT 0x00000000
+-#define mmHDP_XDP_D2H_RSVD_8_DEFAULT 0x00000000
+-#define mmHDP_XDP_D2H_RSVD_9_DEFAULT 0x00000000
+-#define mmHDP_XDP_D2H_RSVD_10_DEFAULT 0x00000000
+-#define mmHDP_XDP_D2H_RSVD_11_DEFAULT 0x00000000
+-#define mmHDP_XDP_D2H_RSVD_12_DEFAULT 0x00000000
+-#define mmHDP_XDP_D2H_RSVD_13_DEFAULT 0x00000000
+-#define mmHDP_XDP_D2H_RSVD_14_DEFAULT 0x00000000
+-#define mmHDP_XDP_D2H_RSVD_15_DEFAULT 0x00000000
+-#define mmHDP_XDP_D2H_RSVD_16_DEFAULT 0x00000000
+-#define mmHDP_XDP_D2H_RSVD_17_DEFAULT 0x00000000
+-#define mmHDP_XDP_D2H_RSVD_18_DEFAULT 0x00000000
+-#define mmHDP_XDP_D2H_RSVD_19_DEFAULT 0x00000000
+-#define mmHDP_XDP_D2H_RSVD_20_DEFAULT 0x00000000
+-#define mmHDP_XDP_D2H_RSVD_21_DEFAULT 0x00000000
+-#define mmHDP_XDP_D2H_RSVD_22_DEFAULT 0x00000000
+-#define mmHDP_XDP_D2H_RSVD_23_DEFAULT 0x00000000
+-#define mmHDP_XDP_D2H_RSVD_24_DEFAULT 0x00000000
+-#define mmHDP_XDP_D2H_RSVD_25_DEFAULT 0x00000000
+-#define mmHDP_XDP_D2H_RSVD_26_DEFAULT 0x00000000
+-#define mmHDP_XDP_D2H_RSVD_27_DEFAULT 0x00000000
+-#define mmHDP_XDP_D2H_RSVD_28_DEFAULT 0x00000000
+-#define mmHDP_XDP_D2H_RSVD_29_DEFAULT 0x00000000
+-#define mmHDP_XDP_D2H_RSVD_30_DEFAULT 0x00000000
+-#define mmHDP_XDP_D2H_RSVD_31_DEFAULT 0x00000000
+-#define mmHDP_XDP_D2H_RSVD_32_DEFAULT 0x00000000
+-#define mmHDP_XDP_D2H_RSVD_33_DEFAULT 0x00000000
+-#define mmHDP_XDP_D2H_RSVD_34_DEFAULT 0x00000000
+-#define mmHDP_XDP_DIRECT2HDP_LAST_DEFAULT 0x00000000
+-#define mmHDP_XDP_P2P_BAR_CFG_DEFAULT 0x0000000f
+-#define mmHDP_XDP_P2P_MBX_OFFSET_DEFAULT 0x000011bc
+-#define mmHDP_XDP_P2P_MBX_ADDR0_DEFAULT 0x00000000
+-#define mmHDP_XDP_P2P_MBX_ADDR1_DEFAULT 0x00000000
+-#define mmHDP_XDP_P2P_MBX_ADDR2_DEFAULT 0x00000000
+-#define mmHDP_XDP_P2P_MBX_ADDR3_DEFAULT 0x00000000
+-#define mmHDP_XDP_P2P_MBX_ADDR4_DEFAULT 0x00000000
+-#define mmHDP_XDP_P2P_MBX_ADDR5_DEFAULT 0x00000000
+-#define mmHDP_XDP_P2P_MBX_ADDR6_DEFAULT 0x00000000
+-#define mmHDP_XDP_HDP_MBX_MC_CFG_DEFAULT 0x00000000
+-#define mmHDP_XDP_HDP_MC_CFG_DEFAULT 0x00020000
+-#define mmHDP_XDP_HST_CFG_DEFAULT 0x0000001b
+-#define mmHDP_XDP_HDP_IPH_CFG_DEFAULT 0x00000000
+-#define mmHDP_XDP_P2P_BAR0_DEFAULT 0x00000000
+-#define mmHDP_XDP_P2P_BAR1_DEFAULT 0x00000000
+-#define mmHDP_XDP_P2P_BAR2_DEFAULT 0x00000000
+-#define mmHDP_XDP_P2P_BAR3_DEFAULT 0x00000000
+-#define mmHDP_XDP_P2P_BAR4_DEFAULT 0x00000000
+-#define mmHDP_XDP_P2P_BAR5_DEFAULT 0x00000000
+-#define mmHDP_XDP_P2P_BAR6_DEFAULT 0x00000000
+-#define mmHDP_XDP_P2P_BAR7_DEFAULT 0x00000000
+-#define mmHDP_XDP_FLUSH_ARMED_STS_DEFAULT 0x00000000
+-#define mmHDP_XDP_FLUSH_CNTR0_STS_DEFAULT 0x00000000
+-#define mmHDP_XDP_BUSY_STS_DEFAULT 0x00000000
+-#define mmHDP_XDP_STICKY_DEFAULT 0x00000000
+-#define mmHDP_XDP_CHKN_DEFAULT 0x48584450
+-#define mmHDP_XDP_BARS_ADDR_39_36_DEFAULT 0x00000000
+-#define mmHDP_XDP_MC_VM_FB_LOCATION_BASE_DEFAULT 0x00000000
+-#define mmHDP_XDP_GPU_IOV_VIOLATION_LOG_DEFAULT 0x00000000
+-#define mmHDP_XDP_MMHUB_ERROR_DEFAULT 0x00000000
+-
+-#endif
+diff --git a/drivers/gpu/drm/amd/include/asic_reg/vega10/HDP/hdp_4_0_offset.h b/drivers/gpu/drm/amd/include/asic_reg/vega10/HDP/hdp_4_0_offset.h
+deleted file mode 100644
+index fbad771..0000000
+--- a/drivers/gpu/drm/amd/include/asic_reg/vega10/HDP/hdp_4_0_offset.h
++++ /dev/null
+@@ -1,209 +0,0 @@
+-/*
+- * Copyright (C) 2017 Advanced Micro Devices, Inc.
+- *
+- * Permission is hereby granted, free of charge, to any person obtaining a
+- * copy of this software and associated documentation files (the "Software"),
+- * to deal in the Software without restriction, including without limitation
+- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+- * and/or sell copies of the Software, and to permit persons to whom the
+- * Software is furnished to do so, subject to the following conditions:
+- *
+- * The above copyright notice and this permission notice shall be included
+- * in all copies or substantial portions of the Software.
+- *
+- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+- * THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+- */
+-#ifndef _hdp_4_0_OFFSET_HEADER
+-#define _hdp_4_0_OFFSET_HEADER
+-
+-
+-
+-// addressBlock: hdp_hdpdec
+-// base address: 0x3c80
+-#define mmHDP_MMHUB_TLVL 0x0000
+-#define mmHDP_MMHUB_TLVL_BASE_IDX 0
+-#define mmHDP_MMHUB_UNITID 0x0001
+-#define mmHDP_MMHUB_UNITID_BASE_IDX 0
+-#define mmHDP_NONSURFACE_BASE 0x0040
+-#define mmHDP_NONSURFACE_BASE_BASE_IDX 0
+-#define mmHDP_NONSURFACE_INFO 0x0041
+-#define mmHDP_NONSURFACE_INFO_BASE_IDX 0
+-#define mmHDP_NONSURFACE_BASE_HI 0x0042
+-#define mmHDP_NONSURFACE_BASE_HI_BASE_IDX 0
+-#define mmHDP_NONSURF_FLAGS 0x00c8
+-#define mmHDP_NONSURF_FLAGS_BASE_IDX 0
+-#define mmHDP_NONSURF_FLAGS_CLR 0x00c9
+-#define mmHDP_NONSURF_FLAGS_CLR_BASE_IDX 0
+-#define mmHDP_HOST_PATH_CNTL 0x00cc
+-#define mmHDP_HOST_PATH_CNTL_BASE_IDX 0
+-#define mmHDP_SW_SEMAPHORE 0x00cd
+-#define mmHDP_SW_SEMAPHORE_BASE_IDX 0
+-#define mmHDP_DEBUG0 0x00ce
+-#define mmHDP_DEBUG0_BASE_IDX 0
+-#define mmHDP_LAST_SURFACE_HIT 0x00d0
+-#define mmHDP_LAST_SURFACE_HIT_BASE_IDX 0
+-#define mmHDP_READ_CACHE_INVALIDATE 0x00d1
+-#define mmHDP_READ_CACHE_INVALIDATE_BASE_IDX 0
+-#define mmHDP_OUTSTANDING_REQ 0x00d2
+-#define mmHDP_OUTSTANDING_REQ_BASE_IDX 0
+-#define mmHDP_MISC_CNTL 0x00d3
+-#define mmHDP_MISC_CNTL_BASE_IDX 0
+-#define mmHDP_MEM_POWER_LS 0x00d4
+-#define mmHDP_MEM_POWER_LS_BASE_IDX 0
+-#define mmHDP_MMHUB_CNTL 0x00d5
+-#define mmHDP_MMHUB_CNTL_BASE_IDX 0
+-#define mmHDP_EDC_CNT 0x00d6
+-#define mmHDP_EDC_CNT_BASE_IDX 0
+-#define mmHDP_VERSION 0x00d7
+-#define mmHDP_VERSION_BASE_IDX 0
+-#define mmHDP_CLK_CNTL 0x00d8
+-#define mmHDP_CLK_CNTL_BASE_IDX 0
+-#define mmHDP_MEMIO_CNTL 0x00f6
+-#define mmHDP_MEMIO_CNTL_BASE_IDX 0
+-#define mmHDP_MEMIO_ADDR 0x00f7
+-#define mmHDP_MEMIO_ADDR_BASE_IDX 0
+-#define mmHDP_MEMIO_STATUS 0x00f8
+-#define mmHDP_MEMIO_STATUS_BASE_IDX 0
+-#define mmHDP_MEMIO_WR_DATA 0x00f9
+-#define mmHDP_MEMIO_WR_DATA_BASE_IDX 0
+-#define mmHDP_MEMIO_RD_DATA 0x00fa
+-#define mmHDP_MEMIO_RD_DATA_BASE_IDX 0
+-#define mmHDP_XDP_DIRECT2HDP_FIRST 0x0100
+-#define mmHDP_XDP_DIRECT2HDP_FIRST_BASE_IDX 0
+-#define mmHDP_XDP_D2H_FLUSH 0x0101
+-#define mmHDP_XDP_D2H_FLUSH_BASE_IDX 0
+-#define mmHDP_XDP_D2H_BAR_UPDATE 0x0102
+-#define mmHDP_XDP_D2H_BAR_UPDATE_BASE_IDX 0
+-#define mmHDP_XDP_D2H_RSVD_3 0x0103
+-#define mmHDP_XDP_D2H_RSVD_3_BASE_IDX 0
+-#define mmHDP_XDP_D2H_RSVD_4 0x0104
+-#define mmHDP_XDP_D2H_RSVD_4_BASE_IDX 0
+-#define mmHDP_XDP_D2H_RSVD_5 0x0105
+-#define mmHDP_XDP_D2H_RSVD_5_BASE_IDX 0
+-#define mmHDP_XDP_D2H_RSVD_6 0x0106
+-#define mmHDP_XDP_D2H_RSVD_6_BASE_IDX 0
+-#define mmHDP_XDP_D2H_RSVD_7 0x0107
+-#define mmHDP_XDP_D2H_RSVD_7_BASE_IDX 0
+-#define mmHDP_XDP_D2H_RSVD_8 0x0108
+-#define mmHDP_XDP_D2H_RSVD_8_BASE_IDX 0
+-#define mmHDP_XDP_D2H_RSVD_9 0x0109
+-#define mmHDP_XDP_D2H_RSVD_9_BASE_IDX 0
+-#define mmHDP_XDP_D2H_RSVD_10 0x010a
+-#define mmHDP_XDP_D2H_RSVD_10_BASE_IDX 0
+-#define mmHDP_XDP_D2H_RSVD_11 0x010b
+-#define mmHDP_XDP_D2H_RSVD_11_BASE_IDX 0
+-#define mmHDP_XDP_D2H_RSVD_12 0x010c
+-#define mmHDP_XDP_D2H_RSVD_12_BASE_IDX 0
+-#define mmHDP_XDP_D2H_RSVD_13 0x010d
+-#define mmHDP_XDP_D2H_RSVD_13_BASE_IDX 0
+-#define mmHDP_XDP_D2H_RSVD_14 0x010e
+-#define mmHDP_XDP_D2H_RSVD_14_BASE_IDX 0
+-#define mmHDP_XDP_D2H_RSVD_15 0x010f
+-#define mmHDP_XDP_D2H_RSVD_15_BASE_IDX 0
+-#define mmHDP_XDP_D2H_RSVD_16 0x0110
+-#define mmHDP_XDP_D2H_RSVD_16_BASE_IDX 0
+-#define mmHDP_XDP_D2H_RSVD_17 0x0111
+-#define mmHDP_XDP_D2H_RSVD_17_BASE_IDX 0
+-#define mmHDP_XDP_D2H_RSVD_18 0x0112
+-#define mmHDP_XDP_D2H_RSVD_18_BASE_IDX 0
+-#define mmHDP_XDP_D2H_RSVD_19 0x0113
+-#define mmHDP_XDP_D2H_RSVD_19_BASE_IDX 0
+-#define mmHDP_XDP_D2H_RSVD_20 0x0114
+-#define mmHDP_XDP_D2H_RSVD_20_BASE_IDX 0
+-#define mmHDP_XDP_D2H_RSVD_21 0x0115
+-#define mmHDP_XDP_D2H_RSVD_21_BASE_IDX 0
+-#define mmHDP_XDP_D2H_RSVD_22 0x0116
+-#define mmHDP_XDP_D2H_RSVD_22_BASE_IDX 0
+-#define mmHDP_XDP_D2H_RSVD_23 0x0117
+-#define mmHDP_XDP_D2H_RSVD_23_BASE_IDX 0
+-#define mmHDP_XDP_D2H_RSVD_24 0x0118
+-#define mmHDP_XDP_D2H_RSVD_24_BASE_IDX 0
+-#define mmHDP_XDP_D2H_RSVD_25 0x0119
+-#define mmHDP_XDP_D2H_RSVD_25_BASE_IDX 0
+-#define mmHDP_XDP_D2H_RSVD_26 0x011a
+-#define mmHDP_XDP_D2H_RSVD_26_BASE_IDX 0
+-#define mmHDP_XDP_D2H_RSVD_27 0x011b
+-#define mmHDP_XDP_D2H_RSVD_27_BASE_IDX 0
+-#define mmHDP_XDP_D2H_RSVD_28 0x011c
+-#define mmHDP_XDP_D2H_RSVD_28_BASE_IDX 0
+-#define mmHDP_XDP_D2H_RSVD_29 0x011d
+-#define mmHDP_XDP_D2H_RSVD_29_BASE_IDX 0
+-#define mmHDP_XDP_D2H_RSVD_30 0x011e
+-#define mmHDP_XDP_D2H_RSVD_30_BASE_IDX 0
+-#define mmHDP_XDP_D2H_RSVD_31 0x011f
+-#define mmHDP_XDP_D2H_RSVD_31_BASE_IDX 0
+-#define mmHDP_XDP_D2H_RSVD_32 0x0120
+-#define mmHDP_XDP_D2H_RSVD_32_BASE_IDX 0
+-#define mmHDP_XDP_D2H_RSVD_33 0x0121
+-#define mmHDP_XDP_D2H_RSVD_33_BASE_IDX 0
+-#define mmHDP_XDP_D2H_RSVD_34 0x0122
+-#define mmHDP_XDP_D2H_RSVD_34_BASE_IDX 0
+-#define mmHDP_XDP_DIRECT2HDP_LAST 0x0123
+-#define mmHDP_XDP_DIRECT2HDP_LAST_BASE_IDX 0
+-#define mmHDP_XDP_P2P_BAR_CFG 0x0124
+-#define mmHDP_XDP_P2P_BAR_CFG_BASE_IDX 0
+-#define mmHDP_XDP_P2P_MBX_OFFSET 0x0125
+-#define mmHDP_XDP_P2P_MBX_OFFSET_BASE_IDX 0
+-#define mmHDP_XDP_P2P_MBX_ADDR0 0x0126
+-#define mmHDP_XDP_P2P_MBX_ADDR0_BASE_IDX 0
+-#define mmHDP_XDP_P2P_MBX_ADDR1 0x0127
+-#define mmHDP_XDP_P2P_MBX_ADDR1_BASE_IDX 0
+-#define mmHDP_XDP_P2P_MBX_ADDR2 0x0128
+-#define mmHDP_XDP_P2P_MBX_ADDR2_BASE_IDX 0
+-#define mmHDP_XDP_P2P_MBX_ADDR3 0x0129
+-#define mmHDP_XDP_P2P_MBX_ADDR3_BASE_IDX 0
+-#define mmHDP_XDP_P2P_MBX_ADDR4 0x012a
+-#define mmHDP_XDP_P2P_MBX_ADDR4_BASE_IDX 0
+-#define mmHDP_XDP_P2P_MBX_ADDR5 0x012b
+-#define mmHDP_XDP_P2P_MBX_ADDR5_BASE_IDX 0
+-#define mmHDP_XDP_P2P_MBX_ADDR6 0x012c
+-#define mmHDP_XDP_P2P_MBX_ADDR6_BASE_IDX 0
+-#define mmHDP_XDP_HDP_MBX_MC_CFG 0x012d
+-#define mmHDP_XDP_HDP_MBX_MC_CFG_BASE_IDX 0
+-#define mmHDP_XDP_HDP_MC_CFG 0x012e
+-#define mmHDP_XDP_HDP_MC_CFG_BASE_IDX 0
+-#define mmHDP_XDP_HST_CFG 0x012f
+-#define mmHDP_XDP_HST_CFG_BASE_IDX 0
+-#define mmHDP_XDP_HDP_IPH_CFG 0x0131
+-#define mmHDP_XDP_HDP_IPH_CFG_BASE_IDX 0
+-#define mmHDP_XDP_P2P_BAR0 0x0134
+-#define mmHDP_XDP_P2P_BAR0_BASE_IDX 0
+-#define mmHDP_XDP_P2P_BAR1 0x0135
+-#define mmHDP_XDP_P2P_BAR1_BASE_IDX 0
+-#define mmHDP_XDP_P2P_BAR2 0x0136
+-#define mmHDP_XDP_P2P_BAR2_BASE_IDX 0
+-#define mmHDP_XDP_P2P_BAR3 0x0137
+-#define mmHDP_XDP_P2P_BAR3_BASE_IDX 0
+-#define mmHDP_XDP_P2P_BAR4 0x0138
+-#define mmHDP_XDP_P2P_BAR4_BASE_IDX 0
+-#define mmHDP_XDP_P2P_BAR5 0x0139
+-#define mmHDP_XDP_P2P_BAR5_BASE_IDX 0
+-#define mmHDP_XDP_P2P_BAR6 0x013a
+-#define mmHDP_XDP_P2P_BAR6_BASE_IDX 0
+-#define mmHDP_XDP_P2P_BAR7 0x013b
+-#define mmHDP_XDP_P2P_BAR7_BASE_IDX 0
+-#define mmHDP_XDP_FLUSH_ARMED_STS 0x013c
+-#define mmHDP_XDP_FLUSH_ARMED_STS_BASE_IDX 0
+-#define mmHDP_XDP_FLUSH_CNTR0_STS 0x013d
+-#define mmHDP_XDP_FLUSH_CNTR0_STS_BASE_IDX 0
+-#define mmHDP_XDP_BUSY_STS 0x013e
+-#define mmHDP_XDP_BUSY_STS_BASE_IDX 0
+-#define mmHDP_XDP_STICKY 0x013f
+-#define mmHDP_XDP_STICKY_BASE_IDX 0
+-#define mmHDP_XDP_CHKN 0x0140
+-#define mmHDP_XDP_CHKN_BASE_IDX 0
+-#define mmHDP_XDP_BARS_ADDR_39_36 0x0144
+-#define mmHDP_XDP_BARS_ADDR_39_36_BASE_IDX 0
+-#define mmHDP_XDP_MC_VM_FB_LOCATION_BASE 0x0145
+-#define mmHDP_XDP_MC_VM_FB_LOCATION_BASE_BASE_IDX 0
+-#define mmHDP_XDP_GPU_IOV_VIOLATION_LOG 0x0148
+-#define mmHDP_XDP_GPU_IOV_VIOLATION_LOG_BASE_IDX 0
+-#define mmHDP_XDP_MMHUB_ERROR 0x0149
+-#define mmHDP_XDP_MMHUB_ERROR_BASE_IDX 0
+-
+-#endif
+diff --git a/drivers/gpu/drm/amd/include/asic_reg/vega10/HDP/hdp_4_0_sh_mask.h b/drivers/gpu/drm/amd/include/asic_reg/vega10/HDP/hdp_4_0_sh_mask.h
+deleted file mode 100644
+index 5861875..0000000
+--- a/drivers/gpu/drm/amd/include/asic_reg/vega10/HDP/hdp_4_0_sh_mask.h
++++ /dev/null
+@@ -1,601 +0,0 @@
+-/*
+- * Copyright (C) 2017 Advanced Micro Devices, Inc.
+- *
+- * Permission is hereby granted, free of charge, to any person obtaining a
+- * copy of this software and associated documentation files (the "Software"),
+- * to deal in the Software without restriction, including without limitation
+- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+- * and/or sell copies of the Software, and to permit persons to whom the
+- * Software is furnished to do so, subject to the following conditions:
+- *
+- * The above copyright notice and this permission notice shall be included
+- * in all copies or substantial portions of the Software.
+- *
+- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+- * THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+- */
+-#ifndef _hdp_4_0_SH_MASK_HEADER
+-#define _hdp_4_0_SH_MASK_HEADER
+-
+-
+-// addressBlock: hdp_hdpdec
+-//HDP_MMHUB_TLVL
+-#define HDP_MMHUB_TLVL__HDP_WR_TLVL__SHIFT 0x0
+-#define HDP_MMHUB_TLVL__HDP_RD_TLVL__SHIFT 0x4
+-#define HDP_MMHUB_TLVL__XDP_WR_TLVL__SHIFT 0x8
+-#define HDP_MMHUB_TLVL__XDP_RD_TLVL__SHIFT 0xc
+-#define HDP_MMHUB_TLVL__XDP_MBX_WR_TLVL__SHIFT 0x10
+-#define HDP_MMHUB_TLVL__HDP_WR_TLVL_MASK 0x00000007L
+-#define HDP_MMHUB_TLVL__HDP_RD_TLVL_MASK 0x00000070L
+-#define HDP_MMHUB_TLVL__XDP_WR_TLVL_MASK 0x00000700L
+-#define HDP_MMHUB_TLVL__XDP_RD_TLVL_MASK 0x00007000L
+-#define HDP_MMHUB_TLVL__XDP_MBX_WR_TLVL_MASK 0x00070000L
+-//HDP_MMHUB_UNITID
+-#define HDP_MMHUB_UNITID__HDP_UNITID__SHIFT 0x0
+-#define HDP_MMHUB_UNITID__XDP_UNITID__SHIFT 0x8
+-#define HDP_MMHUB_UNITID__XDP_MBX_UNITID__SHIFT 0x10
+-#define HDP_MMHUB_UNITID__HDP_UNITID_MASK 0x0000003FL
+-#define HDP_MMHUB_UNITID__XDP_UNITID_MASK 0x00003F00L
+-#define HDP_MMHUB_UNITID__XDP_MBX_UNITID_MASK 0x003F0000L
+-//HDP_NONSURFACE_BASE
+-#define HDP_NONSURFACE_BASE__NONSURF_BASE_39_8__SHIFT 0x0
+-#define HDP_NONSURFACE_BASE__NONSURF_BASE_39_8_MASK 0xFFFFFFFFL
+-//HDP_NONSURFACE_INFO
+-#define HDP_NONSURFACE_INFO__NONSURF_SWAP__SHIFT 0x4
+-#define HDP_NONSURFACE_INFO__NONSURF_VMID__SHIFT 0x8
+-#define HDP_NONSURFACE_INFO__NONSURF_SWAP_MASK 0x00000030L
+-#define HDP_NONSURFACE_INFO__NONSURF_VMID_MASK 0x00000F00L
+-//HDP_NONSURFACE_BASE_HI
+-#define HDP_NONSURFACE_BASE_HI__NONSURF_BASE_47_40__SHIFT 0x0
+-#define HDP_NONSURFACE_BASE_HI__NONSURF_BASE_47_40_MASK 0x000000FFL
+-//HDP_NONSURF_FLAGS
+-#define HDP_NONSURF_FLAGS__NONSURF_WRITE_FLAG__SHIFT 0x0
+-#define HDP_NONSURF_FLAGS__NONSURF_READ_FLAG__SHIFT 0x1
+-#define HDP_NONSURF_FLAGS__NONSURF_WRITE_FLAG_MASK 0x00000001L
+-#define HDP_NONSURF_FLAGS__NONSURF_READ_FLAG_MASK 0x00000002L
+-//HDP_NONSURF_FLAGS_CLR
+-#define HDP_NONSURF_FLAGS_CLR__NONSURF_WRITE_FLAG_CLR__SHIFT 0x0
+-#define HDP_NONSURF_FLAGS_CLR__NONSURF_READ_FLAG_CLR__SHIFT 0x1
+-#define HDP_NONSURF_FLAGS_CLR__NONSURF_WRITE_FLAG_CLR_MASK 0x00000001L
+-#define HDP_NONSURF_FLAGS_CLR__NONSURF_READ_FLAG_CLR_MASK 0x00000002L
+-//HDP_HOST_PATH_CNTL
+-#define HDP_HOST_PATH_CNTL__WR_STALL_TIMER__SHIFT 0x9
+-#define HDP_HOST_PATH_CNTL__RD_STALL_TIMER__SHIFT 0xb
+-#define HDP_HOST_PATH_CNTL__WRITE_COMBINE_TIMER_PRELOAD_CFG__SHIFT 0x12
+-#define HDP_HOST_PATH_CNTL__WRITE_COMBINE_TIMER__SHIFT 0x13
+-#define HDP_HOST_PATH_CNTL__WRITE_COMBINE_EN__SHIFT 0x15
+-#define HDP_HOST_PATH_CNTL__WRITE_COMBINE_64B_EN__SHIFT 0x16
+-#define HDP_HOST_PATH_CNTL__ALL_SURFACES_DIS__SHIFT 0x1d
+-#define HDP_HOST_PATH_CNTL__WRITE_THROUGH_CACHE_DIS__SHIFT 0x1e
+-#define HDP_HOST_PATH_CNTL__LIN_RD_CACHE_DIS__SHIFT 0x1f
+-#define HDP_HOST_PATH_CNTL__WR_STALL_TIMER_MASK 0x00000600L
+-#define HDP_HOST_PATH_CNTL__RD_STALL_TIMER_MASK 0x00001800L
+-#define HDP_HOST_PATH_CNTL__WRITE_COMBINE_TIMER_PRELOAD_CFG_MASK 0x00040000L
+-#define HDP_HOST_PATH_CNTL__WRITE_COMBINE_TIMER_MASK 0x00180000L
+-#define HDP_HOST_PATH_CNTL__WRITE_COMBINE_EN_MASK 0x00200000L
+-#define HDP_HOST_PATH_CNTL__WRITE_COMBINE_64B_EN_MASK 0x00400000L
+-#define HDP_HOST_PATH_CNTL__ALL_SURFACES_DIS_MASK 0x20000000L
+-#define HDP_HOST_PATH_CNTL__WRITE_THROUGH_CACHE_DIS_MASK 0x40000000L
+-#define HDP_HOST_PATH_CNTL__LIN_RD_CACHE_DIS_MASK 0x80000000L
+-//HDP_SW_SEMAPHORE
+-#define HDP_SW_SEMAPHORE__SW_SEMAPHORE__SHIFT 0x0
+-#define HDP_SW_SEMAPHORE__SW_SEMAPHORE_MASK 0xFFFFFFFFL
+-//HDP_DEBUG0
+-#define HDP_DEBUG0__HDP_DEBUG__SHIFT 0x0
+-#define HDP_DEBUG0__HDP_DEBUG_MASK 0xFFFFFFFFL
+-//HDP_LAST_SURFACE_HIT
+-#define HDP_LAST_SURFACE_HIT__LAST_SURFACE_HIT__SHIFT 0x0
+-#define HDP_LAST_SURFACE_HIT__LAST_SURFACE_HIT_MASK 0x00000003L
+-//HDP_READ_CACHE_INVALIDATE
+-#define HDP_READ_CACHE_INVALIDATE__READ_CACHE_INVALIDATE__SHIFT 0x0
+-#define HDP_READ_CACHE_INVALIDATE__READ_CACHE_INVALIDATE_MASK 0x00000001L
+-//HDP_OUTSTANDING_REQ
+-#define HDP_OUTSTANDING_REQ__WRITE_REQ__SHIFT 0x0
+-#define HDP_OUTSTANDING_REQ__READ_REQ__SHIFT 0x8
+-#define HDP_OUTSTANDING_REQ__WRITE_REQ_MASK 0x000000FFL
+-#define HDP_OUTSTANDING_REQ__READ_REQ_MASK 0x0000FF00L
+-//HDP_MISC_CNTL
+-#define HDP_MISC_CNTL__FLUSH_INVALIDATE_CACHE__SHIFT 0x0
+-#define HDP_MISC_CNTL__IDLE_HYSTERESIS_CNTL__SHIFT 0x2
+-#define HDP_MISC_CNTL__OUTSTANDING_WRITE_COUNT_1024__SHIFT 0x5
+-#define HDP_MISC_CNTL__MULTIPLE_READS__SHIFT 0x6
+-#define HDP_MISC_CNTL__SIMULTANEOUS_READS_WRITES__SHIFT 0xb
+-#define HDP_MISC_CNTL__FED_ENABLE__SHIFT 0x15
+-#define HDP_MISC_CNTL__SYSHUB_CHANNEL_PRIORITY__SHIFT 0x17
+-#define HDP_MISC_CNTL__MMHUB_WRBURST_ENABLE__SHIFT 0x18
+-#define HDP_MISC_CNTL__ALL_FUNCTION_CACHELINE_INVALID__SHIFT 0x19
+-#define HDP_MISC_CNTL__HDP_MMHUB_PENDING_WR_TAG_CHECK__SHIFT 0x1a
+-#define HDP_MISC_CNTL__XDP_MMHUB_PENDING_WR_TAG_CHECK__SHIFT 0x1b
+-#define HDP_MISC_CNTL__VARIABLE_CACHELINE_SIZE__SHIFT 0x1c
+-#define HDP_MISC_CNTL__ADAPTIVE_CACHELINE_SIZE__SHIFT 0x1d
+-#define HDP_MISC_CNTL__MMHUB_WRBURST_SIZE__SHIFT 0x1e
+-#define HDP_MISC_CNTL__FLUSH_INVALIDATE_CACHE_MASK 0x00000001L
+-#define HDP_MISC_CNTL__IDLE_HYSTERESIS_CNTL_MASK 0x0000000CL
+-#define HDP_MISC_CNTL__OUTSTANDING_WRITE_COUNT_1024_MASK 0x00000020L
+-#define HDP_MISC_CNTL__MULTIPLE_READS_MASK 0x00000040L
+-#define HDP_MISC_CNTL__SIMULTANEOUS_READS_WRITES_MASK 0x00000800L
+-#define HDP_MISC_CNTL__FED_ENABLE_MASK 0x00200000L
+-#define HDP_MISC_CNTL__SYSHUB_CHANNEL_PRIORITY_MASK 0x00800000L
+-#define HDP_MISC_CNTL__MMHUB_WRBURST_ENABLE_MASK 0x01000000L
+-#define HDP_MISC_CNTL__ALL_FUNCTION_CACHELINE_INVALID_MASK 0x02000000L
+-#define HDP_MISC_CNTL__HDP_MMHUB_PENDING_WR_TAG_CHECK_MASK 0x04000000L
+-#define HDP_MISC_CNTL__XDP_MMHUB_PENDING_WR_TAG_CHECK_MASK 0x08000000L
+-#define HDP_MISC_CNTL__VARIABLE_CACHELINE_SIZE_MASK 0x10000000L
+-#define HDP_MISC_CNTL__ADAPTIVE_CACHELINE_SIZE_MASK 0x20000000L
+-#define HDP_MISC_CNTL__MMHUB_WRBURST_SIZE_MASK 0x40000000L
+-//HDP_MEM_POWER_LS
+-#define HDP_MEM_POWER_LS__LS_ENABLE__SHIFT 0x0
+-#define HDP_MEM_POWER_LS__LS_HOLD__SHIFT 0x7
+-#define HDP_MEM_POWER_LS__LS_ENABLE_MASK 0x00000001L
+-#define HDP_MEM_POWER_LS__LS_HOLD_MASK 0x00001F80L
+-//HDP_MMHUB_CNTL
+-#define HDP_MMHUB_CNTL__HDP_MMHUB_RO__SHIFT 0x0
+-#define HDP_MMHUB_CNTL__HDP_MMHUB_GCC__SHIFT 0x1
+-#define HDP_MMHUB_CNTL__HDP_MMHUB_SNOOP__SHIFT 0x2
+-#define HDP_MMHUB_CNTL__HDP_MMHUB_RO_MASK 0x00000001L
+-#define HDP_MMHUB_CNTL__HDP_MMHUB_GCC_MASK 0x00000002L
+-#define HDP_MMHUB_CNTL__HDP_MMHUB_SNOOP_MASK 0x00000004L
+-//HDP_EDC_CNT
+-#define HDP_EDC_CNT__MEM0_SED_COUNT__SHIFT 0x0
+-#define HDP_EDC_CNT__MEM1_SED_COUNT__SHIFT 0x2
+-#define HDP_EDC_CNT__MEM0_SED_COUNT_MASK 0x00000003L
+-#define HDP_EDC_CNT__MEM1_SED_COUNT_MASK 0x0000000CL
+-//HDP_VERSION
+-#define HDP_VERSION__MINVER__SHIFT 0x0
+-#define HDP_VERSION__MAJVER__SHIFT 0x8
+-#define HDP_VERSION__REV__SHIFT 0x10
+-#define HDP_VERSION__MINVER_MASK 0x000000FFL
+-#define HDP_VERSION__MAJVER_MASK 0x0000FF00L
+-#define HDP_VERSION__REV_MASK 0x00FF0000L
+-//HDP_CLK_CNTL
+-#define HDP_CLK_CNTL__REG_CLK_ENABLE_COUNT__SHIFT 0x0
+-#define HDP_CLK_CNTL__REG_WAKE_DYN_CLK__SHIFT 0x4
+-#define HDP_CLK_CNTL__DBUS_CLK_SOFT_OVERRIDE__SHIFT 0x1c
+-#define HDP_CLK_CNTL__DYN_CLK_SOFT_OVERRIDE__SHIFT 0x1d
+-#define HDP_CLK_CNTL__XDP_REG_CLK_SOFT_OVERRIDE__SHIFT 0x1e
+-#define HDP_CLK_CNTL__HDP_REG_CLK_SOFT_OVERRIDE__SHIFT 0x1f
+-#define HDP_CLK_CNTL__REG_CLK_ENABLE_COUNT_MASK 0x0000000FL
+-#define HDP_CLK_CNTL__REG_WAKE_DYN_CLK_MASK 0x00000010L
+-#define HDP_CLK_CNTL__DBUS_CLK_SOFT_OVERRIDE_MASK 0x10000000L
+-#define HDP_CLK_CNTL__DYN_CLK_SOFT_OVERRIDE_MASK 0x20000000L
+-#define HDP_CLK_CNTL__XDP_REG_CLK_SOFT_OVERRIDE_MASK 0x40000000L
+-#define HDP_CLK_CNTL__HDP_REG_CLK_SOFT_OVERRIDE_MASK 0x80000000L
+-//HDP_MEMIO_CNTL
+-#define HDP_MEMIO_CNTL__MEMIO_SEND__SHIFT 0x0
+-#define HDP_MEMIO_CNTL__MEMIO_OP__SHIFT 0x1
+-#define HDP_MEMIO_CNTL__MEMIO_BE__SHIFT 0x2
+-#define HDP_MEMIO_CNTL__MEMIO_WR_STROBE__SHIFT 0x6
+-#define HDP_MEMIO_CNTL__MEMIO_RD_STROBE__SHIFT 0x7
+-#define HDP_MEMIO_CNTL__MEMIO_ADDR_UPPER__SHIFT 0x8
+-#define HDP_MEMIO_CNTL__MEMIO_CLR_WR_ERROR__SHIFT 0xe
+-#define HDP_MEMIO_CNTL__MEMIO_CLR_RD_ERROR__SHIFT 0xf
+-#define HDP_MEMIO_CNTL__MEMIO_VF__SHIFT 0x10
+-#define HDP_MEMIO_CNTL__MEMIO_VFID__SHIFT 0x11
+-#define HDP_MEMIO_CNTL__MEMIO_SEND_MASK 0x00000001L
+-#define HDP_MEMIO_CNTL__MEMIO_OP_MASK 0x00000002L
+-#define HDP_MEMIO_CNTL__MEMIO_BE_MASK 0x0000003CL
+-#define HDP_MEMIO_CNTL__MEMIO_WR_STROBE_MASK 0x00000040L
+-#define HDP_MEMIO_CNTL__MEMIO_RD_STROBE_MASK 0x00000080L
+-#define HDP_MEMIO_CNTL__MEMIO_ADDR_UPPER_MASK 0x00003F00L
+-#define HDP_MEMIO_CNTL__MEMIO_CLR_WR_ERROR_MASK 0x00004000L
+-#define HDP_MEMIO_CNTL__MEMIO_CLR_RD_ERROR_MASK 0x00008000L
+-#define HDP_MEMIO_CNTL__MEMIO_VF_MASK 0x00010000L
+-#define HDP_MEMIO_CNTL__MEMIO_VFID_MASK 0x003E0000L
+-//HDP_MEMIO_ADDR
+-#define HDP_MEMIO_ADDR__MEMIO_ADDR_LOWER__SHIFT 0x0
+-#define HDP_MEMIO_ADDR__MEMIO_ADDR_LOWER_MASK 0xFFFFFFFFL
+-//HDP_MEMIO_STATUS
+-#define HDP_MEMIO_STATUS__MEMIO_WR_STATUS__SHIFT 0x0
+-#define HDP_MEMIO_STATUS__MEMIO_RD_STATUS__SHIFT 0x1
+-#define HDP_MEMIO_STATUS__MEMIO_WR_ERROR__SHIFT 0x2
+-#define HDP_MEMIO_STATUS__MEMIO_RD_ERROR__SHIFT 0x3
+-#define HDP_MEMIO_STATUS__MEMIO_WR_STATUS_MASK 0x00000001L
+-#define HDP_MEMIO_STATUS__MEMIO_RD_STATUS_MASK 0x00000002L
+-#define HDP_MEMIO_STATUS__MEMIO_WR_ERROR_MASK 0x00000004L
+-#define HDP_MEMIO_STATUS__MEMIO_RD_ERROR_MASK 0x00000008L
+-//HDP_MEMIO_WR_DATA
+-#define HDP_MEMIO_WR_DATA__MEMIO_WR_DATA__SHIFT 0x0
+-#define HDP_MEMIO_WR_DATA__MEMIO_WR_DATA_MASK 0xFFFFFFFFL
+-//HDP_MEMIO_RD_DATA
+-#define HDP_MEMIO_RD_DATA__MEMIO_RD_DATA__SHIFT 0x0
+-#define HDP_MEMIO_RD_DATA__MEMIO_RD_DATA_MASK 0xFFFFFFFFL
+-//HDP_XDP_DIRECT2HDP_FIRST
+-#define HDP_XDP_DIRECT2HDP_FIRST__RESERVED__SHIFT 0x0
+-#define HDP_XDP_DIRECT2HDP_FIRST__RESERVED_MASK 0xFFFFFFFFL
+-//HDP_XDP_D2H_FLUSH
+-#define HDP_XDP_D2H_FLUSH__D2H_FLUSH_FLUSH_NUM__SHIFT 0x0
+-#define HDP_XDP_D2H_FLUSH__D2H_FLUSH_MBX_ENC_DATA__SHIFT 0x4
+-#define HDP_XDP_D2H_FLUSH__D2H_FLUSH_MBX_ADDR_SEL__SHIFT 0x8
+-#define HDP_XDP_D2H_FLUSH__D2H_FLUSH_XPB_CLG__SHIFT 0xb
+-#define HDP_XDP_D2H_FLUSH__D2H_FLUSH_SEND_HOST__SHIFT 0x10
+-#define HDP_XDP_D2H_FLUSH__D2H_FLUSH_ALTER_FLUSH_NUM__SHIFT 0x12
+-#define HDP_XDP_D2H_FLUSH__D2H_FLUSH_RSVD_0__SHIFT 0x13
+-#define HDP_XDP_D2H_FLUSH__D2H_FLUSH_RSVD_1__SHIFT 0x14
+-#define HDP_XDP_D2H_FLUSH__D2H_FLUSH_FLUSH_NUM_MASK 0x0000000FL
+-#define HDP_XDP_D2H_FLUSH__D2H_FLUSH_MBX_ENC_DATA_MASK 0x000000F0L
+-#define HDP_XDP_D2H_FLUSH__D2H_FLUSH_MBX_ADDR_SEL_MASK 0x00000700L
+-#define HDP_XDP_D2H_FLUSH__D2H_FLUSH_XPB_CLG_MASK 0x0000F800L
+-#define HDP_XDP_D2H_FLUSH__D2H_FLUSH_SEND_HOST_MASK 0x00010000L
+-#define HDP_XDP_D2H_FLUSH__D2H_FLUSH_ALTER_FLUSH_NUM_MASK 0x00040000L
+-#define HDP_XDP_D2H_FLUSH__D2H_FLUSH_RSVD_0_MASK 0x00080000L
+-#define HDP_XDP_D2H_FLUSH__D2H_FLUSH_RSVD_1_MASK 0x00100000L
+-//HDP_XDP_D2H_BAR_UPDATE
+-#define HDP_XDP_D2H_BAR_UPDATE__D2H_BAR_UPDATE_ADDR__SHIFT 0x0
+-#define HDP_XDP_D2H_BAR_UPDATE__D2H_BAR_UPDATE_FLUSH_NUM__SHIFT 0x10
+-#define HDP_XDP_D2H_BAR_UPDATE__D2H_BAR_UPDATE_BAR_NUM__SHIFT 0x14
+-#define HDP_XDP_D2H_BAR_UPDATE__D2H_BAR_UPDATE_ADDR_MASK 0x0000FFFFL
+-#define HDP_XDP_D2H_BAR_UPDATE__D2H_BAR_UPDATE_FLUSH_NUM_MASK 0x000F0000L
+-#define HDP_XDP_D2H_BAR_UPDATE__D2H_BAR_UPDATE_BAR_NUM_MASK 0x00700000L
+-//HDP_XDP_D2H_RSVD_3
+-#define HDP_XDP_D2H_RSVD_3__RESERVED__SHIFT 0x0
+-#define HDP_XDP_D2H_RSVD_3__RESERVED_MASK 0xFFFFFFFFL
+-//HDP_XDP_D2H_RSVD_4
+-#define HDP_XDP_D2H_RSVD_4__RESERVED__SHIFT 0x0
+-#define HDP_XDP_D2H_RSVD_4__RESERVED_MASK 0xFFFFFFFFL
+-//HDP_XDP_D2H_RSVD_5
+-#define HDP_XDP_D2H_RSVD_5__RESERVED__SHIFT 0x0
+-#define HDP_XDP_D2H_RSVD_5__RESERVED_MASK 0xFFFFFFFFL
+-//HDP_XDP_D2H_RSVD_6
+-#define HDP_XDP_D2H_RSVD_6__RESERVED__SHIFT 0x0
+-#define HDP_XDP_D2H_RSVD_6__RESERVED_MASK 0xFFFFFFFFL
+-//HDP_XDP_D2H_RSVD_7
+-#define HDP_XDP_D2H_RSVD_7__RESERVED__SHIFT 0x0
+-#define HDP_XDP_D2H_RSVD_7__RESERVED_MASK 0xFFFFFFFFL
+-//HDP_XDP_D2H_RSVD_8
+-#define HDP_XDP_D2H_RSVD_8__RESERVED__SHIFT 0x0
+-#define HDP_XDP_D2H_RSVD_8__RESERVED_MASK 0xFFFFFFFFL
+-//HDP_XDP_D2H_RSVD_9
+-#define HDP_XDP_D2H_RSVD_9__RESERVED__SHIFT 0x0
+-#define HDP_XDP_D2H_RSVD_9__RESERVED_MASK 0xFFFFFFFFL
+-//HDP_XDP_D2H_RSVD_10
+-#define HDP_XDP_D2H_RSVD_10__RESERVED__SHIFT 0x0
+-#define HDP_XDP_D2H_RSVD_10__RESERVED_MASK 0xFFFFFFFFL
+-//HDP_XDP_D2H_RSVD_11
+-#define HDP_XDP_D2H_RSVD_11__RESERVED__SHIFT 0x0
+-#define HDP_XDP_D2H_RSVD_11__RESERVED_MASK 0xFFFFFFFFL
+-//HDP_XDP_D2H_RSVD_12
+-#define HDP_XDP_D2H_RSVD_12__RESERVED__SHIFT 0x0
+-#define HDP_XDP_D2H_RSVD_12__RESERVED_MASK 0xFFFFFFFFL
+-//HDP_XDP_D2H_RSVD_13
+-#define HDP_XDP_D2H_RSVD_13__RESERVED__SHIFT 0x0
+-#define HDP_XDP_D2H_RSVD_13__RESERVED_MASK 0xFFFFFFFFL
+-//HDP_XDP_D2H_RSVD_14
+-#define HDP_XDP_D2H_RSVD_14__RESERVED__SHIFT 0x0
+-#define HDP_XDP_D2H_RSVD_14__RESERVED_MASK 0xFFFFFFFFL
+-//HDP_XDP_D2H_RSVD_15
+-#define HDP_XDP_D2H_RSVD_15__RESERVED__SHIFT 0x0
+-#define HDP_XDP_D2H_RSVD_15__RESERVED_MASK 0xFFFFFFFFL
+-//HDP_XDP_D2H_RSVD_16
+-#define HDP_XDP_D2H_RSVD_16__RESERVED__SHIFT 0x0
+-#define HDP_XDP_D2H_RSVD_16__RESERVED_MASK 0xFFFFFFFFL
+-//HDP_XDP_D2H_RSVD_17
+-#define HDP_XDP_D2H_RSVD_17__RESERVED__SHIFT 0x0
+-#define HDP_XDP_D2H_RSVD_17__RESERVED_MASK 0xFFFFFFFFL
+-//HDP_XDP_D2H_RSVD_18
+-#define HDP_XDP_D2H_RSVD_18__RESERVED__SHIFT 0x0
+-#define HDP_XDP_D2H_RSVD_18__RESERVED_MASK 0xFFFFFFFFL
+-//HDP_XDP_D2H_RSVD_19
+-#define HDP_XDP_D2H_RSVD_19__RESERVED__SHIFT 0x0
+-#define HDP_XDP_D2H_RSVD_19__RESERVED_MASK 0xFFFFFFFFL
+-//HDP_XDP_D2H_RSVD_20
+-#define HDP_XDP_D2H_RSVD_20__RESERVED__SHIFT 0x0
+-#define HDP_XDP_D2H_RSVD_20__RESERVED_MASK 0xFFFFFFFFL
+-//HDP_XDP_D2H_RSVD_21
+-#define HDP_XDP_D2H_RSVD_21__RESERVED__SHIFT 0x0
+-#define HDP_XDP_D2H_RSVD_21__RESERVED_MASK 0xFFFFFFFFL
+-//HDP_XDP_D2H_RSVD_22
+-#define HDP_XDP_D2H_RSVD_22__RESERVED__SHIFT 0x0
+-#define HDP_XDP_D2H_RSVD_22__RESERVED_MASK 0xFFFFFFFFL
+-//HDP_XDP_D2H_RSVD_23
+-#define HDP_XDP_D2H_RSVD_23__RESERVED__SHIFT 0x0
+-#define HDP_XDP_D2H_RSVD_23__RESERVED_MASK 0xFFFFFFFFL
+-//HDP_XDP_D2H_RSVD_24
+-#define HDP_XDP_D2H_RSVD_24__RESERVED__SHIFT 0x0
+-#define HDP_XDP_D2H_RSVD_24__RESERVED_MASK 0xFFFFFFFFL
+-//HDP_XDP_D2H_RSVD_25
+-#define HDP_XDP_D2H_RSVD_25__RESERVED__SHIFT 0x0
+-#define HDP_XDP_D2H_RSVD_25__RESERVED_MASK 0xFFFFFFFFL
+-//HDP_XDP_D2H_RSVD_26
+-#define HDP_XDP_D2H_RSVD_26__RESERVED__SHIFT 0x0
+-#define HDP_XDP_D2H_RSVD_26__RESERVED_MASK 0xFFFFFFFFL
+-//HDP_XDP_D2H_RSVD_27
+-#define HDP_XDP_D2H_RSVD_27__RESERVED__SHIFT 0x0
+-#define HDP_XDP_D2H_RSVD_27__RESERVED_MASK 0xFFFFFFFFL
+-//HDP_XDP_D2H_RSVD_28
+-#define HDP_XDP_D2H_RSVD_28__RESERVED__SHIFT 0x0
+-#define HDP_XDP_D2H_RSVD_28__RESERVED_MASK 0xFFFFFFFFL
+-//HDP_XDP_D2H_RSVD_29
+-#define HDP_XDP_D2H_RSVD_29__RESERVED__SHIFT 0x0
+-#define HDP_XDP_D2H_RSVD_29__RESERVED_MASK 0xFFFFFFFFL
+-//HDP_XDP_D2H_RSVD_30
+-#define HDP_XDP_D2H_RSVD_30__RESERVED__SHIFT 0x0
+-#define HDP_XDP_D2H_RSVD_30__RESERVED_MASK 0xFFFFFFFFL
+-//HDP_XDP_D2H_RSVD_31
+-#define HDP_XDP_D2H_RSVD_31__RESERVED__SHIFT 0x0
+-#define HDP_XDP_D2H_RSVD_31__RESERVED_MASK 0xFFFFFFFFL
+-//HDP_XDP_D2H_RSVD_32
+-#define HDP_XDP_D2H_RSVD_32__RESERVED__SHIFT 0x0
+-#define HDP_XDP_D2H_RSVD_32__RESERVED_MASK 0xFFFFFFFFL
+-//HDP_XDP_D2H_RSVD_33
+-#define HDP_XDP_D2H_RSVD_33__RESERVED__SHIFT 0x0
+-#define HDP_XDP_D2H_RSVD_33__RESERVED_MASK 0xFFFFFFFFL
+-//HDP_XDP_D2H_RSVD_34
+-#define HDP_XDP_D2H_RSVD_34__RESERVED__SHIFT 0x0
+-#define HDP_XDP_D2H_RSVD_34__RESERVED_MASK 0xFFFFFFFFL
+-//HDP_XDP_DIRECT2HDP_LAST
+-#define HDP_XDP_DIRECT2HDP_LAST__RESERVED__SHIFT 0x0
+-#define HDP_XDP_DIRECT2HDP_LAST__RESERVED_MASK 0xFFFFFFFFL
+-//HDP_XDP_P2P_BAR_CFG
+-#define HDP_XDP_P2P_BAR_CFG__P2P_BAR_CFG_ADDR_SIZE__SHIFT 0x0
+-#define HDP_XDP_P2P_BAR_CFG__P2P_BAR_CFG_BAR_FROM__SHIFT 0x4
+-#define HDP_XDP_P2P_BAR_CFG__P2P_BAR_CFG_ADDR_SIZE_MASK 0x0000000FL
+-#define HDP_XDP_P2P_BAR_CFG__P2P_BAR_CFG_BAR_FROM_MASK 0x00000030L
+-//HDP_XDP_P2P_MBX_OFFSET
+-#define HDP_XDP_P2P_MBX_OFFSET__P2P_MBX_OFFSET__SHIFT 0x0
+-#define HDP_XDP_P2P_MBX_OFFSET__P2P_MBX_OFFSET_MASK 0x0001FFFFL
+-//HDP_XDP_P2P_MBX_ADDR0
+-#define HDP_XDP_P2P_MBX_ADDR0__VALID__SHIFT 0x0
+-#define HDP_XDP_P2P_MBX_ADDR0__ADDR_35_19__SHIFT 0x3
+-#define HDP_XDP_P2P_MBX_ADDR0__ADDR_39_36__SHIFT 0x14
+-#define HDP_XDP_P2P_MBX_ADDR0__ADDR_47_40__SHIFT 0x18
+-#define HDP_XDP_P2P_MBX_ADDR0__VALID_MASK 0x00000001L
+-#define HDP_XDP_P2P_MBX_ADDR0__ADDR_35_19_MASK 0x000FFFF8L
+-#define HDP_XDP_P2P_MBX_ADDR0__ADDR_39_36_MASK 0x00F00000L
+-#define HDP_XDP_P2P_MBX_ADDR0__ADDR_47_40_MASK 0xFF000000L
+-//HDP_XDP_P2P_MBX_ADDR1
+-#define HDP_XDP_P2P_MBX_ADDR1__VALID__SHIFT 0x0
+-#define HDP_XDP_P2P_MBX_ADDR1__ADDR_35_19__SHIFT 0x3
+-#define HDP_XDP_P2P_MBX_ADDR1__ADDR_39_36__SHIFT 0x14
+-#define HDP_XDP_P2P_MBX_ADDR1__ADDR_47_40__SHIFT 0x18
+-#define HDP_XDP_P2P_MBX_ADDR1__VALID_MASK 0x00000001L
+-#define HDP_XDP_P2P_MBX_ADDR1__ADDR_35_19_MASK 0x000FFFF8L
+-#define HDP_XDP_P2P_MBX_ADDR1__ADDR_39_36_MASK 0x00F00000L
+-#define HDP_XDP_P2P_MBX_ADDR1__ADDR_47_40_MASK 0xFF000000L
+-//HDP_XDP_P2P_MBX_ADDR2
+-#define HDP_XDP_P2P_MBX_ADDR2__VALID__SHIFT 0x0
+-#define HDP_XDP_P2P_MBX_ADDR2__ADDR_35_19__SHIFT 0x3
+-#define HDP_XDP_P2P_MBX_ADDR2__ADDR_39_36__SHIFT 0x14
+-#define HDP_XDP_P2P_MBX_ADDR2__ADDR_47_40__SHIFT 0x18
+-#define HDP_XDP_P2P_MBX_ADDR2__VALID_MASK 0x00000001L
+-#define HDP_XDP_P2P_MBX_ADDR2__ADDR_35_19_MASK 0x000FFFF8L
+-#define HDP_XDP_P2P_MBX_ADDR2__ADDR_39_36_MASK 0x00F00000L
+-#define HDP_XDP_P2P_MBX_ADDR2__ADDR_47_40_MASK 0xFF000000L
+-//HDP_XDP_P2P_MBX_ADDR3
+-#define HDP_XDP_P2P_MBX_ADDR3__VALID__SHIFT 0x0
+-#define HDP_XDP_P2P_MBX_ADDR3__ADDR_35_19__SHIFT 0x3
+-#define HDP_XDP_P2P_MBX_ADDR3__ADDR_39_36__SHIFT 0x14
+-#define HDP_XDP_P2P_MBX_ADDR3__ADDR_47_40__SHIFT 0x18
+-#define HDP_XDP_P2P_MBX_ADDR3__VALID_MASK 0x00000001L
+-#define HDP_XDP_P2P_MBX_ADDR3__ADDR_35_19_MASK 0x000FFFF8L
+-#define HDP_XDP_P2P_MBX_ADDR3__ADDR_39_36_MASK 0x00F00000L
+-#define HDP_XDP_P2P_MBX_ADDR3__ADDR_47_40_MASK 0xFF000000L
+-//HDP_XDP_P2P_MBX_ADDR4
+-#define HDP_XDP_P2P_MBX_ADDR4__VALID__SHIFT 0x0
+-#define HDP_XDP_P2P_MBX_ADDR4__ADDR_35_19__SHIFT 0x3
+-#define HDP_XDP_P2P_MBX_ADDR4__ADDR_39_36__SHIFT 0x14
+-#define HDP_XDP_P2P_MBX_ADDR4__ADDR_47_40__SHIFT 0x18
+-#define HDP_XDP_P2P_MBX_ADDR4__VALID_MASK 0x00000001L
+-#define HDP_XDP_P2P_MBX_ADDR4__ADDR_35_19_MASK 0x000FFFF8L
+-#define HDP_XDP_P2P_MBX_ADDR4__ADDR_39_36_MASK 0x00F00000L
+-#define HDP_XDP_P2P_MBX_ADDR4__ADDR_47_40_MASK 0xFF000000L
+-//HDP_XDP_P2P_MBX_ADDR5
+-#define HDP_XDP_P2P_MBX_ADDR5__VALID__SHIFT 0x0
+-#define HDP_XDP_P2P_MBX_ADDR5__ADDR_35_19__SHIFT 0x3
+-#define HDP_XDP_P2P_MBX_ADDR5__ADDR_39_36__SHIFT 0x14
+-#define HDP_XDP_P2P_MBX_ADDR5__ADDR_47_40__SHIFT 0x18
+-#define HDP_XDP_P2P_MBX_ADDR5__VALID_MASK 0x00000001L
+-#define HDP_XDP_P2P_MBX_ADDR5__ADDR_35_19_MASK 0x000FFFF8L
+-#define HDP_XDP_P2P_MBX_ADDR5__ADDR_39_36_MASK 0x00F00000L
+-#define HDP_XDP_P2P_MBX_ADDR5__ADDR_47_40_MASK 0xFF000000L
+-//HDP_XDP_P2P_MBX_ADDR6
+-#define HDP_XDP_P2P_MBX_ADDR6__VALID__SHIFT 0x0
+-#define HDP_XDP_P2P_MBX_ADDR6__ADDR_35_19__SHIFT 0x3
+-#define HDP_XDP_P2P_MBX_ADDR6__ADDR_39_36__SHIFT 0x14
+-#define HDP_XDP_P2P_MBX_ADDR6__ADDR_47_40__SHIFT 0x18
+-#define HDP_XDP_P2P_MBX_ADDR6__VALID_MASK 0x00000001L
+-#define HDP_XDP_P2P_MBX_ADDR6__ADDR_35_19_MASK 0x000FFFF8L
+-#define HDP_XDP_P2P_MBX_ADDR6__ADDR_39_36_MASK 0x00F00000L
+-#define HDP_XDP_P2P_MBX_ADDR6__ADDR_47_40_MASK 0xFF000000L
+-//HDP_XDP_HDP_MBX_MC_CFG
+-#define HDP_XDP_HDP_MBX_MC_CFG__HDP_MBX_MC_CFG_TAP_WRREQ_QOS__SHIFT 0x0
+-#define HDP_XDP_HDP_MBX_MC_CFG__HDP_MBX_MC_CFG_TAP_WRREQ_SWAP__SHIFT 0x4
+-#define HDP_XDP_HDP_MBX_MC_CFG__HDP_MBX_MC_CFG_TAP_WRREQ_VMID__SHIFT 0x8
+-#define HDP_XDP_HDP_MBX_MC_CFG__HDP_MBX_MC_CFG_TAP_WRREQ_RO__SHIFT 0xc
+-#define HDP_XDP_HDP_MBX_MC_CFG__HDP_MBX_MC_CFG_TAP_WRREQ_GCC__SHIFT 0xd
+-#define HDP_XDP_HDP_MBX_MC_CFG__HDP_MBX_MC_CFG_TAP_WRREQ_SNOOP__SHIFT 0xe
+-#define HDP_XDP_HDP_MBX_MC_CFG__HDP_MBX_MC_CFG_TAP_WRREQ_QOS_MASK 0x0000000FL
+-#define HDP_XDP_HDP_MBX_MC_CFG__HDP_MBX_MC_CFG_TAP_WRREQ_SWAP_MASK 0x00000030L
+-#define HDP_XDP_HDP_MBX_MC_CFG__HDP_MBX_MC_CFG_TAP_WRREQ_VMID_MASK 0x00000F00L
+-#define HDP_XDP_HDP_MBX_MC_CFG__HDP_MBX_MC_CFG_TAP_WRREQ_RO_MASK 0x00001000L
+-#define HDP_XDP_HDP_MBX_MC_CFG__HDP_MBX_MC_CFG_TAP_WRREQ_GCC_MASK 0x00002000L
+-#define HDP_XDP_HDP_MBX_MC_CFG__HDP_MBX_MC_CFG_TAP_WRREQ_SNOOP_MASK 0x00004000L
+-//HDP_XDP_HDP_MC_CFG
+-#define HDP_XDP_HDP_MC_CFG__HDP_MC_CFG_HST_TAP_REQ_SNOOP__SHIFT 0x3
+-#define HDP_XDP_HDP_MC_CFG__HDP_MC_CFG_HST_TAP_REQ_SWAP__SHIFT 0x4
+-#define HDP_XDP_HDP_MC_CFG__HDP_MC_CFG_HST_TAP_REQ_VMID__SHIFT 0x8
+-#define HDP_XDP_HDP_MC_CFG__HDP_MC_CFG_HST_TAP_REQ_RO__SHIFT 0xc
+-#define HDP_XDP_HDP_MC_CFG__HDP_MC_CFG_HST_TAP_REQ_GCC__SHIFT 0xd
+-#define HDP_XDP_HDP_MC_CFG__HDP_MC_CFG_XDP_HIGHER_PRI_THRESH__SHIFT 0xe
+-#define HDP_XDP_HDP_MC_CFG__HDP_MC_CFG_HST_TAP_REQ_SNOOP_MASK 0x00000008L
+-#define HDP_XDP_HDP_MC_CFG__HDP_MC_CFG_HST_TAP_REQ_SWAP_MASK 0x00000030L
+-#define HDP_XDP_HDP_MC_CFG__HDP_MC_CFG_HST_TAP_REQ_VMID_MASK 0x00000F00L
+-#define HDP_XDP_HDP_MC_CFG__HDP_MC_CFG_HST_TAP_REQ_RO_MASK 0x00001000L
+-#define HDP_XDP_HDP_MC_CFG__HDP_MC_CFG_HST_TAP_REQ_GCC_MASK 0x00002000L
+-#define HDP_XDP_HDP_MC_CFG__HDP_MC_CFG_XDP_HIGHER_PRI_THRESH_MASK 0x000FC000L
+-//HDP_XDP_HST_CFG
+-#define HDP_XDP_HST_CFG__HST_CFG_WR_COMBINE_EN__SHIFT 0x0
+-#define HDP_XDP_HST_CFG__HST_CFG_WR_COMBINE_TIMER__SHIFT 0x1
+-#define HDP_XDP_HST_CFG__HST_CFG_WR_BURST_EN__SHIFT 0x3
+-#define HDP_XDP_HST_CFG__HST_CFG_WR_COMBINE_64B_EN__SHIFT 0x4
+-#define HDP_XDP_HST_CFG__HST_CFG_WR_COMBINE_TIMER_PRELOAD_CFG__SHIFT 0x5
+-#define HDP_XDP_HST_CFG__HST_CFG_WR_COMBINE_EN_MASK 0x00000001L
+-#define HDP_XDP_HST_CFG__HST_CFG_WR_COMBINE_TIMER_MASK 0x00000006L
+-#define HDP_XDP_HST_CFG__HST_CFG_WR_BURST_EN_MASK 0x00000008L
+-#define HDP_XDP_HST_CFG__HST_CFG_WR_COMBINE_64B_EN_MASK 0x00000010L
+-#define HDP_XDP_HST_CFG__HST_CFG_WR_COMBINE_TIMER_PRELOAD_CFG_MASK 0x00000020L
+-//HDP_XDP_HDP_IPH_CFG
+-#define HDP_XDP_HDP_IPH_CFG__HDP_IPH_CFG_SYS_FIFO_DEPTH_OVERRIDE__SHIFT 0x0
+-#define HDP_XDP_HDP_IPH_CFG__HDP_IPH_CFG_XDP_FIFO_DEPTH_OVERRIDE__SHIFT 0x6
+-#define HDP_XDP_HDP_IPH_CFG__HDP_IPH_CFG_INVERSE_PEER_TAG_MATCHING__SHIFT 0xc
+-#define HDP_XDP_HDP_IPH_CFG__HDP_IPH_CFG_P2P_RD_EN__SHIFT 0xd
+-#define HDP_XDP_HDP_IPH_CFG__HDP_IPH_CFG_SYS_FIFO_DEPTH_OVERRIDE_MASK 0x0000003FL
+-#define HDP_XDP_HDP_IPH_CFG__HDP_IPH_CFG_XDP_FIFO_DEPTH_OVERRIDE_MASK 0x00000FC0L
+-#define HDP_XDP_HDP_IPH_CFG__HDP_IPH_CFG_INVERSE_PEER_TAG_MATCHING_MASK 0x00001000L
+-#define HDP_XDP_HDP_IPH_CFG__HDP_IPH_CFG_P2P_RD_EN_MASK 0x00002000L
+-//HDP_XDP_P2P_BAR0
+-#define HDP_XDP_P2P_BAR0__ADDR__SHIFT 0x0
+-#define HDP_XDP_P2P_BAR0__FLUSH__SHIFT 0x10
+-#define HDP_XDP_P2P_BAR0__VALID__SHIFT 0x14
+-#define HDP_XDP_P2P_BAR0__ADDR_MASK 0x0000FFFFL
+-#define HDP_XDP_P2P_BAR0__FLUSH_MASK 0x000F0000L
+-#define HDP_XDP_P2P_BAR0__VALID_MASK 0x00100000L
+-//HDP_XDP_P2P_BAR1
+-#define HDP_XDP_P2P_BAR1__ADDR__SHIFT 0x0
+-#define HDP_XDP_P2P_BAR1__FLUSH__SHIFT 0x10
+-#define HDP_XDP_P2P_BAR1__VALID__SHIFT 0x14
+-#define HDP_XDP_P2P_BAR1__ADDR_MASK 0x0000FFFFL
+-#define HDP_XDP_P2P_BAR1__FLUSH_MASK 0x000F0000L
+-#define HDP_XDP_P2P_BAR1__VALID_MASK 0x00100000L
+-//HDP_XDP_P2P_BAR2
+-#define HDP_XDP_P2P_BAR2__ADDR__SHIFT 0x0
+-#define HDP_XDP_P2P_BAR2__FLUSH__SHIFT 0x10
+-#define HDP_XDP_P2P_BAR2__VALID__SHIFT 0x14
+-#define HDP_XDP_P2P_BAR2__ADDR_MASK 0x0000FFFFL
+-#define HDP_XDP_P2P_BAR2__FLUSH_MASK 0x000F0000L
+-#define HDP_XDP_P2P_BAR2__VALID_MASK 0x00100000L
+-//HDP_XDP_P2P_BAR3
+-#define HDP_XDP_P2P_BAR3__ADDR__SHIFT 0x0
+-#define HDP_XDP_P2P_BAR3__FLUSH__SHIFT 0x10
+-#define HDP_XDP_P2P_BAR3__VALID__SHIFT 0x14
+-#define HDP_XDP_P2P_BAR3__ADDR_MASK 0x0000FFFFL
+-#define HDP_XDP_P2P_BAR3__FLUSH_MASK 0x000F0000L
+-#define HDP_XDP_P2P_BAR3__VALID_MASK 0x00100000L
+-//HDP_XDP_P2P_BAR4
+-#define HDP_XDP_P2P_BAR4__ADDR__SHIFT 0x0
+-#define HDP_XDP_P2P_BAR4__FLUSH__SHIFT 0x10
+-#define HDP_XDP_P2P_BAR4__VALID__SHIFT 0x14
+-#define HDP_XDP_P2P_BAR4__ADDR_MASK 0x0000FFFFL
+-#define HDP_XDP_P2P_BAR4__FLUSH_MASK 0x000F0000L
+-#define HDP_XDP_P2P_BAR4__VALID_MASK 0x00100000L
+-//HDP_XDP_P2P_BAR5
+-#define HDP_XDP_P2P_BAR5__ADDR__SHIFT 0x0
+-#define HDP_XDP_P2P_BAR5__FLUSH__SHIFT 0x10
+-#define HDP_XDP_P2P_BAR5__VALID__SHIFT 0x14
+-#define HDP_XDP_P2P_BAR5__ADDR_MASK 0x0000FFFFL
+-#define HDP_XDP_P2P_BAR5__FLUSH_MASK 0x000F0000L
+-#define HDP_XDP_P2P_BAR5__VALID_MASK 0x00100000L
+-//HDP_XDP_P2P_BAR6
+-#define HDP_XDP_P2P_BAR6__ADDR__SHIFT 0x0
+-#define HDP_XDP_P2P_BAR6__FLUSH__SHIFT 0x10
+-#define HDP_XDP_P2P_BAR6__VALID__SHIFT 0x14
+-#define HDP_XDP_P2P_BAR6__ADDR_MASK 0x0000FFFFL
+-#define HDP_XDP_P2P_BAR6__FLUSH_MASK 0x000F0000L
+-#define HDP_XDP_P2P_BAR6__VALID_MASK 0x00100000L
+-//HDP_XDP_P2P_BAR7
+-#define HDP_XDP_P2P_BAR7__ADDR__SHIFT 0x0
+-#define HDP_XDP_P2P_BAR7__FLUSH__SHIFT 0x10
+-#define HDP_XDP_P2P_BAR7__VALID__SHIFT 0x14
+-#define HDP_XDP_P2P_BAR7__ADDR_MASK 0x0000FFFFL
+-#define HDP_XDP_P2P_BAR7__FLUSH_MASK 0x000F0000L
+-#define HDP_XDP_P2P_BAR7__VALID_MASK 0x00100000L
+-//HDP_XDP_FLUSH_ARMED_STS
+-#define HDP_XDP_FLUSH_ARMED_STS__FLUSH_ARMED_STS__SHIFT 0x0
+-#define HDP_XDP_FLUSH_ARMED_STS__FLUSH_ARMED_STS_MASK 0xFFFFFFFFL
+-//HDP_XDP_FLUSH_CNTR0_STS
+-#define HDP_XDP_FLUSH_CNTR0_STS__FLUSH_CNTR0_STS__SHIFT 0x0
+-#define HDP_XDP_FLUSH_CNTR0_STS__FLUSH_CNTR0_STS_MASK 0x03FFFFFFL
+-//HDP_XDP_BUSY_STS
+-#define HDP_XDP_BUSY_STS__BUSY_BITS__SHIFT 0x0
+-#define HDP_XDP_BUSY_STS__BUSY_BITS_MASK 0x0003FFFFL
+-//HDP_XDP_STICKY
+-#define HDP_XDP_STICKY__STICKY_STS__SHIFT 0x0
+-#define HDP_XDP_STICKY__STICKY_W1C__SHIFT 0x10
+-#define HDP_XDP_STICKY__STICKY_STS_MASK 0x0000FFFFL
+-#define HDP_XDP_STICKY__STICKY_W1C_MASK 0xFFFF0000L
+-//HDP_XDP_CHKN
+-#define HDP_XDP_CHKN__CHKN_0_RSVD__SHIFT 0x0
+-#define HDP_XDP_CHKN__CHKN_1_RSVD__SHIFT 0x8
+-#define HDP_XDP_CHKN__CHKN_2_RSVD__SHIFT 0x10
+-#define HDP_XDP_CHKN__CHKN_3_RSVD__SHIFT 0x18
+-#define HDP_XDP_CHKN__CHKN_0_RSVD_MASK 0x000000FFL
+-#define HDP_XDP_CHKN__CHKN_1_RSVD_MASK 0x0000FF00L
+-#define HDP_XDP_CHKN__CHKN_2_RSVD_MASK 0x00FF0000L
+-#define HDP_XDP_CHKN__CHKN_3_RSVD_MASK 0xFF000000L
+-//HDP_XDP_BARS_ADDR_39_36
+-#define HDP_XDP_BARS_ADDR_39_36__BAR0_ADDR_39_36__SHIFT 0x0
+-#define HDP_XDP_BARS_ADDR_39_36__BAR1_ADDR_39_36__SHIFT 0x4
+-#define HDP_XDP_BARS_ADDR_39_36__BAR2_ADDR_39_36__SHIFT 0x8
+-#define HDP_XDP_BARS_ADDR_39_36__BAR3_ADDR_39_36__SHIFT 0xc
+-#define HDP_XDP_BARS_ADDR_39_36__BAR4_ADDR_39_36__SHIFT 0x10
+-#define HDP_XDP_BARS_ADDR_39_36__BAR5_ADDR_39_36__SHIFT 0x14
+-#define HDP_XDP_BARS_ADDR_39_36__BAR6_ADDR_39_36__SHIFT 0x18
+-#define HDP_XDP_BARS_ADDR_39_36__BAR7_ADDR_39_36__SHIFT 0x1c
+-#define HDP_XDP_BARS_ADDR_39_36__BAR0_ADDR_39_36_MASK 0x0000000FL
+-#define HDP_XDP_BARS_ADDR_39_36__BAR1_ADDR_39_36_MASK 0x000000F0L
+-#define HDP_XDP_BARS_ADDR_39_36__BAR2_ADDR_39_36_MASK 0x00000F00L
+-#define HDP_XDP_BARS_ADDR_39_36__BAR3_ADDR_39_36_MASK 0x0000F000L
+-#define HDP_XDP_BARS_ADDR_39_36__BAR4_ADDR_39_36_MASK 0x000F0000L
+-#define HDP_XDP_BARS_ADDR_39_36__BAR5_ADDR_39_36_MASK 0x00F00000L
+-#define HDP_XDP_BARS_ADDR_39_36__BAR6_ADDR_39_36_MASK 0x0F000000L
+-#define HDP_XDP_BARS_ADDR_39_36__BAR7_ADDR_39_36_MASK 0xF0000000L
+-//HDP_XDP_MC_VM_FB_LOCATION_BASE
+-#define HDP_XDP_MC_VM_FB_LOCATION_BASE__FB_BASE__SHIFT 0x0
+-#define HDP_XDP_MC_VM_FB_LOCATION_BASE__FB_BASE_MASK 0x03FFFFFFL
+-//HDP_XDP_GPU_IOV_VIOLATION_LOG
+-#define HDP_XDP_GPU_IOV_VIOLATION_LOG__VIOLATION_STATUS__SHIFT 0x0
+-#define HDP_XDP_GPU_IOV_VIOLATION_LOG__MULTIPLE_VIOLATION_STATUS__SHIFT 0x1
+-#define HDP_XDP_GPU_IOV_VIOLATION_LOG__ADDRESS__SHIFT 0x2
+-#define HDP_XDP_GPU_IOV_VIOLATION_LOG__OPCODE__SHIFT 0x12
+-#define HDP_XDP_GPU_IOV_VIOLATION_LOG__VF__SHIFT 0x13
+-#define HDP_XDP_GPU_IOV_VIOLATION_LOG__VFID__SHIFT 0x14
+-#define HDP_XDP_GPU_IOV_VIOLATION_LOG__INITIATOR_ID__SHIFT 0x18
+-#define HDP_XDP_GPU_IOV_VIOLATION_LOG__VIOLATION_STATUS_MASK 0x00000001L
+-#define HDP_XDP_GPU_IOV_VIOLATION_LOG__MULTIPLE_VIOLATION_STATUS_MASK 0x00000002L
+-#define HDP_XDP_GPU_IOV_VIOLATION_LOG__ADDRESS_MASK 0x0003FFFCL
+-#define HDP_XDP_GPU_IOV_VIOLATION_LOG__OPCODE_MASK 0x00040000L
+-#define HDP_XDP_GPU_IOV_VIOLATION_LOG__VF_MASK 0x00080000L
+-#define HDP_XDP_GPU_IOV_VIOLATION_LOG__VFID_MASK 0x00F00000L
+-#define HDP_XDP_GPU_IOV_VIOLATION_LOG__INITIATOR_ID_MASK 0xFF000000L
+-//HDP_XDP_MMHUB_ERROR
+-#define HDP_XDP_MMHUB_ERROR__HDP_BRESP_01__SHIFT 0x1
+-#define HDP_XDP_MMHUB_ERROR__HDP_BRESP_10__SHIFT 0x2
+-#define HDP_XDP_MMHUB_ERROR__HDP_BRESP_11__SHIFT 0x3
+-#define HDP_XDP_MMHUB_ERROR__HDP_BUSER_NACK_01__SHIFT 0x5
+-#define HDP_XDP_MMHUB_ERROR__HDP_BUSER_NACK_10__SHIFT 0x6
+-#define HDP_XDP_MMHUB_ERROR__HDP_BUSER_NACK_11__SHIFT 0x7
+-#define HDP_XDP_MMHUB_ERROR__HDP_RRESP_01__SHIFT 0x9
+-#define HDP_XDP_MMHUB_ERROR__HDP_RRESP_10__SHIFT 0xa
+-#define HDP_XDP_MMHUB_ERROR__HDP_RRESP_11__SHIFT 0xb
+-#define HDP_XDP_MMHUB_ERROR__HDP_RUSER_NACK_01__SHIFT 0xd
+-#define HDP_XDP_MMHUB_ERROR__HDP_RUSER_NACK_10__SHIFT 0xe
+-#define HDP_XDP_MMHUB_ERROR__HDP_RUSER_NACK_11__SHIFT 0xf
+-#define HDP_XDP_MMHUB_ERROR__XDP_BRESP_01__SHIFT 0x11
+-#define HDP_XDP_MMHUB_ERROR__XDP_BRESP_10__SHIFT 0x12
+-#define HDP_XDP_MMHUB_ERROR__XDP_BRESP_11__SHIFT 0x13
+-#define HDP_XDP_MMHUB_ERROR__XDP_BUSER_NACK_01__SHIFT 0x15
+-#define HDP_XDP_MMHUB_ERROR__XDP_BUSER_NACK_10__SHIFT 0x16
+-#define HDP_XDP_MMHUB_ERROR__XDP_BUSER_NACK_11__SHIFT 0x17
+-#define HDP_XDP_MMHUB_ERROR__HDP_BRESP_01_MASK 0x00000002L
+-#define HDP_XDP_MMHUB_ERROR__HDP_BRESP_10_MASK 0x00000004L
+-#define HDP_XDP_MMHUB_ERROR__HDP_BRESP_11_MASK 0x00000008L
+-#define HDP_XDP_MMHUB_ERROR__HDP_BUSER_NACK_01_MASK 0x00000020L
+-#define HDP_XDP_MMHUB_ERROR__HDP_BUSER_NACK_10_MASK 0x00000040L
+-#define HDP_XDP_MMHUB_ERROR__HDP_BUSER_NACK_11_MASK 0x00000080L
+-#define HDP_XDP_MMHUB_ERROR__HDP_RRESP_01_MASK 0x00000200L
+-#define HDP_XDP_MMHUB_ERROR__HDP_RRESP_10_MASK 0x00000400L
+-#define HDP_XDP_MMHUB_ERROR__HDP_RRESP_11_MASK 0x00000800L
+-#define HDP_XDP_MMHUB_ERROR__HDP_RUSER_NACK_01_MASK 0x00002000L
+-#define HDP_XDP_MMHUB_ERROR__HDP_RUSER_NACK_10_MASK 0x00004000L
+-#define HDP_XDP_MMHUB_ERROR__HDP_RUSER_NACK_11_MASK 0x00008000L
+-#define HDP_XDP_MMHUB_ERROR__XDP_BRESP_01_MASK 0x00020000L
+-#define HDP_XDP_MMHUB_ERROR__XDP_BRESP_10_MASK 0x00040000L
+-#define HDP_XDP_MMHUB_ERROR__XDP_BRESP_11_MASK 0x00080000L
+-#define HDP_XDP_MMHUB_ERROR__XDP_BUSER_NACK_01_MASK 0x00200000L
+-#define HDP_XDP_MMHUB_ERROR__XDP_BUSER_NACK_10_MASK 0x00400000L
+-#define HDP_XDP_MMHUB_ERROR__XDP_BUSER_NACK_11_MASK 0x00800000L
+-
+-#endif
+--
+2.7.4
+