[09/23] drm: Remove struct drm_driver.get_scanout_position()
diff mbox series

Message ID 20200110092127.27847-10-tzimmermann@suse.de
State New
Headers show
Series
  • drm: Clean up VBLANK callbacks in struct drm_driver
Related show

Commit Message

Thomas Zimmermann Jan. 10, 2020, 9:21 a.m. UTC
All users of struct drm_driver.get_scanout_position() have been
covnerted to the respective CRTC helper function. Remove the callback
from struct drm_driver.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
 drivers/gpu/drm/drm_vblank.c | 13 ++-------
 include/drm/drm_drv.h        | 52 ------------------------------------
 2 files changed, 2 insertions(+), 63 deletions(-)

Comments

Yannick Fertre Jan. 14, 2020, 3:32 p.m. UTC | #1
Thanks for the patch.

Tested-by: Yannick Fertré <yannick.fertre@st.com><mailto:yannick.fertre@st.com>

BR
Yannick Fertré


On 1/10/20 10:21 AM, Thomas Zimmermann wrote:

All users of struct drm_driver.get_scanout_position() have been
covnerted to the respective CRTC helper function. Remove the callback
from struct drm_driver.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de><mailto:tzimmermann@suse.de>
---
 drivers/gpu/drm/drm_vblank.c | 13 ++-------
 include/drm/drm_drv.h        | 52 ------------------------------------
 2 files changed, 2 insertions(+), 63 deletions(-)

diff --git a/drivers/gpu/drm/drm_vblank.c b/drivers/gpu/drm/drm_vblank.c
index c12f0b333e14..b84065911d69 100644
--- a/drivers/gpu/drm/drm_vblank.c
+++ b/drivers/gpu/drm/drm_vblank.c
@@ -633,8 +633,7 @@ bool drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev,
        }

        /* Scanout position query not supported? Should not happen. */
