mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 07:04:24 +00:00
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>
This commit is contained in:
parent
5c3fe8b03e
commit
911bdf0ae6
2 changed files with 6 additions and 6 deletions
|
@ -1558,7 +1558,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
|
||||||
goto out_rmmap;
|
goto out_rmmap;
|
||||||
}
|
}
|
||||||
|
|
||||||
dev_priv->mm.gtt_mtrr = arch_phys_wc_add(dev_priv->gtt.mappable_base,
|
dev_priv->gtt.mtrr = arch_phys_wc_add(dev_priv->gtt.mappable_base,
|
||||||
aperture_size);
|
aperture_size);
|
||||||
|
|
||||||
/* The i915 workqueue is primarily used for batched retirement of
|
/* The i915 workqueue is primarily used for batched retirement of
|
||||||
|
@ -1667,7 +1667,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
|
||||||
intel_teardown_mchbar(dev);
|
intel_teardown_mchbar(dev);
|
||||||
destroy_workqueue(dev_priv->wq);
|
destroy_workqueue(dev_priv->wq);
|
||||||
out_mtrrfree:
|
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);
|
io_mapping_free(dev_priv->gtt.mappable);
|
||||||
dev_priv->gtt.gtt_remove(dev);
|
dev_priv->gtt.gtt_remove(dev);
|
||||||
out_rmmap:
|
out_rmmap:
|
||||||
|
@ -1705,7 +1705,7 @@ int i915_driver_unload(struct drm_device *dev)
|
||||||
cancel_delayed_work_sync(&dev_priv->mm.retire_work);
|
cancel_delayed_work_sync(&dev_priv->mm.retire_work);
|
||||||
|
|
||||||
io_mapping_free(dev_priv->gtt.mappable);
|
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();
|
acpi_video_unregister();
|
||||||
|
|
||||||
|
|
|
@ -470,6 +470,8 @@ struct i915_gtt {
|
||||||
struct page *page;
|
struct page *page;
|
||||||
} scratch;
|
} scratch;
|
||||||
|
|
||||||
|
int mtrr;
|
||||||
|
|
||||||
/* global gtt ops */
|
/* global gtt ops */
|
||||||
int (*gtt_probe)(struct drm_device *dev, size_t *gtt_total,
|
int (*gtt_probe)(struct drm_device *dev, size_t *gtt_total,
|
||||||
size_t *stolen, phys_addr_t *mappable_base,
|
size_t *stolen, phys_addr_t *mappable_base,
|
||||||
|
@ -834,8 +836,6 @@ struct i915_gem_mm {
|
||||||
/** Usable portion of the GTT for GEM */
|
/** Usable portion of the GTT for GEM */
|
||||||
unsigned long stolen_base; /* limited to low memory (32-bit) */
|
unsigned long stolen_base; /* limited to low memory (32-bit) */
|
||||||
|
|
||||||
int gtt_mtrr;
|
|
||||||
|
|
||||||
/** PPGTT used for aliasing the PPGTT with the GTT */
|
/** PPGTT used for aliasing the PPGTT with the GTT */
|
||||||
struct i915_hw_ppgtt *aliasing_ppgtt;
|
struct i915_hw_ppgtt *aliasing_ppgtt;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue