diff options
| author | Chris Wilson | 2012-12-03 22:03:14 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2012-12-07 01:16:15 +0100 |
| commit | e9b73c67390a5d4faec1d22cbdf24cd6fcca53f6 (patch) | |
| tree | 5eef72c851d44d956d20e81678123146a2d71542 /drivers/gpu/drm/i915/i915_gem_tiling.c | |
| parent | drm/i915: extract common link_m_n helpers (diff) | |
| download | kernel-qcow2-linux-e9b73c67390a5d4faec1d22cbdf24cd6fcca53f6.tar.gz kernel-qcow2-linux-e9b73c67390a5d4faec1d22cbdf24cd6fcca53f6.tar.xz kernel-qcow2-linux-e9b73c67390a5d4faec1d22cbdf24cd6fcca53f6.zip | |
drm/i915: Reduce memory pressure during shrinker by preallocating swizzle pages
On a machine with bit17 swizzling, we need to store the bit17 of the
physical page address in put-pages. This requires a memory allocation,
on average less than a page, which may be difficult to satisfy is the
request to put-pages is on behalf of the shrinker. We could allow that
allocation to pull from the reserved memory pools, but it seems much
safer to preallocate the array for tiled objects on affected machines.
v2: Export i915_gem_object_needs_bit17_swizzle() for reuse.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_tiling.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_tiling.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c index cedbfd7b3dfa..65f1d4f3f775 100644 --- a/drivers/gpu/drm/i915/i915_gem_tiling.c +++ b/drivers/gpu/drm/i915/i915_gem_tiling.c @@ -396,6 +396,18 @@ i915_gem_set_tiling(struct drm_device *dev, void *data, /* we have to maintain this existing ABI... */ args->stride = obj->stride; args->tiling_mode = obj->tiling_mode; + + /* Try to preallocate memory required to save swizzling on put-pages */ + if (i915_gem_object_needs_bit17_swizzle(obj)) { + if (obj->bit_17 == NULL) { + obj->bit_17 = kmalloc(BITS_TO_LONGS(obj->base.size >> PAGE_SHIFT) * + sizeof(long), GFP_KERNEL); + } + } else { + kfree(obj->bit_17); + obj->bit_17 = NULL; + } + drm_gem_object_unreference(&obj->base); mutex_unlock(&dev->struct_mutex); |