Rev 1986 | Rev 2997 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1986 | Rev 2005 | ||
|---|---|---|---|
| Line 398... | Line 398... | ||
| 398 | /* Initialize GART (initialize after TTM so we can allocate |
398 | /* Initialize GART (initialize after TTM so we can allocate |
| 399 | * memory through TTM but finalize after TTM) */ |
399 | * memory through TTM but finalize after TTM) */ |
| 400 | r = rs400_gart_enable(rdev); |
400 | r = rs400_gart_enable(rdev); |
| 401 | if (r) |
401 | if (r) |
| 402 | return r; |
402 | return r; |
| - | 403 | ||
| - | 404 | /* allocate wb buffer */ |
|
| - | 405 | r = radeon_wb_init(rdev); |
|
| - | 406 | if (r) |
|
| - | 407 | return r; |
|
| - | 408 | ||
| 403 | /* Enable IRQ */ |
409 | /* Enable IRQ */ |
| 404 | // r100_irq_set(rdev); |
410 | r100_irq_set(rdev); |
| 405 | rdev->config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL); |
411 | rdev->config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL); |
| 406 | /* 1M ring buffer */ |
412 | /* 1M ring buffer */ |
| 407 | r = r100_cp_init(rdev, 1024 * 1024); |
413 | r = r100_cp_init(rdev, 1024 * 1024); |
| 408 | if (r) { |
414 | if (r) { |
| 409 | dev_err(rdev->dev, "failed initializing CP (%d).\n", r); |
415 | dev_err(rdev->dev, "failed initializing CP (%d).\n", r); |
| 410 | return r; |
416 | return r; |
| 411 | } |
417 | } |
| 412 | // r = r100_ib_init(rdev); |
418 | r = r100_ib_init(rdev); |
| 413 | // if (r) { |
419 | if (r) { |
| 414 | // dev_err(rdev->dev, "failled initializing IB (%d).\n", r); |
420 | dev_err(rdev->dev, "failed initializing IB (%d).\n", r); |
| 415 | // return r; |
421 | return r; |
| 416 | // } |
422 | } |
| 417 | return 0; |
423 | return 0; |
| 418 | } |
424 | } |
| Line 460... | Line 466... | ||
| 460 | /* Initialize clocks */ |
466 | /* Initialize clocks */ |
| 461 | radeon_get_clock_info(rdev->ddev); |
467 | radeon_get_clock_info(rdev->ddev); |
| 462 | /* initialize memory controller */ |
468 | /* initialize memory controller */ |
| 463 | rs400_mc_init(rdev); |
469 | rs400_mc_init(rdev); |
| 464 | /* Fence driver */ |
470 | /* Fence driver */ |
| 465 | // r = radeon_fence_driver_init(rdev); |
471 | r = radeon_fence_driver_init(rdev); |
| 466 | // if (r) |
472 | if (r) |
| 467 | // return r; |
473 | return r; |
| 468 | // r = radeon_irq_kms_init(rdev); |
474 | r = radeon_irq_kms_init(rdev); |
| 469 | // if (r) |
475 | if (r) |
| 470 | // return r; |
476 | return r; |
| 471 | /* Memory manager */ |
477 | /* Memory manager */ |
| 472 | r = radeon_bo_init(rdev); |
478 | r = radeon_bo_init(rdev); |
| 473 | if (r) |
479 | if (r) |
| 474 | return r; |
480 | return r; |
| 475 | r = rs400_gart_init(rdev); |
481 | r = rs400_gart_init(rdev); |