From: Jammy Zhou Date: Wed, 13 May 2015 14:52:42 +0000 (+0800) Subject: drm/amdgpu: rewording some left radeons X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=86c2b79062be6a328014d90d1e4ef6a0afae02ad;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git drm/amdgpu: rewording some left radeons Signed-off-by: Jammy Zhou Reviewed-by: Christian König --- 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) static inline void amdgpu_ring_write(struct amdgpu_ring *ring, uint32_t v) { if (ring->count_dw <= 0) - DRM_ERROR("radeon: writing more dwords to the ring than expected!\n"); + DRM_ERROR("amdgpu: writing more dwords to the ring than expected!\n"); ring->ring[ring->wptr++] = v; ring->wptr &= ring->ptr_mask; 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) * xchg of the current process. * * More over for this to go in infinite loop there need to be - * continuously new fence signaled ie radeon_fence_read needs + * continuously new fence signaled ie amdgpu_fence_read needs * to return a different value each time for both the currently * polling process and the other process that xchg the last_seq * btw atomic read and xchg of the current process. And the * value the other process set as last seq must be higher than * the seq value we just read. Which means that current process - * need to be interrupted after radeon_fence_read and before + * need to be interrupted after amdgpu_fence_read and before * atomic xchg. * * To be even more safe we count the number of time we loop and