diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-09-16 17:54:23 +0200 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-27 23:31:05 +0100 |
| commit | 920afa77ced7124c8bb7d0c4839885618a3b4a54 (patch) | |
| tree | 849a91385768a4050df8d605c52a81ea2c255cda /drivers/gpu/drm/i915/intel_overlay.c | |
| parent | a6e0aa421406dc4cfd736c6d07d26ed39ab4f7bc (diff) | |
| download | kernel_samsung_smdk4412-920afa77ced7124c8bb7d0c4839885618a3b4a54.zip kernel_samsung_smdk4412-920afa77ced7124c8bb7d0c4839885618a3b4a54.tar.gz kernel_samsung_smdk4412-920afa77ced7124c8bb7d0c4839885618a3b4a54.tar.bz2 | |
drm/i915: range-restricted bind_to_gtt
Like before add a parameter mappable (also to gem_object_pin) and
set it depending upon the context. Only bos that are brought into
the gtt due to an execbuffer call can be put into the unmappable
part of the gtt, everything else (especially pinned objects) need
to be put into the mappable part of the gtt.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c index 2d4a696..beda201 100644 --- a/drivers/gpu/drm/i915/intel_overlay.c +++ b/drivers/gpu/drm/i915/intel_overlay.c @@ -781,7 +781,7 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay, if (ret != 0) return ret; - ret = i915_gem_object_pin(new_bo, PAGE_SIZE); + ret = i915_gem_object_pin(new_bo, PAGE_SIZE, true); if (ret != 0) return ret; @@ -1423,7 +1423,7 @@ void intel_setup_overlay(struct drm_device *dev) } overlay->flip_addr = overlay->reg_bo->phys_obj->handle->busaddr; } else { - ret = i915_gem_object_pin(reg_bo, PAGE_SIZE); + ret = i915_gem_object_pin(reg_bo, PAGE_SIZE, true); if (ret) { DRM_ERROR("failed to pin overlay register bo\n"); goto out_free_bo; |