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
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)
drm: Fix treatment of drm_vblank_offdelay in drm_vblank_on() (v2)
Tip revision: bb74fc1
File | Mode | Size |
---|---|---|
crush | ||
Kconfig | -rw-r--r-- | 1.1 KB |
Makefile | -rw-r--r-- | 357 bytes |
armor.c | -rw-r--r-- | 1.9 KB |
auth.c | -rw-r--r-- | 7.6 KB |
auth_none.c | -rw-r--r-- | 3.0 KB |
auth_none.h | -rw-r--r-- | 529 bytes |
auth_x.c | -rw-r--r-- | 19.3 KB |
auth_x.h | -rw-r--r-- | 889 bytes |
auth_x_protocol.h | -rw-r--r-- | 1.7 KB |
buffer.c | -rw-r--r-- | 1.2 KB |
ceph_common.c | -rw-r--r-- | 17.8 KB |
ceph_fs.c | -rw-r--r-- | 1.7 KB |
ceph_hash.c | -rw-r--r-- | 2.8 KB |
ceph_strings.c | -rw-r--r-- | 866 bytes |
crypto.c | -rw-r--r-- | 13.8 KB |
crypto.h | -rw-r--r-- | 1.4 KB |
debugfs.c | -rw-r--r-- | 7.6 KB |
messenger.c | -rw-r--r-- | 85.5 KB |
mon_client.c | -rw-r--r-- | 27.4 KB |
msgpool.c | -rw-r--r-- | 2.0 KB |
osd_client.c | -rw-r--r-- | 78.7 KB |
osdmap.c | -rw-r--r-- | 39.4 KB |
pagelist.c | -rw-r--r-- | 3.6 KB |
pagevec.c | -rw-r--r-- | 4.1 KB |
snapshot.c | -rw-r--r-- | 2.2 KB |
Computing file changes ...