diff options
| author | Eric Anholt <eric@anholt.net> | 2008-05-30 14:42:08 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-05-30 14:42:08 -0700 |
| commit | 461bfa3da6f85b85c21cd84f81bb4eefa5481418 (patch) | |
| tree | 33e91c8cd024f67922670f9ed6565ceda1e4f3b5 /bsd-core/drm_drawable.c | |
| parent | 50bce2bc625deb439dd61f504496dddd0cd4f572 (diff) | |
| parent | 6e8a2cff66ac0d6afaf9bb233bc81449c2014078 (diff) | |
Merge commit 'origin/master' into drm-gem
Conflicts:
linux-core/Makefile.kernel
shared-core/i915_drv.h
shared-core/nouveau_state.c
Diffstat (limited to 'bsd-core/drm_drawable.c')
| -rw-r--r-- | bsd-core/drm_drawable.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/bsd-core/drm_drawable.c b/bsd-core/drm_drawable.c index fb318d47..268b956c 100644 --- a/bsd-core/drm_drawable.c +++ b/bsd-core/drm_drawable.c @@ -56,7 +56,7 @@ RB_GENERATE_STATIC(drawable_tree, bsd_drm_drawable_info, tree, drm_drawable_compare); struct drm_drawable_info * -drm_get_drawable_info(drm_device_t *dev, int handle) +drm_get_drawable_info(struct drm_device *dev, int handle) { struct bsd_drm_drawable_info find, *result; @@ -66,7 +66,7 @@ drm_get_drawable_info(drm_device_t *dev, int handle) return &result->info; } -int drm_adddraw(drm_device_t *dev, void *data, struct drm_file *file_priv) +int drm_adddraw(struct drm_device *dev, void *data, struct drm_file *file_priv) { drm_draw_t *draw = data; struct bsd_drm_drawable_info *info; @@ -87,7 +87,7 @@ int drm_adddraw(drm_device_t *dev, void *data, struct drm_file *file_priv) return 0; } -int drm_rmdraw(drm_device_t *dev, void *data, struct drm_file *file_priv) +int drm_rmdraw(struct drm_device *dev, void *data, struct drm_file *file_priv) { drm_draw_t *draw = (drm_draw_t *)data; struct drm_drawable_info *info; @@ -108,7 +108,8 @@ int drm_rmdraw(drm_device_t *dev, void *data, struct drm_file *file_priv) } } -int drm_update_draw(drm_device_t *dev, void *data, struct drm_file *file_priv) +int drm_update_draw(struct drm_device *dev, void *data, + struct drm_file *file_priv) { struct drm_drawable_info *info; struct drm_update_draw *update = (struct drm_update_draw *)data; @@ -135,8 +136,10 @@ int drm_update_draw(drm_device_t *dev, void *data, struct drm_file *file_priv) if (info->rects == NULL) { info->rects = drm_alloc(sizeof(*info->rects) * update->num, DRM_MEM_DRAWABLE); - if (info->rects == NULL) + if (info->rects == NULL) { + DRM_SPINUNLOCK(&dev->drw_lock); return ENOMEM; + } info->num_rects = update->num; } /* For some reason the pointer arg is unsigned long long. */ |