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 179... | Line 179... | ||
| 179 | if (rdev->flags & RADEON_IS_PCIE) { |
179 | if (rdev->flags & RADEON_IS_PCIE) { |
| 180 | r = rv370_pcie_gart_enable(rdev); |
180 | r = rv370_pcie_gart_enable(rdev); |
| 181 | if (r) |
181 | if (r) |
| 182 | return r; |
182 | return r; |
| 183 | } |
183 | } |
| - | 184 | ||
| - | 185 | /* allocate wb buffer */ |
|
| - | 186 | r = radeon_wb_init(rdev); |
|
| - | 187 | if (r) |
|
| - | 188 | return r; |
|
| - | 189 | ||
| 184 | /* Enable IRQ */ |
190 | /* Enable IRQ */ |
| - | 191 | rs600_irq_set(rdev); |
|
| 185 | rdev->config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL); |
192 | rdev->config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL); |
| 186 | /* 1M ring buffer */ |
193 | /* 1M ring buffer */ |
| 187 | r = r100_cp_init(rdev, 1024 * 1024); |
194 | r = r100_cp_init(rdev, 1024 * 1024); |
| 188 | if (r) { |
195 | if (r) { |
| 189 | dev_err(rdev->dev, "failed initializing CP (%d).\n", r); |
196 | dev_err(rdev->dev, "failed initializing CP (%d).\n", r); |
| 190 | return r; |
197 | return r; |
| 191 | } |
198 | } |
| - | 199 | r = r100_ib_init(rdev); |
|
| - | 200 | if (r) { |
|
| - | 201 | dev_err(rdev->dev, "failed initializing IB (%d).\n", r); |
|
| - | 202 | return r; |
|
| - | 203 | } |
|
| 192 | return 0; |
204 | return 0; |
| 193 | } |
205 | } |
| Line 244... | Line 256... | ||
| 244 | } |
256 | } |
| 245 | /* initialize memory controller */ |
257 | /* initialize memory controller */ |
| 246 | r520_mc_init(rdev); |
258 | r520_mc_init(rdev); |
| 247 | rv515_debugfs(rdev); |
259 | rv515_debugfs(rdev); |
| 248 | /* Fence driver */ |
260 | /* Fence driver */ |
| - | 261 | r = radeon_fence_driver_init(rdev); |
|
| - | 262 | if (r) |
|
| - | 263 | return r; |
|
| - | 264 | r = radeon_irq_kms_init(rdev); |
|
| - | 265 | if (r) |
|
| - | 266 | return r; |
|
| 249 | /* Memory manager */ |
267 | /* Memory manager */ |
| 250 | r = radeon_bo_init(rdev); |
268 | r = radeon_bo_init(rdev); |
| 251 | if (r) |
269 | if (r) |
| 252 | return r; |
270 | return r; |
| 253 | r = rv370_pcie_gart_init(rdev); |
271 | r = rv370_pcie_gart_init(rdev); |