Skip to content

Commit 976dd75

Browse files
committed
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>
1 parent e547890 commit 976dd75

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

drivers/gpu/drm/drm_vblank.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ int drm_vblank_init(struct drm_device *dev, unsigned int num_crtcs)
551551
dev->num_crtcs = num_crtcs;
552552

553553
for (i = 0; i < num_crtcs; i++) {
554-
struct drm_vblank_crtc *vblank = &dev->vblank[i];
554+
struct drm_vblank_crtc *vblank = drm_vblank_crtc(dev, i);
555555

556556
vblank->dev = dev;
557557
vblank->pipe = i;
@@ -605,7 +605,9 @@ EXPORT_SYMBOL(drm_dev_has_vblank);
605605
*/
606606
wait_queue_head_t *drm_crtc_vblank_waitqueue(struct drm_crtc *crtc)
607607
{
608-
return &crtc->dev->vblank[drm_crtc_index(crtc)].queue;
608+
struct drm_vblank_crtc *vblank = drm_crtc_vblank_crtc(crtc);
609+
610+
return &vblank->queue;
609611
}
610612
EXPORT_SYMBOL(drm_crtc_vblank_waitqueue);
611613

@@ -729,7 +731,7 @@ drm_crtc_vblank_helper_get_vblank_timestamp_internal(
729731
}
730732

731733
if (drm_drv_uses_atomic_modeset(dev)) {
732-
struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
734+
struct drm_vblank_crtc *vblank = drm_vblank_crtc(dev, pipe);
733735

734736
mode = &vblank->hwmode;
735737
} else {
@@ -1784,7 +1786,7 @@ int drm_wait_vblank_ioctl(struct drm_device *dev, void *data,
17841786
if (pipe >= dev->num_crtcs)
17851787
return -EINVAL;
17861788

1787-
vblank = &dev->vblank[pipe];
1789+
vblank = drm_vblank_crtc(dev, pipe);
17881790

17891791
/* If the counter is currently enabled and accurate, short-circuit
17901792
* queries to return the cached timestamp of the last vblank.

0 commit comments

Comments
 (0)