tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

drm: Add "prefix" parameter to drm_rect_debug_print()

Allow the caller to specify a "prefix" string to drm_rect_debug_print()
to make it easier to see which drm_rect is being printed.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

authored by

Ville Syrjälä and committed by
Daniel Vetter c70f577a 02e6f379

+10 -8
+4 -3
drivers/gpu/drm/drm_rect.c
··· 275 275 276 276 /** 277 277 * drm_rect_debug_print - print the rectangle information 278 + * @prefix: prefix string 278 279 * @r: rectangle to print 279 280 * @fixed_point: rectangle is in 16.16 fixed point format 280 281 */ 281 - void drm_rect_debug_print(const struct drm_rect *r, bool fixed_point) 282 + void drm_rect_debug_print(const char *prefix, const struct drm_rect *r, bool fixed_point) 282 283 { 283 284 int w = drm_rect_width(r); 284 285 int h = drm_rect_height(r); 285 286 286 287 if (fixed_point) 287 - DRM_DEBUG_KMS("%d.%06ux%d.%06u%+d.%06u%+d.%06u\n", 288 + DRM_DEBUG_KMS("%s%d.%06ux%d.%06u%+d.%06u%+d.%06u\n", prefix, 288 289 w >> 16, ((w & 0xffff) * 15625) >> 10, 289 290 h >> 16, ((h & 0xffff) * 15625) >> 10, 290 291 r->x1 >> 16, ((r->x1 & 0xffff) * 15625) >> 10, 291 292 r->y1 >> 16, ((r->y1 & 0xffff) * 15625) >> 10); 292 293 else 293 - DRM_DEBUG_KMS("%dx%d%+d%+d\n", w, h, r->x1, r->y1); 294 + DRM_DEBUG_KMS("%s%dx%d%+d%+d\n", prefix, w, h, r->x1, r->y1); 294 295 } 295 296 EXPORT_SYMBOL(drm_rect_debug_print); 296 297
+4 -4
drivers/gpu/drm/i915/intel_sprite.c
··· 832 832 hscale = drm_rect_calc_hscale(src, dst, min_scale, max_scale); 833 833 if (hscale < 0) { 834 834 DRM_DEBUG_KMS("Horizontal scaling factor out of limits\n"); 835 - drm_rect_debug_print(src, true); 836 - drm_rect_debug_print(dst, false); 835 + drm_rect_debug_print("src: ", src, true); 836 + drm_rect_debug_print("dst: ", dst, false); 837 837 838 838 return hscale; 839 839 } ··· 841 841 vscale = drm_rect_calc_vscale(src, dst, min_scale, max_scale); 842 842 if (vscale < 0) { 843 843 DRM_DEBUG_KMS("Vertical scaling factor out of limits\n"); 844 - drm_rect_debug_print(src, true); 845 - drm_rect_debug_print(dst, false); 844 + drm_rect_debug_print("src: ", src, true); 845 + drm_rect_debug_print("dst: ", dst, false); 846 846 847 847 return vscale; 848 848 }
+2 -1
include/drm/drm_rect.h
··· 162 162 int drm_rect_calc_vscale_relaxed(struct drm_rect *src, 163 163 struct drm_rect *dst, 164 164 int min_vscale, int max_vscale); 165 - void drm_rect_debug_print(const struct drm_rect *r, bool fixed_point); 165 + void drm_rect_debug_print(const char *prefix, 166 + const struct drm_rect *r, bool fixed_point); 166 167 void drm_rect_rotate(struct drm_rect *r, 167 168 int width, int height, 168 169 unsigned int rotation);