Rev 3031 | Rev 3243 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 3031 | Rev 3037 | ||
|---|---|---|---|
| Line 429... | Line 429... | ||
| 429 | { |
429 | { |
| 430 | u32 gma_addr; |
430 | u32 gma_addr; |
| 431 | u32 gtt_map_size; |
431 | u32 gtt_map_size; |
| 432 | int ret; |
432 | int ret; |
| Line 433... | Line -... | ||
| 433 | - | ||
| 434 | ENTER(); |
- | |
| 435 | 433 | ||
| 436 | ret = intel_private.driver->setup(); |
434 | ret = intel_private.driver->setup(); |
| 437 | if (ret != 0) |
435 | if (ret != 0) |
| 438 | { |
- | |
| 439 | LEAVE(); |
436 | { |
| 440 | return ret; |
437 | return ret; |
| Line 441... | Line 438... | ||
| 441 | }; |
438 | }; |
| Line 492... | Line 489... | ||
| 492 | pci_read_config_dword(intel_private.pcidev, I915_GMADDR, |
489 | pci_read_config_dword(intel_private.pcidev, I915_GMADDR, |
| 493 | &gma_addr); |
490 | &gma_addr); |
| Line 494... | Line 491... | ||
| 494 | 491 | ||
| Line 495... | Line -... | ||
| 495 | intel_private.base.gma_bus_addr = (gma_addr & PCI_BASE_ADDRESS_MEM_MASK); |
- | |
| 496 | - | ||
| 497 | LEAVE(); |
492 | intel_private.base.gma_bus_addr = (gma_addr & PCI_BASE_ADDRESS_MEM_MASK); |
| 498 | 493 | ||
| Line 499... | Line 494... | ||
| 499 | return 0; |
494 | return 0; |
| 500 | } |
495 | } |