Commit 6ca523d7 authored by Tao Zhou's avatar Tao Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: remove RREG64/WREG64 



atomic 64 bits REG operations are useless currently

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarTao Zhou <tao.zhou1@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent dd21a572

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

+0 −4
Original line number Diff line number Diff line
@@ -1037,8 +1037,6 @@ void amdgpu_mm_wreg(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);

uint8_t amdgpu_mm_rreg8(struct amdgpu_device *adev, uint32_t offset);

uint64_t amdgpu_mm_rreg64(struct amdgpu_device *adev, uint32_t reg);

void amdgpu_mm_wreg64(struct amdgpu_device *adev, uint32_t reg, uint64_t v);



u32 amdgpu_io_rreg(struct amdgpu_device *adev, u32 reg);

void amdgpu_io_wreg(struct amdgpu_device *adev, u32 reg, u32 v);
@@ -1066,8 +1064,6 @@ int emu_soc_asic_init(struct amdgpu_device *adev); 
#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 RREG64(reg) amdgpu_mm_rreg64(adev, (reg))

#define WREG64(reg, v) amdgpu_mm_wreg64(adev, (reg), (v))

#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

+0 −33
Original line number Diff line number Diff line
@@ -263,39 +263,6 @@ void amdgpu_mm_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v, 
	}

}



/**

 * amdgpu_mm_rreg64 - read a 64 bit memory mapped IO register

 *

 * @adev: amdgpu_device pointer

 * @reg: dword aligned register offset

 *

 * Returns the 64 bit value from the offset specified.

 */

uint64_t amdgpu_mm_rreg64(struct amdgpu_device *adev, uint32_t reg)

{

	if ((reg * 4) < adev->rmmio_size)

		return atomic64_read((atomic64_t *)(adev->rmmio + (reg * 4)));

	else

		BUG();

}



/**

 * amdgpu_mm_wreg64 - write to a 64 bit memory mapped IO register

 *

 * @adev: amdgpu_device pointer

 * @reg: dword aligned register offset

 * @v: 64 bit value to write to the register

 *

 * Writes the value specified to the offset specified.

 */

void amdgpu_mm_wreg64(struct amdgpu_device *adev, uint32_t reg, uint64_t v)

{

	if ((reg * 4) < adev->rmmio_size)

		atomic64_set((atomic64_t *)(adev->rmmio + (reg * 4)), v);

	else

		BUG();

}



/**

 * amdgpu_io_rreg - read an IO register

 *