[Intel-gfx] [PATCH v2 1/3] drm/i915: Bump object bookkeeping to u64 from size_t

[Tvrtko Ursulin]

On 17/10/2016 09:00, Chris Wilson wrote:
> Internally we allow for using more objects than a single process can
> allocate, i.e. we allow for a 64bit GPU address space even on a 32bit
> system. Using size_t may oveerflow.
>
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> ---
>   drivers/gpu/drm/i915/i915_debugfs.c | 2 +-
>   drivers/gpu/drm/i915/i915_drv.h     | 2 +-
>   drivers/gpu/drm/i915/i915_gem.c     | 4 ++--
>   3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index 515c206ba653..dc057c770146 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -392,7 +392,7 @@ static int i915_gem_object_info(struct seq_file *m, void *data)
>   	if (ret)
>   		return ret;
>   
> -	seq_printf(m, "%u objects, %zu bytes\n",
> +	seq_printf(m, "%u objects, %llu bytes\n",
>   		   dev_priv->mm.object_count,
>   		   dev_priv->mm.object_memory);
>   
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 4d1133ffe093..092c5a0a44f0 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -1389,7 +1389,7 @@ struct i915_gem_mm {
>   
>   	/* accounting, useful for userland debugging */
>   	spinlock_t object_stat_lock;
> -	size_t object_memory;
> +	u64 object_memory;
>   	u32 object_count;
>   };
>   
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index fe92e28ea0a8..838dc159a2d1 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -82,7 +82,7 @@ remove_mappable_node(struct drm_mm_node *node)
>   
>   /* some bookkeeping */
>   static void i915_gem_info_add_obj(struct drm_i915_private *dev_priv,
> -				  size_t size)
> +				  u64 size)
>   {
>   	spin_lock(&dev_priv->mm.object_stat_lock);
>   	dev_priv->mm.object_count++;
> @@ -91,7 +91,7 @@ static void i915_gem_info_add_obj(struct drm_i915_private *dev_priv,
>   }
>   
>   static void i915_gem_info_remove_obj(struct drm_i915_private *dev_priv,
> -				     size_t size)
> +				     u64 size)
>   {
>   	spin_lock(&dev_priv->mm.object_stat_lock);
>   	dev_priv->mm.object_count--;

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>

Regards,

Tvrtko