aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_drv.h
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2011-01-26 10:55:56 -0500
committerChris Wilson <chris@chris-wilson.co.uk>2011-01-27 06:06:07 -0500
commit21dd373486956d7789ffd878347c36efad16923d (patch)
tree4b0420fdb193276f4e53df78afc50642e8984a5e /drivers/gpu/drm/i915/i915_drv.h
parente110e8d672c9e6e395a5c8bfa3444899b85181ed (diff)
drm/i915: Defer reporting EIO until we try to use the GPU
Instead of reporting EIO upfront in the entrance of an ioctl that may or may not attempt to use the GPU, defer the actual detection of an invalid ioctl to when we issue a GPU instruction. This allows us to continue to use bo in video memory (via pread/pwrite and mmap) after the GPU has hung. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index a39f8d254502..ff498b98c9bd 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1052,7 +1052,6 @@ extern void i915_mem_takedown(struct mem_block **heap);
1052extern void i915_mem_release(struct drm_device * dev, 1052extern void i915_mem_release(struct drm_device * dev,
1053 struct drm_file *file_priv, struct mem_block *heap); 1053 struct drm_file *file_priv, struct mem_block *heap);
1054/* i915_gem.c */ 1054/* i915_gem.c */
1055int i915_gem_check_is_wedged(struct drm_device *dev);
1056int i915_gem_init_ioctl(struct drm_device *dev, void *data, 1055int i915_gem_init_ioctl(struct drm_device *dev, void *data,
1057 struct drm_file *file_priv); 1056 struct drm_file *file_priv);
1058int i915_gem_create_ioctl(struct drm_device *dev, void *data, 1057int i915_gem_create_ioctl(struct drm_device *dev, void *data,