Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 221782
b: refs/heads/master
c: dbc4a5b
h: refs/heads/master
v: v3
  • Loading branch information
Thomas Hellstrom authored and Dave Airlie committed Nov 9, 2010
1 parent b0e7023 commit 32efcdd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 19 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6e4c55db120b03d411e0eff7cd35f3edabbefe14
refs/heads/master: dbc4a5b83585e89a6bce650d32426f61c8d4bca5
20 changes: 2 additions & 18 deletions trunk/drivers/gpu/drm/ttm/ttm_bo.c
Original file line number Diff line number Diff line change
Expand Up @@ -1354,18 +1354,9 @@ int ttm_bo_init_mm(struct ttm_bo_device *bdev, unsigned type,
int ret = -EINVAL;
struct ttm_mem_type_manager *man;

if (type >= TTM_NUM_MEM_TYPES) {
printk(KERN_ERR TTM_PFX "Illegal memory type %d\n", type);
return ret;
}

BUG_ON(type >= TTM_NUM_MEM_TYPES);
man = &bdev->man[type];
if (man->has_type) {
printk(KERN_ERR TTM_PFX
"Memory manager already initialized for type %d\n",
type);
return ret;
}
BUG_ON(man->has_type);

ret = bdev->driver->init_mem_type(bdev, type, man);
if (ret)
Expand All @@ -1374,13 +1365,6 @@ int ttm_bo_init_mm(struct ttm_bo_device *bdev, unsigned type,

ret = 0;
if (type != TTM_PL_SYSTEM) {
if (!p_size) {
printk(KERN_ERR TTM_PFX
"Zero size memory manager type %d\n",
type);
return ret;
}

ret = (*man->func->init)(man, p_size);
if (ret)
return ret;
Expand Down

0 comments on commit 32efcdd

Please sign in to comment.