diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2016-05-17 15:08:00 +0200 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2016-05-19 14:38:59 +0200 |
| commit | 03f476e1fcb42fca88fc50b94b0d3adbdbe887f0 (patch) | |
| tree | 94aaf06c814236263f7eacffaff96736efb5f5a7 /drivers/gpu/drm/i915/intel_drv.h | |
| parent | 2099deffef4404f949ba1b68d2b17e0608190bc2 (diff) | |
drm/i915: Prepare connectors for nonblocking checks.
intel_unpin_work may not take the list lock because it requires the connector_mutex.
To prevent taking locks we add an array of old and new state. The old state to free,
the new state to commit and verify.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1463490484-19540-18-git-send-email-maarten.lankhorst@linux.intel.com
Reviewed-by: Patrik Jakobsson <patrik.jakobsson@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index dae78f410a80..bc9421049bef 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -982,6 +982,10 @@ struct intel_flip_work { bool can_async_unpin; unsigned fb_bits; + unsigned num_old_connectors, num_new_connectors; + struct drm_connector_state **old_connector_state; + struct drm_connector_state **new_connector_state; + struct intel_crtc_state *old_crtc_state, *new_crtc_state; struct intel_plane_state *old_plane_state[I915_MAX_PLANES + 1]; struct intel_plane_state *new_plane_state[I915_MAX_PLANES + 1]; |