Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 792293cf authored by Mario Kleiner's avatar Mario Kleiner Committed by Eric Anholt
Browse files

drm/vc4: Fix get_vblank_counter with proper no-op for Linux 4.4+ 



get_vblank_counter hooked up to drm_vblank_count() which alway was
non-sensical but didn't hurt in the past. Since Linux 4.4 it
triggers a WARN_ON_ONCE in drm_update_vblank_count on first vblank
irq disable, so fix it by hooking to drm_vblank_no_hw_counter().

Tested against Raspian kernel 4.4.8 tree on RPi 2B.

Signed-off-by: default avatarMario Kleiner <mario.kleiner.de@gmail.com>
Reviewed-by: default avatarEric Anholt <eric@anholt.net>
Fixes: c8b75bca ("drm/vc4: Add KMS support for Raspberry Pi.")
parent 1a695a90

drivers/gpu/drm/vc4/vc4_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static struct drm_driver vc4_drm_driver = { 


	.enable_vblank = vc4_enable_vblank,

	.disable_vblank = vc4_disable_vblank,

	.get_vblank_counter = drm_vblank_count,

	.get_vblank_counter = drm_vblank_no_hw_counter,



#if defined(CONFIG_DEBUG_FS)

	.debugfs_init = vc4_debugfs_init,