aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu
diff options
context:
space:
mode:
authorJammy Zhou <Jammy.Zhou@amd.com>2015-05-13 10:52:42 -0400
committerAlex Deucher <alexander.deucher@amd.com>2015-06-03 21:03:36 -0400
commit86c2b79062be6a328014d90d1e4ef6a0afae02ad (patch)
treea0cf5fad9c33ce8ef426843997b9cf7a77974f62 /drivers/gpu/drm/amd/amdgpu
parentc65444fe054fb69e95444ddd545adf43f682bb41 (diff)
drm/amdgpu: rewording some left radeons
Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu.h2
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 003fa2d12bfb..66b5bd058799 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -2164,7 +2164,7 @@ static inline struct amdgpu_fence *to_amdgpu_fence(struct fence *f)
2164static inline void amdgpu_ring_write(struct amdgpu_ring *ring, uint32_t v) 2164static inline void amdgpu_ring_write(struct amdgpu_ring *ring, uint32_t v)
2165{ 2165{
2166 if (ring->count_dw <= 0) 2166 if (ring->count_dw <= 0)
2167 DRM_ERROR("radeon: writing more dwords to the ring than expected!\n"); 2167 DRM_ERROR("amdgpu: writing more dwords to the ring than expected!\n");
2168 ring->ring[ring->wptr++] = v; 2168 ring->ring[ring->wptr++] = v;
2169 ring->wptr &= ring->ptr_mask; 2169 ring->wptr &= ring->ptr_mask;
2170 ring->count_dw--; 2170 ring->count_dw--;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
index fc63855ed517..be4d53508680 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
@@ -193,13 +193,13 @@ static bool amdgpu_fence_activity(struct amdgpu_ring *ring)
193 * xchg of the current process. 193 * xchg of the current process.
194 * 194 *
195 * More over for this to go in infinite loop there need to be 195 * More over for this to go in infinite loop there need to be
196 * continuously new fence signaled ie radeon_fence_read needs 196 * continuously new fence signaled ie amdgpu_fence_read needs
197 * to return a different value each time for both the currently 197 * to return a different value each time for both the currently
198 * polling process and the other process that xchg the last_seq 198 * polling process and the other process that xchg the last_seq
199 * btw atomic read and xchg of the current process. And the 199 * btw atomic read and xchg of the current process. And the
200 * value the other process set as last seq must be higher than 200 * value the other process set as last seq must be higher than
201 * the seq value we just read. Which means that current process 201 * the seq value we just read. Which means that current process
202 * need to be interrupted after radeon_fence_read and before 202 * need to be interrupted after amdgpu_fence_read and before
203 * atomic xchg. 203 * atomic xchg.
204 * 204 *
205 * To be even more safe we count the number of time we loop and 205 * To be even more safe we count the number of time we loop and