drm/i915/gtt: Remove vgpu check for gen6
authorChris Wilson <chris@chris-wilson.co.uk>
Fri, 8 Jun 2018 15:04:35 +0000 (16:04 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Fri, 8 Jun 2018 18:30:03 +0000 (19:30 +0100)
Since vgpu is not supported on Haswell or any other gen6/7, we do not
need to check and act upon it's enablement.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: Matthew Auld <matthew.william.auld@gmail.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180608150435.15010-2-chris@chris-wilson.co.uk
drivers/gpu/drm/i915/i915_gem_gtt.c

index df0ea66ba68c239f1665cc4798d28044d16c1bab..a8cfe3c413c11f81658f1087af0fef1dc143dd34 100644 (file)
@@ -2024,7 +2024,7 @@ static struct i915_hw_ppgtt *gen6_ppgtt_create(struct drm_i915_private *i915)
        ppgtt->vm.dma = &i915->drm.pdev->dev;
 
        ppgtt->vm.pte_encode = ggtt->vm.pte_encode;
-       if (intel_vgpu_active(i915) || IS_GEN6(i915))
+       if (IS_GEN6(i915))
                ppgtt->switch_mm = gen6_mm_switch;
        else if (IS_GEN7(i915))
                ppgtt->switch_mm = gen7_mm_switch;