From 4c92a3d2b20db93a5fcb318167e26ca8808d0d23 Mon Sep 17 00:00:00 2001 From: Andrey Grodzovsky Date: Thu, 22 Jun 2017 11:45:13 -0400 Subject: [PATCH 0541/4131] drm/amd/display: Global lock typos fix. Fix typos. Signed-off-by: Andrey Grodzovsky Reviewed-by: Roman Li Acked-by: Harry Wentland Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c index 2771258..7cfe098 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c @@ -3029,7 +3029,7 @@ static int do_aquire_global_lock( &commit->flip_done, 10*HZ); if (ret == 0) - DRM_ERROR("[CRTC:%d:%s] cleanup_done or flip_done " + DRM_ERROR("[CRTC:%d:%s] hw_done or flip_done " "timed out\n", crtc->base.id, crtc->name); drm_crtc_commit_put(commit); @@ -3320,9 +3320,9 @@ int amdgpu_dm_atomic_check(struct drm_device *dev, if (ret != 0) { if (ret == -EDEADLK) - DRM_DEBUG_KMS("Atomic check stopped due to to deadlock, retrying.\n"); + DRM_DEBUG_KMS("Atomic check stopped due to to deadlock.\n"); else if (ret == -EINTR || ret == -EAGAIN || ret == -ERESTARTSYS) - DRM_DEBUG_KMS("Atomic check stopped due to to signal, retrying.\n"); + DRM_DEBUG_KMS("Atomic check stopped due to to signal.\n"); else DRM_ERROR("Atomic check failed.\n"); } -- 2.7.4