drm/vblank: use the drm_vblank_crtc() and drm_crtc_vblank_crtc() helpers more

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

v2: Rebase

Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patch.msgid.link/ad41f25c625d6a263b7e2e1d227cb14c5d0ce204.1765290097.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/drm_vblank.c b/drivers/gpu/drm/drm_vblank.c
index 91e63177daaf451617faf8eeb15bfa49cc61e08c..a86561c4b999203193c24ae2994b2699c08cf168 100644 (file)
--- 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);
 
@@ -729,7 +731,7 @@ drm_crtc_vblank_helper_get_vblank_timestamp_internal(
        }
 
        if (drm_drv_uses_atomic_modeset(dev)) {
-               struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
+               struct drm_vblank_crtc *vblank = drm_vblank_crtc(dev, pipe);
 
                mode = &vblank->hwmode;
        } else {
@@ -1784,7 +1786,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.