Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 228473 | Differences between
and this patch

Collapse All | Expand All

(-)linux-2.6.27-gentoo-r4/drivers/gpu/drm/drm_sman.c (-3 / +10 lines)
Lines 209-221 struct drm_memblock_item *drm_sman_alloc Link Here
209
	tmp = sman_mm->allocate(sman_mm->private, size, alignment);
209
	tmp = sman_mm->allocate(sman_mm->private, size, alignment);
210
210
211
	if (!tmp) {
211
	if (!tmp) {
212
		printk("sman_alloc tmp failed\n");
212
		return NULL;
213
		return NULL;
213
	}
214
	}
214
215
215
	memblock = drm_calloc(1, sizeof(*memblock), DRM_MEM_MM);
216
	memblock = drm_calloc(1, sizeof(*memblock), DRM_MEM_MM);
216
217
217
	if (!memblock)
218
	if (!memblock) {
219
		printk("sman_alloc drm_calloc failed\n");
218
		goto out;
220
		goto out;
221
	}
219
222
220
	memblock->mm_info = tmp;
223
	memblock->mm_info = tmp;
221
	memblock->mm = sman_mm;
224
	memblock->mm = sman_mm;
Lines 223-234 struct drm_memblock_item *drm_sman_alloc Link Here
223
226
224
	if (drm_ht_just_insert_please
227
	if (drm_ht_just_insert_please
225
	    (&sman->user_hash_tab, &memblock->user_hash,
228
	    (&sman->user_hash_tab, &memblock->user_hash,
226
	     (unsigned long)memblock, 32, 0, 0))
229
	     (unsigned long)memblock, 32, 0, 0)) {
230
	     	printk("sman_alloc just_insert_please failed\n");
227
		goto out1;
231
		goto out1;
232
	}
228
233
229
	owner_item = drm_sman_get_owner_item(sman, owner);
234
	owner_item = drm_sman_get_owner_item(sman, owner);
230
	if (!owner_item)
235
	if (!owner_item) {
236
		printk("sman_alloc get_owner_item failed\n");
231
		goto out2;
237
		goto out2;
238
	}
232
239
233
	list_add_tail(&memblock->owner_list, &owner_item->mem_blocks);
240
	list_add_tail(&memblock->owner_list, &owner_item->mem_blocks);
234
241
(-)linux-2.6.27-gentoo-r4/drivers/gpu/drm/via/via_mm.c (-1 / +1 lines)
Lines 151-157 int via_mem_alloc(struct drm_device *dev Link Here
151
		mem->offset = 0;
151
		mem->offset = 0;
152
		mem->size = 0;
152
		mem->size = 0;
153
		mem->index = 0;
153
		mem->index = 0;
154
		DRM_DEBUG("Video memory allocation failed\n");
154
		printk("Video memory allocation failed, type=%d size=%ld\n", mem->type, tmpSize);
155
		retval = -ENOMEM;
155
		retval = -ENOMEM;
156
	}
156
	}
157
157

Return to bug 228473