[PATCH 05/24] drm/vblank: use the drm_vblank_crtc() and drm_crtc_vblank_crtc() helpers more

[Jani Nikula]

We have the helpers to avoid open coding dev->vblank[pipe] access.

Signed-off-by: Jani Nikula <jani.nik...@intel.com>
---
 drivers/gpu/drm/drm_vblank.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/drm_vblank.c b/drivers/gpu/drm/drm_vblank.c
index 503eb23d38d2..e3a5a783686f 100644
--- a/drivers/gpu/drm/drm_vblank.c
+++ b/drivers/gpu/drm/drm_vblank.c
@@ -551,7 +551,7 @@ int drm_vblank_init(struct drm_device *dev, unsigned int 
num_crtcs)
        dev->num_crtcs = num_crtcs;
 
        for (i = 0; i < num_crtcs; i++) {
-               struct drm_vblank_crtc *vblank = &dev->vblank[i];
+               struct drm_vblank_crtc *vblank = drm_vblank_crtc(dev, i);
 
                vblank->dev = dev;
                vblank->pipe = i;
@@ -605,7 +605,9 @@ EXPORT_SYMBOL(drm_dev_has_vblank);
  */
 wait_queue_head_t *drm_crtc_vblank_waitqueue(struct drm_crtc *crtc)
 {
-       return &crtc->dev->vblank[drm_crtc_index(crtc)].queue;
+       struct drm_vblank_crtc *vblank = drm_crtc_vblank_crtc(crtc);
+
+       return &vblank->queue;
 }
 EXPORT_SYMBOL(drm_crtc_vblank_waitqueue);
 
@@ -710,7 +712,7 @@ drm_crtc_vblank_helper_get_vblank_timestamp_internal(
 {
        struct drm_device *dev = crtc->dev;
        unsigned int pipe = crtc->index;
-       struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
+       struct drm_vblank_crtc *vblank = drm_vblank_crtc(dev, pipe);
        struct timespec64 ts_etime, ts_vblank_time;
        ktime_t stime, etime;
        bool vbl_status;
@@ -1782,7 +1784,7 @@ int drm_wait_vblank_ioctl(struct drm_device *dev, void 
*data,
        if (pipe >= dev->num_crtcs)
                return -EINVAL;
 
-       vblank = &dev->vblank[pipe];
+       vblank = drm_vblank_crtc(dev, pipe);
 
        /* If the counter is currently enabled and accurate, short-circuit
         * queries to return the cached timestamp of the last vblank.
-- 
2.47.3