-       if (!dev->driver->get_scanout_position ||
-           !crtc->helper_private->get_scanout_position) {
+       if (!crtc->helper_private->get_scanout_position) {
                DRM_ERROR("Called from CRTC w/o get_scanout_position()!?\n");
                return false;
        }
@@ -666,17 +665,9 @@ bool drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev,
                 * Get vertical and horizontal scanout position vpos, hpos,
                 * and bounding timestamps stime, etime, pre/post query.
                 */
-               if (crtc->helper_private->get_scanout_position) {
-                       vbl_status =
-                               crtc->helper_private->get_scanout_position(
+               vbl_status = crtc->helper_private->get_scanout_position(
                                        crtc, in_vblank_irq, &vpos, &hpos,
                                        &stime, &etime, mode);
-               } else {
-                       vbl_status =
-                               dev->driver->get_scanout_position(
-                                       dev, pipe, in_vblank_irq, &vpos,
-                                       &hpos, &stime, &etime, mode);
-               }

                /* Return as no-op if scanout query unsupported or failed. */
                if (!vbl_status) {
diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h
index d0049e5786fc..b704e252f3b2 100644
--- a/include/drm/drm_drv.h
+++ b/include/drm/drm_drv.h
@@ -318,58 +318,6 @@ struct drm_driver {
         */
        void (*disable_vblank) (struct drm_device *dev, unsigned int pipe);

-       /**
-        * @get_scanout_position:
-        *
-        * Called by vblank timestamping code.
-        *
-        * Returns the current display scanout position from a crtc, and an
-        * optional accurate ktime_get() timestamp of when position was
-        * measured. Note that this is a helper callback which is only used if a
-        * driver uses drm_calc_vbltimestamp_from_scanoutpos() for the
-        * @get_vblank_timestamp callback.
-        *
-        * Parameters:
-        *
-        * dev:
-        *     DRM device.
-        * pipe:
-        *     Id of the crtc to query.
-        * in_vblank_irq:
-        *     True when called from drm_crtc_handle_vblank().  Some drivers
-        *     need to apply some workarounds for gpu-specific vblank irq quirks
-        *     if flag is set.
-        * vpos:
-        *     Target location for current vertical scanout position.
-        * hpos:
-        *     Target location for current horizontal scanout position.
-        * stime:
-        *     Target location for timestamp taken immediately before
-        *     scanout position query. Can be NULL to skip timestamp.
-        * etime:
-        *     Target location for timestamp taken immediately after
-        *     scanout position query. Can be NULL to skip timestamp.
-        * mode:
-        *     Current display timings.
-        *
-        * Returns vpos as a positive number while in active scanout area.
-        * Returns vpos as a negative number inside vblank, counting the number
-        * of scanlines to go until end of vblank, e.g., -1 means "one scanline
-        * until start of active scanout / end of vblank."
-        *
-        * Returns:
-        *
-        * True on success, false if a reliable scanout position counter could
-        * not be read out.
-        *
-        * This is deprecated and should not be used by new drivers.
-        * Use &drm_crtc_helper_funcs.get_scanout_position instead.
-        */
-       bool (*get_scanout_position) (struct drm_device *dev, unsigned int pipe,
-                                     bool in_vblank_irq, int *vpos, int *hpos,
-                                     ktime_t *stime, ktime_t *etime,
-                                     const struct drm_display_mode *mode);
-
        /**
         * @get_vblank_timestamp:
         *

Patch
diff mbox series

diff --git a/drivers/gpu/drm/drm_vblank.c b/drivers/gpu/drm/drm_vblank.c
index c12f0b333e14..b84065911d69 100644
--- a/drivers/gpu/drm/drm_vblank.c
+++ b/drivers/gpu/drm/drm_vblank.c
@@ -633,8 +633,7 @@  bool drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev,
 	}
 
 	/* Scanout position query not supported? Should not happen. */
-	if (!dev->driver->get_scanout_position ||
-	    !crtc->helper_private->get_scanout_position) {
+	if (!crtc->helper_private->get_scanout_position) {
 		DRM_ERROR("Called from CRTC w/o get_scanout_position()!?\n");
 		return false;
 	}
@@ -666,17 +665,9 @@  bool drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev,
 		 * Get vertical and horizontal scanout position vpos, hpos,
 		 * and bounding timestamps stime, etime, pre/post query.
 		 */
-		if (crtc->helper_private->get_scanout_position) {
-			vbl_status =
-				crtc->helper_private->get_scanout_position(
+		vbl_status = crtc->helper_private->get_scanout_position(
 					crtc, in_vblank_irq, &vpos, &hpos,
 					&stime, &etime, mode);
-		} else {
-			vbl_status =
-				dev->driver->get_scanout_position(
-					dev, pipe, in_vblank_irq, &vpos,
-					&hpos, &stime, &etime, mode);
-		}
 
 		/* Return as no-op if scanout query unsupported or failed. */
 		if (!vbl_status) {
diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h
index d0049e5786fc..b704e252f3b2 100644
--- a/include/drm/drm_drv.h
+++ b/include/drm/drm_drv.h
@@ -318,58 +318,6 @@  struct drm_driver {
 	 */
 	void (*disable_vblank) (struct drm_device *dev, unsigned int pipe);
 
-	/**
-	 * @get_scanout_position:
-	 *
-	 * Called by vblank timestamping code.
-	 *
-	 * Returns the current display scanout position from a crtc, and an
-	 * optional accurate ktime_get() timestamp of when position was
-	 * measured. Note that this is a helper callback which is only used if a
-	 * driver uses drm_calc_vbltimestamp_from_scanoutpos() for the
-	 * @get_vblank_timestamp callback.
-	 *
-	 * Parameters:
-	 *
-	 * dev:
-	 *     DRM device.
-	 * pipe:
-	 *     Id of the crtc to query.
-	 * in_vblank_irq:
-	 *     True when called from drm_crtc_handle_vblank().  Some drivers
-	 *     need to apply some workarounds for gpu-specific vblank irq quirks
-	 *     if flag is set.
-	 * vpos:
-	 *     Target location for current vertical scanout position.
-	 * hpos:
-	 *     Target location for current horizontal scanout position.
-	 * stime:
-	 *     Target location for timestamp taken immediately before
-	 *     scanout position query. Can be NULL to skip timestamp.
-	 * etime:
-	 *     Target location for timestamp taken immediately after
-	 *     scanout position query. Can be NULL to skip timestamp.
-	 * mode:
-	 *     Current display timings.
-	 *
-	 * Returns vpos as a positive number while in active scanout area.
-	 * Returns vpos as a negative number inside vblank, counting the number
-	 * of scanlines to go until end of vblank, e.g., -1 means "one scanline
-	 * until start of active scanout / end of vblank."
-	 *
-	 * Returns:
-	 *
-	 * True on success, false if a reliable scanout position counter could
-	 * not be read out.
-	 *
-	 * This is deprecated and should not be used by new drivers.
-	 * Use &drm_crtc_helper_funcs.get_scanout_position instead.
-	 */
-	bool (*get_scanout_position) (struct drm_device *dev, unsigned int pipe,
-				      bool in_vblank_irq, int *vpos, int *hpos,
-				      ktime_t *stime, ktime_t *etime,
-				      const struct drm_display_mode *mode);
-
 	/**
 	 * @get_vblank_timestamp:
 	 *