All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: DRI Development <dri-devel@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
	Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
	Daniel Vetter <daniel.vetter@intel.com>
Subject: [PATCH 01/37] drm/doc: move printf helpers out of drmP.h
Date: Wed, 24 May 2017 16:51:36 +0200	[thread overview]
Message-ID: <20170524145212.27837-2-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20170524145212.27837-1-daniel.vetter@ffwll.ch>

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>
---
 include/drm/drmP.h      | 17 -----------------
 include/drm/drm_modes.h | 17 +++++++++++++++++
 include/drm/drm_rect.h  | 27 +++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index b9b5566acfe6..575b29b47811 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -292,23 +292,6 @@ struct pci_controller;
 /* Format strings and argument splitters to simplify printing
  * various "complex" objects
  */
-#define DRM_MODE_FMT    "%d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x"
-#define DRM_MODE_ARG(m) \
-	(m)->base.id, (m)->name, (m)->vrefresh, (m)->clock, \
-	(m)->hdisplay, (m)->hsync_start, (m)->hsync_end, (m)->htotal, \
-	(m)->vdisplay, (m)->vsync_start, (m)->vsync_end, (m)->vtotal, \
-	(m)->type, (m)->flags
-
-#define DRM_RECT_FMT    "%dx%d%+d%+d"
-#define DRM_RECT_ARG(r) drm_rect_width(r), drm_rect_height(r), (r)->x1, (r)->y1
-
-/* for rect's in fixed-point format: */
-#define DRM_RECT_FP_FMT "%d.%06ux%d.%06u%+d.%06u%+d.%06u"
-#define DRM_RECT_FP_ARG(r) \
-		drm_rect_width(r) >> 16, ((drm_rect_width(r) & 0xffff) * 15625) >> 10, \
-		drm_rect_height(r) >> 16, ((drm_rect_height(r) & 0xffff) * 15625) >> 10, \
-		(r)->x1 >> 16, (((r)->x1 & 0xffff) * 15625) >> 10, \
-		(r)->y1 >> 16, (((r)->y1 & 0xffff) * 15625) >> 10
 
 /*@}*/
 
