Attachment 98170 Details for Bug 77916 – fixed patch

[patch] fixed patch

0001-drm-i915-Sanitize-the-enable_ppgtt-module-option-onc.patch (text/plain), 3.17 KB, created by Daniel Vetter on 2014-04-29 09:53:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Vetter

Created: 2014-04-29 09:53:14 UTC

Size: 3.17 KB

patch

obsolete

>From 928ea8470971eb36a29308a3ca01109e9e4f274b Mon Sep 17 00:00:00 2001
>From: Daniel Vetter <daniel.vetter@ffwll.ch>
>Date: Tue, 22 Apr 2014 22:15:19 +0200
>Subject: [PATCH] drm/i915: Sanitize the enable_ppgtt module option once
>
>Otherwise we'll end up spamming dmesg on every context creation on snb
>with vt-d enabled. This regression was introduced in
>
>commit 246cbfb5fb9a1ca0997fbb135464c1ff5bb9c549
>Author: Ben Widawsky <benjamin.widawsky@intel.com>
>Date:   Fri Dec 6 14:11:14 2013 -0800
>
>    drm/i915: Reorganize intel_enable_ppgtt
>
>As the i915.enable_ppgtt is read-only it cannot be changed after the
>module is loaded and so we can perform an early sanitization of the
>values.
>
>v2:
>- Add comment and pimp commit message (Chris)
>- Use the param consistently (Jani)
>
>v3:
>- Fix init sequence on pre-gen6 by moving the sanitize_ppgtt call to
>  gtt_init. Fixes boot hangs on pre-gen6. See
>
>  https://bugs.freedesktop.org/show_bug.cgi?id=77916
>
>- Add a debug output for the sanitize ppgtt mode.
>
>References: https://lkml.org/lkml/2014/4/17/599
>Cc: Alessandro Suardi <alessandro.suardi@gmail.com>
>Cc: Ben Widawsky <ben@bwidawsk.net>
>Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
>Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
>Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>---
> drivers/gpu/drm/i915/i915_gem_gtt.c | 32 +++++++++++++++++++++++++-------
> 1 file changed, 25 insertions(+), 7 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
>index 0d514ff9b94c..be504c1443ac 100644
>--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
>+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
>@@ -34,25 +34,35 @@ static void gen8_setup_private_ppat(struct drm_i915_private *dev_priv);
> 
> bool intel_enable_ppgtt(struct drm_device *dev, bool full)
> {
>-	if (i915.enable_ppgtt == 0 || !HAS_ALIASING_PPGTT(dev))
>+	if (i915.enable_ppgtt == 0)
> 		return false;
> 
> 	if (i915.enable_ppgtt == 1 && full)
> 		return false;
> 
>+	return true;
>+}
>+
>+static int sanitize_enable_ppgtt(struct drm_device *dev, int enable_ppgtt)
>+{
>+	if (enable_ppgtt == 0 || !HAS_ALIASING_PPGTT(dev))
>+		return 0;
>+
>+	if (enable_ppgtt == 1)
>+		return 1;
>+
>+	if (enable_ppgtt == 2 && HAS_PPGTT(dev))
>+		return 2;
>+
> #ifdef CONFIG_INTEL_IOMMU
> 	/* Disable ppgtt on SNB if VT-d is on. */
> 	if (INTEL_INFO(dev)->gen == 6 && intel_iommu_gfx_mapped) {
> 		DRM_INFO("Disabling PPGTT because VT-d is on\n");
>-		return false;
>+		return 0;
> 	}
> #endif
> 
>-	/* Full ppgtt disabled by default for now due to issues. */
>-	if (full)
>-		return HAS_PPGTT(dev) && (i915.enable_ppgtt == 2);
>-	else
>-		return HAS_ALIASING_PPGTT(dev);
>+	return HAS_ALIASING_PPGTT(dev) ? 1 : 0;
> }
> 
> 
>@@ -1966,6 +1976,14 @@ int i915_gem_gtt_init(struct drm_device *dev)
> 	if (intel_iommu_gfx_mapped)
> 		DRM_INFO("VT-d active for gfx access\n");
> #endif
>+	/*
>+	 * i915.enable_ppgtt is read-only, so do an early pass to validate the
>+	 * user's requested state against the hardware/driver capabilities.  We
>+	 * do this now so that we can print out any log messages once rather
>+	 * than every time we check intel_enable_ppgtt().
>+	 */
>+	i915.enable_ppgtt = sanitize_enable_ppgtt(dev, i915.enable_ppgtt);
>+	DRM_DEBUG_DRIVER("ppgtt mode: %i\n", i915.enable_ppgtt);
> 
> 	return 0;
> }
>-- 
>1.9.2
>

Actions: View | Splinter Review

Attachments on bug 77916: 97943 | 98170

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.