| 104,12 → 104,8 |
|---|
| return -ENOMEM; |
| } |
| |
| if (drm_mm_init(&mm->offset_manager, DRM_FILE_PAGE_OFFSET_START, |
| DRM_FILE_PAGE_OFFSET_SIZE)) { |
| drm_ht_remove(&mm->offset_hash); |
| kfree(mm); |
| return -ENOMEM; |
| } |
| drm_mm_init(&mm->offset_manager, DRM_FILE_PAGE_OFFSET_START, |
| DRM_FILE_PAGE_OFFSET_SIZE); |
| |
| return 0; |
| } |
| 447,25 → 443,21 |
|---|
| spin_lock(&dev->object_name_lock); |
| if (!obj->name) { |
| ret = idr_alloc(&dev->object_name_idr, obj, 1, 0, GFP_NOWAIT); |
| obj->name = ret; |
| args->name = (uint64_t) obj->name; |
| spin_unlock(&dev->object_name_lock); |
| idr_preload_end(); |
| |
| if (ret < 0) |
| goto err; |
| ret = 0; |
| |
| obj->name = ret; |
| |
| /* Allocate a reference for the name table. */ |
| drm_gem_object_reference(obj); |
| } else { |
| } |
| |
| args->name = (uint64_t) obj->name; |
| spin_unlock(&dev->object_name_lock); |
| idr_preload_end(); |
| ret = 0; |
| } |
| |
| err: |
| spin_unlock(&dev->object_name_lock); |
| idr_preload_end(); |
| drm_gem_object_unreference_unlocked(obj); |
| return ret; |
| } |