diff options
| author | Daniel Vetter | 2014-01-25 21:14:57 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2014-01-25 21:14:57 +0100 |
| commit | 0e5539b923e3cfb79512b61f6f6137f865160804 (patch) | |
| tree | cb4c21b9b4cda572d98492f6e0020dfb4fb51146 /drivers/gpu/drm/i915/intel_overlay.c | |
| parent | drm/i915: Make underruns DRM_ERROR (diff) | |
| parent | drm/i915: Place the Global GTT VM first in the list of VM (diff) | |
| download | kernel-qcow2-linux-0e5539b923e3cfb79512b61f6f6137f865160804.tar.gz kernel-qcow2-linux-0e5539b923e3cfb79512b61f6f6137f865160804.tar.xz kernel-qcow2-linux-0e5539b923e3cfb79512b61f6f6137f865160804.zip | |
Merge branch 'topic/ppgtt' into drm-intel-next-queued
Because whatever.*
* This should contain a fairly long list of issues and still
unresolved resgressions, but I didn't really get a vote.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_overlay.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_overlay.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c index a759ecdb7a6e..424f0946d8c4 100644 --- a/drivers/gpu/drm/i915/intel_overlay.c +++ b/drivers/gpu/drm/i915/intel_overlay.c @@ -293,7 +293,7 @@ static void intel_overlay_release_old_vid_tail(struct intel_overlay *overlay) { struct drm_i915_gem_object *obj = overlay->old_vid_bo; - i915_gem_object_unpin(obj); + i915_gem_object_ggtt_unpin(obj); drm_gem_object_unreference(&obj->base); overlay->old_vid_bo = NULL; @@ -306,7 +306,7 @@ static void intel_overlay_off_tail(struct intel_overlay *overlay) /* never have the overlay hw on without showing a frame */ BUG_ON(!overlay->vid_bo); - i915_gem_object_unpin(obj); + i915_gem_object_ggtt_unpin(obj); drm_gem_object_unreference(&obj->base); overlay->vid_bo = NULL; @@ -782,7 +782,7 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay, return 0; out_unpin: - i915_gem_object_unpin(new_bo); + i915_gem_object_ggtt_unpin(new_bo); return ret; } @@ -1386,7 +1386,7 @@ void intel_setup_overlay(struct drm_device *dev) out_unpin_bo: if (!OVERLAY_NEEDS_PHYSICAL(dev)) - i915_gem_object_unpin(reg_bo); + i915_gem_object_ggtt_unpin(reg_bo); out_free_bo: drm_gem_object_unreference(®_bo->base); out_free: |