Rev 1428 | Rev 1963 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1428 | Rev 1430 | ||
|---|---|---|---|
| Line 144... | Line 144... | ||
| 144 | int i; |
144 | int i; |
| 145 | int r = 0; |
145 | int r = 0; |
| Line 146... | Line 146... | ||
| 146 | 146 | ||
| 147 | if (rdev->ib_pool.robj) |
147 | if (rdev->ib_pool.robj) |
| - | 148 | return 0; |
|
| 148 | return 0; |
149 | INIT_LIST_HEAD(&rdev->ib_pool.bogus_ib); |
| 149 | /* Allocate 1M object buffer */ |
150 | /* Allocate 1M object buffer */ |
| 150 | r = radeon_bo_create(rdev, NULL, RADEON_IB_POOL_SIZE*64*1024, |
151 | r = radeon_bo_create(rdev, NULL, RADEON_IB_POOL_SIZE*64*1024, |
| 151 | true, RADEON_GEM_DOMAIN_GTT, |
152 | true, RADEON_GEM_DOMAIN_GTT, |
| 152 | &rdev->ib_pool.robj); |
153 | &rdev->ib_pool.robj); |
| Line 276... | Line 277... | ||
| 276 | 277 | ||
| 277 | int radeon_ring_init(struct radeon_device *rdev, unsigned ring_size) |
278 | int radeon_ring_init(struct radeon_device *rdev, unsigned ring_size) |
| 278 | { |
279 | { |
| Line 279... | Line -... | ||
| 279 | int r; |
- | |
| 280 | - | ||
| 281 | ENTER(); |
280 | int r; |
| 282 | 281 | ||
| 283 | rdev->cp.ring_size = ring_size; |
282 | rdev->cp.ring_size = ring_size; |
| 284 | /* Allocate ring buffer */ |
283 | /* Allocate ring buffer */ |
| 285 | if (rdev->cp.ring_obj == NULL) { |
284 | if (rdev->cp.ring_obj == NULL) { |
| Line 308... | Line 307... | ||
| 308 | return r; |
307 | return r; |
| 309 | } |
308 | } |
| 310 | } |
309 | } |
| 311 | rdev->cp.ptr_mask = (rdev->cp.ring_size / 4) - 1; |
310 | rdev->cp.ptr_mask = (rdev->cp.ring_size / 4) - 1; |
| 312 | rdev->cp.ring_free_dw = rdev->cp.ring_size / 4; |
311 | rdev->cp.ring_free_dw = rdev->cp.ring_size / 4; |
| 313 | - | ||
| 314 | LEAVE(); |
- | |
| 315 | - | ||
| 316 | return 0; |
312 | return 0; |
| 317 | } |
313 | } |
| Line 318... | Line 314... | ||
| 318 | 314 | ||
| 319 | void radeon_ring_fini(struct radeon_device *rdev) |
315 | void radeon_ring_fini(struct radeon_device *rdev) |
| Line 364... | Line 360... | ||
| 364 | 360 | ||
| 365 | int radeon_debugfs_ib_init(struct radeon_device *rdev) |
361 | int radeon_debugfs_ib_init(struct radeon_device *rdev) |
| 366 | { |
362 | { |
| 367 | #if defined(CONFIG_DEBUG_FS) |
363 | #if defined(CONFIG_DEBUG_FS) |
| - | 364 | unsigned i; |
|
| Line -... | Line 365... | ||
| - | 365 | int r; |
|
| - | 366 | ||
| - | 367 | radeon_debugfs_ib_bogus_info_list[0].data = rdev; |
|
| - | 368 | r = radeon_debugfs_add_files(rdev, radeon_debugfs_ib_bogus_info_list, 1); |
|
| 368 | unsigned i; |
369 | if (r) |
| 369 | 370 | return r; |
|
| 370 | for (i = 0; i < RADEON_IB_POOL_SIZE; i++) { |
371 | for (i = 0; i < RADEON_IB_POOL_SIZE; i++) { |
| 371 | sprintf(radeon_debugfs_ib_names[i], "radeon_ib_%04u", i); |
372 | sprintf(radeon_debugfs_ib_names[i], "radeon_ib_%04u", i); |
| 372 | radeon_debugfs_ib_list[i].name = radeon_debugfs_ib_names[i]; |
373 | radeon_debugfs_ib_list[i].name = radeon_debugfs_ib_names[i]; |