[PATCH 2/2] drm/amdgpu: remove RREG64/WREG64

Koenig, Christian Christian.Koenig at amd.com
Fri Aug 9 06:42:36 UTC 2019


Am 09.08.19 um 06:27 schrieb Tao Zhou:
> atomic 64 bits REG operations are useless currently
>
> Signed-off-by: Tao Zhou <tao.zhou1 at amd.com>

Reviewed-by: Christian K├Ânig <christian.koenig at amd.com>

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu.h        |  4 ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 33 ----------------------
>   2 files changed, 37 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> index ed1a217e86e4..f6ae5652b2e5 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> @@ -1042,8 +1042,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);
> @@ -1071,8 +1069,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))
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index 7eb9e0b9235a..2f43c58f5d03 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -262,39 +262,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
>    *



More information about the amd-gfx mailing list