diff options
| author | Ben Widawsky <benjamin.widawsky@intel.com> | 2013-04-08 18:43:54 -0700 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-04-18 09:43:15 +0200 |
| commit | 6197349bdeb97ee6f533990617c51c67ac233f79 (patch) | |
| tree | 8353b6096396903b85a5745e04252429337ec2cd /drivers/gpu/drm/i915/i915_drv.c | |
| parent | 3ed124b21e6bf388c63b182d9c2d766a6ca0e8be (diff) | |
drm/i915: Abstract PPGTT enabling
Since we've already set up a nice vtable to abstract other PPGTT
functions, also abstract the actual register programming to enable
things.
This function will probably need to change a bit as we implement real
processes.
v2: Resolve conflicts due to patch series reordering.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v1)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index bd92e7d4765..70d10de73bb 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -927,7 +927,8 @@ int i915_reset(struct drm_device *dev) ring->init(ring); i915_gem_context_init(dev); - i915_gem_init_ppgtt(dev); + if (dev_priv->mm.aliasing_ppgtt) + dev_priv->mm.aliasing_ppgtt->enable(dev); /* * It would make sense to re-init all the other hw state, at |