https://github.com/torvalds/linux
Revision bb74fc1bf3072bd3ab4ed5f43afd287a63baf2d7 authored by Mario Kleiner on 12 February 2016, 19:30:30 UTC, committed by Dave Airlie on 17 February 2016, 04:19:00 UTC
drm_vblank_offdelay can have three different types of values:

< 0 is to be always treated the same as dev->vblank_disable_immediate
= 0 is to be treated as "never disable vblanks"
> 0 is to be treated as disable immediate if kms driver wants it
    that way via dev->vblank_disable_immediate. Otherwise it is
    a disable timeout in msecs.

This got broken in Linux 3.18+ for the implementation of
drm_vblank_on. If the user specified a value of zero which should
always reenable vblank irqs in this function, a kms driver could
override the users choice by setting vblank_disable_immediate
to true. This patch fixes the regression and keeps the user in
control.

v2: Only reenable vblank if there are clients left or the user
    requested to "never disable vblanks" via offdelay 0. Enabling
    vblanks even in the "delayed disable" case (offdelay > 0) was
    specifically added by Ville in commit cd19e52aee922
    ("drm: Kick start vblank interrupts at drm_vblank_on()"),
    but after discussion it turns out that this was done by accident.

    Citing Ville: "I think it just ended up as a mess due to changing
    some of the semantics of offdelay<0 vs. offdelay==0 vs.
    disable_immediate during the review of the series. So yeah, given
    how drm_vblank_put() works now, I'd just make this check for
    offdelay==0."

Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Cc: <stable@vger.kernel.org> # 3.18+
Cc: michel@daenzer.net
Cc: vbabka@suse.cz
Cc: ville.syrjala@linux.intel.com
Cc: daniel.vetter@ffwll.ch
Cc: dri-devel@lists.freedesktop.org
Cc: alexander.deucher@amd.com
Cc: christian.koenig@amd.com
Signed-off-by: Dave Airlie <airlied@redhat.com>
1 parent c61934e
History
Tip revision: bb74fc1bf3072bd3ab4ed5f43afd287a63baf2d7 authored by Mario Kleiner on 12 February 2016, 19:30:30 UTC
drm: Fix treatment of drm_vblank_offdelay in drm_vblank_on() (v2)
Tip revision: bb74fc1
File Mode Size
Kconfig -rw-r--r-- 1.0 KB
Makefile -rw-r--r-- 150 bytes
hsr_device.c -rw-r--r-- 11.7 KB
hsr_device.h -rw-r--r-- 815 bytes
hsr_forward.c -rw-r--r-- 9.8 KB
hsr_forward.h -rw-r--r-- 577 bytes
hsr_framereg.c -rw-r--r-- 13.1 KB
hsr_framereg.h -rw-r--r-- 1.7 KB
hsr_main.c -rw-r--r-- 3.2 KB
hsr_main.h -rw-r--r-- 4.9 KB
hsr_netlink.c -rw-r--r-- 11.2 KB
hsr_netlink.h -rw-r--r-- 923 bytes
hsr_slave.c -rw-r--r-- 4.3 KB
hsr_slave.h -rw-r--r-- 1.1 KB

back to top