drm/amdgpu: retire RREG32_IDX/WREG32_IDX (ec59847e) · Commits · 戴 / test

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -1023,8 +1023,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)

		@@ -1038,10 +1036,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))

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;