diff options
| author | Chris Wilson | 2012-07-20 13:40:59 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2012-07-25 18:23:51 +0200 |
| commit | 3bb73aba1ed5198a2c1dfaac4f3c95459930d84a (patch) | |
| tree | cda853891463b2df4e440775a7faf415a143395c /drivers/gpu/drm/i915/i915_drv.h | |
| parent | drm/i915: add inte_crt->adpa_reg (diff) | |
| download | kernel-qcow2-linux-3bb73aba1ed5198a2c1dfaac4f3c95459930d84a.tar.gz kernel-qcow2-linux-3bb73aba1ed5198a2c1dfaac4f3c95459930d84a.tar.xz kernel-qcow2-linux-3bb73aba1ed5198a2c1dfaac4f3c95459930d84a.zip | |
drm/i915: Allow late allocation of request for i915_add_request()
Request preallocation was added to i915_add_request() in order to
support the overlay. However, not all users care and can quite happily
ignore the failure to allocate the request as they will simply repeat
the request in the future.
By pushing the allocation down into i915_add_request(), we can then
remove some rather ugly error handling in the callers.
v2: Nullify request->file_priv otherwise we chase a garbage pointer
when retiring requests.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 2c0d8403c5ed..1f5f5ff6f897 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1358,9 +1358,9 @@ void i915_gem_init_ppgtt(struct drm_device *dev); void i915_gem_cleanup_ringbuffer(struct drm_device *dev); int __must_check i915_gpu_idle(struct drm_device *dev); int __must_check i915_gem_idle(struct drm_device *dev); -int __must_check i915_add_request(struct intel_ring_buffer *ring, - struct drm_file *file, - struct drm_i915_gem_request *request); +int i915_add_request(struct intel_ring_buffer *ring, + struct drm_file *file, + struct drm_i915_gem_request *request); int __must_check i915_wait_seqno(struct intel_ring_buffer *ring, uint32_t seqno); int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf); |