Rev 1268 | Rev 1412 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1268 | Rev 1321 | ||
|---|---|---|---|
| Line 185... | Line 185... | ||
| 185 | r = rv370_pcie_gart_enable(rdev); |
185 | r = rv370_pcie_gart_enable(rdev); |
| 186 | if (r) |
186 | if (r) |
| 187 | return r; |
187 | return r; |
| 188 | } |
188 | } |
| 189 | /* Enable IRQ */ |
189 | /* Enable IRQ */ |
| 190 | // rdev->irq.sw_int = true; |
- | |
| 191 | // rs600_irq_set(rdev); |
190 | // rs600_irq_set(rdev); |
| 192 | /* 1M ring buffer */ |
191 | /* 1M ring buffer */ |
| 193 | // r = r100_cp_init(rdev, 1024 * 1024); |
192 | // r = r100_cp_init(rdev, 1024 * 1024); |
| 194 | // if (r) { |
193 | // if (r) { |
| 195 | // dev_err(rdev->dev, "failled initializing CP (%d).\n", r); |
194 | // dev_err(rdev->dev, "failled initializing CP (%d).\n", r); |
| Line 238... | Line 237... | ||
| 238 | "GPU reset failed ! (0xE40=0x%08X, 0x7C0=0x%08X)\n", |
237 | "GPU reset failed ! (0xE40=0x%08X, 0x7C0=0x%08X)\n", |
| 239 | RREG32(R_000E40_RBBM_STATUS), |
238 | RREG32(R_000E40_RBBM_STATUS), |
| 240 | RREG32(R_0007C0_CP_STAT)); |
239 | RREG32(R_0007C0_CP_STAT)); |
| 241 | } |
240 | } |
| 242 | /* check if cards are posted or not */ |
241 | /* check if cards are posted or not */ |
| - | 242 | if (radeon_boot_test_post_card(rdev) == false) |
|
| - | 243 | return -EINVAL; |
|
| - | 244 | ||
| 243 | if (!radeon_card_posted(rdev) && rdev->bios) { |
245 | if (!radeon_card_posted(rdev) && rdev->bios) { |
| 244 | DRM_INFO("GPU not posted. posting now...\n"); |
246 | DRM_INFO("GPU not posted. posting now...\n"); |
| 245 | atom_asic_init(rdev->mode_info.atom_context); |
247 | atom_asic_init(rdev->mode_info.atom_context); |
| 246 | } |
248 | } |
| 247 | /* Initialize clocks */ |
249 | /* Initialize clocks */ |
| Line 262... | Line 264... | ||
| 262 | // return r; |
264 | // return r; |
| 263 | // r = radeon_irq_kms_init(rdev); |
265 | // r = radeon_irq_kms_init(rdev); |
| 264 | // if (r) |
266 | // if (r) |
| 265 | // return r; |
267 | // return r; |
| 266 | /* Memory manager */ |
268 | /* Memory manager */ |
| 267 | r = radeon_object_init(rdev); |
269 | r = radeon_bo_init(rdev); |
| 268 | if (r) |
270 | if (r) |
| 269 | return r; |
271 | return r; |
| 270 | r = rv370_pcie_gart_init(rdev); |
272 | r = rv370_pcie_gart_init(rdev); |
| 271 | if (r) |
273 | if (r) |
| 272 | return r; |
274 | return r; |