From bef46a047a4a9cea6dc46f210480bc52ba05a162 Mon Sep 17 00:00:00 2001 From: Jon Emil Jahren Date: Thu, 26 Apr 2018 23:44:15 +0200 Subject: [PATCH] Partially revert e277adc5a06cf Some of the color management setup seem to cause a hang when screen is locked. --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 24 ----------------------- 1 file changed, 24 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 1dd1142246c2..5b47cc209288 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -4690,30 +4690,6 @@ static int dm_update_crtcs_state(struct dc *dc, /* Release extra reference */ if (new_stream) dc_stream_release(new_stream); - - /* - * We want to do dc stream updates that do not require a - * full modeset below. - */ - if (!enable || !aconnector || modereset_required(new_crtc_state)) - continue; - /* - * Given above conditions, the dc state cannot be NULL because: - * 1. We're attempting to enable a CRTC. Which has a... - * 2. Valid connector attached, and - * 3. User does not want to reset it (disable or mark inactive, - * which can happen on a CRTC that's already disabled). - * => It currently exists. - */ - BUG_ON(dm_new_crtc_state->stream == NULL); - - /* Color managment settings */ - if (dm_new_crtc_state->base.color_mgmt_changed) { - ret = amdgpu_dm_set_regamma_lut(dm_new_crtc_state); - if (ret) - goto fail; - amdgpu_dm_set_ctm(dm_new_crtc_state); - } } return ret; -- 2.14.3