diff options
author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2015-07-13 11:55:05 +0200 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-07-15 09:58:05 +0200 |
commit | 1f7457b135b075e7a60c9133723363045084c333 (patch) | |
tree | 7039668618923b51c27f630ec798f7bdfef3a01f /drivers/watchdog/at91sam9_wdt.h | |
parent | cd13f5ab42a63d267f452ac5fd641136c7b8f17c (diff) | |
download | talos-obmc-linux-1f7457b135b075e7a60c9133723363045084c333.tar.gz talos-obmc-linux-1f7457b135b075e7a60c9133723363045084c333.zip |
drm/i915: Fix noatomic crtc disabling, v2.
This fixes the breakage caused by
commit eddfcbcdc27fbecb33bff098967bbdd7ca75bfa6
Author: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Date: Mon Jun 15 12:33:53 2015 +0200
drm/i915: Update less state during modeset.
No need to repeatedly call update_watermarks, or update_fbc.
Down to a single call to update_watermarks in .crtc_enable
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Tested-by(IVB): Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Add missing shared dpll disable to the noatomic disable function.
This function will be replaced by its atomic counterpart soon.
Changes since v1:
- intel_crtc->active and watermarks are fixed by a patch from
Patrik Jakobsson
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/watchdog/at91sam9_wdt.h')
0 files changed, 0 insertions, 0 deletions