summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_drv.h
diff options
context:
space:
mode:
authorBen Widawsky2013-06-28 01:30:23 +0200
committerDaniel Vetter2013-07-01 11:28:01 +0200
commit911bdf0ae6405db3313c6e5798cf08640fdd0714 (patch)
tree0e0e782830027c6211680392d397e042e9134b12 /drivers/gpu/drm/i915/i915_drv.h
parentdrm/i915: Move fbc members out of line (diff)
downloadkernel-qcow2-linux-911bdf0ae6405db3313c6e5798cf08640fdd0714.tar.gz
kernel-qcow2-linux-911bdf0ae6405db3313c6e5798cf08640fdd0714.tar.xz
kernel-qcow2-linux-911bdf0ae6405db3313c6e5798cf08640fdd0714.zip
drm/i915: Move gtt_mtrr to i915_gtt
for file in `ls drivers/gpu/drm/i915/*.c` ; do sed -i "s/mm.gtt_mtrr/gtt.mtrr/" $file; done Signed-off-by: Ben Widawsky <ben@bwidawsk.net> 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.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index d1db73a5ba0c..da07f6f28854 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -470,6 +470,8 @@ struct i915_gtt {
struct page *page;
} scratch;
+ int mtrr;
+
/* global gtt ops */
int (*gtt_probe)(struct drm_device *dev, size_t *gtt_total,
size_t *stolen, phys_addr_t *mappable_base,
@@ -834,8 +836,6 @@ struct i915_gem_mm {
/** Usable portion of the GTT for GEM */
unsigned long stolen_base; /* limited to low memory (32-bit) */
- int gtt_mtrr;
-
/** PPGTT used for aliasing the PPGTT with the GTT */
struct i915_hw_ppgtt *aliasing_ppgtt;