leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm: tweak drm_print_bits()

Browse Source 
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 <jani.nikula@linux.intel.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Sean Paul <sean@poorly.run>
Link: http://patchwork.freedesktop.org/patch/msgid/20190923065814.4797-1-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann
2019-09-23 08:58:14 +02:00
parent 67c1a02048
commit 141f6357f4
3 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/drm_gem_ttm_helper.c
View File

@@ -23,7 +23,7 @@
void drm_gem_ttm_print_info(struct drm_printer *p, unsigned int indent, void drm_gem_ttm_print_info(struct drm_printer *p, unsigned int indent,
const struct drm_gem_object *gem) const struct drm_gem_object *gem)
{ {
static const char const *plname[] = { static const char * const plname[] = {
[ TTM_PL_SYSTEM ] = "system", [ TTM_PL_SYSTEM ] = "system",
[ TTM_PL_TT ] = "tt", [ TTM_PL_TT ] = "tt",
[ TTM_PL_VRAM ] = "vram", [ 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); const struct ttm_buffer_object *bo = drm_gem_ttm_of_gem(gem);
drm_printf_indent(p, indent, "placement="); 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"); drm_printf(p, "\n");
if (bo->mem.bus.is_iomem) { if (bo->mem.bus.is_iomem) {

20
drivers/gpu/drm/drm_print.c
View File

@@ -189,28 +189,26 @@ EXPORT_SYMBOL(drm_printf);
* drm_print_bits - print bits to a &drm_printer stream * drm_print_bits - print bits to a &drm_printer stream
* *
* Print bits (in flag fields for example) in human readable form. * 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 * @p: the &drm_printer
* @value: field value. * @value: field value.
* @bits: Array with bit names. * @bits: Array with bit names.
* @from: start of bit range to print (inclusive). * @nbits: Size of bit names array.
* @to: end of bit range to print (exclusive).
*/ */
void drm_print_bits(struct drm_printer *p, void drm_print_bits(struct drm_printer *p, unsigned long value,
unsigned long value, const char *bits[], const char * const bits[], unsigned int nbits)
unsigned int from, unsigned int to)
{ {
bool first = true; bool first = true;
unsigned int i; unsigned int i;
for (i = from; i < to; i++) { if (WARN_ON_ONCE(nbits > BITS_PER_TYPE(value)))
if (!(value & (1 << i))) nbits = BITS_PER_TYPE(value);
continue;
if (WARN_ON_ONCE(!bits[i-from])) for_each_set_bit(i, &value, nbits) {
if (WARN_ON_ONCE(!bits[i]))
continue; continue;
drm_printf(p, "%s%s", first ? "" : ",", drm_printf(p, "%s%s", first ? "" : ",",
bits[i-from]); bits[i]);
first = false; first = false;
} }
if (first) if (first)

5
include/drm/drm_print.h
View File

@@ -89,9 +89,8 @@ __printf(2, 3)
void drm_printf(struct drm_printer *p, const char *f, ...); void drm_printf(struct drm_printer *p, const char *f, ...);
void drm_puts(struct drm_printer *p, const char *str); 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_regset32(struct drm_printer *p, struct debugfs_regset32 *regset);
void drm_print_bits(struct drm_printer *p, void drm_print_bits(struct drm_printer *p, unsigned long value,
unsigned long value, const char *bits[], const char * const bits[], unsigned int nbits);
unsigned int from, unsigned int to);
__printf(2, 0) __printf(2, 0)
/** /**