Rev 3037 | Rev 3243 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 3037 | Rev 3120 | ||
---|---|---|---|
Line 2396... | Line 2396... | ||
2396 | { |
2396 | { |
2397 | /* Respect the kernel parameter if it is set */ |
2397 | /* Respect the kernel parameter if it is set */ |
2398 | if (i915_enable_rc6 >= 0) |
2398 | if (i915_enable_rc6 >= 0) |
2399 | return i915_enable_rc6; |
2399 | return i915_enable_rc6; |
Line 2400... | Line -... | ||
2400 | - | ||
2401 | if (INTEL_INFO(dev)->gen == 5) { |
- | |
2402 | #ifdef CONFIG_INTEL_IOMMU |
2400 | |
2403 | /* Disable rc6 on ilk if VT-d is on. */ |
2401 | /* Disable RC6 on Ironlake */ |
2404 | if (intel_iommu_gfx_mapped) |
2402 | if (INTEL_INFO(dev)->gen == 5) |
2405 | return false; |
- | |
2406 | #endif |
- | |
2407 | DRM_DEBUG_DRIVER("Ironlake: only RC6 available\n"); |
- | |
2408 | return INTEL_RC6_ENABLE; |
- | |
Line 2409... | Line 2403... | ||
2409 | } |
2403 | return 0; |
2410 | 2404 | ||
2411 | if (IS_HASWELL(dev)) { |
2405 | if (IS_HASWELL(dev)) { |
2412 | DRM_DEBUG_DRIVER("Haswell: only RC6 available\n"); |
2406 | DRM_DEBUG_DRIVER("Haswell: only RC6 available\n"); |