+Rohit
-----Original Message-----
From: Zhou, Peng Ju <PengJu.Zhou@xxxxxxx>
Sent: Wednesday, May 19, 2021 10:34 AM
To: Zhou, Peng Ju <PengJu.Zhou@xxxxxxx>; Alex Deucher <alexdeucher@xxxxxxxxx>; amd-gfx@xxxxxxxxxxxxxxxxxxxxx
Cc: Deng, Emily <Emily.Deng@xxxxxxx>; Ming, Davis <Davis.Ming@xxxxxxx>; Chang, HaiJun <HaiJun.Chang@xxxxxxx>
Subject: RE: [PATCH v5 01/10] drm/amdgpu: Indirect register access for Navi12 sriov
[AMD Official Use Only - Internal Distribution Only]
Ping on this series.
----------------------------------------------------------------------
BW
Pengju Zhou
> -----Original Message-----
> From: amd-gfx <amd-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> On Behalf Of Zhou,
> Peng Ju
> Sent: Monday, May 17, 2021 10:50 PM
> To: Alex Deucher <alexdeucher@xxxxxxxxx>; amd-gfx@xxxxxxxxxxxxxxxxxxxxx
> Cc: Deng, Emily <Emily.Deng@xxxxxxx>; Ming, Davis
> <Davis.Ming@xxxxxxx>; Chang, HaiJun <HaiJun.Chang@xxxxxxx>
> Subject: RE: [PATCH v5 01/10] drm/amdgpu: Indirect register access for
> Navi12 sriov
>
> [AMD Official Use Only - Internal Distribution Only]
>
> Hi Alex
> About your comment:
> "I think patches 1-4, 16 need to be squashed together to avoid breaking the
> build. Please also provide a description of how the new macros work in the
> patch description. Describe how the reworked macros properly handle
> sending GC and MMHUB accesses via the RLC rather than via some other
> mechanism. It's really hard to follow the macro logic."
>
> I squashed patches 1-4, 16 and add more detail description in the patch
> description.
> Can you help to review the patch series?
>
>
> ----------------------------------------------------------------------
> BW
> Pengju Zhou
>
>
>
> > -----Original Message-----
> > From: Peng Ju Zhou <PengJu.Zhou@xxxxxxx>
> > Sent: Monday, May 17, 2021 10:39 PM
> > To: amd-gfx@xxxxxxxxxxxxxxxxxxxxx
> > Cc: Zhou, Peng Ju <PengJu.Zhou@xxxxxxx>
> > Subject: [PATCH v5 01/10] drm/amdgpu: Indirect register access for Navi12
> > sriov
> >
> > This patch series are used for GC/MMHUB(part)/IH_RB_CNTL indirect
> access
> > in the SRIOV environment.
> >
> > There are 4 bits, controlled by host, to control if
> > GC/MMHUB(part)/IH_RB_CNTL indirect access enabled.
> > (one bit is master bit controls other 3 bits)
> >
> > For GC registers, changing all the register access from MMIO to RLC and use
> > RLC as the default access method in the full access time.
> >
> > For partial MMHUB registers, changing their access from MMIO to RLC in
> the
> > full access time, the remaining registers keep the original access method.
> >
> > For IH_RB_CNTL register, changing it's access from MMIO to PSP.
> >
> > Signed-off-by: Peng Ju Zhou <PengJu.Zhou@xxxxxxx>
> > ---
> > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 +
> > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +-
> > drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 4 +-
> > drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 78 +++++++++----------
> > drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 9 ++-
> > drivers/gpu/drm/amd/amdgpu/soc15_common.h | 87 +++++++++++++----
> --
> > ---
> > 6 files changed, 97 insertions(+), 84 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> > b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> > index 3147c1c935c8..4e0c90e52ab6 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> > @@ -1147,6 +1147,7 @@ int emu_soc_asic_init(struct amdgpu_device
> > *adev);
> > * Registers read & write functions.
> > */
> > #define AMDGPU_REGS_NO_KIQ (1<<1)
> > +#define AMDGPU_REGS_RLC (1<<2)
> >
> > #define RREG32_NO_KIQ(reg) amdgpu_device_rreg(adev, (reg),
> > AMDGPU_REGS_NO_KIQ) #define WREG32_NO_KIQ(reg, v)
> > amdgpu_device_wreg(adev, (reg), (v), AMDGPU_REGS_NO_KIQ) diff --git
> > a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> > b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> > index 7c6c435e5d02..a2392bbe1e21 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> > @@ -490,7 +490,7 @@ void amdgpu_mm_wreg_mmio_rlc(struct
> > amdgpu_device *adev,
> > adev->gfx.rlc.funcs &&
> > adev->gfx.rlc.funcs->is_rlcg_access_range) {
> > if (adev->gfx.rlc.funcs->is_rlcg_access_range(adev, reg))
> > - return adev->gfx.rlc.funcs->rlcg_wreg(adev, reg, v, 0);
> > + return adev->gfx.rlc.funcs->rlcg_wreg(adev, reg, v, 0,
> > 0);
> > } else {
> > writel(v, ((void __iomem *)adev->rmmio) + (reg * 4));
> > }
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h
> > b/drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h
> > index 4fc2ce8ce8ab..7a4775ab6804 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h
> > @@ -127,8 +127,8 @@ struct amdgpu_rlc_funcs {
> > void (*reset)(struct amdgpu_device *adev);
> > void (*start)(struct amdgpu_device *adev);
> > void (*update_spm_vmid)(struct amdgpu_device *adev, unsigned
> > vmid);
> > - void (*rlcg_wreg)(struct amdgpu_device *adev, u32 offset, u32 v, u32
> > flag);
> > - u32 (*rlcg_rreg)(struct amdgpu_device *adev, u32 offset, u32 flag);
> > + void (*rlcg_wreg)(struct amdgpu_device *adev, u32 offset, u32 v, u32
> > acc_flags, u32 hwip);
> > + u32 (*rlcg_rreg)(struct amdgpu_device *adev, u32 offset, u32
> > +acc_flags, u32 hwip);
> > bool (*is_rlcg_access_range)(struct amdgpu_device *adev, uint32_t
> > reg); };
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> > b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> > index 2a3427e5020f..7c5c1ff7d97e 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> > @@ -1427,38 +1427,36 @@ static const struct soc15_reg_golden
> > golden_settings_gc_10_1_2[] =
> > SOC15_REG_GOLDEN_VALUE(GC, 0, mmUTCL1_CTRL, 0xffffffff,
> > 0x00800000) };
> >
> > -static bool gfx_v10_is_rlcg_rw(struct amdgpu_device *adev, u32 offset,
> > uint32_t *flag, bool write) -{
> > - /* always programed by rlcg, only for gc */
> > - if (offset == SOC15_REG_OFFSET(GC, 0, mmRLC_CSIB_ADDR_HI) ||
> > - offset == SOC15_REG_OFFSET(GC, 0, mmRLC_CSIB_ADDR_LO) ||
> > - offset == SOC15_REG_OFFSET(GC, 0, mmRLC_CSIB_LENGTH) ||
> > - offset == SOC15_REG_OFFSET(GC, 0, mmGRBM_GFX_CNTL) ||
> > - offset == SOC15_REG_OFFSET(GC, 0, mmGRBM_GFX_INDEX) ||
> > - offset == SOC15_REG_OFFSET(GC, 0, mmCP_ME_CNTL)) {
> > - if (!amdgpu_sriov_reg_indirect_gc(adev))
> > - *flag = GFX_RLCG_GC_WRITE_OLD;
> > - else
> > - *flag = write ? GFX_RLCG_GC_WRITE :
> > GFX_RLCG_GC_READ;
> > +static bool gfx_v10_get_rlcg_flag(struct amdgpu_device *adev, u32
> > acc_flags, u32 hwip,
> > + int write, u32 *rlcg_flag)
> > +{
> > + switch (hwip) {
> > + case GC_HWIP:
> > + if (amdgpu_sriov_reg_indirect_gc(adev)) {
> > + *rlcg_flag = write ? GFX_RLCG_GC_WRITE :
> > GFX_RLCG_GC_READ;
> >
> > - return true;
> > - }
> > + return true;
> > + /* only in new version, AMDGPU_REGS_NO_KIQ and
> > AMDGPU_REGS_RLC enabled simultaneously */
> > + } else if ((acc_flags & AMDGPU_REGS_RLC) && !(acc_flags &
> > AMDGPU_REGS_NO_KIQ)) {
> > + *rlcg_flag = GFX_RLCG_GC_WRITE_OLD;
> >
> > - /* currently support gc read/write, mmhub write */
> > - if (offset >= SOC15_REG_OFFSET(GC, 0, mmSDMA0_DEC_START) &&
> > - offset <= SOC15_REG_OFFSET(GC, 0, mmRLC_GTS_OFFSET_MSB)) {
> > - if (amdgpu_sriov_reg_indirect_gc(adev))
> > - *flag = write ? GFX_RLCG_GC_WRITE :
> > GFX_RLCG_GC_READ;
> > - else
> > - return false;
> > - } else {
> > - if (amdgpu_sriov_reg_indirect_mmhub(adev))
> > - *flag = GFX_RLCG_MMHUB_WRITE;
> > - else
> > - return false;
> > + return true;
> > + }
> > +
> > + break;
> > + case MMHUB_HWIP:
> > + if (amdgpu_sriov_reg_indirect_mmhub(adev) &&
> > + (acc_flags & AMDGPU_REGS_RLC) && write) {
> > + *rlcg_flag = GFX_RLCG_MMHUB_WRITE;
> > + return true;
> > + }
> > +
> > + break;
> > + default:
> > + DRM_DEBUG("Not program register by RLCG\n");
> > }
> >
> > - return true;
> > + return false;
> > }
> >
> > static u32 gfx_v10_rlcg_rw(struct amdgpu_device *adev, u32 offset, u32 v,
> > uint32_t flag) @@ -1518,36 +1516,34 @@ static u32 gfx_v10_rlcg_rw(struct
> > amdgpu_device *adev, u32 offset, u32 v, uint32
> > return ret;
> > }
> >
> > -static void gfx_v10_rlcg_wreg(struct amdgpu_device *adev, u32 offset, u32
> > value, u32 flag)
> > +static void gfx_v10_rlcg_wreg(struct amdgpu_device *adev, u32 offset,
> > +u32 value, u32 acc_flags, u32 hwip)
> > {
> > - uint32_t rlcg_flag;
> > + u32 rlcg_flag;
> >
> > - if (amdgpu_sriov_fullaccess(adev) &&
> > - gfx_v10_is_rlcg_rw(adev, offset, &rlcg_flag, 1)) {
> > + if (!amdgpu_sriov_runtime(adev) &&
> > + gfx_v10_get_rlcg_flag(adev, acc_flags, hwip, 1, &rlcg_flag)) {
> > gfx_v10_rlcg_rw(adev, offset, value, rlcg_flag);
> > -
> > return;
> > }
> > - if (flag & AMDGPU_REGS_NO_KIQ)
> > +
> > + if (acc_flags & AMDGPU_REGS_NO_KIQ)
> > WREG32_NO_KIQ(offset, value);
> > else
> > WREG32(offset, value);
> > }
> >
> > -static u32 gfx_v10_rlcg_rreg(struct amdgpu_device *adev, u32 offset, u32
> > flag)
> > +static u32 gfx_v10_rlcg_rreg(struct amdgpu_device *adev, u32 offset,
> > +u32 acc_flags, u32 hwip)
> > {
> > - uint32_t rlcg_flag;
> > + u32 rlcg_flag;
> >
> > - if (amdgpu_sriov_fullaccess(adev) &&
> > - gfx_v10_is_rlcg_rw(adev, offset, &rlcg_flag, 0))
> > + if (!amdgpu_sriov_runtime(adev) &&
> > + gfx_v10_get_rlcg_flag(adev, acc_flags, hwip, 0, &rlcg_flag))
> > return gfx_v10_rlcg_rw(adev, offset, 0, rlcg_flag);
> >
> > - if (flag & AMDGPU_REGS_NO_KIQ)
> > + if (acc_flags & AMDGPU_REGS_NO_KIQ)
> > return RREG32_NO_KIQ(offset);
> > else
> > return RREG32(offset);
> > -
> > - return 0;
> > }
> >
> > static const struct soc15_reg_golden golden_settings_gc_10_1_nv14[] = diff
> -
> > -git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> > b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> > index feaa5e4a5538..fe5908f708cc 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> > @@ -734,7 +734,7 @@ static const u32
> > GFX_RLC_SRM_INDEX_CNTL_DATA_OFFSETS[] =
> > mmRLC_SRM_INDEX_CNTL_DATA_7 -
> > mmRLC_SRM_INDEX_CNTL_DATA_0, };
> >
> > -static void gfx_v9_0_rlcg_rw(struct amdgpu_device *adev, u32 offset, u32
> v,
> > u32 flag)
> > +static void gfx_v9_0_rlcg_w(struct amdgpu_device *adev, u32 offset, u32
> > +v, u32 flag)
> > {
> > static void *scratch_reg0;
> > static void *scratch_reg1;
> > @@ -787,15 +787,16 @@ static void gfx_v9_0_rlcg_rw(struct
> amdgpu_device
> > *adev, u32 offset, u32 v, u32
> >
> > }
> >
> > -static void gfx_v9_0_rlcg_wreg(struct amdgpu_device *adev, u32 offset,
> u32
> > v, u32 flag)
> > +static void gfx_v9_0_rlcg_wreg(struct amdgpu_device *adev, u32 offset,
> > + u32 v, u32 acc_flags, u32 hwip)
> > {
> > if (amdgpu_sriov_fullaccess(adev)) {
> > - gfx_v9_0_rlcg_rw(adev, offset, v, flag);
> > + gfx_v9_0_rlcg_w(adev, offset, v, acc_flags);
> >
> > return;
> > }
> >
> > - if (flag & AMDGPU_REGS_NO_KIQ)
> > + if (acc_flags & AMDGPU_REGS_NO_KIQ)
> > WREG32_NO_KIQ(offset, v);
> > else
> > WREG32(offset, v);
> > diff --git a/drivers/gpu/drm/amd/amdgpu/soc15_common.h
> > b/drivers/gpu/drm/amd/amdgpu/soc15_common.h
> > index 14bd794bbea6..c781808e4dc3 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/soc15_common.h
> > +++ b/drivers/gpu/drm/amd/amdgpu/soc15_common.h
> > @@ -27,28 +27,51 @@
> > /* Register Access Macros */
> > #define SOC15_REG_OFFSET(ip, inst, reg) (adev-
> > >reg_offset[ip##_HWIP][inst][reg##_BASE_IDX] + reg)
> >
> > +#define __WREG32_SOC15_RLC__(reg, value, flag, hwip) \
> > + ((amdgpu_sriov_vf(adev) && adev->gfx.rlc.funcs->rlcg_wreg) ? \
> > + adev->gfx.rlc.funcs->rlcg_wreg(adev, reg, value, flag, hwip) : \
> > + WREG32(reg, value))
> > +
> > +#define __RREG32_SOC15_RLC__(reg, flag, hwip) \
> > + ((amdgpu_sriov_vf(adev) && adev->gfx.rlc.funcs->rlcg_rreg) ? \
> > + adev->gfx.rlc.funcs->rlcg_rreg(adev, reg, flag, hwip) : \
> > + RREG32(reg))
> > +
> > #define WREG32_FIELD15(ip, idx, reg, field, val) \
> > - WREG32(adev->reg_offset[ip##_HWIP][idx][mm##reg##_BASE_IDX]
> > + mm##reg, \
> > - (RREG32(adev->reg_offset[ip##_HWIP][idx][mm##reg##_BASE_IDX]
> > + mm##reg) \
> > - & ~REG_FIELD_MASK(reg, field)) | (val) << REG_FIELD_SHIFT(reg,
> > field))
> > + __WREG32_SOC15_RLC__(adev-
> > >reg_offset[ip##_HWIP][idx][mm##reg##_BASE_IDX] + mm##reg, \
> > + (__RREG32_SOC15_RLC__( \
> > + adev-
> > >reg_offset[ip##_HWIP][idx][mm##reg##_BASE_IDX] + mm##reg, \
> > + 0, ip##_HWIP) & \
> > + ~REG_FIELD_MASK(reg, field)) | (val) <<
> > REG_FIELD_SHIFT(reg, field), \
> > + 0, ip##_HWIP)
> >
> > #define RREG32_SOC15(ip, inst, reg) \
> > - RREG32(adev->reg_offset[ip##_HWIP][inst][reg##_BASE_IDX] + reg)
> > + __RREG32_SOC15_RLC__(adev-
> > >reg_offset[ip##_HWIP][inst][reg##_BASE_IDX] + reg, \
> > + 0, ip##_HWIP)
> > +
> > +#define RREG32_SOC15_IP(ip, reg) __RREG32_SOC15_RLC__(reg, 0,
> > +ip##_HWIP)
> >
> > #define RREG32_SOC15_NO_KIQ(ip, inst, reg) \
> > - RREG32_NO_KIQ(adev-
> > >reg_offset[ip##_HWIP][inst][reg##_BASE_IDX] + reg)
> > + __RREG32_SOC15_RLC__(adev-
> > >reg_offset[ip##_HWIP][inst][reg##_BASE_IDX] + reg, \
> > + AMDGPU_REGS_NO_KIQ, ip##_HWIP)
> >
> > #define RREG32_SOC15_OFFSET(ip, inst, reg, offset) \
> > - RREG32((adev->reg_offset[ip##_HWIP][inst][reg##_BASE_IDX] + reg)
> > + offset)
> > +
> > +__RREG32_SOC15_RLC__((adev-
> > >reg_offset[ip##_HWIP][inst][reg##_BASE_IDX]
> > ++ reg) + offset, 0, ip##_HWIP)
> >
> > #define WREG32_SOC15(ip, inst, reg, value) \
> > - WREG32((adev->reg_offset[ip##_HWIP][inst][reg##_BASE_IDX] + reg),
> > value)
> > + __WREG32_SOC15_RLC__((adev-
> > >reg_offset[ip##_HWIP][inst][reg##_BASE_IDX] + reg), \
> > + value, 0, ip##_HWIP)
> > +
> > +#define WREG32_SOC15_IP(ip, reg, value) \
> > + __WREG32_SOC15_RLC__(reg, value, 0, ip##_HWIP)
> >
> > #define WREG32_SOC15_NO_KIQ(ip, inst, reg, value) \
> > - WREG32_NO_KIQ((adev-
> > >reg_offset[ip##_HWIP][inst][reg##_BASE_IDX] + reg), value)
> > + __WREG32_SOC15_RLC__(adev-
> > >reg_offset[ip##_HWIP][inst][reg##_BASE_IDX] + reg, \
> > + value, AMDGPU_REGS_NO_KIQ, ip##_HWIP)
> >
> > #define WREG32_SOC15_OFFSET(ip, inst, reg, offset, value) \
> > - WREG32((adev->reg_offset[ip##_HWIP][inst][reg##_BASE_IDX] + reg)
> > + offset, value)
> > + __WREG32_SOC15_RLC__((adev-
> > >reg_offset[ip##_HWIP][inst][reg##_BASE_IDX] + reg) + offset, \
> > + value, 0, ip##_HWIP)
> >
> > #define SOC15_WAIT_ON_RREG(ip, inst, reg, expected_value, mask) \
> > ({ int ret = 0; \
> > @@ -77,12 +100,7 @@
> > })
> >
> > #define WREG32_RLC(reg, value) \
> > - do { \
> > - if (adev->gfx.rlc.funcs->rlcg_wreg) \
> > - adev->gfx.rlc.funcs->rlcg_wreg(adev, reg, value, 0); \
> > - else \
> > - WREG32(reg, value); \
> > - } while (0)
> > + __WREG32_SOC15_RLC__(reg, value, AMDGPU_REGS_RLC, GC_HWIP)
> >
> > #define WREG32_RLC_EX(prefix, reg, value) \
> > do { \
> > @@ -108,24 +126,19 @@
> > } \
> > } while (0)
> >
> > +/* shadow the registers in the callback function */
> > #define WREG32_SOC15_RLC_SHADOW(ip, inst, reg, value) \
> > - WREG32_RLC((adev->reg_offset[ip##_HWIP][inst][reg##_BASE_IDX]
> > + reg), value)
> > +
> > +__WREG32_SOC15_RLC__((adev-
> > >reg_offset[ip##_HWIP][inst][reg##_BASE_IDX]
> > ++ reg), value, AMDGPU_REGS_RLC, GC_HWIP)
> >
> > +/* for GC only */
> > #define RREG32_RLC(reg) \
> > - (adev->gfx.rlc.funcs->rlcg_rreg ? \
> > - adev->gfx.rlc.funcs->rlcg_rreg(adev, reg, 0) : RREG32(reg))
> > -
> > -#define WREG32_RLC_NO_KIQ(reg, value) \
> > - do { \
> > - if (adev->gfx.rlc.funcs->rlcg_wreg) \
> > - adev->gfx.rlc.funcs->rlcg_wreg(adev, reg, value,
> > AMDGPU_REGS_NO_KIQ); \
> > - else \
> > - WREG32_NO_KIQ(reg, value); \
> > - } while (0)
> > + __RREG32_SOC15_RLC__(reg, AMDGPU_REGS_RLC, GC_HWIP)
> > +
> > +#define WREG32_RLC_NO_KIQ(reg, value, hwip) \
> > + __WREG32_SOC15_RLC__(reg, value, AMDGPU_REGS_NO_KIQ |
> > AMDGPU_REGS_RLC,
> > +hwip)
> >
> > -#define RREG32_RLC_NO_KIQ(reg) \
> > - (adev->gfx.rlc.funcs->rlcg_rreg ? \
> > - adev->gfx.rlc.funcs->rlcg_rreg(adev, reg,
> > AMDGPU_REGS_NO_KIQ) : RREG32_NO_KIQ(reg))
> > +#define RREG32_RLC_NO_KIQ(reg, hwip) \
> > + __RREG32_SOC15_RLC__(reg, AMDGPU_REGS_NO_KIQ |
> > AMDGPU_REGS_RLC, hwip)
> >
> > #define WREG32_SOC15_RLC_SHADOW_EX(prefix, ip, inst, reg, value) \
> > do { \
> > @@ -146,12 +159,12 @@
> > } while (0)
> >
> > #define RREG32_SOC15_RLC(ip, inst, reg) \
> > - RREG32_RLC(adev->reg_offset[ip##_HWIP][inst][reg##_BASE_IDX] +
> > reg)
> > + __RREG32_SOC15_RLC__(adev-
> > >reg_offset[ip##_HWIP][inst][reg##_BASE_IDX]
> > ++ reg, AMDGPU_REGS_RLC, ip##_HWIP)
> >
> > #define WREG32_SOC15_RLC(ip, inst, reg, value) \
> > do { \
> > uint32_t target_reg = adev-
> > >reg_offset[ip##_HWIP][0][reg##_BASE_IDX] + reg;\
> > - WREG32_RLC(target_reg, value); \
> > + __WREG32_SOC15_RLC__(target_reg, value,
> > AMDGPU_REGS_RLC, ip##_HWIP);
> > +\
> > } while (0)
> >
> > #define WREG32_SOC15_RLC_EX(prefix, ip, inst, reg, value) \ @@ -161,14
> > +174,16 @@
> > } while (0)
> >
> > #define WREG32_FIELD15_RLC(ip, idx, reg, field, val) \
> > - WREG32_RLC((adev-
> > >reg_offset[ip##_HWIP][idx][mm##reg##_BASE_IDX] + mm##reg), \
> > - (RREG32_RLC(adev-
> > >reg_offset[ip##_HWIP][idx][mm##reg##_BASE_IDX] + mm##reg) \
> > - & ~REG_FIELD_MASK(reg, field)) | (val) << REG_FIELD_SHIFT(reg,
> > field))
> > + __WREG32_SOC15_RLC__((adev-
> > >reg_offset[ip##_HWIP][idx][mm##reg##_BASE_IDX] + mm##reg), \
> > + (__RREG32_SOC15_RLC__(adev-
> > >reg_offset[ip##_HWIP][idx][mm##reg##_BASE_IDX] + mm##reg, \
> > + AMDGPU_REGS_RLC,
> > ip##_HWIP) & \
> > + ~REG_FIELD_MASK(reg, field)) | (val) <<
> > REG_FIELD_SHIFT(reg, field), \
> > + AMDGPU_REGS_RLC, ip##_HWIP)
> >
> > #define WREG32_SOC15_OFFSET_RLC(ip, inst, reg, offset, value) \
> > - WREG32_RLC(((adev->reg_offset[ip##_HWIP][inst][reg##_BASE_IDX]
> > + reg) + offset), value)
> > +
> > +__WREG32_SOC15_RLC__((adev-
> > >reg_offset[ip##_HWIP][inst][reg##_BASE_IDX]
> > ++ reg) + offset, value, AMDGPU_REGS_RLC, ip##_HWIP)
> >
> > #define RREG32_SOC15_OFFSET_RLC(ip, inst, reg, offset) \
> > - RREG32_RLC(((adev->reg_offset[ip##_HWIP][inst][reg##_BASE_IDX] +
> > reg) + offset))
> > +
> > +__RREG32_SOC15_RLC__((adev-
> > >reg_offset[ip##_HWIP][inst][reg##_BASE_IDX]
> > ++ reg) + offset, AMDGPU_REGS_RLC, ip##_HWIP)
> >
> > #endif
> > --
> > 2.17.1
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.f
> reedesktop.org%2Fmailman%2Flistinfo%2Famd-
> gfx&data=04%7C01%7CPengju.Zhou%40amd.com%7C5593a422cc7e48b
> 80f6c08d9194308ae%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7
> C637568597973904052%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAw
> MDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sd
> ata=a4brqHQ43K6fkF%2BAgWWclhZdgEs2SpThk%2BFYcmaInTM%3D&r
> eserved=0
_______________________________________________
amd-gfx mailing list
amd-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
