Rev 1963 | Rev 2997 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1963 | Rev 2005 | ||
|---|---|---|---|
| Line 207... | Line 207... | ||
| 207 | r = r100_pci_gart_enable(rdev); |
207 | r = r100_pci_gart_enable(rdev); |
| 208 | if (r) |
208 | if (r) |
| 209 | return r; |
209 | return r; |
| 210 | } |
210 | } |
| 211 | r420_pipes_init(rdev); |
211 | r420_pipes_init(rdev); |
| - | 212 | ||
| - | 213 | /* allocate wb buffer */ |
|
| - | 214 | r = radeon_wb_init(rdev); |
|
| - | 215 | if (r) |
|
| - | 216 | return r; |
|
| - | 217 | ||
| 212 | /* Enable IRQ */ |
218 | /* Enable IRQ */ |
| - | 219 | r100_irq_set(rdev); |
|
| 213 | rdev->config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL); |
220 | rdev->config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL); |
| 214 | /* 1M ring buffer */ |
221 | /* 1M ring buffer */ |
| 215 | r = r100_cp_init(rdev, 1024 * 1024); |
222 | r = r100_cp_init(rdev, 1024 * 1024); |
| 216 | if (r) { |
223 | if (r) { |
| 217 | dev_err(rdev->dev, "failed initializing CP (%d).\n", r); |
224 | dev_err(rdev->dev, "failed initializing CP (%d).\n", r); |
| 218 | return r; |
225 | return r; |
| 219 | } |
226 | } |
| 220 | r420_cp_errata_init(rdev); |
227 | r420_cp_errata_init(rdev); |
| - | 228 | r = r100_ib_init(rdev); |
|
| - | 229 | if (r) { |
|
| - | 230 | dev_err(rdev->dev, "failed initializing IB (%d).\n", r); |
|
| - | 231 | return r; |
|
| - | 232 | } |
|
| 221 | return 0; |
233 | return 0; |
| 222 | } |
234 | } |
| Line 223... | Line 235... | ||
| 223 | 235 | ||
| 224 | int r420_resume(struct radeon_device *rdev) |
236 | int r420_resume(struct radeon_device *rdev) |
| Line 300... | Line 312... | ||
| 300 | } |
312 | } |
| 301 | /* initialize memory controller */ |
313 | /* initialize memory controller */ |
| 302 | r300_mc_init(rdev); |
314 | r300_mc_init(rdev); |
| 303 | r420_debugfs(rdev); |
315 | r420_debugfs(rdev); |
| 304 | /* Fence driver */ |
316 | /* Fence driver */ |
| - | 317 | r = radeon_fence_driver_init(rdev); |
|
| - | 318 | if (r) { |
|
| - | 319 | return r; |
|
| 305 | 320 | } |
|
| - | 321 | r = radeon_irq_kms_init(rdev); |
|
| - | 322 | if (r) { |
|
| - | 323 | return r; |
|
| - | 324 | } |
|
| 306 | /* Memory manager */ |
325 | /* Memory manager */ |
| 307 | r = radeon_bo_init(rdev); |
326 | r = radeon_bo_init(rdev); |
| 308 | if (r) { |
327 | if (r) { |
| 309 | return r; |
328 | return r; |
| 310 | } |
329 | } |