Am Sonntag, dem 08.09.2024 um 17:43 +0800 schrieb Sui Jingfeng:
> This will make the newly implemented etnaviv_gem_object_funcs::print_info
> get in use, which improves code sharing and simplifies debugfs. Achieve
> better humen readability for debug log.
>
> Use container_of_const() if 'struct etnaviv_gem_object *etnaviv_obj' is a
> constant pointer.
>
> Signed-off-by: Sui Jingfeng <sui.jingfeng@xxxxxxxxx>
> ---
> drivers/gpu/drm/drm_gem.c | 1 +
> drivers/gpu/drm/etnaviv/etnaviv_gem.c | 13 +++++--------
> include/drm/drm_gem.h | 2 ++
> 3 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
> index d4bbc5d109c8..9c5c971c1b23 100644
> --- a/drivers/gpu/drm/drm_gem.c
> +++ b/drivers/gpu/drm/drm_gem.c
> @@ -1160,6 +1160,7 @@ void drm_gem_print_info(struct drm_printer *p, unsigned int indent,
> if (obj->funcs->print_info)
> obj->funcs->print_info(p, indent, obj);
> }
> +EXPORT_SYMBOL(drm_gem_print_info);
This needs to be a separate patch. I don't think I can take such a
change intermingled with etnaviv changes in the same patch. This needs
some acks from DRM core.
Regards,
Lucas
>
> int drm_gem_pin_locked(struct drm_gem_object *obj)
> {
> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
> index 543d881585b3..6bdf72cd9e85 100644
> --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c
> +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
> @@ -3,6 +3,7 @@
> * Copyright (C) 2015-2018 Etnaviv Project
> */
>
> +#include <drm/drm_gem.h>
> #include <drm/drm_prime.h>
> #include <linux/dma-mapping.h>
> #include <linux/shmem_fs.h>
> @@ -432,15 +433,11 @@ int etnaviv_gem_wait_bo(struct etnaviv_gpu *gpu, struct drm_gem_object *obj,
> #ifdef CONFIG_DEBUG_FS
> static void etnaviv_gem_describe(struct drm_gem_object *obj, struct seq_file *m)
> {
> - struct etnaviv_gem_object *etnaviv_obj = to_etnaviv_bo(obj);
> + struct drm_printer p = drm_seq_file_printer(m);
> struct dma_resv *robj = obj->resv;
> - unsigned long off = drm_vma_node_start(&obj->vma_node);
> int r;
>
> - seq_printf(m, "%08x: %c %2d (%2d) %08lx %p %zd\n",
> - etnaviv_obj->flags, is_active(etnaviv_obj) ? 'A' : 'I',
> - obj->name, kref_read(&obj->refcount),
> - off, etnaviv_obj->vaddr, obj->size);
> + drm_gem_print_info(&p, 1, obj);
>
> r = dma_resv_lock(robj, NULL);
> if (r)
> @@ -461,7 +458,7 @@ void etnaviv_gem_describe_objects(struct etnaviv_drm_private *priv,
> list_for_each_entry(etnaviv_obj, &priv->gem_list, gem_node) {
> struct drm_gem_object *obj = &etnaviv_obj->base;
>
> - seq_puts(m, " ");
> + seq_printf(m, "obj[%d]:\n", count);
> etnaviv_gem_describe(obj, m);
> count++;
> size += obj->size;
> @@ -556,7 +553,7 @@ static void etnaviv_gem_object_info(struct drm_printer *p,
> {
> const struct etnaviv_gem_object *etnaviv_obj;
>
> - etnaviv_obj = container_of(obj, struct etnaviv_gem_object, base);
> + etnaviv_obj = container_of_const(obj, struct etnaviv_gem_object, base);
>
> drm_printf_indent(p, indent, "caching mode=%s\n",
> etnaviv_gem_obj_caching_info(etnaviv_obj->flags));
> diff --git a/include/drm/drm_gem.h b/include/drm/drm_gem.h
> index bae4865b2101..0791566fab53 100644
> --- a/include/drm/drm_gem.h
> +++ b/include/drm/drm_gem.h
> @@ -480,6 +480,8 @@ void drm_gem_vm_close(struct vm_area_struct *vma);
> int drm_gem_mmap_obj(struct drm_gem_object *obj, unsigned long obj_size,
> struct vm_area_struct *vma);
> int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma);
> +void drm_gem_print_info(struct drm_printer *p, unsigned int indent,
> + const struct drm_gem_object *obj);
>
> /**
> * drm_gem_object_get - acquire a GEM buffer object reference
