Skip to content

Commit e547890

Browse files
committed
drm/vblank: limit vblank variable scope to atomic
In drm_crtc_vblank_helper_get_vblank_timestamp_internal(), we only need the vblank variable for atomic modesetting. Limit the scope to make upcoming changes easier. Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de> Link: https://patch.msgid.link/b50f0bff654a6902ffd7ae52c31d46fad9ed7540.1765290097.git.jani.nikula@intel.com Signed-off-by: Jani Nikula <jani.nikula@intel.com>
1 parent 65defc4 commit e547890

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

drivers/gpu/drm/drm_vblank.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,6 @@ drm_crtc_vblank_helper_get_vblank_timestamp_internal(
710710
{
711711
struct drm_device *dev = crtc->dev;
712712
unsigned int pipe = crtc->index;
713-
struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
714713
struct timespec64 ts_etime, ts_vblank_time;
715714
ktime_t stime, etime;
716715
bool vbl_status;
@@ -729,10 +728,13 @@ drm_crtc_vblank_helper_get_vblank_timestamp_internal(
729728
return false;
730729
}
731730

732-
if (drm_drv_uses_atomic_modeset(dev))
731+
if (drm_drv_uses_atomic_modeset(dev)) {
732+
struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
733+
733734
mode = &vblank->hwmode;
734-
else
735+
} else {
735736
mode = &crtc->hwmode;
737+
}
736738

737739
/* If mode timing undefined, just return as no-op:
738740
* Happens during initial modesetting of a crtc.

0 commit comments

Comments
 (0)