On Mon, Jul 08, 2013 at 11:08:34PM -0700, Ben Widawsky wrote:
> After we plumb our code to support multiple address spaces (VMs), there
> are a few situations where we want to be able to traverse the list of
> all address spaces in the system. Cases like eviction, or error state
> collection are obvious example.
>
> Signed-off-by: Ben Widawsky <ben at bwidawsk.net>
> ---
> drivers/gpu/drm/i915/i915_dma.c | 5 +++++
> drivers/gpu/drm/i915/i915_drv.h | 2 ++
> 2 files changed, 7 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
> index 3ac9dcc..d13e21f 100644
> --- a/drivers/gpu/drm/i915/i915_dma.c
> +++ b/drivers/gpu/drm/i915/i915_dma.c
> @@ -1497,6 +1497,10 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
>
> i915_dump_device_info(dev_priv);
>
> + INIT_LIST_HEAD(&dev_priv->vm_list);
> + INIT_LIST_HEAD(&dev_priv->gtt.base.global_link);
> + list_add(&dev_priv->gtt.base.global_link, &dev_priv->vm_list);
> +
> if (i915_get_bridge_dev(dev)) {
> ret = -EIO;
> goto free_priv;
> @@ -1754,6 +1758,7 @@ int i915_driver_unload(struct drm_device *dev)
> i915_free_hws(dev);
> }
>
> + list_del(&dev_priv->vm_list);
Shouldn't this delete (dev_priv->gtt.base.global_link)?
Also I guess a ggtt_takedown function to wrap up the various bits would be
good (but maybe only at the end of this series as a cleanup).
Finally a WARN_ON(!list_empty(&dev_priv->vm_list)); at the very end of the
gem cleanup sounds like good paranoia.
> drm_mm_takedown(&dev_priv->gtt.base.mm);
> if (dev_priv->regs != NULL)
> pci_iounmap(dev->pdev, dev_priv->regs);
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 1296565..997c9a5 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -449,6 +449,7 @@ typedef uint32_t gen6_gtt_pte_t;
> struct i915_address_space {
> struct drm_mm mm;
> struct drm_device *dev;
> + struct list_head global_link;
> unsigned long start; /* Start offset always 0 for dri2 */
> size_t total; /* size addr space maps (ex. 2GB for ggtt) */
>
> @@ -1120,6 +1121,7 @@ typedef struct drm_i915_private {
> enum modeset_restore modeset_restore;
> struct mutex modeset_restore_lock;
>
> + struct list_head vm_list; /* Global list of all address spaces */
> struct i915_gtt gtt; /* VMA representing the global address space */
>
> struct i915_gem_mm mm;
> --
> 1.8.3.2
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
