diff options
| author | Ben Widawsky <ben@bwidawsk.net> | 2013-07-16 16:50:06 -0700 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-07-17 22:23:43 +0200 |
| commit | 93bd8649dba3155d1a0ba2a902d9c49f1c75a1da (patch) | |
| tree | 50d29aad6fd49dcbab1e3c0d4ff40d9bc6c4b9b2 /drivers/gpu/drm/i915/i915_gem_stolen.c | |
| parent | 853ba5d2231619e1c7f7de1269e135174ec8e3cb (diff) | |
| download | blackbird-op-linux-93bd8649dba3155d1a0ba2a902d9c49f1c75a1da.tar.gz blackbird-op-linux-93bd8649dba3155d1a0ba2a902d9c49f1c75a1da.zip | |
drm/i915: Put the mm in the parent address space
Every address space should support object allocation. It therefore makes
sense to have the allocator be part of the "superclass" which GGTT and
PPGTT will derive.
Since our maximum address space size is only 2GB we're not yet able to
avoid doing allocation/eviction; but we'd hope one day this becomes
almost irrelvant.
v2: Rebased
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_stolen.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_stolen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c index 76c3b8699168..5d38cb0cd1ce 100644 --- a/drivers/gpu/drm/i915/i915_gem_stolen.c +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c @@ -396,8 +396,8 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev, */ obj->gtt_space.start = gtt_offset; obj->gtt_space.size = size; - if (drm_mm_initialized(&dev_priv->mm.gtt_space)) { - ret = drm_mm_reserve_node(&dev_priv->mm.gtt_space, + if (drm_mm_initialized(&dev_priv->gtt.base.mm)) { + ret = drm_mm_reserve_node(&dev_priv->gtt.base.mm, &obj->gtt_space); if (ret) { DRM_DEBUG_KMS("failed to allocate stolen GTT space\n"); |
