From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kroah-Hartman Subject: [PATCH 4.4 232/342] drm: Fix treatment of drm_vblank_offdelay in drm_vblank_on() (v2) Date: Tue, 01 Mar 2016 23:55:01 +0000 Message-ID: <20160301234535.419474625@linuxfoundation.org> References: <20160301234527.990448862@linuxfoundation.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail333.us4.mandrillapp.com (mail333.us4.mandrillapp.com [205.201.137.77]) by gabe.freedesktop.org (Postfix) with ESMTPS id DB2276E10B for ; Wed, 2 Mar 2016 00:24:50 +0000 (UTC) Received: from pmta03.dal05.mailchimp.com (127.0.0.1) by mail333.us4.mandrillapp.com id hqopd4174noe for ; Tue, 1 Mar 2016 23:55:01 +0000 (envelope-from ) In-Reply-To: <20160301234527.990448862@linuxfoundation.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org Cc: dri-devel@lists.freedesktop.org, Greg Kroah-Hartman , michel@daenzer.net, stable@vger.kernel.org, Daniel Vetter , alexander.deucher@amd.com, Dave Airlie , christian.koenig@amd.com, vbabka@suse.cz List-Id: dri-devel@lists.freedesktop.org NC40LXN0YWJsZSByZXZpZXcgcGF0Y2guICBJZiBhbnlvbmUgaGFzIGFueSBvYmplY3Rpb25zLCBw bGVhc2UgbGV0IG1lIGtub3cuCgotLS0tLS0tLS0tLS0tLS0tLS0KCkZyb206IE1hcmlvIEtsZWlu ZXIgPG1hcmlvLmtsZWluZXIuZGVAZ21haWwuY29tPgoKY29tbWl0IGJiNzRmYzFiZjMwNzJiZDNh YjRlZDVmNDNhZmQyODdhNjNiYWYyZDcgdXBzdHJlYW0uCgpkcm1fdmJsYW5rX29mZmRlbGF5IGNh biBoYXZlIHRocmVlIGRpZmZlcmVudCB0eXBlcyBvZiB2YWx1ZXM6Cgo8IDAgaXMgdG8gYmUgYWx3 YXlzIHRyZWF0ZWQgdGhlIHNhbWUgYXMgZGV2LT52YmxhbmtfZGlzYWJsZV9pbW1lZGlhdGUKPSAw IGlzIHRvIGJlIHRyZWF0ZWQgYXMgIm5ldmVyIGRpc2FibGUgdmJsYW5rcyIKPiAwIGlzIHRvIGJl IHRyZWF0ZWQgYXMgZGlzYWJsZSBpbW1lZGlhdGUgaWYga21zIGRyaXZlciB3YW50cyBpdAogICAg dGhhdCB3YXkgdmlhIGRldi0+dmJsYW5rX2Rpc2FibGVfaW1tZWRpYXRlLiBPdGhlcndpc2UgaXQg aXMKICAgIGEgZGlzYWJsZSB0aW1lb3V0IGluIG1zZWNzLgoKVGhpcyBnb3QgYnJva2VuIGluIExp bnV4IDMuMTgrIGZvciB0aGUgaW1wbGVtZW50YXRpb24gb2YKZHJtX3ZibGFua19vbi4gSWYgdGhl IHVzZXIgc3BlY2lmaWVkIGEgdmFsdWUgb2YgemVybyB3aGljaCBzaG91bGQKYWx3YXlzIHJlZW5h YmxlIHZibGFuayBpcnFzIGluIHRoaXMgZnVuY3Rpb24sIGEga21zIGRyaXZlciBjb3VsZApvdmVy cmlkZSB0aGUgdXNlcnMgY2hvaWNlIGJ5IHNldHRpbmcgdmJsYW5rX2Rpc2FibGVfaW1tZWRpYXRl CnRvIHRydWUuIFRoaXMgcGF0Y2ggZml4ZXMgdGhlIHJlZ3Jlc3Npb24gYW5kIGtlZXBzIHRoZSB1 c2VyIGluCmNvbnRyb2wuCgp2MjogT25seSByZWVuYWJsZSB2YmxhbmsgaWYgdGhlcmUgYXJlIGNs aWVudHMgbGVmdCBvciB0aGUgdXNlcgogICAgcmVxdWVzdGVkIHRvICJuZXZlciBkaXNhYmxlIHZi bGFua3MiIHZpYSBvZmZkZWxheSAwLiBFbmFibGluZwogICAgdmJsYW5rcyBldmVuIGluIHRoZSAi ZGVsYXllZCBkaXNhYmxlIiBjYXNlIChvZmZkZWxheSA+IDApIHdhcwogICAgc3BlY2lmaWNhbGx5 IGFkZGVkIGJ5IFZpbGxlIGluIGNvbW1pdCBjZDE5ZTUyYWVlOTIyCiAgICAoImRybTogS2ljayBz dGFydCB2YmxhbmsgaW50ZXJydXB0cyBhdCBkcm1fdmJsYW5rX29uKCkiKSwKICAgIGJ1dCBhZnRl ciBkaXNjdXNzaW9uIGl0IHR1cm5zIG91dCB0aGF0IHRoaXMgd2FzIGRvbmUgYnkgYWNjaWRlbnQu CgogICAgQ2l0aW5nIFZpbGxlOiAiSSB0aGluayBpdCBqdXN0IGVuZGVkIHVwIGFzIGEgbWVzcyBk dWUgdG8gY2hhbmdpbmcKICAgIHNvbWUgb2YgdGhlIHNlbWFudGljcyBvZiBvZmZkZWxheTwwIHZz LiBvZmZkZWxheT09MCB2cy4KICAgIGRpc2FibGVfaW1tZWRpYXRlIGR1cmluZyB0aGUgcmV2aWV3 IG9mIHRoZSBzZXJpZXMuIFNvIHllYWgsIGdpdmVuCiAgICBob3cgZHJtX3ZibGFua19wdXQoKSB3 b3JrcyBub3csIEknZCBqdXN0IG1ha2UgdGhpcyBjaGVjayBmb3IKICAgIG9mZmRlbGF5PT0wLiIK ClNpZ25lZC1vZmYtYnk6IE1hcmlvIEtsZWluZXIgPG1hcmlvLmtsZWluZXIuZGVAZ21haWwuY29t PgpSZXZpZXdlZC1ieTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KQ2M6 IG1pY2hlbEBkYWVuemVyLm5ldApDYzogdmJhYmthQHN1c2UuY3oKQ2M6IHZpbGxlLnN5cmphbGFA bGludXguaW50ZWwuY29tCkNjOiBkYW5pZWwudmV0dGVyQGZmd2xsLmNoCkNjOiBkcmktZGV2ZWxA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCkNjOiBhbGV4YW5kZXIuZGV1Y2hlckBhbWQuY29tCkNjOiBj aHJpc3RpYW4ua29lbmlnQGFtZC5jb20KU2lnbmVkLW9mZi1ieTogRGF2ZSBBaXJsaWUgPGFpcmxp ZWRAcmVkaGF0LmNvbT4KU2lnbmVkLW9mZi1ieTogR3JlZyBLcm9haC1IYXJ0bWFuIDxncmVna2hA bGludXhmb3VuZGF0aW9uLm9yZz4KCi0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9pcnEuYyB8ICAg IDMgKy0tCiAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDIgZGVsZXRpb25zKC0pCgot LS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2lycS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1f aXJxLmMKQEAgLTE0OTQsOCArMTQ5NCw3IEBAIHZvaWQgZHJtX3ZibGFua19vbihzdHJ1Y3QgZHJt X2RldmljZSAqZGUKIAkgKiByZS1lbmFibGUgaW50ZXJydXB0cyBpZiB0aGVyZSBhcmUgdXNlcnMg bGVmdCwgb3IgdGhlCiAJICogdXNlciB3aXNoZXMgdmJsYW5rIGludGVycnVwdHMgdG8gYmUgZW5h YmxlZCBhbGwgdGhlIHRpbWUuCiAJICovCi0JaWYgKGF0b21pY19yZWFkKCZ2YmxhbmstPnJlZmNv dW50KSAhPSAwIHx8Ci0JICAgICghZGV2LT52YmxhbmtfZGlzYWJsZV9pbW1lZGlhdGUgJiYgZHJt X3ZibGFua19vZmZkZWxheSA9PSAwKSkKKwlpZiAoYXRvbWljX3JlYWQoJnZibGFuay0+cmVmY291 bnQpICE9IDAgfHwgZHJtX3ZibGFua19vZmZkZWxheSA9PSAwKQogCQlXQVJOX09OKGRybV92Ymxh bmtfZW5hYmxlKGRldiwgcGlwZSkpOwogCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmRldi0+dmJs X2xvY2ssIGlycWZsYWdzKTsKIH0KX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v ZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753463AbcCBAeq (ORCPT ); Tue, 1 Mar 2016 19:34:46 -0500 Received: from mail177-1.suw61.mandrillapp.com ([198.2.177.1]:27939 "EHLO mail177-1.suw61.mandrillapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756269AbcCAX5U (ORCPT ); Tue, 1 Mar 2016 18:57:20 -0500 From: Greg Kroah-Hartman Subject: [PATCH 4.4 232/342] drm: Fix treatment of drm_vblank_offdelay in drm_vblank_on() (v2) X-Mailer: git-send-email 2.7.2 To: Cc: Greg Kroah-Hartman , , Mario Kleiner , Daniel Vetter , , , , , , , Dave Airlie Message-Id: <20160301234535.419474625@linuxfoundation.org> In-Reply-To: <20160301234527.990448862@linuxfoundation.org> References: <20160301234527.990448862@linuxfoundation.org> X-Report-Abuse: Please forward a copy of this message, including all headers, to abuse@mandrill.com X-Report-Abuse: You can also report abuse here: http://mandrillapp.com/contact/abuse?id=30481620.e6aada45d89446e1ab116f46c461c8b4 X-Mandrill-User: md_30481620 Date: Tue, 01 Mar 2016 23:55:00 +0000 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mario Kleiner commit bb74fc1bf3072bd3ab4ed5f43afd287a63baf2d7 upstream. 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 Reviewed-by: Daniel Vetter 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 Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/drm_irq.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@ -1494,8 +1494,7 @@ void drm_vblank_on(struct drm_device *de * 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) WARN_ON(drm_vblank_enable(dev, pipe)); spin_unlock_irqrestore(&dev->vbl_lock, irqflags); }