Rev 6084 | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 6084 | Rev 6660 | ||
|---|---|---|---|
| Line 580... | Line 580... | ||
| 580 | intel_private.gtt_mappable_entries * 4); |
580 | intel_private.gtt_mappable_entries * 4); |
| Line 581... | Line 581... | ||
| 581 | 581 | ||
| Line 582... | Line 582... | ||
| 582 | gtt_map_size = intel_private.gtt_total_entries * 4; |
582 | gtt_map_size = intel_private.gtt_total_entries * 4; |
| - | 583 | ||
| - | 584 | intel_private.gtt = NULL; |
|
| - | 585 | if (intel_gtt_can_wc()) |
|
| 583 | 586 | intel_private.gtt = ioremap_wc(intel_private.gtt_phys_addr, |
|
| 584 | intel_private.gtt = NULL; |
587 | gtt_map_size); |
| 585 | if (intel_private.gtt == NULL) |
588 | if (intel_private.gtt == NULL) |
| 586 | intel_private.gtt = ioremap(intel_private.gtt_phys_addr, |
589 | intel_private.gtt = ioremap(intel_private.gtt_phys_addr, |
| 587 | gtt_map_size); |
590 | gtt_map_size); |
| Line 952... | Line 955... | ||
| 952 | } else { |
955 | } else { |
| 953 | intel_i915_setup_chipset_flush(); |
956 | intel_i915_setup_chipset_flush(); |
| 954 | } |
957 | } |
| Line 955... | Line 958... | ||
| 955 | 958 | ||
| 956 | if (intel_private.ifp_resource.start) |
959 | if (intel_private.ifp_resource.start) |
| 957 | intel_private.i9xx_flush_page = ioremap(intel_private.ifp_resource.start, PAGE_SIZE); |
960 | intel_private.i9xx_flush_page = ioremap_nocache(intel_private.ifp_resource.start, PAGE_SIZE); |
| 958 | if (!intel_private.i9xx_flush_page) |
961 | if (!intel_private.i9xx_flush_page) |
| 959 | dev_err(&intel_private.pcidev->dev, |
962 | dev_err(&intel_private.pcidev->dev, |
| 960 | "can't ioremap flush page - no chipset flushing\n"); |
963 | "can't ioremap flush page - no chipset flushing\n"); |