diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2015-08-18 13:40:06 +0200 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2015-11-02 15:50:31 +0100 |
| commit | 7580d774b0466fff28aab19db4f36dac37a3d1a9 (patch) | |
| tree | 9b5024b8be800450c9bd1f26d9691b165faba675 /drivers/gpu/drm/i915/intel_overlay.c | |
| parent | f935675f0c07f87da2facc4c144d511e6da48240 (diff) | |
| download | op-kernel-dev-7580d774b0466fff28aab19db4f36dac37a3d1a9.zip op-kernel-dev-7580d774b0466fff28aab19db4f36dac37a3d1a9.tar.gz | |
drm/i915: Wait for object idle without locks in atomic_commit, v2.
Make pinning and waiting a separate step, and wait for object idle
without struct_mutex held.
Changes since v1:
- Do not wait when a reset is in progress.
- Remove call to i915_gem_object_wait_rendering for
intel_overlay_do_put_image (Chris Wilson)
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_overlay.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_overlay.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c index 4445426..76f1980 100644 --- a/drivers/gpu/drm/i915/intel_overlay.c +++ b/drivers/gpu/drm/i915/intel_overlay.c @@ -749,7 +749,7 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay, if (ret != 0) return ret; - ret = i915_gem_object_pin_to_display_plane(new_bo, 0, NULL, NULL, + ret = i915_gem_object_pin_to_display_plane(new_bo, 0, &i915_ggtt_view_normal); if (ret != 0) return ret; |
