aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_drv.h
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2010-09-16 09:45:15 -0400
committerChris Wilson <chris@chris-wilson.co.uk>2010-10-27 18:31:04 -0400
commita6e0aa421406dc4cfd736c6d07d26ed39ab4f7bc (patch)
tree4c2112e228971561f3e8871e5405cb77ff3c16c1 /drivers/gpu/drm/i915/i915_drv.h
parentd935cc61d466f6cc7514032835f4fc379cb7e2ca (diff)
drm/i915: range-restricted eviction support
Add a mappable parameter to i915_gem_evict_something to distinguish the two cases (non-restricted vs. mappable gtt allocations). No functional changes because the mappable limit is set to the end of the gtt currently. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index f168e82c10a..dc0a21a3489 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -535,6 +535,8 @@ typedef struct drm_i915_private {
535 struct drm_mm vram; 535 struct drm_mm vram;
536 /** Memory allocator for GTT */ 536 /** Memory allocator for GTT */
537 struct drm_mm gtt_space; 537 struct drm_mm gtt_space;
538 /** End of mappable part of GTT */
539 unsigned long gtt_mappable_end;
538 540
539 struct io_mapping *gtt_mapping; 541 struct io_mapping *gtt_mapping;
540 int gtt_mtrr; 542 int gtt_mtrr;
@@ -1067,7 +1069,8 @@ void i915_gem_shrinker_init(void);
1067void i915_gem_shrinker_exit(void); 1069void i915_gem_shrinker_exit(void);
1068 1070
1069/* i915_gem_evict.c */ 1071/* i915_gem_evict.c */
1070int i915_gem_evict_something(struct drm_device *dev, int min_size, unsigned alignment); 1072int i915_gem_evict_something(struct drm_device *dev, int min_size,
1073 unsigned alignment, bool mappable);
1071int i915_gem_evict_everything(struct drm_device *dev); 1074int i915_gem_evict_everything(struct drm_device *dev);
1072int i915_gem_evict_inactive(struct drm_device *dev); 1075int i915_gem_evict_inactive(struct drm_device *dev);
1073 1076