aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_gem_execbuffer.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2011-03-01 15:24:41 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2011-03-01 16:01:02 +0000
commit271d81b84171d84723357ae6d172ec16b0d8139c (patch)
treeca4d1952f3e47e69706be5609143ae4d1b8e291a /drivers/gpu/drm/i915/i915_gem_execbuffer.c
parent5d9faa16a73f3317177ec42d5b5d826947458eb9 (diff)
downloadkernel_samsung_smdk4412-271d81b84171d84723357ae6d172ec16b0d8139c.zip
kernel_samsung_smdk4412-271d81b84171d84723357ae6d172ec16b0d8139c.tar.gz
kernel_samsung_smdk4412-271d81b84171d84723357ae6d172ec16b0d8139c.tar.bz2
drm/i915: Allow relocation deltas outside of target bo
Userspace has a legitimate requirement to use a delta that points to outside of the target bo, and so we need to enable this. (As this is an abi break, albeit a relaxation of the current restrictions, mark the change with a new flag.) Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_execbuffer.c')
-rw-r--r--drivers/gpu/drm/i915/i915_gem_execbuffer.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index 71a4a3b..1c3b76a 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -350,16 +350,6 @@ i915_gem_execbuffer_relocate_entry(struct drm_i915_gem_object *obj,
return ret;
}
- /* and points to somewhere within the target object. */
- if (unlikely(reloc->delta >= target_obj->size)) {
- DRM_ERROR("Relocation beyond target object bounds: "
- "obj %p target %d delta %d size %d.\n",
- obj, reloc->target_handle,
- (int) reloc->delta,
- (int) target_obj->size);
- return ret;
- }
-
reloc->delta += target_offset;
if (obj->base.write_domain == I915_GEM_DOMAIN_CPU) {
uint32_t page_offset = reloc->offset & ~PAGE_MASK;