From e7e223764459581c2f41c00ff4ffe5a19b8fd6c9 Mon Sep 17 00:00:00 2001 From: "Jerry (Fangzhi) Zuo" Date: Thu, 8 Mar 2018 09:56:49 -0500 Subject: [PATCH 3331/4131] drm/amd/display: Temporary fix for RHEL6 rotation issue Signed-off-by: Jerry (Fangzhi) Zuo Reviewed-by: Harry Wentland Acked-by: Alex Deucher --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++++ 1 file changed, 4 insertions(+) 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 2a765b1..f752ca9 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -4490,6 +4490,10 @@ static int amdgpu_dm_atomic_commit(struct drm_device *dev, if (ret) return ret; } +#if defined(OS_NAME_RHEL_6) + else // Temporary fix for pflip conflict between block and nonblock call + return -EBUSY; +#endif drm_atomic_helper_swap_state(dev, state); -- 2.7.4