]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/vblank: limit vblank variable scope to atomic
authorJani Nikula <jani.nikula@intel.com>
Tue, 9 Dec 2025 14:23:13 +0000 (16:23 +0200)
committerJani Nikula <jani.nikula@intel.com>
Thu, 11 Dec 2025 14:55:36 +0000 (16:55 +0200)
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>
drivers/gpu/drm/drm_vblank.c

index 503eb23d38d2f2b79e48f3aee14987897cd68d4b..91e63177daaf451617faf8eeb15bfa49cc61e08c 100644 (file)
@@ -710,7 +710,6 @@ 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 timespec64 ts_etime, ts_vblank_time;
        ktime_t stime, etime;
        bool vbl_status;
@@ -729,10 +728,13 @@ drm_crtc_vblank_helper_get_vblank_timestamp_internal(
                return false;
        }
 
-       if (drm_drv_uses_atomic_modeset(dev))
+       if (drm_drv_uses_atomic_modeset(dev)) {
+               struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
+
                mode = &vblank->hwmode;
-       else
+       } else {
                mode = &crtc->hwmode;
+       }
 
        /* If mode timing undefined, just return as no-op:
         * Happens during initial modesetting of a crtc.