diff options
| author | Jerry (Fangzhi) Zuo <Jerry.Zuo@amd.com> | 2018-03-08 09:56:49 -0500 |
|---|---|---|
| committer | Jerry (Fangzhi) Zuo <Jerry.Zuo@amd.com> | 2018-03-08 10:20:53 -0500 |
| commit | 2fefb23f22fa503d40442efacf2b85616ca4709d (patch) | |
| tree | ec28678c4933ca36a5b436823acca79c6f9c2bb7 | |
| parent | a923a2cff8a6473fc0237bc98ac97d86a5289775 (diff) | |
drm/amd/display: Temporary fix for RHEL6 rotation issue
Signed-off-by: Jerry (Fangzhi) Zuo <Jerry.Zuo@amd.com>
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 |
1 files changed, 4 insertions, 0 deletions
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 6c7183cab2ef..ed984a1ae02b 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -4493,6 +4493,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); |