drm/vkms: Clean up artifacts from old vblank timer
Thomas Zimmermann
maintainerPATCH 1/1 drm/vkms: Clean up artifacts from old vblank timer
Vkms uses DRM's shared vblank timer. Do not include hrtimer.h and fix comments referring to the original implementation. This should have been done as part of commit 02e2681ffe1a ("drm/vkms: Convert to DRM's vblank timer").
Signed-off-by Thomas Zimmermann <[email protected]>
Fixes 02e2681ffe1a ("drm/vkms: Convert to DRM's vblank timer")
Cc Louis Chauvet <[email protected]>
Cc Haneen Mohammed <[email protected]>
Cc Simona Vetter <[email protected]>
Cc Melissa Wen <[email protected]>
--- drivers/gpu/drm/vkms/vkms_composer.c | 4 ++-- drivers/gpu/drm/vkms/vkms_drv.h | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-)
drivers/gpu/drm/vkms/vkms_composer.c +2 -2
@@ -595,7 +595,7 @@ static int compose_active_planes(struct vkms_writeback_job *active_wb,* * Work handler for composing and computing CRCs. work_struct scheduled in * an ordered workqueue that's periodically scheduled to run by -* vkms_vblank_simulate() and flushed at vkms_atomic_commit_tail(). +* vkms_crtc_handle_vblank_timeout() and flushed at vkms_atomic_commit_tail(). */ void vkms_composer_worker (struct work_struct *work) {
@@ -637,7 +637,7 @@ void vkms_composer_worker(struct work_struct *work)spin_unlock_irq (&out->composer_lock);/* -* We raced with the vblank hrtimer and previous work already computed +* We raced with the vblank timer and previous work already computed * the crc, nothing to do. */ if (!crc_pending)
drivers/gpu/drm/vkms/vkms_drv.h +0 -5
@@ -3,8 +3,6 @@#ifndef _VKMS_DRV_H_#define _VKMS_DRV_H_ -#include <linux/hrtimer.h> -#include <drm/drm.h> #include <drm/drm_framebuffer.h> #include <drm/drm_gem.h>
@@ -205,9 +203,6 @@ struct vkms_crtc_state {* @encoder: DRM encoder used for this output * @connector: DRM connector used for this output * @wb_connecter: DRM writeback connector used for this output -* @vblank_hrtimer: Timer used to trigger the vblank -* @period_ns: vblank period, in nanoseconds, used to configure @vblank_hrtimer and to compute -* vblank timestamps * @composer_workq: Ordered workqueue for @composer_state.composer_work. * @lock: Lock used to protect concurrent access to the composer * @composer_enabled: Protected by @lock, true when the VKMS composer is active (crc needed or
Signature · 1 line
2.53.0