Skip to content

Commit

Permalink
drm/vc4: Fix get_vblank_counter with proper no-op for Linux 4.4+
Browse files Browse the repository at this point in the history
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: Mario Kleiner <mario.kleiner.de@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Fixes: c8b75bc ("drm/vc4: Add KMS support for Raspberry Pi.")
  • Loading branch information
Mario Kleiner authored and Eric Anholt committed May 31, 2016
1 parent 1a695a9 commit 792293c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/vc4/vc4_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 792293c

Please sign in to comment.