drm/etnaviv: Implement drm_gem_object_funcs::print_info()
Subsystems (3)
cover drm/etnaviv: Implement drm_gem_object_funcs::print_info()
It will be called by drm_gem_print_info() if have implemented, and this can provide more information about the framebuffer objects. In order to make the newly implemented etnaviv_gem_object_funcs::print_info() get in use, we make the drm_gem_print_info() exported, then we re-implement the etnaviv_gem_describe() base on it.
Sample Testing Information:
[root@fedora 0]# ls
clients DPI-1 encoder-1 gem_names mm ring
crtc-0 DPI-2 framebuffer gpu mmu state
crtc-1 encoder-0 gem internal_clients name
[root@fedora 0]# cat framebuffer
framebuffer[49]:
allocated by = Xorg refcount=1 format=AR24 little-endian (0x34325241) modifier=0x0 size=32x32 layers: size[0]=32x32 pitch[0]=128 offset[0]=0 obj[0]: name=0 refcount=3 start=00040096 size=16384 imported=no caching mode=write-combine active=no vaddr=0000000000000000 framebuffer[47]: allocated by = Xorg refcount=2 format=XR24 little-endian (0x34325258) modifier=0x0 size=1024x600 layers: size[0]=1024x600 pitch[0]=4096 offset[0]=0 obj[0]: name=0 refcount=3 start=00040000 size=2457600 imported=no caching mode=write-combine active=no vaddr=0000000000000000
[root@fedora 0]# cat gem
obj[0]:
name=0 refcount=3 start=00040000 size=2457600 imported=no caching mode=write-combine active=no vaddr=0000000000000000 obj[1]: name=0 refcount=3 start=00040096 size=16384 imported=no caching mode=write-combine active=no vaddr=0000000000000000 obj[2]: name=0 refcount=2 start=00040097 size=16384 imported=no caching mode=write-combine active=no vaddr=0000000000000000
Total 3 objects, 2490368 bytes
Sui Jingfeng (2):
drm/etnaviv: Implement drm_gem_object_funcs::print_info() drm/etnaviv: Export drm_gem_print_info() and use it
drivers/gpu/drm/drm_gem.c | 1 + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 43 ++++++++++++++++++++++----- drivers/gpu/drm/etnaviv/etnaviv_gem.h | 2 +- include/drm/drm_gem.h | 2 ++ 4 files changed, 40 insertions(+), 8 deletions(-)
Signature · 1 line
2.34.1
PATCH 1/2 drm/etnaviv: Implement drm_gem_object_funcs::print_info()
It will be called by drm_gem_print_info() if have implemented, and this can provide more information about the framebuffer objects.
--- drivers/gpu/drm/etnaviv/etnaviv_gem.c | 32 +++++++++++++++++++++++++++ drivers/gpu/drm/etnaviv/etnaviv_gem.h | 2 +- 2 files changed, 33 insertions(+), 1 deletion(-)
drivers/gpu/drm/etnaviv/etnaviv_gem.c +32 -0
@@ -533,8 +533,40 @@ static const struct vm_operations_struct vm_ops = { .close = drm_gem_vm_close, }; +static const char *etnaviv_gem_obj_caching_info (u32 flags) +{ +switch (flags &ETNA_BO_CACHE_MASK ) { +case ETNA_BO_CACHED : +return "cached" ; +case ETNA_BO_UNCACHED : +return "uncached" ; +case ETNA_BO_WC : +return "write-combine" ; +default : +break ; + } + +return "unknown" ; +} + +static void etnaviv_gem_object_info (struct drm_printer *p, +unsigned int indent, +const struct drm_gem_object *obj) +{ +const struct etnaviv_gem_object *etnaviv_obj; + + etnaviv_obj = container_of(obj, struct etnaviv_gem_object, base); + +drm_printf_indent (p, indent,"caching mode=%s\n" , +etnaviv_gem_obj_caching_info (etnaviv_obj->flags)); +drm_printf_indent (p, indent,"active=%s\n" , +str_yes_no (is_active (etnaviv_obj))); +drm_printf_indent (p, indent,"vaddr=%p\n" , etnaviv_obj->vaddr); +} +static const struct drm_gem_object_funcs etnaviv_gem_object_funcs = { .free = etnaviv_gem_free_object, + .print_info = etnaviv_gem_object_info, .pin = etnaviv_gem_prime_pin, .unpin = etnaviv_gem_prime_unpin, .get_sg_table = etnaviv_gem_prime_get_sg_table,
drivers/gpu/drm/etnaviv/etnaviv_gem.h +1 -1
@@ -68,7 +68,7 @@ struct etnaviv_gem_ops {int (*mmap)(struct etnaviv_gem_object *,struct vm_area_struct *); }; -static inline bool is_active (struct etnaviv_gem_object *etnaviv_obj) +static inline bool is_active (const struct etnaviv_gem_object *etnaviv_obj) {return atomic_read (&etnaviv_obj->gpu_active) !=0 ; }
Signature · 1 line
2.34.1
PATCH 2/2 drm/etnaviv: Export drm_gem_print_info() and use it
In reply to Sui JingfengThis 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.
--- drivers/gpu/drm/drm_gem.c | 1 + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 11 ++++------- include/drm/drm_gem.h | 2 ++ 3 files changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/drm_gem.c +1 -0
@@ -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);int drm_gem_pin_locked (struct drm_gem_object *obj) {
drivers/gpu/drm/etnaviv/etnaviv_gem.c +4 -7
@@ -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;
include/drm/drm_gem.h +2 -0
@@ -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
Signature · 1 line
2.34.1