diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/gpu/drm/radeon/r420.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/gpu/drm/radeon/r420.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r420.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/drivers/gpu/drm/radeon/r420.c b/drivers/gpu/drm/radeon/r420.c index 59f7bccc5be0..417fab81812f 100644 --- a/drivers/gpu/drm/radeon/r420.c +++ b/drivers/gpu/drm/radeon/r420.c | |||
| @@ -96,7 +96,7 @@ void r420_pipes_init(struct radeon_device *rdev) | |||
| 96 | "programming pipes. Bad things might happen.\n"); | 96 | "programming pipes. Bad things might happen.\n"); |
| 97 | } | 97 | } |
| 98 | /* get max number of pipes */ | 98 | /* get max number of pipes */ |
| 99 | gb_pipe_select = RREG32(0x402C); | 99 | gb_pipe_select = RREG32(R400_GB_PIPE_SELECT); |
| 100 | num_pipes = ((gb_pipe_select >> 12) & 3) + 1; | 100 | num_pipes = ((gb_pipe_select >> 12) & 3) + 1; |
| 101 | 101 | ||
| 102 | /* SE chips have 1 pipe */ | 102 | /* SE chips have 1 pipe */ |
| @@ -248,23 +248,25 @@ static int r420_startup(struct radeon_device *rdev) | |||
| 248 | return r; | 248 | return r; |
| 249 | } | 249 | } |
| 250 | r420_pipes_init(rdev); | 250 | r420_pipes_init(rdev); |
| 251 | |||
| 252 | /* allocate wb buffer */ | ||
| 253 | r = radeon_wb_init(rdev); | ||
| 254 | if (r) | ||
| 255 | return r; | ||
| 256 | |||
| 251 | /* Enable IRQ */ | 257 | /* Enable IRQ */ |
| 252 | r100_irq_set(rdev); | 258 | r100_irq_set(rdev); |
| 253 | rdev->config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL); | 259 | rdev->config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL); |
| 254 | /* 1M ring buffer */ | 260 | /* 1M ring buffer */ |
| 255 | r = r100_cp_init(rdev, 1024 * 1024); | 261 | r = r100_cp_init(rdev, 1024 * 1024); |
| 256 | if (r) { | 262 | if (r) { |
| 257 | dev_err(rdev->dev, "failled initializing CP (%d).\n", r); | 263 | dev_err(rdev->dev, "failed initializing CP (%d).\n", r); |
| 258 | return r; | 264 | return r; |
| 259 | } | 265 | } |
| 260 | r420_cp_errata_init(rdev); | 266 | r420_cp_errata_init(rdev); |
| 261 | r = r100_wb_init(rdev); | ||
| 262 | if (r) { | ||
| 263 | dev_err(rdev->dev, "failled initializing WB (%d).\n", r); | ||
| 264 | } | ||
| 265 | r = r100_ib_init(rdev); | 267 | r = r100_ib_init(rdev); |
| 266 | if (r) { | 268 | if (r) { |
| 267 | dev_err(rdev->dev, "failled initializing IB (%d).\n", r); | 269 | dev_err(rdev->dev, "failed initializing IB (%d).\n", r); |
| 268 | return r; | 270 | return r; |
| 269 | } | 271 | } |
| 270 | return 0; | 272 | return 0; |
| @@ -302,7 +304,7 @@ int r420_suspend(struct radeon_device *rdev) | |||
| 302 | { | 304 | { |
| 303 | r420_cp_errata_fini(rdev); | 305 | r420_cp_errata_fini(rdev); |
| 304 | r100_cp_disable(rdev); | 306 | r100_cp_disable(rdev); |
| 305 | r100_wb_disable(rdev); | 307 | radeon_wb_disable(rdev); |
| 306 | r100_irq_disable(rdev); | 308 | r100_irq_disable(rdev); |
| 307 | if (rdev->flags & RADEON_IS_PCIE) | 309 | if (rdev->flags & RADEON_IS_PCIE) |
| 308 | rv370_pcie_gart_disable(rdev); | 310 | rv370_pcie_gart_disable(rdev); |
| @@ -314,7 +316,7 @@ int r420_suspend(struct radeon_device *rdev) | |||
| 314 | void r420_fini(struct radeon_device *rdev) | 316 | void r420_fini(struct radeon_device *rdev) |
| 315 | { | 317 | { |
| 316 | r100_cp_fini(rdev); | 318 | r100_cp_fini(rdev); |
| 317 | r100_wb_fini(rdev); | 319 | radeon_wb_fini(rdev); |
| 318 | r100_ib_fini(rdev); | 320 | r100_ib_fini(rdev); |
| 319 | radeon_gem_fini(rdev); | 321 | radeon_gem_fini(rdev); |
| 320 | if (rdev->flags & RADEON_IS_PCIE) | 322 | if (rdev->flags & RADEON_IS_PCIE) |
| @@ -418,7 +420,7 @@ int r420_init(struct radeon_device *rdev) | |||
| 418 | /* Somethings want wront with the accel init stop accel */ | 420 | /* Somethings want wront with the accel init stop accel */ |
| 419 | dev_err(rdev->dev, "Disabling GPU acceleration\n"); | 421 | dev_err(rdev->dev, "Disabling GPU acceleration\n"); |
| 420 | r100_cp_fini(rdev); | 422 | r100_cp_fini(rdev); |
| 421 | r100_wb_fini(rdev); | 423 | radeon_wb_fini(rdev); |
| 422 | r100_ib_fini(rdev); | 424 | r100_ib_fini(rdev); |
| 423 | radeon_irq_kms_fini(rdev); | 425 | radeon_irq_kms_fini(rdev); |
| 424 | if (rdev->flags & RADEON_IS_PCIE) | 426 | if (rdev->flags & RADEON_IS_PCIE) |