drm: tweak drm_print_bits()
Subsystems (2)
PATCH 1/1 drm: tweak drm_print_bits()
There is little reason for the from/to logic, printing a subset of the bits can be done by simply shifting/masking value if needed.
Also use for_each_set_bit().
--- include/drm/drm_print.h | 5 ++--- drivers/gpu/drm/drm_gem_ttm_helper.c | 4 ++-- drivers/gpu/drm/drm_print.c | 20 +++++++++----------- 3 files changed, 13 insertions(+), 16 deletions(-)
include/drm/drm_print.h +2 -3
@@ -89,9 +89,8 @@ __printf(2, 3)void drm_printf (struct drm_printer *p,const char *f, ...);void drm_puts (struct drm_printer *p,const char *str);void drm_print_regset32 (struct drm_printer *p,struct debugfs_regset32 *regset); -void drm_print_bits (struct drm_printer *p, -unsigned long value,const char *bits[], -unsigned int from,unsigned int to); +void drm_print_bits (struct drm_printer *p,unsigned long value, +const char *const bits[],int nbits);__printf (2 ,0 )/**
drivers/gpu/drm/drm_gem_ttm_helper.c +2 -2
@@ -23,7 +23,7 @@void drm_gem_ttm_print_info (struct drm_printer *p,unsigned int indent,const struct drm_gem_object *gem) { -static const char const *plname[] = { +static const char *const plname[] = { [TTM_PL_SYSTEM ] ="system" , [TTM_PL_TT ] ="tt" , [TTM_PL_VRAM ] ="vram" ,
@@ -40,7 +40,7 @@ void drm_gem_ttm_print_info(struct drm_printer *p, unsigned int indent,const struct ttm_buffer_object *bo =drm_gem_ttm_of_gem (gem);drm_printf_indent (p, indent,"placement=" ); -drm_print_bits (p, bo->mem.placement, plname,0 ,ARRAY_SIZE (plname)); +drm_print_bits (p, bo->mem.placement, plname,ARRAY_SIZE (plname));drm_printf (p,"\n" );if (bo->mem.bus.is_iomem) {
drivers/gpu/drm/drm_print.c +9 -11
@@ -189,28 +189,26 @@ EXPORT_SYMBOL(drm_printf);* drm_print_bits - print bits to a &drm_printer stream * * Print bits (in flag fields for example) in human readable form. -* The first name in the @bits array is for the bit indexed by @from. * * @p: the &drm_printer * @value: field value. * @bits: Array with bit names. -* @from: start of bit range to print (inclusive). -* @to: end of bit range to print (exclusive). +* @nbits: Size of bit names array. */ -void drm_print_bits (struct drm_printer *p, -unsigned long value,const char *bits[], -unsigned int from,unsigned int to) +void drm_print_bits (struct drm_printer *p,unsigned long value, +const char *const bits[],int nbits) {bool first = true;unsigned int i; -for (i = from; i < to; i++) { -if (!(value & (1 << i))) -continue ; -if (WARN_ON_ONCE (!bits[i-from])) +if (WARN_ON_ONCE (nbits >sizeof (unsigned long ) *8 )) + nbits =sizeof (unsigned long ) *8 ; + +for_each_set_bit (i, &value, nbits) { +if (WARN_ON_ONCE (!bits[i]))continue ;drm_printf (p,"%s%s" , first ?"" :"," , - bits[i-from]); + bits[i]); first = false; }if (first)
Signature · 1 line
2.18.1
Quoted 4 lines · Gerd Hoffmann
There is little reason for the from/to logic, printing a subset of the bits can be done by simply shifting/masking value if needed.
Also use
for_each_set_bit().
Oh, I don't know why I stumbled upon and reviewed a patch that had already been merged. Can't keep track of everything it seems...
Quoted 69 lines
Suggested-by Jani Nikula <[email protected]>Signed-off-by Gerd Hoffmann <[email protected]>--- include/drm/drm_print.h | 5 ++--- drivers/gpu/drm/drm_gem_ttm_helper.c | 4 ++-- drivers/gpu/drm/drm_print.c | 20 +++++++++----------- 3 files changed, 13 insertions(+), 16 deletions(-)include/drm/drm_print.h +2
-3@@ -89,9 +89,8 @@ __printf(2, 3)void drm_printf (struct drm_printer *p,const char *f, ...);void drm_puts (struct drm_printer *p,const char *str);void drm_print_regset32 (struct drm_printer *p,struct debugfs_regset32 *regset); -void drm_print_bits (struct drm_printer *p, -unsigned long value,const char *bits[], -unsigned int from,unsigned int to); +void drm_print_bits (struct drm_printer *p,unsigned long value, +const char *const bits[],int nbits);__printf (2 ,0 )/** drivers/gpu/drm/drm_gem_ttm_helper.c +2
-2@@ -23,7 +23,7 @@void drm_gem_ttm_print_info (struct drm_printer *p,unsigned int indent,const struct drm_gem_object *gem) { -static const char const *plname[] = { +static const char *const plname[] = { [TTM_PL_SYSTEM ] ="system" , [TTM_PL_TT ] ="tt" , [TTM_PL_VRAM ] ="vram" ,@@ -40,7 +40,7 @@ void drm_gem_ttm_print_info(struct drm_printer *p, unsigned int indent,const struct ttm_buffer_object *bo =drm_gem_ttm_of_gem (gem);drm_printf_indent (p, indent,"placement=" ); -drm_print_bits (p, bo->mem.placement, plname,0 ,ARRAY_SIZE (plname)); +drm_print_bits (p, bo->mem.placement, plname,ARRAY_SIZE (plname));drm_printf (p,"\n" );if (bo->mem.bus.is_iomem) {drivers/gpu/drm/drm_print.c +3
-6@@ -189,28 +189,26 @@ EXPORT_SYMBOL(drm_printf);* drm_print_bits - print bits to a &drm_printer stream * * Print bits (in flag fields for example) in human readable form. -* The first name in the @bits array is for the bit indexed by @from. * * @p: the &drm_printer * @value: field value. * @bits: Array with bit names. -* @from: start of bit range to print (inclusive). -* @to: end of bit range to print (exclusive). +* @nbits: Size of bit names array. */ -void drm_print_bits (struct drm_printer *p, -unsigned long value,const char *bits[], -unsigned int from,unsigned int to) +void drm_print_bits (struct drm_printer *p,unsigned long value, +const char *const bits[],int nbits)
drivers/gpu/drm/drm_print.c EXPORT_SYMBOL(drm_printf); · line 205
Quoted 10 lines
drivers/gpu/drm/drm_print.c +2
-4{bool first = true;unsigned int i; -for (i = from; i < to; i++) { -if (!(value & (1 << i))) -continue ; -if (WARN_ON_ONCE (!bits[i-from])) +if (WARN_ON_ONCE (nbits >sizeof (unsigned long ) *8 )) + nbits =sizeof (unsigned long ) *8 ;
Might be neater with BITS_PER_TYPE(value) instead of open coding, but either way,
Quoted 10 lines
drivers/gpu/drm/drm_print.c +4
-1+ +for_each_set_bit (i, &value, nbits) { +if (WARN_ON_ONCE (!bits[i]))continue ;drm_printf (p,"%s%s" , first ?"" :"," , - bits[i-from]); + bits[i]); first = false; }if (first)
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Quoted 18 lines · Gerd Hoffmann
There is little reason for the from/to logic, printing a subset of the bits can be done by simply shifting/masking value if needed.
Also use
for_each_set_bit().Suggested-by Jani Nikula <[email protected]>Signed-off-by Gerd Hoffmann <[email protected]>--- include/drm/drm_print.h | 5 ++--- drivers/gpu/drm/drm_gem_ttm_helper.c | 4 ++-- drivers/gpu/drm/drm_print.c | 20 +++++++++----------- 3 files changed, 13 insertions(+), 16 deletions(-)include/drm/drm_print.h +0
-0
include/drm/drm_print.h __printf(2, 3) · line 93
Quoted 8 lines
include/drm/drm_print.h +2
-3@@ -89,9 +89,8 @@ __printf(2, 3)void drm_printf (struct drm_printer *p,const char *f, ...);void drm_puts (struct drm_printer *p,const char *str);void drm_print_regset32 (struct drm_printer *p,struct debugfs_regset32 *regset); -void drm_print_bits (struct drm_printer *p, -unsigned long value,const char *bits[], -unsigned int from,unsigned int to); +void drm_print_bits (struct drm_printer *p,unsigned long value, +const char *const bits[],int nbits);
bitmap_*() APIs that this calls underneath all use unsigned int for nbits, so might be good to stick with that. After all, this better never be negative.
Thierry
Quoted 74 lines
include/drm/drm_print.h +0
-0__printf (2 ,0 )/** drivers/gpu/drm/drm_gem_ttm_helper.c +2
-2@@ -23,7 +23,7 @@void drm_gem_ttm_print_info (struct drm_printer *p,unsigned int indent,const struct drm_gem_object *gem) { -static const char const *plname[] = { +static const char *const plname[] = { [TTM_PL_SYSTEM ] ="system" , [TTM_PL_TT ] ="tt" , [TTM_PL_VRAM ] ="vram" ,@@ -40,7 +40,7 @@ void drm_gem_ttm_print_info(struct drm_printer *p, unsigned int indent,const struct ttm_buffer_object *bo =drm_gem_ttm_of_gem (gem);drm_printf_indent (p, indent,"placement=" ); -drm_print_bits (p, bo->mem.placement, plname,0 ,ARRAY_SIZE (plname)); +drm_print_bits (p, bo->mem.placement, plname,ARRAY_SIZE (plname));drm_printf (p,"\n" );if (bo->mem.bus.is_iomem) {drivers/gpu/drm/drm_print.c +9
-11@@ -189,28 +189,26 @@ EXPORT_SYMBOL(drm_printf);* drm_print_bits - print bits to a &drm_printer stream * * Print bits (in flag fields for example) in human readable form. -* The first name in the @bits array is for the bit indexed by @from. * * @p: the &drm_printer * @value: field value. * @bits: Array with bit names. -* @from: start of bit range to print (inclusive). -* @to: end of bit range to print (exclusive). +* @nbits: Size of bit names array. */ -void drm_print_bits (struct drm_printer *p, -unsigned long value,const char *bits[], -unsigned int from,unsigned int to) +void drm_print_bits (struct drm_printer *p,unsigned long value, +const char *const bits[],int nbits) {bool first = true;unsigned int i; -for (i = from; i < to; i++) { -if (!(value & (1 << i))) -continue ; -if (WARN_ON_ONCE (!bits[i-from])) +if (WARN_ON_ONCE (nbits >sizeof (unsigned long ) *8 )) + nbits =sizeof (unsigned long ) *8 ; + +for_each_set_bit (i, &value, nbits) { +if (WARN_ON_ONCE (!bits[i]))continue ;drm_printf (p,"%s%s" , first ?"" :"," , - bits[i-from]); + bits[i]); first = false; }if (first)Signature · 6 lines
2.18.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel