| 308,7 → 308,7 |
|---|
| return -EINVAL; |
| } |
| |
| if (obj->pin_count) { |
| if (obj->pin_count || obj->framebuffer_references) { |
| drm_gem_object_unreference_unlocked(&obj->base); |
| return -EBUSY; |
| } |
| 393,7 → 393,7 |
|---|
| /* Try to preallocate memory required to save swizzling on put-pages */ |
| if (i915_gem_object_needs_bit17_swizzle(obj)) { |
| if (obj->bit_17 == NULL) { |
| obj->bit_17 = kmalloc(BITS_TO_LONGS(obj->base.size >> PAGE_SHIFT) * |
| obj->bit_17 = kcalloc(BITS_TO_LONGS(obj->base.size >> PAGE_SHIFT), |
| sizeof(long), GFP_KERNEL); |
| } |
| } else { |
| 505,7 → 505,7 |
|---|
| int i; |
| |
| if (obj->bit_17 == NULL) { |
| obj->bit_17 = kmalloc(BITS_TO_LONGS(page_count) * |
| obj->bit_17 = kcalloc(BITS_TO_LONGS(page_count), |
| sizeof(long), GFP_KERNEL); |
| if (obj->bit_17 == NULL) { |
| DRM_ERROR("Failed to allocate memory for bit 17 " |
| 523,5 → 523,4 |
|---|
| i++; |
| } |
| } |
| |
| #endif |