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>

2 files changed, 6 insertions, 6 deletions

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index adb319b53ecd..0e2214236083 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1558,8 +1558,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
                 goto out_rmmap;
         }
 
-        dev_priv->mm.gtt_mtrr = arch_phys_wc_add(dev_priv->gtt.mappable_base,
-                                                 aperture_size);
+        dev_priv->gtt.mtrr = arch_phys_wc_add(dev_priv->gtt.mappable_base,
+                                              aperture_size);
 
         /* The i915 workqueue is primarily used for batched retirement of
          * requests (and thus managing bo) once the task has been completed
@@ -1667,7 +1667,7 @@ out_gem_unload:
         intel_teardown_mchbar(dev);
         destroy_workqueue(dev_priv->wq);
 out_mtrrfree:
-        arch_phys_wc_del(dev_priv->mm.gtt_mtrr);
+        arch_phys_wc_del(dev_priv->gtt.mtrr);
         io_mapping_free(dev_priv->gtt.mappable);
         dev_priv->gtt.gtt_remove(dev);
 out_rmmap:
@@ -1705,7 +1705,7 @@ int i915_driver_unload(struct drm_device *dev)
         cancel_delayed_work_sync(&dev_priv->mm.retire_work);
 
         io_mapping_free(dev_priv->gtt.mappable);
-        arch_phys_wc_del(dev_priv->mm.gtt_mtrr);
+        arch_phys_wc_del(dev_priv->gtt.mtrr);
 
         acpi_video_unregister();
 
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;