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 12/37] drm/vblank: Consistent drm_crtc_ prefix
Date: Wed, 24 May 2017 16:51:47 +0200	[thread overview]
Message-ID: <20170524145212.27837-13-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20170524145212.27837-1-daniel.vetter@ffwll.ch>

We use drm_crtc_ for all the new-style vblank functions which directly
take a struct drm_crtc *. drm_accurate_vblank_count was the odd one
out, correct this to appease my OCD.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 drivers/gpu/drm/drm_vblank.c           | 8 ++++----
 drivers/gpu/drm/i915/i915_irq.c        | 2 +-
 drivers/gpu/drm/i915/intel_display.c   | 2 +-
 drivers/gpu/drm/nouveau/nv50_display.c | 2 +-
 include/drm/drm_vblank.h               | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/drm_vblank.c b/drivers/gpu/drm/drm_vblank.c
index 7883f3218105..9263bacb6ebd 100644
--- a/drivers/gpu/drm/drm_vblank.c
+++ b/drivers/gpu/drm/drm_vblank.c
@@ -294,7 +294,7 @@ static u32 drm_vblank_count(struct drm_device *dev, unsigned int pipe)
 }
 
 /**
- * drm_accurate_vblank_count - retrieve the master vblank counter
+ * drm_crtc_accurate_vblank_count - retrieve the master vblank counter
  * @crtc: which counter to retrieve
  *
  * This function is similar to drm_crtc_vblank_count() but this function
@@ -304,7 +304,7 @@ static u32 drm_vblank_count(struct drm_device *dev, unsigned int pipe)
  * This is mostly useful for hardware that can obtain the scanout position, but
  * doesn't have a hardware frame counter.
  */
-u32 drm_accurate_vblank_count(struct drm_crtc *crtc)
+u32 drm_crtc_accurate_vblank_count(struct drm_crtc *crtc)
 {
 	struct drm_device *dev = crtc->dev;
 	unsigned int pipe = drm_crtc_index(crtc);
@@ -323,7 +323,7 @@ u32 drm_accurate_vblank_count(struct drm_crtc *crtc)
 
 	return vblank;
 }
-EXPORT_SYMBOL(drm_accurate_vblank_count);
+EXPORT_SYMBOL(drm_crtc_accurate_vblank_count);
 
 static void __disable_vblank(struct drm_device *dev, unsigned int pipe)
 {
@@ -771,7 +771,7 @@ drm_get_last_vbltimestamp(struct drm_device *dev, unsigned int pipe,
  * vblank events since the system was booted, including lost events due to
  * modesetting activity. Note that this timer isn't correct against a racing
  * vblank interrupt (since it only reports the software vblank counter), see
- * drm_accurate_vblank_count() for such use-cases.
+ * drm_crtc_accurate_vblank_count() for such use-cases.
  *
  * Returns:
  * The software vblank counter.
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 69400ee928e5..912905fa6e3b 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -1603,7 +1603,7 @@ static void display_pipe_crc_irq_handler(struct drm_i915_private *dev_priv,
 		crcs[3] = crc3;
 		crcs[4] = crc4;
 		drm_crtc_add_crc_entry(&crtc->base, true,
-				       drm_accurate_vblank_count(&crtc->base),
+				       drm_crtc_accurate_vblank_count(&crtc->base),
 				       crcs);
 	}
 }
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 7fa21df5bcd7..eeb766fd4a16 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12753,7 +12753,7 @@ u32 intel_crtc_get_vblank_counter(struct intel_crtc *crtc)
 	struct drm_device *dev = crtc->base.dev;
 
 	if (!dev->max_vblank_count)
-		return drm_accurate_vblank_count(&crtc->base);
+		return drm_crtc_accurate_vblank_count(&crtc->base);
 
 	return dev->driver->get_vblank_counter(dev, crtc->pipe);
 }
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index 9303daa79aba..0ea17ad97819 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -4029,7 +4029,7 @@ nv50_disp_atomic_commit_tail(struct drm_atomic_state *state)
 		if (crtc->state->event) {
 			unsigned long flags;
 			/* Get correct count/ts if racing with vblank irq */
-			drm_accurate_vblank_count(crtc);
+			drm_crtc_accurate_vblank_count(crtc);
 			spin_lock_irqsave(&crtc->dev->event_lock, flags);
 			drm_crtc_send_vblank_event(crtc, crtc->state->event);
 			spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
diff --git a/include/drm/drm_vblank.h b/include/drm/drm_vblank.h
index 4cde47332dfa..4ceef128582f 100644
--- a/include/drm/drm_vblank.h
+++ b/include/drm/drm_vblank.h
@@ -169,7 +169,7 @@ void drm_crtc_vblank_off(struct drm_crtc *crtc);
 void drm_crtc_vblank_reset(struct drm_crtc *crtc);
 void drm_crtc_vblank_on(struct drm_crtc *crtc);
 void drm_vblank_cleanup(struct drm_device *dev);
-u32 drm_accurate_vblank_count(struct drm_crtc *crtc);
+u32 drm_crtc_accurate_vblank_count(struct drm_crtc *crtc);
 
 bool drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev,
 					   unsigned int pipe, int *max_error,
-- 
2.11.0

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

  parent 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 ` [PATCH 01/37] drm/doc: move printf helpers out of drmP.h Daniel Vetter
2017-05-30  7:33   ` 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 ` Daniel Vetter [this message]
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-13-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 \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.