[PATCH] drm/i915: Allow full PPGTT with param override

[PATCH] drm/i915: Allow full PPGTT with param override

[Ben Widawsky]

When PPGTT was disabled by default, the patch also prevented the user
from overriding this behavior via module parameter. Being able to test
this on arbitrary kernels is extremely beneficial to track down the
remaining bugs. The patch that prevented this was:

commit 93a25a9e2d67765c3092bfaac9b855d95e39df97
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Thu Mar 6 09:40:43 2014 +0100

    drm/i915: Disable full ppgtt by default

By default PPGTT is set to -1. 0 means off, 1 means aliasing only, 2
means full, all other values are reserved.

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
---
 drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index bbc9420..9068628 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -50,7 +50,7 @@ bool intel_enable_ppgtt(struct drm_device *dev, bool full)
 
 	/* Full ppgtt disabled by default for now due to issues. */
 	if (full)
-		return false; /* HAS_PPGTT(dev) */
+		return HAS_PPGTT(dev) && (i915.enable_ppgtt == 2);
 	else
 		return HAS_ALIASING_PPGTT(dev);
 }
-- 
1.9.1

Re: [PATCH] drm/i915: Allow full PPGTT with param override

[Daniel Vetter]

On Mon, Mar 24, 2014 at 06:06:00PM -0700, Ben Widawsky wrote:
> When PPGTT was disabled by default, the patch also prevented the user
> from overriding this behavior via module parameter. Being able to test
> this on arbitrary kernels is extremely beneficial to track down the
> remaining bugs. The patch that prevented this was:
> 
> commit 93a25a9e2d67765c3092bfaac9b855d95e39df97
> Author: Daniel Vetter <daniel.vetter@ffwll.ch>
> Date:   Thu Mar 6 09:40:43 2014 +0100
> 
>     drm/i915: Disable full ppgtt by default
> 
> By default PPGTT is set to -1. 0 means off, 1 means aliasing only, 2
> means full, all other values are reserved.
> 
> Signed-off-by: Ben Widawsky <ben@bwidawsk.net>

My apologies for breaking this a bit harder than intended, and thanks for
fixing it up. Patch merged to dinq.
-Daniel

> ---
>  drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> index bbc9420..9068628 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> @@ -50,7 +50,7 @@ bool intel_enable_ppgtt(struct drm_device *dev, bool full)
>  
>  	/* Full ppgtt disabled by default for now due to issues. */
>  	if (full)
> -		return false; /* HAS_PPGTT(dev) */
> +		return HAS_PPGTT(dev) && (i915.enable_ppgtt == 2);
>  	else
>  		return HAS_ALIASING_PPGTT(dev);
>  }
> -- 
> 1.9.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

Re: [PATCH] drm/i915: Allow full PPGTT with param override

[Ben Widawsky]

On Tue, Mar 25, 2014 at 10:46:12AM +0100, Daniel Vetter wrote:
> On Mon, Mar 24, 2014 at 06:06:00PM -0700, Ben Widawsky wrote:
> > When PPGTT was disabled by default, the patch also prevented the user
> > from overriding this behavior via module parameter. Being able to test
> > this on arbitrary kernels is extremely beneficial to track down the
> > remaining bugs. The patch that prevented this was:
> > 
> > commit 93a25a9e2d67765c3092bfaac9b855d95e39df97
> > Author: Daniel Vetter <daniel.vetter@ffwll.ch>
> > Date:   Thu Mar 6 09:40:43 2014 +0100
> > 
> >     drm/i915: Disable full ppgtt by default
> > 
> > By default PPGTT is set to -1. 0 means off, 1 means aliasing only, 2
> > means full, all other values are reserved.
> > 
> > Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
> 
> My apologies for breaking this a bit harder than intended, and thanks for
> fixing it up. Patch merged to dinq.
> -Daniel
> 

No harm, no foul. FWIW QA had been reported 0 PPGTT regressions for the
last week or so. Score one for their consistency.

> > ---
> >  drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> > index bbc9420..9068628 100644
> > --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> > +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> > @@ -50,7 +50,7 @@ bool intel_enable_ppgtt(struct drm_device *dev, bool full)
> >  
> >  	/* Full ppgtt disabled by default for now due to issues. */
> >  	if (full)
> > -		return false; /* HAS_PPGTT(dev) */
> > +		return HAS_PPGTT(dev) && (i915.enable_ppgtt == 2);
> >  	else
> >  		return HAS_ALIASING_PPGTT(dev);
> >  }
> > -- 
> > 1.9.1
> > 
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
> -- 
> Daniel Vetter
> Software Engineer, Intel Corporation
> +41 (0) 79 365 57 48 - http://blog.ffwll.ch
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ben Widawsky, Intel Open Source Technology Center

Re: [PATCH] drm/i915: Allow full PPGTT with param override

[Daniel Vetter]

On Tue, Mar 25, 2014 at 5:42 PM, Ben Widawsky <ben@bwidawsk.net> wrote:
>> My apologies for breaking this a bit harder than intended, and thanks for
>> fixing it up. Patch merged to dinq.
>> -Daniel
>>
>
> No harm, no foul. FWIW QA had been reported 0 PPGTT regressions for the
> last week or so. Score one for their consistency.

Well, let's see whether they start to see all the issues again then
... I guess I could say this was all a sneaky trick from me to have a
proper baseline from our QA people ;-)
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch