fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2025-12-20 21:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up whinging from checkpatch.pl in drm_gem.c

Browse source 
Whitespace changes, a few too-long-lines and some extra braces.
This commit is contained in:
Keith Packard 2008-05-08 11:13:29 -07:00
parent 2f573e6df4
commit 07ad5ce1e1
2 changed files with 51 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
linux-core/drm_gem.c
View file

@ -391,9 +391,9 @@ drm_gem_name_ioctl(struct drm_device *dev, void *data,
return -EINVAL; return -EINVAL;
again: again:
if (idr_pre_get(&dev->object_name_idr, GFP_KERNEL) == 0) { if (idr_pre_get(&dev->object_name_idr, GFP_KERNEL) == 0)
return -ENOMEM; return -ENOMEM;
}
spin_lock(&dev->object_name_lock); spin_lock(&dev->object_name_lock);
if (obj->name) { if (obj->name) {
spin_unlock(&dev->object_name_lock); spin_unlock(&dev->object_name_lock);
@ -498,7 +498,10 @@ drm_gem_open(struct drm_device *dev, struct drm_file *file_private)
spin_lock_init(&file_private->table_lock); spin_lock_init(&file_private->table_lock);
} }
/** Called at device close to release the file's handle references on objects. */ /**
* Called at device close to release the file's
* handle references on objects.
*/
static int static int
drm_gem_object_release_handle(int id, void *ptr, void *data) drm_gem_object_release_handle(int id, void *ptr, void *data)
{ {
@ -517,7 +520,8 @@ drm_gem_object_release_handle (int id, void *ptr, void *data)
void void
drm_gem_release(struct drm_device *dev, struct drm_file *file_private) drm_gem_release(struct drm_device *dev, struct drm_file *file_private)
{ {
idr_for_each(&file_private->object_idr, &drm_gem_object_release_handle, NULL); idr_for_each(&file_private->object_idr,
&drm_gem_object_release_handle, NULL);
idr_destroy(&file_private->object_idr); idr_destroy(&file_private->object_idr);
} }
@ -552,7 +556,9 @@ EXPORT_SYMBOL(drm_gem_object_free);
void void
drm_gem_object_handle_free(struct kref *kref) drm_gem_object_handle_free(struct kref *kref)
{ {
struct drm_gem_object *obj = container_of (kref, struct drm_gem_object, handlecount); struct drm_gem_object *obj = container_of(kref,
struct drm_gem_object,
handlecount);
struct drm_device *dev = obj->dev; struct drm_device *dev = obj->dev;
/* Remove any name for this object */ /* Remove any name for this object */

2
linux-core/i915_gem.c
View file

@ -883,11 +883,13 @@ err:
drm_gem_object_unreference(object_list[i]); drm_gem_object_unreference(object_list[i]);
} }
#if 0
/* XXX kludge for now as we don't clean the exec ring yet */ /* XXX kludge for now as we don't clean the exec ring yet */
if (object_list != NULL) { if (object_list != NULL) {
for (i = 0; i < args->buffer_count; i++) for (i = 0; i < args->buffer_count; i++)
i915_gem_object_wait_rendering (object_list[i]); i915_gem_object_wait_rendering (object_list[i]);
} }
#endif
drm_free(object_list, sizeof(*object_list) * args->buffer_count, drm_free(object_list, sizeof(*object_list) * args->buffer_count,
DRM_MEM_DRIVER); DRM_MEM_DRIVER);