geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[gem] Another round of cleanups from checkpatch.pl

main
Eric Anholt 2008-06-11 15:51:17 -07:00
parent 2655005762
commit 846d792ac1
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
linux-core/i915_gem.c
View File

@ -547,8 +547,8 @@ i915_wait_request(struct drm_device *dev, uint32_t seqno)
i915_user_irq_off(dev_priv);
}
if (ret)
DRM_ERROR ("%s returns %d (awaiting %d at %d)\n",
__func__, ret, seqno, i915_get_gem_seqno(dev));
DRM_ERROR("%s returns %d (awaiting %d at %d)\n",
__func__, ret, seqno, i915_get_gem_seqno(dev));
/* Directly dispatch request retiring. While we have the work queue
* to handle this, the waiter on a request often wants an associated
@ -701,8 +701,8 @@ i915_gem_object_unbind(struct drm_gem_object *obj)
* also ensure that all pending GPU writes are finished
* before we unbind.
*/
ret = i915_gem_object_set_domain (obj, I915_GEM_DOMAIN_CPU,
I915_GEM_DOMAIN_CPU);
ret = i915_gem_object_set_domain(obj, I915_GEM_DOMAIN_CPU,
I915_GEM_DOMAIN_CPU);
if (ret)
return ret;
@ -1242,7 +1242,7 @@ i915_gem_object_check_coherency(struct drm_gem_object *obj, int handle)
int bad_count = 0;
DRM_INFO("%s: checking coherency of object %p@0x%08x (%d, %dkb):\n",
__FUNCTION__, obj, obj_priv->gtt_offset, handle,
__func__, obj, obj_priv->gtt_offset, handle,
obj->size / 1024);
gtt_mapping = ioremap(dev->agp->base + obj_priv->gtt_offset,
@ -1301,9 +1301,7 @@ i915_gem_object_check_coherency(struct drm_gem_object *obj, int handle)
#endif
/**
* Bind an object to the GTT and evaluate the relocations landing in it
*
*
* Bind an object to the GTT and evaluate the relocations landing in it.
*/
static int
i915_gem_object_bind_and_relocate(struct drm_gem_object *obj,
@ -1567,7 +1565,8 @@ i915_gem_ring_throttle(struct drm_device *dev)
list);
/* Break out if we're close enough. */
if ((long) (jiffies - request->emitted_jiffies) <= (20 * HZ) / 1000) {
if ((long) (jiffies - request->emitted_jiffies) <=
(20 * HZ) / 1000) {
mutex_unlock(&dev->struct_mutex);
return 0;
}
@ -1877,7 +1876,7 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data,
obj_priv = obj->driver_private;
args->busy = obj_priv->active;
drm_gem_object_unreference(obj);
mutex_unlock(&dev->struct_mutex);
return 0;

20
shared-core/i915_drm.h
View File

@ -573,11 +573,15 @@ struct drm_i915_gem_exec_object {
* operation.
*/
uint32_t handle;
/** List of relocations to be performed on this buffer */
/** Number of relocations to be performed on this buffer */
uint32_t relocation_count;
uint64_t relocs_ptr; /* struct drm_i915_gem_relocation_entry *relocs */
/**
* Pointer to array of struct drm_i915_gem_relocation_entry containing
* the relocations to be performed in this buffer.
*/
uint64_t relocs_ptr;
/** Required alignment in graphics aperture */
uint64_t alignment;
@ -593,11 +597,13 @@ struct drm_i915_gem_execbuffer {
* List of buffers to be validated with their relocations to be
* performend on them.
*
* This is a pointer to an array of struct drm_i915_gem_validate_entry.
*
* These buffers must be listed in an order such that all relocations
* a buffer is performing refer to buffers that have already appeared
* in the validate list.
*/
uint64_t buffers_ptr; /* struct drm_i915_gem_validate_entry *buffers */
uint64_t buffers_ptr;
uint32_t buffer_count;
/** Offset in the batchbuffer to start execution from. */
@ -614,7 +620,7 @@ struct drm_i915_gem_pin {
/** Handle of the buffer to be pinned. */
uint32_t handle;
uint32_t pad;
/** alignment required within the aperture */
uint64_t alignment;
@ -631,7 +637,7 @@ struct drm_i915_gem_unpin {
struct drm_i915_gem_busy {
/** Handle of the buffer to check for busy */
uint32_t handle;
/** Return busy status (1 if busy, 0 if idle) */
uint32_t busy;
};