diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2015-08-18 13:40:05 +0200 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2015-11-02 15:50:17 +0100 |
| commit | 5008e874edd34705be433bfa74bd29908182b36e (patch) | |
| tree | 3e5d75193d255984963a5c9de73795520de2c45c /drivers/gpu/drm/i915/intel_atomic.c | |
| parent | 3abc4e09c620e3b53887d7add88158549eee021f (diff) | |
| download | linux-5008e874edd34705be433bfa74bd29908182b36e.tar.gz linux-5008e874edd34705be433bfa74bd29908182b36e.tar.bz2 linux-5008e874edd34705be433bfa74bd29908182b36e.zip | |
drm/i915: Make wait_for_flips interruptible.
Move it from intel_crtc_atomic_commit to prepare_plane_fb.
Waiting is done before committing, otherwise it's too late
to undo the changes.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Ander Conselvan De Oliveira <ander.conselvan.de.oliveira@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_atomic.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_atomic.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c index 05b12032d262..643f342de33b 100644 --- a/drivers/gpu/drm/i915/intel_atomic.c +++ b/drivers/gpu/drm/i915/intel_atomic.c @@ -206,8 +206,6 @@ int intel_atomic_setup_scalers(struct drm_device *dev, * but since this plane is unchanged just do the * minimum required validation. */ - if (plane->type == DRM_PLANE_TYPE_PRIMARY) - intel_crtc->atomic.wait_for_flips = true; crtc_state->base.planes_changed = true; } |