On Tue, 4 Sep 2012 21:03:02 +0100
Chris Wilson <ch...@chris-wilson.co.uk> wrote:
> Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
> ---
> drivers/gpu/drm/i915/i915_drv.h | 2 ++
> drivers/gpu/drm/i915/i915_gem_gtt.c | 35
> ++++++++++++++++++++++++++++++++---
> 2 files changed, 34 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index f614c26..533361e 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -899,6 +899,8 @@ enum i915_cache_level {
> I915_CACHE_LLC_MLC, /* gen6+, in docs at least! */
> };
>
> +#define I915_GTT_RESERVED ((struct drm_mm_node *)0x1)
> +
> struct drm_i915_gem_object_ops {
> int (*get_pages)(struct drm_i915_gem_object *);
> void (*put_pages)(struct drm_i915_gem_object *);
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c
> b/drivers/gpu/drm/i915/i915_gem_gtt.c
> index c86dc59..d1b4cc8 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> @@ -378,18 +378,47 @@ void i915_gem_init_global_gtt(struct drm_device *dev,
> unsigned long end)
> {
> drm_i915_private_t *dev_priv = dev->dev_private;
> + struct drm_mm_node *entry;
> + struct drm_i915_gem_object *obj;
>
> - /* Substract the guard page ... */
> + /* Subtract the guard page ... */
> drm_mm_init(&dev_priv->mm.gtt_space, start, end - start - PAGE_SIZE);
> if (!HAS_LLC(dev))
> dev_priv->mm.gtt_space.color_adjust = i915_gtt_color_adjust;
>
> + /* Mark any preallocated objects as occupied */
> + list_for_each_entry(obj, &dev_priv->mm.bound_list, gtt_list) {
> + DRM_DEBUG_KMS("reserving preallocated space: %x + %zx\n",
> + obj->gtt_offset, obj->base.size);
> +
> + BUG_ON(obj->gtt_space != I915_GTT_RESERVED);
> + obj->gtt_space = drm_mm_create_block(&dev_priv->mm.gtt_space,
> + obj->gtt_offset,
> + obj->base.size,
> + false);
> + obj->has_global_gtt_mapping = 1;
> + }
> +
> dev_priv->mm.gtt_start = start;
> dev_priv->mm.gtt_mappable_end = mappable_end;
> dev_priv->mm.gtt_end = end;
> dev_priv->mm.gtt_total = end - start;
> dev_priv->mm.mappable_gtt_total = min(end, mappable_end) - start;
>
> - /* ... but ensure that we clear the entire range. */
> - intel_gtt_clear_range(start / PAGE_SIZE, (end-start) / PAGE_SIZE);
> + /* Clear any non-preallocated blocks */
> + list_for_each_entry(entry, &dev_priv->mm.gtt_space.hole_stack,
> hole_stack) {
> + unsigned long hole_start = entry->start + entry->size;
> + unsigned long hole_end = list_entry(entry->node_list.next,
> + struct drm_mm_node,
> + node_list)->start;
> +
> + DRM_DEBUG_KMS("clearing unused GTT space: [%lx, %lx]\n",
> + hole_start, hole_end);
> +
> + intel_gtt_clear_range(hole_start / PAGE_SIZE,
> + (hole_end-hole_start) / PAGE_SIZE);
> + }
> +
> + /* And finally clear the reserved guard page */
> + intel_gtt_clear_range(end / PAGE_SIZE - 1, 1);
> }
Reviewed-by: Jesse Barnes <jbar...@virtuousgeek.org>
--
Jesse Barnes, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
