[Intel-gfx] [PATCH v4 2/2] drm/i915: Create dumb buffer from LMEM

[Matthew Auld]

On Mon, 2 Dec 2019 at 06:55, Ramalingam C <ramalingam.c at intel.com> wrote:
>
> When LMEM is supported, dumb buffer preferred to be created from LMEM.
>
> v2:
>   Parameters are reshuffled. [Chris]
> v3:
>   s/region_id/mem_type
> v4:
>   use the i915_gem_object_create_region [chris]
>
> Signed-off-by: Ramalingam C <ramalingam.c at intel.com>
> cc: Matthew Auld <matthew.auld at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_gem.c | 14 +++++++++++---
>  1 file changed, 11 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index 61395b03443e..34e480c8293e 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -44,6 +44,7 @@
>  #include "gem/i915_gem_clflush.h"
>  #include "gem/i915_gem_context.h"
>  #include "gem/i915_gem_ioctls.h"
> +#include "gem/i915_gem_region.h"
>  #include "gem/i915_gem_pm.h"
>  #include "gt/intel_context.h"
>  #include "gt/intel_engine_user.h"
> @@ -176,6 +177,7 @@ i915_gem_phys_pwrite(struct drm_i915_gem_object *obj,
>  static int
>  i915_gem_create(struct drm_file *file,
>                 struct drm_i915_private *dev_priv,
> +               enum intel_memory_type mem_type,
>                 u64 *size_p,
>                 u32 *handle_p)
>  {
> @@ -189,7 +191,8 @@ i915_gem_create(struct drm_file *file,
>                 return -EINVAL;
>
>         /* Allocate the new object */
> -       obj = i915_gem_object_create_shmem(dev_priv, size);
> +       obj = i915_gem_object_create_region(intel_memory_region_lookup(dev_priv,
> +                                           mem_type), size, 0);

Reviewed-by: Matthew Auld <matthew.auld at intel.com>

But how should we go about testing this?

We would still need to clear the object(maybe I915_BO_ALLOC_CLEARED?)
in order to pass the IGTs. We also need to adjust dumb_buffer.c, since
that uses get_avail_ram_mb() for always_clear, but maybe we need the
query region uapi for that?

>         if (IS_ERR(obj))
>                 return PTR_ERR(obj);
>
> @@ -209,6 +212,7 @@ i915_gem_dumb_create(struct drm_file *file,
>                      struct drm_device *dev,
>                      struct drm_mode_create_dumb *args)
>  {
> +       enum intel_memory_type mem_type = INTEL_MEMORY_SYSTEM;
>         int cpp = DIV_ROUND_UP(args->bpp, 8);
>         u32 format;
>
> @@ -235,7 +239,11 @@ i915_gem_dumb_create(struct drm_file *file,
>                 args->pitch = ALIGN(args->pitch, 4096);
>
>         args->size = args->pitch * args->height;
> -       return i915_gem_create(file, to_i915(dev),
> +
> +       if (HAS_LMEM(to_i915(dev)))
> +               mem_type = INTEL_MEMORY_LOCAL;
> +
> +       return i915_gem_create(file, to_i915(dev), mem_type,
>                                &args->size, &args->handle);
>  }
>
> @@ -254,7 +262,7 @@ i915_gem_create_ioctl(struct drm_device *dev, void *data,
>
>         i915_gem_flush_free_objects(dev_priv);
>
> -       return i915_gem_create(file, dev_priv,
> +       return i915_gem_create(file, dev_priv, INTEL_MEMORY_SYSTEM,
>                                &args->size, &args->handle);
>  }
>
> --
> 2.20.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx