diff options
| author | Daniel Vetter | 2012-03-26 09:45:40 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2012-03-27 13:14:59 +0200 |
| commit | 644ec02b5d135b63369a5dbf74976cdeef310dcd (patch) | |
| tree | 14fc1cc4fff79c5bed7b8388eb38cf38e93bb88e /drivers/gpu/drm/i915/i915_dma.c | |
| parent | drm/i915: reinstate GM45 TV detection fix (diff) | |
| download | kernel-qcow2-linux-644ec02b5d135b63369a5dbf74976cdeef310dcd.tar.gz kernel-qcow2-linux-644ec02b5d135b63369a5dbf74976cdeef310dcd.tar.xz kernel-qcow2-linux-644ec02b5d135b63369a5dbf74976cdeef310dcd.zip | |
drm/i915: s/i915_gem_do_init/i915_gem_init_global_gtt
... because this is what it actually doesn now that we have the global
gtt vs. ppgtt split.
Also move it to the other global gtt functions in i915_gem_gtt.c
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index fdff0097cf2b..b6e0a4599db9 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1210,7 +1210,7 @@ static int i915_load_gem_init(struct drm_device *dev) /* For paranoia keep the guard page in between. */ gtt_size -= PAGE_SIZE; - i915_gem_do_init(dev, 0, mappable_size, gtt_size); + i915_gem_init_global_gtt(dev, 0, mappable_size, gtt_size); ret = i915_gem_init_aliasing_ppgtt(dev); if (ret) @@ -1226,7 +1226,8 @@ static int i915_load_gem_init(struct drm_device *dev) * should be enough to keep any prefetching inside of the * aperture. */ - i915_gem_do_init(dev, 0, mappable_size, gtt_size - PAGE_SIZE); + i915_gem_init_global_gtt(dev, 0, mappable_size, + gtt_size - PAGE_SIZE); } ret = i915_gem_init_hw(dev); |