Skip to contentSkip to conversation

drm/i915: Allow full PPGTT with param override

PATCH In review Ben Widawsky 3 participants 4 messages Mar 25, 2014

Subsystems (2)
DRM drivers Intel i915
lore
Share & tools
lore

Ben Widawsky

author
#0 lore raw

PATCH 1/1 drm/i915: Allow full PPGTT with param override

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 <[email protected]>
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 <[email protected]>
---
 drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +1 -1
index bbc9420..9068628 100644
@@ -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);
 }
Signature · 1 line
1.9.1
#1 lore raw
Quoted 9 lines · 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 <[email protected]>
Date:   Thu Mar 6 09:40:43 2014 +0100
Quoted 6 lines

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 <[email protected]>

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

Quoted 24 lines
---
 drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +1 -1
index bbc9420..9068628 100644
@@ -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);
 }
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
#2 lore raw
Quoted 12 lines · Daniel Vetter
Quoted 11 lines · 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 <[email protected]>
Date:   Thu Mar 6 09:40:43 2014 +0100

drm/i915: Disable full ppgtt by default

Quoted 9 lines
Quoted 4 lines

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 <[email protected]>

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.

Quoted 33 lines
Quoted 24 lines
---
 drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +1 -1
index bbc9420..9068628 100644
@@ -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);
 }
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 1 line
Ben Widawsky, Intel Open Source Technology Center
#3 lore raw
Quoted 7 lines · Ben Widawsky
Quoted 4 lines

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

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