From: Mario Kleiner <mario.kleiner.de@gmail.com> To: dri-devel@lists.freedesktop.org Cc: mario.kleiner.de@gmail.com, linux@bernd-steinhauser.de, <stable@vger.kernel.org>, michel@daenzer.net, vbabka@suse.cz, ville.syrjala@linux.intel.com, daniel.vetter@ffwll.ch, alexander.deucher@amd.com, christian.koenig@amd.com Subject: [PATCH 4/6] drm: Fix treatment of drm_vblank_offdelay in drm_vblank_on() Date: Mon, 8 Feb 2016 02:13:27 +0100 [thread overview] Message-ID: <1454894009-15466-5-git-send-email-mario.kleiner.de@gmail.com> (raw) In-Reply-To: <1454894009-15466-1-git-send-email-mario.kleiner.de@gmail.com> 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. Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com> 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 --- drivers/gpu/drm/drm_irq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index 5c27ad3..fb17c45 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@ -1492,8 +1492,8 @@ void drm_vblank_on(struct drm_device *dev, unsigned int pipe) * re-enable interrupts if there are users left, or the * user wishes vblank interrupts to be enabled all the time. */ - if (atomic_read(&vblank->refcount) != 0 || - (!dev->vblank_disable_immediate && drm_vblank_offdelay == 0)) + if (atomic_read(&vblank->refcount) != 0 || drm_vblank_offdelay == 0 || + (!dev->vblank_disable_immediate && drm_vblank_offdelay > 0)) WARN_ON(drm_vblank_enable(dev, pipe)); spin_unlock_irqrestore(&dev->vbl_lock, irqflags); } -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Mario Kleiner <mario.kleiner.de@gmail.com> To: dri-devel@lists.freedesktop.org Cc: mario.kleiner.de@gmail.com, linux@bernd-steinhauser.de, stable@vger.kernel.org, michel@daenzer.net, vbabka@suse.cz, ville.syrjala@linux.intel.com, daniel.vetter@ffwll.ch, alexander.deucher@amd.com, christian.koenig@amd.com Subject: [PATCH 4/6] drm: Fix treatment of drm_vblank_offdelay in drm_vblank_on() Date: Mon, 8 Feb 2016 02:13:27 +0100 [thread overview] Message-ID: <1454894009-15466-5-git-send-email-mario.kleiner.de@gmail.com> (raw) In-Reply-To: <1454894009-15466-1-git-send-email-mario.kleiner.de@gmail.com> 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. Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com> 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 --- drivers/gpu/drm/drm_irq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index 5c27ad3..fb17c45 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@ -1492,8 +1492,8 @@ void drm_vblank_on(struct drm_device *dev, unsigned int pipe) * re-enable interrupts if there are users left, or the * user wishes vblank interrupts to be enabled all the time. */ - if (atomic_read(&vblank->refcount) != 0 || - (!dev->vblank_disable_immediate && drm_vblank_offdelay == 0)) + if (atomic_read(&vblank->refcount) != 0 || drm_vblank_offdelay == 0 || + (!dev->vblank_disable_immediate && drm_vblank_offdelay > 0)) WARN_ON(drm_vblank_enable(dev, pipe)); spin_unlock_irqrestore(&dev->vbl_lock, irqflags); } -- 1.9.1
next prev parent reply other threads:[~2016-02-08 1:14 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-02-08 1:13 drm vblank regression fixes for Linux 4.4+ Mario Kleiner 2016-02-08 1:13 ` [PATCH 1/6] drm: No-Op redundant calls to drm_vblank_off() Mario Kleiner 2016-02-08 1:13 ` Mario Kleiner 2016-02-09 9:54 ` Daniel Vetter 2016-02-09 9:54 ` Daniel Vetter 2016-02-09 13:27 ` Mario Kleiner 2016-02-08 1:13 ` [PATCH 2/6] drm: Prevent vblank counter bumps > 1 with active vblank clients Mario Kleiner 2016-02-08 1:13 ` Mario Kleiner 2016-02-09 9:56 ` Daniel Vetter 2016-02-09 9:56 ` Daniel Vetter 2016-02-09 10:07 ` Ville Syrjälä 2016-02-09 10:07 ` Ville Syrjälä 2016-02-09 10:23 ` Daniel Vetter 2016-02-09 10:23 ` Daniel Vetter 2016-02-09 13:39 ` Mario Kleiner 2016-02-09 13:39 ` Mario Kleiner 2016-02-09 14:29 ` Daniel Vetter 2016-02-09 14:29 ` Daniel Vetter 2016-02-09 16:18 ` Mario Kleiner 2016-02-09 16:18 ` Mario Kleiner 2016-02-08 1:13 ` [PATCH 3/6] drm: Fix drm_vblank_pre/post_modeset regression from Linux 4.4 Mario Kleiner 2016-02-08 1:13 ` Mario Kleiner 2016-02-09 10:00 ` Daniel Vetter 2016-02-11 13:03 ` Vlastimil Babka 2016-02-08 1:13 ` Mario Kleiner [this message] 2016-02-08 1:13 ` [PATCH 4/6] drm: Fix treatment of drm_vblank_offdelay in drm_vblank_on() Mario Kleiner 2016-02-09 10:06 ` Daniel Vetter 2016-02-09 10:06 ` Daniel Vetter 2016-02-09 11:10 ` Ville Syrjälä 2016-02-09 11:10 ` Ville Syrjälä 2016-02-09 13:29 ` Mario Kleiner 2016-02-09 13:29 ` Mario Kleiner 2016-02-09 13:41 ` Ville Syrjälä 2016-02-09 13:41 ` Ville Syrjälä 2016-02-09 14:31 ` Daniel Vetter 2016-02-09 14:31 ` Daniel Vetter 2016-02-08 1:13 ` [PATCH 5/6] drm: Prevent vblank counter jumps with timestamp based update method Mario Kleiner 2016-02-08 1:13 ` Mario Kleiner 2016-02-09 10:09 ` Daniel Vetter 2016-02-09 13:53 ` Mario Kleiner 2016-02-09 14:11 ` Ville Syrjälä 2016-02-09 14:11 ` Ville Syrjälä 2016-02-09 15:03 ` Daniel Vetter 2016-02-09 15:03 ` Daniel Vetter 2016-02-10 16:28 ` Mario Kleiner 2016-02-10 16:28 ` Mario Kleiner 2016-02-10 17:17 ` Daniel Vetter 2016-02-10 18:36 ` Mario Kleiner 2016-02-10 19:34 ` Daniel Vetter 2016-02-10 19:34 ` Daniel Vetter 2016-02-08 1:13 ` [PATCH 6/6] drm/radeon/pm: Handle failure of drm_vblank_get Mario Kleiner 2016-02-09 10:10 ` Daniel Vetter
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1454894009-15466-5-git-send-email-mario.kleiner.de@gmail.com \ --to=mario.kleiner.de@gmail.com \ --cc=alexander.deucher@amd.com \ --cc=christian.koenig@amd.com \ --cc=daniel.vetter@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=linux@bernd-steinhauser.de \ --cc=michel@daenzer.net \ --cc=stable@vger.kernel.org \ --cc=vbabka@suse.cz \ --cc=ville.syrjala@linux.intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.