Subversion Repositories Kolibri OS

Compare Revisions

Ignore whitespace Rev 3481 → Rev 3482

/drivers/video/drm/i915/i915_gem.c
267,9 → 267,6
trace_i915_gem_object_create(obj);
 
*handle_p = handle;
 
// printf("%s obj %p handle %d\n", __FUNCTION__, obj, handle);
 
return 0;
}
 
694,8 → 691,6
out_unpin:
i915_gem_object_unpin(obj);
out:
printf("% s ret = %d\n", __FUNCTION__, ret);
 
return ret;
}
 
1949,7 → 1944,8
}
if (was_empty) {
queue_delayed_work(dev_priv->wq,
&dev_priv->mm.retire_work, HZ);
&dev_priv->mm.retire_work,
round_jiffies_up_relative(HZ));
intel_mark_busy(dev_priv->dev);
}
}
2135,7 → 2131,8
 
/* Come back later if the device is busy... */
if (!mutex_trylock(&dev->struct_mutex)) {
queue_delayed_work(dev_priv->wq, &dev_priv->mm.retire_work, HZ);
queue_delayed_work(dev_priv->wq, &dev_priv->mm.retire_work,
round_jiffies_up_relative(HZ));
return;
}
 
2153,7 → 2150,8
}
 
if (!dev_priv->mm.suspended && !idle)
queue_delayed_work(dev_priv->wq, &dev_priv->mm.retire_work, HZ);
queue_delayed_work(dev_priv->wq, &dev_priv->mm.retire_work,
round_jiffies_up_relative(HZ));
if (idle)
intel_mark_idle(dev);