diff mbox

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

Message ID 1402676913-23012-1-git-send-email-jbarnes@virtuousgeek.org (mailing list archive)
State New, archived
Headers show

Commit Message

Jesse Barnes June 13, 2014, 4:28 p.m. UTC
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>
---
 drivers/gpu/drm/i915/i915_gem_gtt.c |    6 ++++++
 1 file changed, 6 insertions(+)

Comments

Ville Syrjälä June 13, 2014, 4:45 p.m. UTC | #1
On Fri, Jun 13, 2014 at 09:28:33AM -0700, Jesse Barnes wrote:
> 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>

I don't have any affected systems myself, but it did fail for me on
a pre-production part and the evidence from the bugs is strong, so:

Acked-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> ---
>  drivers/gpu/drm/i915/i915_gem_gtt.c |    6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> index 8b3cde7..7f226fa 100644
> --- 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;
>  }
>  
> -- 
> 1.7.9.5
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter June 13, 2014, 4:52 p.m. UTC | #2
On Fri, Jun 13, 2014 at 07:45:50PM +0300, Ville Syrjälä wrote:
> On Fri, Jun 13, 2014 at 09:28:33AM -0700, Jesse Barnes wrote:
> > 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>
> 
> I don't have any affected systems myself, but it did fail for me on
> a pre-production part and the evidence from the bugs is strong, so:
> 
> Acked-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Queued for -next, thanks for the patch.
-Daniel

> 
> > ---
> >  drivers/gpu/drm/i915/i915_gem_gtt.c |    6 ++++++
> >  1 file changed, 6 insertions(+)
> > 
> > diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> > index 8b3cde7..7f226fa 100644
> > --- 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;
> >  }
> >  
> > -- 
> > 1.7.9.5
> > 
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
> -- 
> Ville Syrjälä
> Intel OTC
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 8b3cde7..7f226fa 100644
--- 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;
 }