drm/i915/vlv: disable PPGTT on early revs v3

jbarnes993 · danvet · commit 62942ed7279d · 2014-06-13T18:52:28.000+02:00
Early revs didn't have PPGTT support, so disable there. v2: add debug msg when disabling on early stepping v3: enable on other B3 packages as well (untested) (Ville) References: https://bugs.freedesktop.org/show_bug.cgi?id=79669 References: https://bugs.freedesktop.org/show_bug.cgi?id=79670 Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> Acked-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -63,6 +63,12 @@ static int sanitize_enable_ppgtt(struct drm_device *dev, int enable_ppgtt)
 	}
 #endif
 
+	/* Early VLV doesn't have this */
+	if (IS_VALLEYVIEW(dev) && dev->pdev->revision < 0xb) {
+		DRM_DEBUG_DRIVER("disabling PPGTT on pre-B3 step VLV\n");
+		return 0;
+	}
+
 	return HAS_ALIASING_PPGTT(dev) ? 1 : 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,12 @@ static int sanitize_enable_ppgtt(struct drm_device *dev, int enable_ppgtt)`
`63`	`63`	`}`
`64`	`64`	`#endif`
`65`	`65`
	`66`	`+ /* Early VLV doesn't have this */`
	`67`	`+ if (IS_VALLEYVIEW(dev) && dev->pdev->revision < 0xb) {`
	`68`	`+ DRM_DEBUG_DRIVER("disabling PPGTT on pre-B3 step VLV\n");`
	`69`	`+ return 0;`
	`70`	`+ }`
	`71`	`+`
`66`	`72`	`return HAS_ALIASING_PPGTT(dev) ? 1 : 0;`
`67`	`73`	`}`
`68`	`74`