summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_gem.c
diff options
context:
space:
mode:
authorDaniel Vetter2012-06-07 15:56:03 +0200
committerDaniel Vetter2012-06-12 22:21:07 +0200
commit8ecd1a6615f0d9de6759aafe229bc1cc4ee99c7b (patch)
tree21ed616513e68e37b7fc2d95d19fad1e1a883add /drivers/gpu/drm/i915/i915_gem.c
parentagp/intel-gtt: move gart base addres setup (diff)
downloadkernel-qcow2-linux-8ecd1a6615f0d9de6759aafe229bc1cc4ee99c7b.tar.gz
kernel-qcow2-linux-8ecd1a6615f0d9de6759aafe229bc1cc4ee99c7b.tar.xz
kernel-qcow2-linux-8ecd1a6615f0d9de6759aafe229bc1cc4ee99c7b.zip
drm/i915: call intel_enable_gtt
When drm/i915 is in control of the gtt, we need to call the enable function at all the relevant places ourselves. Reviewed-by: Jani Nikula <jani.nikula@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 108e4c2b5ffa..2884b0865473 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3689,6 +3689,9 @@ i915_gem_init_hw(struct drm_device *dev)
drm_i915_private_t *dev_priv = dev->dev_private;
int ret;
+ if (!intel_enable_gtt())
+ return -EIO;
+
i915_gem_l3_remap(dev);
i915_gem_init_swizzling(dev);