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==