diff --git a/include/drm/drm_modes.h b/include/drm/drm_modes.h
index 6dd34280e892..94ac771fe460 100644
--- a/include/drm/drm_modes.h
+++ b/include/drm/drm_modes.h
@@ -197,6 +197,8 @@ enum drm_mode_status {
  * there's the hardware timings, which are corrected for interlacing,
  * double-clocking and similar things. They are provided as a convenience, and
  * can be appropriately computed using drm_mode_set_crtcinfo().
+ *
+ * For printing you can use %DRM_MODE_FMT and DRM_MODE_ARG().
  */
 struct drm_display_mode {
 	/**
@@ -407,6 +409,21 @@ struct drm_display_mode {
 	enum hdmi_picture_aspect picture_aspect_ratio;
 };
 
+/**
+ * DRM_MODE_FMT - printf string for &struct drm_display_mode
+ */
+#define DRM_MODE_FMT    "%d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x"
+
+/**
+ * DRM_MODE_ARG - printf arguments for &struct drm_display_mode
+ * @m: display mode
+ */
+#define DRM_MODE_ARG(m) \
+	(m)->base.id, (m)->name, (m)->vrefresh, (m)->clock, \
+	(m)->hdisplay, (m)->hsync_start, (m)->hsync_end, (m)->htotal, \
+	(m)->vdisplay, (m)->vsync_start, (m)->vsync_end, (m)->vtotal, \
+	(m)->type, (m)->flags
+
 #define obj_to_mode(x) container_of(x, struct drm_display_mode, base)
 
 /**
diff --git a/include/drm/drm_rect.h b/include/drm/drm_rect.h
index 83bb156d4356..44bc122b9ee0 100644
--- a/include/drm/drm_rect.h
+++ b/include/drm/drm_rect.h
@@ -43,6 +43,33 @@ struct drm_rect {
 };
 
 /**
+ * DRM_RECT_FMT - printf string for &struct drm_rect
+ */
+#define DRM_RECT_FMT    "%dx%d%+d%+d"
+/**
+ * DRM_RECT_ARG - printf arguments for &struct drm_rect
+ * @r: rectangle struct
+ */
+#define DRM_RECT_ARG(r) drm_rect_width(r), drm_rect_height(r), (r)->x1, (r)->y1
+
+/**
+ * DRM_RECT_FP_FMT - printf string for &struct drm_rect in 16.16 fixed point
+ */
+#define DRM_RECT_FP_FMT "%d.%06ux%d.%06u%+d.%06u%+d.%06u"
+/**
+ * DRM_RECT_FP_ARG - printf arguments for &struct drm_rect in 16.16 fixed point
+ * @r: rectangle struct
+ *
+ * This is useful for e.g. printing plane source rectangles, which are in 16.16
+ * fixed point.
+ */
+#define DRM_RECT_FP_ARG(r) \
+		drm_rect_width(r) >> 16, ((drm_rect_width(r) & 0xffff) * 15625) >> 10, \
+		drm_rect_height(r) >> 16, ((drm_rect_height(r) & 0xffff) * 15625) >> 10, \
+		(r)->x1 >> 16, (((r)->x1 & 0xffff) * 15625) >> 10, \
+		(r)->y1 >> 16, (((r)->y1 & 0xffff) * 15625) >> 10
+
+/**
  * drm_rect_adjust_size - adjust the size of the rectangle
  * @r: rectangle to be adjusted
  * @dw: horizontal adjustment
-- 
2.11.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  reply	other threads:[~2017-05-24 14:52 UTC|newest]

Thread overview: 94+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-24 14:51 [PATCH 00/37] drm: more doc work&cleanup, mostly vblank related Daniel Vetter
2017-05-24 14:51 ` Daniel Vetter [this message]
2017-05-30  7:33   ` [PATCH 01/37] drm/doc: move printf helpers out of drmP.h Neil Armstrong
2017-05-24 14:51 ` [PATCH 02/37] drm: Remove drm_device->virtdev Daniel Vetter
2017-05-24 14:51 ` Daniel Vetter
2017-05-29  6:52   ` Gerd Hoffmann
2017-05-29  6:52   ` Gerd Hoffmann
2017-05-30  7:33   ` Neil Armstrong
2017-05-30  7:33   ` Neil Armstrong
2017-05-24 14:51 ` [PATCH 03/37] drm/udl: Remove dummy busid callback Daniel Vetter
2017-05-24 14:51 ` [PATCH 04/37] drm: Remove drm_driver->set_busid hook Daniel Vetter
2017-05-24 14:51 ` [PATCH 05/37] drm/pci: Deprecate drm_pci_init/exit completely Daniel Vetter
2017-05-24 14:51 ` [PATCH 06/37] drm/doc: Improve ioctl/fops docs a bit more Daniel Vetter
2017-05-31  9:20   ` [PATCH] " Daniel Vetter
2017-05-24 14:51 ` [PATCH 07/37] drm: Extract drm_vblank.[hc] Daniel Vetter
2017-05-29 19:36   ` Stefan Agner
2017-05-31  8:04     ` Daniel Vetter
2017-05-31  9:21   ` [PATCH] " Daniel Vetter
2017-05-31 17:51     ` Stefan Agner
2017-06-01  5:55       ` Daniel Vetter
2017-05-31 18:22     ` kbuild test robot
2017-05-24 14:51 ` [PATCH 08/37] drm/doc: Polish irq helper documentation Daniel Vetter
2017-05-25  7:46   ` Stefan Agner
2017-05-29 18:58     ` Daniel Vetter
2017-05-31  9:22   ` [PATCH] " Daniel Vetter
2017-05-24 14:51 ` [PATCH 09/37] drm/doc: Drop empty include for drm_color_mgmt.h Daniel Vetter
2017-05-24 14:51 ` [PATCH 10/37] drm/doc: vblank cleanup Daniel Vetter
2017-06-15 12:58   ` Thierry Reding
2017-06-20  8:18     ` Daniel Vetter
2017-05-24 14:51 ` [PATCH 11/37] drm/vblank: _ioctl posfix for ioctl handler Daniel Vetter
2017-05-24 14:51 ` [PATCH 12/37] drm/vblank: Consistent drm_crtc_ prefix Daniel Vetter
2017-05-24 14:51 ` [PATCH 13/37] drm: better document how to send out the crtc disable event Daniel Vetter
2017-05-24 14:54   ` Boris Brezillon
2017-05-30  7:35   ` Neil Armstrong
2017-05-24 14:51 ` [PATCH 14/37] drm/amd|radeon: Drop drm_vblank_cleanup Daniel Vetter
2017-05-24 14:51 ` [PATCH 15/37] drm/arcgpu: " Daniel Vetter
2017-05-24 14:57   ` Alexey Brodkin
2017-05-24 14:51 ` [PATCH 16/37] drm/hdlcd|mali: " Daniel Vetter
2017-05-31 10:57   ` Liviu Dudau
2017-05-31 11:03     ` Daniel Vetter
2017-05-31 11:22       ` Liviu Dudau
2017-05-31 16:41         ` Daniel Vetter
2017-05-31 16:57           ` Liviu Dudau
2017-06-01  5:55             ` Daniel Vetter
2017-05-31 16:37   ` Liviu Dudau
2017-06-01  6:01     ` [Intel-gfx] " Daniel Vetter
2017-05-24 14:51 ` [PATCH 17/37] drm/atmel: " Daniel Vetter
2017-05-24 15:19   ` Boris Brezillon
2017-05-24 14:51 ` [PATCH 18/37] drm/exynos: " Daniel Vetter
2017-05-30  0:03   ` Inki Dae
2017-05-31  8:45     ` Daniel Vetter
2017-06-01  6:15       ` Inki Dae
2017-06-01  9:44         ` Daniel Vetter
2017-05-24 14:51 ` [PATCH 19/37] drm/fsl: " Daniel Vetter
2017-05-25  8:18   ` Stefan Agner
2017-05-26  7:00     ` Daniel Vetter
2017-05-30 21:17       ` Stefan Agner
2017-05-31  8:52         ` Daniel Vetter
2017-06-08 21:42           ` Stefan Agner
2017-05-24 14:51 ` [PATCH 20/37] drm/hibmc: " Daniel Vetter
2017-05-24 14:51 ` [PATCH 21/37] drm/kirin: " Daniel Vetter
2017-05-24 14:51 ` [PATCH 22/37] drm/i915: " Daniel Vetter
2017-05-24 14:51 ` [PATCH 23/37] drm/imx: " Daniel Vetter
2017-05-29 11:07   ` Philipp Zabel
2017-05-31  8:51     ` Daniel Vetter
2017-05-24 14:51 ` [PATCH 24/37] drm/mtk: " Daniel Vetter
2017-05-24 14:52 ` [PATCH 25/37] drm/meson: " Daniel Vetter
2017-05-24 15:46   ` Neil Armstrong
2017-05-24 14:52 ` [PATCH 26/37] drm/mxsfb: " Daniel Vetter
     [not found] ` <20170524145212.27837-1-daniel.vetter-/w4YWyX8dFk@public.gmane.org>
2017-05-24 14:52   ` [PATCH 27/37] drm/nouveau: " Daniel Vetter
2017-05-24 14:52 ` [PATCH 28/37] drm/rockchip: " Daniel Vetter
2017-05-24 14:52 ` [PATCH 29/37] drm/shmob: " Daniel Vetter
2017-05-24 14:52 ` [PATCH 30/37] drm/sti: " Daniel Vetter
2017-06-01 15:37   ` Vincent ABRIOU
2017-06-20  8:20     ` Daniel Vetter
2017-05-24 14:52 ` [PATCH 31/37] drm/stm: " Daniel Vetter
2017-05-29  8:09   ` Philippe CORNU
2017-05-24 14:52 ` [PATCH 32/37] drm/sun4i: " Daniel Vetter
2017-05-29  7:43   ` Maxime Ripard
2017-05-24 14:52 ` [PATCH 33/37] drm/tegra: " Daniel Vetter
2017-06-15 13:00   ` Thierry Reding
2017-06-20  8:21     ` Daniel Vetter
2017-05-24 14:52 ` [PATCH 34/37] drm/udl: " Daniel Vetter
2017-05-24 14:52 ` [PATCH 35/37] drm/vmwgfx: " Daniel Vetter
2017-06-03  5:10   ` Sinclair Yeh
2017-05-24 14:52 ` [PATCH 36/37] drm/zte: " Daniel Vetter
2017-05-25  3:01   ` Shawn Guo
2017-05-26  6:57     ` Daniel Vetter
2017-05-26 11:04       ` Shawn Guo
2017-05-24 14:52 ` [PATCH 37/37] drm/vblank: Unexport drm_vblank_cleanup Daniel Vetter
2017-05-24 15:12 ` ✓ Fi.CI.BAT: success for drm: more doc work&cleanup, mostly vblank related Patchwork
2017-05-24 15:19 ` [PATCH 00/37] " Chris Wilson
2017-05-24 15:54   ` [Intel-gfx] " Daniel Vetter
2017-05-31 10:05 ` ✓ Fi.CI.BAT: success for drm: more doc work&cleanup, mostly vblank related (rev4) Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170524145212.27837-2-daniel.vetter@ffwll.ch \
    --to=daniel.vetter@ffwll.ch \
    --cc=daniel.vetter@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --subject='Re: [PATCH 01/37] drm/doc: move printf helpers out of drmP.h' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.