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

drm/doc: move printf helpers out of drmP.h

And document them lightly. Unfortunately kernel-doc isn't the most
awesome for documenting #defines that don't look like functions, it
makes functions out of them :-/

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170524145212.27837-2-daniel.vetter@ffwll.ch
Link: http://patchwork.freedesktop.org/patch/msgid/20170524145212.27837-3-daniel.vetter@ffwll.ch

+44 -17
-17
include/drm/drmP.h
··· 292 292 /* Format strings and argument splitters to simplify printing 293 293 * various "complex" objects 294 294 */ 295 - #define DRM_MODE_FMT "%d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x" 296 - #define DRM_MODE_ARG(m) \ 297 - (m)->base.id, (m)->name, (m)->vrefresh, (m)->clock, \ 298 - (m)->hdisplay, (m)->hsync_start, (m)->hsync_end, (m)->htotal, \ 299 - (m)->vdisplay, (m)->vsync_start, (m)->vsync_end, (m)->vtotal, \ 300 - (m)->type, (m)->flags 301 - 302 - #define DRM_RECT_FMT "%dx%d%+d%+d" 303 - #define DRM_RECT_ARG(r) drm_rect_width(r), drm_rect_height(r), (r)->x1, (r)->y1 304 - 305 - /* for rect's in fixed-point format: */ 306 - #define DRM_RECT_FP_FMT "%d.%06ux%d.%06u%+d.%06u%+d.%06u" 307 - #define DRM_RECT_FP_ARG(r) \ 308 - drm_rect_width(r) >> 16, ((drm_rect_width(r) & 0xffff) * 15625) >> 10, \ 309 - drm_rect_height(r) >> 16, ((drm_rect_height(r) & 0xffff) * 15625) >> 10, \ 310 - (r)->x1 >> 16, (((r)->x1 & 0xffff) * 15625) >> 10, \ 311 - (r)->y1 >> 16, (((r)->y1 & 0xffff) * 15625) >> 10 312 295 313 296 /*@}*/ 314 297
+17
include/drm/drm_modes.h
··· 197 197 * there's the hardware timings, which are corrected for interlacing, 198 198 * double-clocking and similar things. They are provided as a convenience, and 199 199 * can be appropriately computed using drm_mode_set_crtcinfo(). 200 + * 201 + * For printing you can use %DRM_MODE_FMT and DRM_MODE_ARG(). 200 202 */ 201 203 struct drm_display_mode { 202 204 /** ··· 408 406 */ 409 407 enum hdmi_picture_aspect picture_aspect_ratio; 410 408 }; 409 + 410 + /** 411 + * DRM_MODE_FMT - printf string for &struct drm_display_mode 412 + */ 413 + #define DRM_MODE_FMT "%d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x" 414 + 415 + /** 416 + * DRM_MODE_ARG - printf arguments for &struct drm_display_mode 417 + * @m: display mode 418 + */ 419 + #define DRM_MODE_ARG(m) \ 420 + (m)->base.id, (m)->name, (m)->vrefresh, (m)->clock, \ 421 + (m)->hdisplay, (m)->hsync_start, (m)->hsync_end, (m)->htotal, \ 422 + (m)->vdisplay, (m)->vsync_start, (m)->vsync_end, (m)->vtotal, \ 423 + (m)->type, (m)->flags 411 424 412 425 #define obj_to_mode(x) container_of(x, struct drm_display_mode, base) 413 426
+27
include/drm/drm_rect.h
··· 43 43 }; 44 44 45 45 /** 46 + * DRM_RECT_FMT - printf string for &struct drm_rect 47 + */ 48 + #define DRM_RECT_FMT "%dx%d%+d%+d" 49 + /** 50 + * DRM_RECT_ARG - printf arguments for &struct drm_rect 51 + * @r: rectangle struct 52 + */ 53 + #define DRM_RECT_ARG(r) drm_rect_width(r), drm_rect_height(r), (r)->x1, (r)->y1 54 + 55 + /** 56 + * DRM_RECT_FP_FMT - printf string for &struct drm_rect in 16.16 fixed point 57 + */ 58 + #define DRM_RECT_FP_FMT "%d.%06ux%d.%06u%+d.%06u%+d.%06u" 59 + /** 60 + * DRM_RECT_FP_ARG - printf arguments for &struct drm_rect in 16.16 fixed point 61 + * @r: rectangle struct 62 + * 63 + * This is useful for e.g. printing plane source rectangles, which are in 16.16 64 + * fixed point. 65 + */ 66 + #define DRM_RECT_FP_ARG(r) \ 67 + drm_rect_width(r) >> 16, ((drm_rect_width(r) & 0xffff) * 15625) >> 10, \ 68 + drm_rect_height(r) >> 16, ((drm_rect_height(r) & 0xffff) * 15625) >> 10, \ 69 + (r)->x1 >> 16, (((r)->x1 & 0xffff) * 15625) >> 10, \ 70 + (r)->y1 >> 16, (((r)->y1 & 0xffff) * 15625) >> 10 71 + 72 + /** 46 73 * drm_rect_adjust_size - adjust the size of the rectangle 47 74 * @r: rectangle to be adjusted 48 75 * @dw: horizontal adjustment