refine register access interfaces
Subsystems (2)
cover refine register access interfaces
The series refined register access interfaces including:
1. add indirect access support to registers outside of mmio bar
2. remove the inproper workaround leaving in the low level if
3. retire legacy interface RREG32_IDX/WREG32_IDX
4. retire redundant flags AMDGPU_REGS_KIQ/AMDGPU_REGS_IDX
Hawking Zhang (6):
drm/amdgpu: remove inproper workaround for vega10 drm/amdgpu: replace indirect mmio access in non-dc code path drm/amdgpu: retire indirect mmio reg support from cgs drm/amdgpu: retire RREG32_IDX/WREG32_IDX drm/amdgpu: retire AMDGPU_REGS_KIQ flag drm/amdgpu: support access regs outside of mmio bar
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 29 +++++-------- drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 8 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 69 +++++++++--------------------- drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 4 +- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 8 ++-- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 8 ++-- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 14 +++--- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 14 +++--- drivers/gpu/drm/amd/include/cgs_common.h | 1 - 9 files changed, 60 insertions(+), 95 deletions(-)
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 1/6 drm/amdgpu: remove inproper workaround for vega10
the workaround is not needed for soc15 ASICs except for vega10. it is even not needed with latest vega10 vbios.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 -- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 16 ---------------- 2 files changed, 18 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -2
@@ -960,8 +960,6 @@ struct amdgpu_device {/* s3/s4 mask */ bool in_suspend; -/* record last mm index being written through WREG32*/ -unsigned long last_mm_index;bool in_gpu_reset;enum pp_mp1_state mp1_state;struct mutex lock_reset;
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0 -16
@@ -387,10 +387,6 @@ void static inline amdgpu_mm_wreg_mmio(struct amdgpu_device *adev, uint32_t reg,writel (v, ((void __iomem *)adev->rmmio) + (mmMM_DATA *4 ));spin_unlock_irqrestore (&adev->mmio_idx_lock, flags); } - -if (adev->asic_type >=CHIP_VEGA10 && reg ==1 && adev->last_mm_index ==0x5702C ) { -udelay (500 ); - } }/**
@@ -406,10 +402,6 @@ void static inline amdgpu_mm_wreg_mmio(struct amdgpu_device *adev, uint32_t reg,void amdgpu_mm_wreg (struct amdgpu_device *adev,uint32_t reg,uint32_t v,uint32_t acc_flags) { -if (adev->asic_type >=CHIP_VEGA10 && reg ==0 ) { - adev->last_mm_index = v; - } -if ((acc_flags &AMDGPU_REGS_KIQ ) || (!(acc_flags &AMDGPU_REGS_NO_KIQ ) &&amdgpu_sriov_runtime (adev)))return amdgpu_kiq_wreg (adev, reg, v);
@@ -464,20 +456,12 @@ u32 amdgpu_io_rreg(struct amdgpu_device *adev, u32 reg)*/ void amdgpu_io_wreg (struct amdgpu_device *adev,u32 reg,u32 v) { -if (adev->asic_type >=CHIP_VEGA10 && reg ==0 ) { - adev->last_mm_index = v; - } -if ((reg *4 ) < adev->rio_mem_size)iowrite32 (v, adev->rio_mem + (reg *4 ));else {iowrite32 ((reg *4 ), adev->rio_mem + (mmMM_INDEX *4 ));iowrite32 (v, adev->rio_mem + (mmMM_DATA *4 )); } - -if (adev->asic_type >=CHIP_VEGA10 && reg ==1 && adev->last_mm_index ==0x5702C ) { -udelay (500 ); - } }/**
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/6 drm/amdgpu: replace indirect mmio access in non-dc code path
In reply to Hawking Zhangall the mmCUR_CONTROL instances are in mmr range and can be accessd directly by using RREG32/WREG32
--- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 8 ++++---- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 8 ++++---- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 14 +++++++------- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 14 +++++++------- 4 files changed, 22 insertions(+), 22 deletions(-)
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +4 -4
@@ -2303,9 +2303,9 @@ static void dce_v10_0_hide_cursor(struct drm_crtc *crtc)struct amdgpu_device *adev = crtc->dev->dev_private;u32 tmp; - tmp =RREG32_IDX (mmCUR_CONTROL + amdgpu_crtc->crtc_offset); + tmp =RREG32 (mmCUR_CONTROL + amdgpu_crtc->crtc_offset); tmp =REG_SET_FIELD (tmp,CUR_CONTROL ,CURSOR_EN ,0 ); -WREG32_IDX (mmCUR_CONTROL + amdgpu_crtc->crtc_offset, tmp); +WREG32 (mmCUR_CONTROL + amdgpu_crtc->crtc_offset, tmp); }static void dce_v10_0_show_cursor (struct drm_crtc *crtc)
@@ -2319,10 +2319,10 @@ static void dce_v10_0_show_cursor(struct drm_crtc *crtc)WREG32 (mmCUR_SURFACE_ADDRESS + amdgpu_crtc->crtc_offset,lower_32_bits (amdgpu_crtc->cursor_addr)); - tmp =RREG32_IDX (mmCUR_CONTROL + amdgpu_crtc->crtc_offset); + tmp =RREG32 (mmCUR_CONTROL + amdgpu_crtc->crtc_offset); tmp =REG_SET_FIELD (tmp,CUR_CONTROL ,CURSOR_EN ,1 ); tmp =REG_SET_FIELD (tmp,CUR_CONTROL ,CURSOR_MODE ,2 ); -WREG32_IDX (mmCUR_CONTROL + amdgpu_crtc->crtc_offset, tmp); +WREG32 (mmCUR_CONTROL + amdgpu_crtc->crtc_offset, tmp); } static int dce_v10_0_cursor_move_locked(struct drm_crtc *crtc,
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +4 -4
@@ -2382,9 +2382,9 @@ static void dce_v11_0_hide_cursor(struct drm_crtc *crtc)struct amdgpu_device *adev = crtc->dev->dev_private;u32 tmp; - tmp =RREG32_IDX (mmCUR_CONTROL + amdgpu_crtc->crtc_offset); + tmp =RREG32 (mmCUR_CONTROL + amdgpu_crtc->crtc_offset); tmp =REG_SET_FIELD (tmp,CUR_CONTROL ,CURSOR_EN ,0 ); -WREG32_IDX (mmCUR_CONTROL + amdgpu_crtc->crtc_offset, tmp); +WREG32 (mmCUR_CONTROL + amdgpu_crtc->crtc_offset, tmp); }static void dce_v11_0_show_cursor (struct drm_crtc *crtc)
@@ -2398,10 +2398,10 @@ static void dce_v11_0_show_cursor(struct drm_crtc *crtc)WREG32 (mmCUR_SURFACE_ADDRESS + amdgpu_crtc->crtc_offset,lower_32_bits (amdgpu_crtc->cursor_addr)); - tmp =RREG32_IDX (mmCUR_CONTROL + amdgpu_crtc->crtc_offset); + tmp =RREG32 (mmCUR_CONTROL + amdgpu_crtc->crtc_offset); tmp =REG_SET_FIELD (tmp,CUR_CONTROL ,CURSOR_EN ,1 ); tmp =REG_SET_FIELD (tmp,CUR_CONTROL ,CURSOR_MODE ,2 ); -WREG32_IDX (mmCUR_CONTROL + amdgpu_crtc->crtc_offset, tmp); +WREG32 (mmCUR_CONTROL + amdgpu_crtc->crtc_offset, tmp); } static int dce_v11_0_cursor_move_locked(struct drm_crtc *crtc,
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +7 -7
@@ -2194,9 +2194,9 @@ static void dce_v6_0_hide_cursor(struct drm_crtc *crtc)struct amdgpu_crtc *amdgpu_crtc =to_amdgpu_crtc (crtc);struct amdgpu_device *adev = crtc->dev->dev_private; -WREG32_IDX (mmCUR_CONTROL + amdgpu_crtc->crtc_offset, - (CURSOR_24_8_PRE_MULT <<CUR_CONTROL__CURSOR_MODE__SHIFT ) | - (CURSOR_URGENT_1_2 <<CUR_CONTROL__CURSOR_URGENT_CONTROL__SHIFT )); +WREG32 (mmCUR_CONTROL + amdgpu_crtc->crtc_offset, + (CURSOR_24_8_PRE_MULT <<CUR_CONTROL__CURSOR_MODE__SHIFT ) | + (CURSOR_URGENT_1_2 <<CUR_CONTROL__CURSOR_URGENT_CONTROL__SHIFT )); }
@@ -2211,10 +2211,10 @@ static void dce_v6_0_show_cursor(struct drm_crtc *crtc)WREG32 (mmCUR_SURFACE_ADDRESS + amdgpu_crtc->crtc_offset,lower_32_bits (amdgpu_crtc->cursor_addr)); -WREG32_IDX (mmCUR_CONTROL + amdgpu_crtc->crtc_offset, -CUR_CONTROL__CURSOR_EN_MASK | - (CURSOR_24_8_PRE_MULT <<CUR_CONTROL__CURSOR_MODE__SHIFT ) | - (CURSOR_URGENT_1_2 <<CUR_CONTROL__CURSOR_URGENT_CONTROL__SHIFT )); +WREG32 (mmCUR_CONTROL + amdgpu_crtc->crtc_offset, +CUR_CONTROL__CURSOR_EN_MASK | + (CURSOR_24_8_PRE_MULT <<CUR_CONTROL__CURSOR_MODE__SHIFT ) | + (CURSOR_URGENT_1_2 <<CUR_CONTROL__CURSOR_URGENT_CONTROL__SHIFT )); }
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +7 -7
@@ -2205,9 +2205,9 @@ static void dce_v8_0_hide_cursor(struct drm_crtc *crtc)struct amdgpu_crtc *amdgpu_crtc =to_amdgpu_crtc (crtc);struct amdgpu_device *adev = crtc->dev->dev_private; -WREG32_IDX (mmCUR_CONTROL + amdgpu_crtc->crtc_offset, - (CURSOR_24_8_PRE_MULT <<CUR_CONTROL__CURSOR_MODE__SHIFT ) | - (CURSOR_URGENT_1_2 <<CUR_CONTROL__CURSOR_URGENT_CONTROL__SHIFT )); +WREG32 (mmCUR_CONTROL + amdgpu_crtc->crtc_offset, + (CURSOR_24_8_PRE_MULT <<CUR_CONTROL__CURSOR_MODE__SHIFT ) | + (CURSOR_URGENT_1_2 <<CUR_CONTROL__CURSOR_URGENT_CONTROL__SHIFT )); }static void dce_v8_0_show_cursor (struct drm_crtc *crtc)
@@ -2220,10 +2220,10 @@ static void dce_v8_0_show_cursor(struct drm_crtc *crtc)WREG32 (mmCUR_SURFACE_ADDRESS + amdgpu_crtc->crtc_offset,lower_32_bits (amdgpu_crtc->cursor_addr)); -WREG32_IDX (mmCUR_CONTROL + amdgpu_crtc->crtc_offset, -CUR_CONTROL__CURSOR_EN_MASK | - (CURSOR_24_8_PRE_MULT <<CUR_CONTROL__CURSOR_MODE__SHIFT ) | - (CURSOR_URGENT_1_2 <<CUR_CONTROL__CURSOR_URGENT_CONTROL__SHIFT )); +WREG32 (mmCUR_CONTROL + amdgpu_crtc->crtc_offset, +CUR_CONTROL__CURSOR_EN_MASK | + (CURSOR_24_8_PRE_MULT <<CUR_CONTROL__CURSOR_MODE__SHIFT ) | + (CURSOR_URGENT_1_2 <<CUR_CONTROL__CURSOR_URGENT_CONTROL__SHIFT )); } static int dce_v8_0_cursor_move_locked(struct drm_crtc *crtc,
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/6 drm/amdgpu: retire indirect mmio reg support from cgs
In reply to Hawking Zhangnot needed anymore
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 8 ++++---- drivers/gpu/drm/amd/include/cgs_common.h | 1 - 2 files changed, 4 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +4 -4
@@ -60,8 +60,6 @@ static uint32_t amdgpu_cgs_read_ind_register(struct cgs_device *cgs_device, {CGS_FUNC_ADEV ;switch (space) { -case CGS_IND_REG__MMIO : -return RREG32_IDX (index);case CGS_IND_REG__PCIE :return RREG32_PCIE (index);case CGS_IND_REG__SMC :
@@ -77,6 +75,8 @@ static uint32_t amdgpu_cgs_read_ind_register(struct cgs_device *cgs_device,case CGS_IND_REG__AUDIO_ENDPT :DRM_ERROR ("audio endpt register access not implemented.\n" );return 0 ; +default : +BUG (); }WARN (1 ,"Invalid indirect register space" );return 0 ;
@@ -88,8 +88,6 @@ static void amdgpu_cgs_write_ind_register(struct cgs_device *cgs_device, {CGS_FUNC_ADEV ;switch (space) { -case CGS_IND_REG__MMIO : -return WREG32_IDX (index, value);case CGS_IND_REG__PCIE :return WREG32_PCIE (index, value);case CGS_IND_REG__SMC :
@@ -105,6 +103,8 @@ static void amdgpu_cgs_write_ind_register(struct cgs_device *cgs_device,case CGS_IND_REG__AUDIO_ENDPT :DRM_ERROR ("audio endpt register access not implemented.\n" );return ; +default : +BUG (); }WARN (1 ,"Invalid indirect register space" ); }
drivers/gpu/drm/amd/include/cgs_common.h +0 -1
@@ -32,7 +32,6 @@ struct cgs_device;* enum cgs_ind_reg - Indirect register spaces */ enum cgs_ind_reg { -CGS_IND_REG__MMIO ,CGS_IND_REG__PCIE ,CGS_IND_REG__SMC ,CGS_IND_REG__UVD_CTX ,
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/6 drm/amdgpu: retire RREG32_IDX/WREG32_IDX
In reply to Hawking Zhangthose are not needed anymore
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 4 ---- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -4
@@ -1027,8 +1027,6 @@ int emu_soc_asic_init(struct amdgpu_device *adev);/* * Registers read & write functions. */ - -#define AMDGPU_REGS_IDX (1<<0)#define AMDGPU_REGS_NO_KIQ (1<<1)#define AMDGPU_REGS_KIQ (1<<2)
@@ -1042,10 +1040,8 @@ int emu_soc_asic_init(struct amdgpu_device *adev);#define WREG8 (reg, v) amdgpu_mm_wreg8(adev, (reg), (v))#define RREG32 (reg) amdgpu_mm_rreg(adev, (reg), 0) -#define RREG32_IDX (reg) amdgpu_mm_rreg(adev, (reg), AMDGPU_REGS_IDX)#define DREG32 (reg) printk(KERN_INFO "REGISTER: " #reg " : 0x%08X\n", amdgpu_mm_rreg(adev, (reg), 0))#define WREG32 (reg, v) amdgpu_mm_wreg(adev, (reg), (v), 0) -#define WREG32_IDX (reg, v) amdgpu_mm_wreg(adev, (reg), (v), AMDGPU_REGS_IDX)#define REG_SET (FIELD , v) (((v) << FIELD##_SHIFT) & FIELD##_MASK)#define REG_GET (FIELD , v) (((v) << FIELD##_SHIFT) & FIELD##_MASK)#define RREG32_PCIE (reg) adev->pcie_rreg(adev, (reg))
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2 -2
@@ -317,7 +317,7 @@ uint32_t amdgpu_mm_rreg(struct amdgpu_device *adev, uint32_t reg,if ((acc_flags &AMDGPU_REGS_KIQ ) || (!(acc_flags &AMDGPU_REGS_NO_KIQ ) &&amdgpu_sriov_runtime (adev)))return amdgpu_kiq_rreg (adev, reg); -if ((reg *4 ) < adev->rmmio_size && !(acc_flags &AMDGPU_REGS_IDX )) +if ((reg *4 ) < adev->rmmio_size) ret =readl (((void __iomem *)adev->rmmio) + (reg *4 ));else {unsigned long flags;
@@ -377,7 +377,7 @@ void static inline amdgpu_mm_wreg_mmio(struct amdgpu_device *adev, uint32_t reg, {trace_amdgpu_mm_wreg (adev->pdev->device, reg, v); -if ((reg *4 ) < adev->rmmio_size && !(acc_flags &AMDGPU_REGS_IDX )) +if ((reg *4 ) < adev->rmmio_size)writel (v, ((void __iomem *)adev->rmmio) + (reg *4 ));else {unsigned long flags;
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/6 drm/amdgpu: retire AMDGPU_REGS_KIQ flag
In reply to Hawking Zhangall the register access through kiq is redirected
to amdgpu_kiq_rreg/amdgpu_kiq_wreg
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 5 ++--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +2 -3
@@ -1028,13 +1028,12 @@ int emu_soc_asic_init(struct amdgpu_device *adev);* Registers read & write functions. */ #define AMDGPU_REGS_NO_KIQ (1<<1) -#define AMDGPU_REGS_KIQ (1<<2)#define RREG32_NO_KIQ (reg) amdgpu_mm_rreg(adev, (reg), AMDGPU_REGS_NO_KIQ)#define WREG32_NO_KIQ (reg, v) amdgpu_mm_wreg(adev, (reg), (v), AMDGPU_REGS_NO_KIQ) -#define RREG32_KIQ (reg) amdgpu_mm_rreg(adev, (reg), AMDGPU_REGS_KIQ) -#define WREG32_KIQ (reg, v) amdgpu_mm_wreg(adev, (reg), (v), AMDGPU_REGS_KIQ) +#define RREG32_KIQ (reg) amdgpu_kiq_rreg(adev, (reg)) +#define WREG32_KIQ (reg, v) amdgpu_kiq_wreg(adev, (reg), (v))#define RREG8 (reg) amdgpu_mm_rreg8(adev, (reg))#define WREG8 (reg, v) amdgpu_mm_wreg8(adev, (reg), (v))
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2 -2
@@ -314,7 +314,7 @@ uint32_t amdgpu_mm_rreg(struct amdgpu_device *adev, uint32_t reg, {uint32_t ret; -if ((acc_flags &AMDGPU_REGS_KIQ ) || (!(acc_flags &AMDGPU_REGS_NO_KIQ ) &&amdgpu_sriov_runtime (adev))) +if (!(acc_flags &AMDGPU_REGS_NO_KIQ ) &&amdgpu_sriov_runtime (adev))return amdgpu_kiq_rreg (adev, reg);if ((reg *4 ) < adev->rmmio_size)
@@ -402,7 +402,7 @@ void static inline amdgpu_mm_wreg_mmio(struct amdgpu_device *adev, uint32_t reg,void amdgpu_mm_wreg (struct amdgpu_device *adev,uint32_t reg,uint32_t v,uint32_t acc_flags) { -if ((acc_flags &AMDGPU_REGS_KIQ ) || (!(acc_flags &AMDGPU_REGS_NO_KIQ ) &&amdgpu_sriov_runtime (adev))) +if (!(acc_flags &AMDGPU_REGS_NO_KIQ ) &&amdgpu_sriov_runtime (adev))return amdgpu_kiq_wreg (adev, reg, v);amdgpu_mm_wreg_mmio (adev, reg, v, acc_flags);
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/6 drm/amdgpu: support access regs outside of mmio bar
In reply to Hawking Zhangadd indirect access support to registers outside of mmio bar.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 18 ++++++------ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 45 +++++++++++------------------- drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 4 +-- 3 files changed, 28 insertions(+), 39 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +9 -9
@@ -1007,10 +1007,10 @@ int amdgpu_gpu_wait_for_idle(struct amdgpu_device *adev);void amdgpu_device_vram_access (struct amdgpu_device *adev,loff_t pos,uint32_t *buf,size_t size,bool write); -uint32_t amdgpu_mm_rreg (struct amdgpu_device *adev,uint32_t reg, +uint32_t amdgpu_device_rreg (struct amdgpu_device *adev,uint32_t reg, +uint32_t acc_flags); +void amdgpu_device_wreg (struct amdgpu_device *adev,uint32_t reg,uint32_t v,uint32_t acc_flags); -void amdgpu_mm_wreg (struct amdgpu_device *adev,uint32_t reg,uint32_t v, -uint32_t acc_flags);void amdgpu_mm_wreg_mmio_rlc (struct amdgpu_device *adev,uint32_t reg,uint32_t v,uint32_t acc_flags);void amdgpu_mm_wreg8 (struct amdgpu_device *adev,uint32_t offset,uint8_t value);
@@ -1029,8 +1029,8 @@ int emu_soc_asic_init(struct amdgpu_device *adev);*/ #define AMDGPU_REGS_NO_KIQ (1<<1) -#define RREG32_NO_KIQ (reg) amdgpu_mm_rreg(adev, (reg), AMDGPU_REGS_NO_KIQ) -#define WREG32_NO_KIQ (reg, v) amdgpu_mm_wreg(adev, (reg), (v), AMDGPU_REGS_NO_KIQ) +#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)#define RREG32_KIQ (reg) amdgpu_kiq_rreg(adev, (reg))#define WREG32_KIQ (reg, v) amdgpu_kiq_wreg(adev, (reg), (v))
@@ -1038,9 +1038,9 @@ int emu_soc_asic_init(struct amdgpu_device *adev);#define RREG8 (reg) amdgpu_mm_rreg8(adev, (reg))#define WREG8 (reg, v) amdgpu_mm_wreg8(adev, (reg), (v)) -#define RREG32 (reg) amdgpu_mm_rreg(adev, (reg), 0) -#define DREG32 (reg) printk(KERN_INFO "REGISTER: " #reg " : 0x%08X\n", amdgpu_mm_rreg(adev, (reg), 0)) -#define WREG32 (reg, v) amdgpu_mm_wreg(adev, (reg), (v), 0) +#define RREG32 (reg) amdgpu_device_rreg(adev, (reg), 0) +#define DREG32 (reg) printk(KERN_INFO "REGISTER: " #reg " : 0x%08X\n", amdgpu_device_rreg(adev, (reg), 0)) +#define WREG32 (reg, v) amdgpu_device_wreg(adev, (reg), (v), 0)#define REG_SET (FIELD , v) (((v) << FIELD##_SHIFT) & FIELD##_MASK)#define REG_GET (FIELD , v) (((v) << FIELD##_SHIFT) & FIELD##_MASK)#define RREG32_PCIE (reg) adev->pcie_rreg(adev, (reg))
@@ -1077,7 +1077,7 @@ int emu_soc_asic_init(struct amdgpu_device *adev); tmp_ |= ((val) & ~(mask)); \WREG32_PLL (reg, tmp_); \ } while (0) -#define DREG32_SYS (sqf, adev, reg) seq_printf((sqf), #reg " : 0x%08X\n", amdgpu_mm_rreg((adev), (reg), false)) +#define DREG32_SYS (sqf, adev, reg) seq_printf((sqf), #reg " : 0x%08X\n", amdgpu_device_rreg((adev), (reg), false))#define RREG32_IO (reg) amdgpu_io_rreg(adev, (reg))#define WREG32_IO (reg, v) amdgpu_io_wreg(adev, (reg), (v))
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +17 -28
94 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +2 -2
@@ -35,7 +35,7 @@#define AMDGPU_JOB_GET_TIMELINE_NAME (job) \ job->base.s_fence->finished.ops->get_timeline_name(&job->base.s_fence->finished) -TRACE_EVENT(amdgpu_mm_rreg, +TRACE_EVENT(amdgpu_device_rreg, TP_PROTO(unsigned did, uint32_t reg, uint32_t value), TP_ARGS(did, reg, value), TP_STRUCT__entry(
@@ -54,7 +54,7 @@ TRACE_EVENT(amdgpu_mm_rreg, (unsigned long)__entry->value) ); -TRACE_EVENT(amdgpu_mm_wreg, +TRACE_EVENT(amdgpu_device_wreg, TP_PROTO(unsigned did, uint32_t reg, uint32_t value), TP_ARGS(did, reg, value), TP_STRUCT__entry(
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Regards,
Christian.
Am 03.04.20 um 12:55 schrieb Hawking Zhang:
Quoted 14 lines
The series refined register access interfaces including:
1. add indirect access support to registers outside of mmio bar
2. remove the inproper workaround leaving in the low level if
3. retire legacy interface RREG32_IDX/WREG32_IDX
4. retire redundant flags AMDGPU_REGS_KIQ/AMDGPU_REGS_IDXHawking Zhang (6):
drm/amdgpu: remove inproper workaround for vega10 drm/amdgpu: replace indirect mmio access in non-dc code path drm/amdgpu: retire indirect mmio reg support from cgs drm/amdgpu: retire RREG32_IDX/WREG32_IDX drm/amdgpu: retireAMDGPU_REGS_KIQflag drm/amdgpu: support access regs outside of mmio bar
Quoted 11 lines
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 29 +++++-------- drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 8 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 69 +++++++++--------------------- drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 4 +- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 8 ++-- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 8 ++-- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 14 +++--- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 14 +++--- drivers/gpu/drm/amd/include/cgs_common.h | 1 - 9 files changed, 60 insertions(+), 95 deletions(-)
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx