diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-03-18 13:06:17 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-03-18 13:06:17 +1000 |
| commit | 218212722f681fb31b24749776984fd809eec2f2 (patch) | |
| tree | ae1a9dbc0f9c0242c6cdb2f7bccca03091be6484 /drivers/gpu/drm/i915/intel_dp.c | |
| parent | dcb99fd9b08cfe1afe426af4d8d3cbc429190f15 (diff) | |
| parent | 5c673b60a9b3b23486f4eda75c72e91d31d26a2b (diff) | |
Merge tag 'drm-intel-fixes-2014-03-17' of git://anongit.freedesktop.org/drm-intel into drm-fixes
Two 3.14 specific fixes, two cc: stable.
* tag 'drm-intel-fixes-2014-03-17' of git://anongit.freedesktop.org/drm-intel:
drm/i915: Don't enable display error interrupts from the start
drm/i915: Fix scanline counter fixup on BDW
drm/i915: Add a workaround for HSW scanline counter weirdness
drm/i915: Fix PSR programming
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 57552eb386b..41bdac44dfc 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -1639,7 +1639,7 @@ static void intel_edp_psr_enable_source(struct intel_dp *intel_dp) val |= EDP_PSR_LINK_DISABLE; I915_WRITE(EDP_PSR_CTL(dev), val | - IS_BROADWELL(dev) ? 0 : link_entry_time | + (IS_BROADWELL(dev) ? 0 : link_entry_time) | max_sleep_time << EDP_PSR_MAX_SLEEP_TIME_SHIFT | idle_frames << EDP_PSR_IDLE_FRAME_SHIFT | EDP_PSR_ENABLE); |