[gem] Remove carefully-sprinkled i915_kernel_lost_context().
They are not unnecessary since the kernel's the only thing touching the ring.main
parent
62a3be962f
commit
dac3bcb414
|
@ -1404,7 +1404,6 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
|
|||
DRM_INFO("buffers_ptr %d buffer_count %d len %08x\n",
|
||||
(int) args->buffers_ptr, args->buffer_count, args->batch_len);
|
||||
#endif
|
||||
i915_kernel_lost_context(dev);
|
||||
|
||||
/* Copy in the exec list from userland */
|
||||
exec_list = drm_calloc(sizeof(*exec_list), args->buffer_count,
|
||||
|
@ -1614,7 +1613,6 @@ i915_gem_pin_ioctl(struct drm_device *dev, void *data,
|
|||
|
||||
mutex_lock(&dev->struct_mutex);
|
||||
|
||||
i915_kernel_lost_context(dev);
|
||||
obj = drm_gem_object_lookup(dev, file_priv, args->handle);
|
||||
if (obj == NULL) {
|
||||
DRM_ERROR("Bad handle in i915_gem_pin_ioctl(): %d\n",
|
||||
|
@ -1647,7 +1645,6 @@ i915_gem_unpin_ioctl(struct drm_device *dev, void *data,
|
|||
|
||||
mutex_lock(&dev->struct_mutex);
|
||||
|
||||
i915_kernel_lost_context(dev);
|
||||
obj = drm_gem_object_lookup(dev, file_priv, args->handle);
|
||||
if (obj == NULL) {
|
||||
DRM_ERROR("Bad handle in i915_gem_unpin_ioctl(): %d\n",
|
||||
|
@ -1711,7 +1708,6 @@ int i915_gem_init_object(struct drm_gem_object *obj)
|
|||
|
||||
void i915_gem_free_object(struct drm_gem_object *obj)
|
||||
{
|
||||
i915_kernel_lost_context(obj->dev);
|
||||
i915_gem_object_unbind(obj);
|
||||
|
||||
drm_free(obj->driver_private, 1, DRM_MEM_DRIVER);
|
||||
|
@ -1729,7 +1725,6 @@ i915_gem_set_domain(struct drm_gem_object *obj,
|
|||
BUG_ON(!mutex_is_locked(&dev->struct_mutex));
|
||||
|
||||
drm_client_lock_take(dev, file_priv);
|
||||
i915_kernel_lost_context(dev);
|
||||
ret = i915_gem_object_set_domain(obj, read_domains, write_domain);
|
||||
if (ret) {
|
||||
drm_client_lock_release(dev);
|
||||
|
|
Loading…
Reference in New Issue