diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 003fa2d12bfbf807d714d0b511f04a13e54f8118..66b5bd0587991ac3874c4e04cf82c3408bb3e30f 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 fc63855ed5179bd1a4f14e5a45f87eb03e34b9d5..be4d53508680870cdc3bc58179c9b583e3777e13 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