aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_dp.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2014-07-11 13:30:12 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-07-23 01:05:16 -0400
commite921bcbfba1f973c60e3c537adeb32e0cdf2eb77 (patch)
treed133f12ddd74bf2fdef61bcb2e220d41b41edfc1 /drivers/gpu/drm/i915/intel_dp.c
parent2807cf69df89defb024ac74708b6e43c231d0d47 (diff)
drm/i915: Don't try to disable psr harder from the work item
It's disabled already except when we've raced. Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp.c')
-rw-r--r--drivers/gpu/drm/i915/intel_dp.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 457bd82373d7..0184188b3a2d 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1896,9 +1896,7 @@ static void intel_edp_psr_work(struct work_struct *work)
1896 if (!intel_dp) 1896 if (!intel_dp)
1897 return; 1897 return;
1898 1898
1899 if (!intel_edp_psr_match_conditions(intel_dp)) 1899 if (intel_edp_psr_match_conditions(intel_dp))
1900 intel_edp_psr_disable(intel_dp);
1901 else
1902 intel_edp_psr_do_enable(intel_dp); 1900 intel_edp_psr_do_enable(intel_dp);
1903} 1901}
1904 1902