From: Andrey Grodzovsky Date: Mon, 26 Aug 2019 14:11:50 +0000 (-0400) Subject: drm/amd/display: Fix error message X-Git-Tag: v5.4-rc1~106^2~5^2~57 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed8a5fb2a606b6dfc6e417da6e64efcbb899e4cc;p=thirdparty%2Fkernel%2Flinux.git drm/amd/display: Fix error message Since reservation_object_wait_timeout_rcu is called with interruptable set to false it's wrong to say 'or interrupted' in the error message. Signed-off-by: Andrey Grodzovsky Reviewed-by: Nicholas Kazlauskas Reviewed-by: Christian König Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 15e256d3ab472..f731d9ab25833 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -5727,7 +5727,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, false, msecs_to_jiffies(5000)); if (unlikely(r <= 0)) - DRM_ERROR("Waiting for fences timed out or interrupted!"); + DRM_ERROR("Waiting for fences timed out!"); /* * TODO This might fail and hence better not used, wait