Ping? On Mon, Jun 22, 2020 at 6:12 PM Alex Deucher <alexdeucher@xxxxxxxxx> wrote: > > drop the duplicate register macros from sid.h and use the > standard ones in the oss register headers. > > Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx> > --- > drivers/gpu/drm/amd/amdgpu/si.c | 1 + > drivers/gpu/drm/amd/amdgpu/si_ih.c | 2 ++ > drivers/gpu/drm/amd/amdgpu/sid.h | 19 ------------------- > 3 files changed, 3 insertions(+), 19 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/si.c b/drivers/gpu/drm/amd/amdgpu/si.c > index cda9aa5e4b9e..9b12285177e3 100644 > --- a/drivers/gpu/drm/amd/amdgpu/si.c > +++ b/drivers/gpu/drm/amd/amdgpu/si.c > @@ -45,6 +45,7 @@ > #include "dce_virtual.h" > #include "gca/gfx_6_0_d.h" > #include "oss/oss_1_0_d.h" > +#include "oss/oss_1_0_sh_mask.h" > #include "gmc/gmc_6_0_d.h" > #include "dce/dce_6_0_d.h" > #include "uvd/uvd_4_0_d.h" > diff --git a/drivers/gpu/drm/amd/amdgpu/si_ih.c b/drivers/gpu/drm/amd/amdgpu/si_ih.c > index 88ae27a5a03d..621727d7fd18 100644 > --- a/drivers/gpu/drm/amd/amdgpu/si_ih.c > +++ b/drivers/gpu/drm/amd/amdgpu/si_ih.c > @@ -27,6 +27,8 @@ > #include "amdgpu_ih.h" > #include "sid.h" > #include "si_ih.h" > +#include "oss/oss_1_0_d.h" > +#include "oss/oss_1_0_sh_mask.h" > > static void si_ih_set_interrupt_funcs(struct amdgpu_device *adev); > > diff --git a/drivers/gpu/drm/amd/amdgpu/sid.h b/drivers/gpu/drm/amd/amdgpu/sid.h > index 75b5d441b628..5f660f0c819f 100644 > --- a/drivers/gpu/drm/amd/amdgpu/sid.h > +++ b/drivers/gpu/drm/amd/amdgpu/sid.h > @@ -2341,11 +2341,6 @@ > # define NI_INPUT_GAMMA_XVYCC_222 3 > # define NI_OVL_INPUT_GAMMA_MODE(x) (((x) & 0x3) << 4) > > -#define IH_RB_WPTR__RB_OVERFLOW_MASK 0x1 > -#define IH_RB_CNTL__WPTR_OVERFLOW_CLEAR_MASK 0x80000000 > -#define SRBM_STATUS__IH_BUSY_MASK 0x20000 > -#define SRBM_SOFT_RESET__SOFT_RESET_IH_MASK 0x400 > - > #define BLACKOUT_MODE_MASK 0x00000007 > #define VGA_RENDER_CONTROL 0xC0 > #define R_000300_VGA_RENDER_CONTROL 0xC0 > @@ -2432,18 +2427,6 @@ > #define MC_SEQ_MISC0__MT__HBM 0x60000000 > #define MC_SEQ_MISC0__MT__DDR3 0xB0000000 > > -#define SRBM_STATUS__MCB_BUSY_MASK 0x200 > -#define SRBM_STATUS__MCB_BUSY__SHIFT 0x9 > -#define SRBM_STATUS__MCB_NON_DISPLAY_BUSY_MASK 0x400 > -#define SRBM_STATUS__MCB_NON_DISPLAY_BUSY__SHIFT 0xa > -#define SRBM_STATUS__MCC_BUSY_MASK 0x800 > -#define SRBM_STATUS__MCC_BUSY__SHIFT 0xb > -#define SRBM_STATUS__MCD_BUSY_MASK 0x1000 > -#define SRBM_STATUS__MCD_BUSY__SHIFT 0xc > -#define SRBM_STATUS__VMC_BUSY_MASK 0x100 > -#define SRBM_STATUS__VMC_BUSY__SHIFT 0x8 > - > - > #define GRBM_STATUS__GUI_ACTIVE_MASK 0x80000000 > #define CP_INT_CNTL_RING__TIME_STAMP_INT_ENABLE_MASK 0x4000000 > #define CP_INT_CNTL_RING0__PRIV_REG_INT_ENABLE_MASK 0x800000 > @@ -2468,8 +2451,6 @@ > > #define PCIE_BUS_CLK 10000 > #define TCLK (PCIE_BUS_CLK / 10) > -#define CC_DRM_ID_STRAPS__ATI_REV_ID_MASK 0xf0000000 > -#define CC_DRM_ID_STRAPS__ATI_REV_ID__SHIFT 0x1c > #define PCIE_PORT_INDEX 0xe > #define PCIE_PORT_DATA 0xf > #define EVERGREEN_PIF_PHY0_INDEX 0x8 > -- > 2.25.4 > _______________________________________________ amd-gfx mailing list amd-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/amd-gfx
