drm/amdgpu: Remove volatile from amdgpu and amdgpu_ih headers

Remove the unnecessary use of volatile in some of the amdgpu.h and
amdgpu_ih.h headers.

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Rodrigo Siqueira <siqueira@igalia.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 6d123172bb0a024230a186822ce7ddb914b3dfa6..0e6a09651bbc6a51be0ac7b8399ddd6c146b5dd6 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -721,7 +721,7 @@ int amdgpu_cs_wait_fences_ioctl(struct drm_device *dev, void *data,
 /* VRAM scratch page for HDP bug, default vram page */
 struct amdgpu_mem_scratch {
        struct amdgpu_bo                *robj;
-       volatile uint32_t               *ptr;
+       uint32_t                        *ptr;
        u64                             gpu_addr;
 };
 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h
index 7f7ea046e2097a59e18af0835a8411caf37ee16f..f58b6be7fccc0cd5839d349210fe8f197e36e13f 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h
@@ -56,14 +56,14 @@ struct amdgpu_ih_ring {
        bool                    use_bus_addr;
 
        struct amdgpu_bo        *ring_obj;
-       volatile uint32_t       *ring;
+       uint32_t                *ring;
        uint64_t                gpu_addr;
 
        uint64_t                wptr_addr;
-       volatile uint32_t       *wptr_cpu;
+       uint32_t                *wptr_cpu;
 
        uint64_t                rptr_addr;
-       volatile uint32_t       *rptr_cpu;
+       uint32_t                *rptr_cpu;
 
        bool                    enabled;
        unsigned                rptr;