diff options
author | Keith Packard <keithp@keithp.com> | 2008-11-21 02:14:48 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2008-11-24 18:28:43 -0500 |
commit | 6133047aa64d2fd5b3b79dff74f696ded45615b2 (patch) | |
tree | 5a1b8ee154479156da304e181a05289da7cf81c5 /drivers | |
parent | 05eff845a28499762075d3a72e238a31f4d2407c (diff) |
drm/i915: execbuffer pins objects, no need to ensure they're still in the GTT
Before we had the notion of pinning objects, we had a kludge around to make
sure all of the objects were still resident in the GTT before we committed
to executing a batch buffer. We don't need this any longer, and it sticks an
error return in the middle of object domain computations that must be
associated with a subsequent flush/invalidate emmission into the ring.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 6e4c6dd50659..54bb0d0e49b8 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
@@ -1866,17 +1866,6 @@ i915_gem_execbuffer(struct drm_device *dev, void *data, | |||
1866 | 1866 | ||
1867 | for (i = 0; i < args->buffer_count; i++) { | 1867 | for (i = 0; i < args->buffer_count; i++) { |
1868 | struct drm_gem_object *obj = object_list[i]; | 1868 | struct drm_gem_object *obj = object_list[i]; |
1869 | struct drm_i915_gem_object *obj_priv = obj->driver_private; | ||
1870 | |||
1871 | if (obj_priv->gtt_space == NULL) { | ||
1872 | /* We evicted the buffer in the process of validating | ||
1873 | * our set of buffers in. We could try to recover by | ||
1874 | * kicking them everything out and trying again from | ||
1875 | * the start. | ||
1876 | */ | ||
1877 | ret = -ENOMEM; | ||
1878 | goto err; | ||
1879 | } | ||
1880 | 1869 | ||
1881 | /* make sure all previous memory operations have passed */ | 1870 | /* make sure all previous memory operations have passed */ |
1882 | ret = i915_gem_object_set_domain(obj, | 1871 | ret = i915_gem_object_set_domain(obj, |