drm/amdgpu: replace readq/writeq with atomic64 operations

what we really want is a read or write that is guaranteed to be 64 bits
at a time, atomic64 operations are supported on all architectures

Signed-off-by: Tao Zhou <tao.zhou1@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index e7537e1c4fdf20dddb39fbd7d3f4b7f698d58413..0471a1d4305c3a40cf76a51b4fc0131c0e29a480 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -273,14 +273,10 @@ void amdgpu_mm_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v,
  */
 uint64_t amdgpu_mm_rreg64(struct amdgpu_device *adev, uint32_t reg)
 {
-       uint64_t ret;
-
        if ((reg * 4) < adev->rmmio_size)
-               ret = readq(((void __iomem *)adev->rmmio) + (reg * 4));
+               return atomic64_read((atomic64_t *)(adev->rmmio + (reg * 4)));
        else
                BUG();
-
-       return ret;
 }
 
 /**
@@ -295,7 +291,7 @@ 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)
 {
        if ((reg * 4) < adev->rmmio_size)
-               writeq(v, ((void __iomem *)adev->rmmio) + (reg * 4));
+               atomic64_set((atomic64_t *)(adev->rmmio + (reg * 4)), v);
        else
                BUG();
 }