|
@@ -104,9 +104,11 @@ static int sanitize_enable_ppgtt(struct drm_device *dev, int enable_ppgtt)
|
|
|
{
|
|
|
bool has_aliasing_ppgtt;
|
|
|
bool has_full_ppgtt;
|
|
|
+ bool has_full_48bit_ppgtt;
|
|
|
|
|
|
has_aliasing_ppgtt = INTEL_INFO(dev)->gen >= 6;
|
|
|
has_full_ppgtt = INTEL_INFO(dev)->gen >= 7;
|
|
|
+ has_full_48bit_ppgtt = IS_BROADWELL(dev) || INTEL_INFO(dev)->gen >= 9;
|
|
|
|
|
|
if (intel_vgpu_active(dev))
|
|
|
has_full_ppgtt = false; /* emulation is too hard */
|
|
@@ -125,6 +127,9 @@ static int sanitize_enable_ppgtt(struct drm_device *dev, int enable_ppgtt)
|
|
|
if (enable_ppgtt == 2 && has_full_ppgtt)
|
|
|
return 2;
|
|
|
|
|
|
+ if (enable_ppgtt == 3 && has_full_48bit_ppgtt)
|
|
|
+ return 3;
|
|
|
+
|
|
|
#ifdef CONFIG_INTEL_IOMMU
|
|
|
/* Disable ppgtt on SNB if VT-d is on. */
|
|
|
if (INTEL_INFO(dev)->gen == 6 && intel_iommu_gfx_mapped) {
|
|
@@ -141,7 +146,7 @@ static int sanitize_enable_ppgtt(struct drm_device *dev, int enable_ppgtt)
|
|
|
}
|
|
|
|
|
|
if (INTEL_INFO(dev)->gen >= 8 && i915.enable_execlists)
|
|
|
- return 2;
|
|
|
+ return has_full_48bit_ppgtt ? 3 : 2;
|
|
|
else
|
|
|
return has_aliasing_ppgtt ? 1 : 0;
|
|
|
}
|