aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_drv.h
diff options
context:
space:
mode:
authorBen Widawsky <ben@bwidawsk.net>2013-01-24 17:45:00 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-01-31 05:50:07 -0500
commita54c0c279f3864171fe53c66e769d5a137c5c651 (patch)
tree08d17841b72e39afdc4ce601f46770824c12fe8a /drivers/gpu/drm/i915/i915_drv.h
parentbaa09f5fd8a6d033ec075355dda99a65b7f6a0f3 (diff)
drm/i915: remove intel_gtt structure
With the probe call in our dispatch table, we can now cut away the last three remaining members in the intel_gtt shared struct and so remove it completely. v2: Rebased on top of Daniel's series Signed-off-by: Ben Widawsky <ben@bwidawsk.net> Reviewed-by: Damien Lespiau <damien.lespiau@intel.com> [danvet: bikeshed commit message a bit.] Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index dee8d5c7a235..d3274164143d 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -406,6 +406,7 @@ struct i915_gtt {
406 unsigned int pg_start, 406 unsigned int pg_start,
407 enum i915_cache_level cache_level); 407 enum i915_cache_level cache_level);
408}; 408};
409#define gtt_total_entries(gtt) ((gtt).total >> PAGE_SHIFT)
409 410
410#define I915_PPGTT_PD_ENTRIES 512 411#define I915_PPGTT_PD_ENTRIES 512
411#define I915_PPGTT_PT_ENTRIES 1024 412#define I915_PPGTT_PT_ENTRIES 1024
@@ -696,8 +697,6 @@ struct intel_l3_parity {
696}; 697};
697 698
698struct i915_gem_mm { 699struct i915_gem_mm {
699 /** Bridge to intel-gtt-ko */
700 struct intel_gtt *gtt;
701 /** Memory allocator for GTT stolen memory */ 700 /** Memory allocator for GTT stolen memory */
702 struct drm_mm stolen; 701 struct drm_mm stolen;
703 /** Memory allocator for GTT */ 702 /** Memory allocator for GTT */