summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_atomic.c
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2015-08-27 15:44:05 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-09-14 10:03:13 +0200
commitbfd16b2a23dc99f2af3f5c4f54aa153347f2dc3c (patch)
treeb04131f041a00948d19217ce67154b50120abaf9 /drivers/gpu/drm/i915/intel_atomic.c
parentf4502c25ebd04691f284fdafff4a5613299c36dc (diff)
downloadlinux-stable-bfd16b2a23dc99f2af3f5c4f54aa153347f2dc3c.tar.gz
linux-stable-bfd16b2a23dc99f2af3f5c4f54aa153347f2dc3c.tar.bz2
linux-stable-bfd16b2a23dc99f2af3f5c4f54aa153347f2dc3c.zip
drm/i915: Make updating pipe without modeset atomic.
Instead of doing a hack during primary plane commit the state is updated during atomic evasion. It handles differences in pipe size and the panel fitter. This is continuing on top of Daniel's work to make faster modesets atomic, and not yet enabled by default. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org> [danvet: - simplify/future-proof if ladder that Jesse spotted - resolve conflict in pipe_config_check and don't spuriously move the code.] Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_atomic.c')
-rw-r--r--drivers/gpu/drm/i915/intel_atomic.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c
index 2c4b1c44296c..f1975f267710 100644
--- a/drivers/gpu/drm/i915/intel_atomic.c
+++ b/drivers/gpu/drm/i915/intel_atomic.c
@@ -93,6 +93,8 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc)
__drm_atomic_helper_crtc_duplicate_state(crtc, &crtc_state->base);
+ crtc_state->update_pipe = false;
+
return &crtc_state->base;
}