summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_gem_gtt.c
diff options
context:
space:
mode:
authorBen Widawsky2014-03-25 02:06:00 +0100
committerDaniel Vetter2014-04-01 22:58:07 +0200
commit8d214b7d9c45f4af23ce41b2bc74f79c44f760de (patch)
tree8b6cea4beb22b7e9264c99a4b4f4d9dd7cb29619 /drivers/gpu/drm/i915/i915_gem_gtt.c
parentdrm/i915: Split out GTT specific header file (diff)
downloadkernel-qcow2-linux-8d214b7d9c45f4af23ce41b2bc74f79c44f760de.tar.gz
kernel-qcow2-linux-8d214b7d9c45f4af23ce41b2bc74f79c44f760de.tar.xz
kernel-qcow2-linux-8d214b7d9c45f4af23ce41b2bc74f79c44f760de.zip
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 <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> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_gtt.c')
-rw-r--r--drivers/gpu/drm/i915/i915_gem_gtt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 0334cf20b3db..b31cde1d5979 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);
}