From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:52936 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752973AbbL3Wbc (ORCPT ); Wed, 30 Dec 2015 17:31:32 -0500 Message-ID: <1451514677.25978.73.camel@decadent.org.uk> Subject: [PATCH 3.16] drm/i915: Disable PSMI sleep messages on all rings around context switches From: Ben Hutchings To: Luis Henriques Cc: stable , Chris Wilson , Daniel Vetter , Jani Nikula Date: Wed, 30 Dec 2015 22:31:17 +0000 Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-7gILDbutuxQYUwnboH15" Mime-Version: 1.0 Sender: stable-owner@vger.kernel.org List-ID: --=-7gILDbutuxQYUwnboH15 Content-Type: multipart/mixed; boundary="=-EU1zWOgOV8daPirFKggS" --=-EU1zWOgOV8daPirFKggS Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable This fix from 3.19 (commit 2c550183476d) has so far only been applied to 3.18.y, but the bug appears to have been introduced in 3.14 or earlier. =C2=A0There is a positive result of testing on 3.16-ckt here: https://bugs.debian.org/777231 For 3.16-ckt I only made context changes (see attached patch). =C2=A0I gave up trying to backport to 3.14. Ben. --=20 Ben Hutchings This sentence contradicts itself - no actually it doesn't. --=-EU1zWOgOV8daPirFKggS Content-Disposition: attachment; filename="drm-i915-disable-psmi-sleep-messages-on-all-rings-3.16.patch" Content-Type: text/x-patch; name="drm-i915-disable-psmi-sleep-messages-on-all-rings-3.16.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSBkMjMxN2NkZTMzMjU2ZTZlMGYzMDJhZjhlZDhhODg4ZTM1OTIxMjU1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51 az4KRGF0ZTogVHVlLCAxNiBEZWMgMjAxNCAxMDowMjoyNyArMDAwMApTdWJqZWN0OiBbUEFUQ0hd IGRybS9pOTE1OiBEaXNhYmxlIFBTTUkgc2xlZXAgbWVzc2FnZXMgb24gYWxsIHJpbmdzIGFyb3Vu ZAogY29udGV4dCBzd2l0Y2hlcwpNSU1FLVZlcnNpb246IDEuMApDb250ZW50LVR5cGU6IHRleHQv cGxhaW47IGNoYXJzZXQ9VVRGLTgKQ29udGVudC1UcmFuc2Zlci1FbmNvZGluZzogOGJpdAoKY29t bWl0IDJjNTUwMTgzNDc2ZGZhMjU2NDEzMDlhZTlhMjhkMzBmZWVkMTQzNzkgdXBzdHJlYW0uCgpU aGVyZSBleGlzdHMgYSBjdXJyZW50IHdvcmthcm91bmQgdG8gcHJldmVudCBhIGhhbmcgb24gY29u dGV4dCBzd2l0Y2gKc2hvdWxkIHRoZSByaW5nIGdvIHRvIHNsZWVwIGluIHRoZSBtaWRkbGUgb2Yg dGhlIHJlc3RvcmUsCldhUHJvZ3JhbU1pQXJiT25PZmZBcm91bmRNaVNldENvbnRleHQgKGFwcGxp Y2FibGUgdG8gYWxsIGdlbjcrKS4gSW4Kc3BpdGUgb2YgZGlzYWJsaW5nIGFyYml0cmF0aW9uICh3 aGljaCBwcmV2ZW50cyB0aGUgcmluZyBmcm9tIHBvd2VyaW5nCmRvd24gZHVyaW5nIHRoZSBjcml0 aWNhbCBzZWN0aW9uKSB3ZSB3ZXJlIHN0aWxsIGhpdHRpbmcgaGFuZ3MgdGhhdCBoYWQKdGhlIGhh bGxtYXJrcyBvZiB0aGUga25vd24gZXJyYXR1bS4gVGhhdCBpcyB3ZSBhcmUgc3RpbGwgc2VlaW5n IGhhbmdzCiJvbiB0aGUgbGFzdCBpbnN0cnVjdGlvbiBpbiB0aGUgY29udGV4dCByZXN0b3JlIi4g QnkgY29tcGFyaW5nIC1uaWdodGx5Cihicm9rZW4pIHdpdGggcmVxdWVzdHMgKHdvcmtpbmcpLCB3 ZSB3ZXJlIGFibGUgdG8gZGVkdWNlIHRoYXQgaXQgd2FzIHRoZQpzZW1hcGhvcmUgTFJJIGNyb3Nz LXRhbGsgdGhhdCByZXByb2R1Y2VkIHRoZSBvcmlnaW5hbCBmYWlsdXJlLiBUaGUga2V5CndhcyB0 aGF0IHJlcXVlc3RzIGltcGxlbWVudGVkIGRlZmVycmVkIHNlbWFwaG9yZSBzaWduYWxsaW5nLCBh bmQKZGlzYWJsaW5nIHRoYXQsIGkuZS4gZW1pdHRpbmcgdGhlIHNlbWFwaG9yZSBzaWduYWwgdG8g ZXZlcnkgb3RoZXIgcmluZwphZnRlciBldmVyeSBiYXRjaCByZXN0b3JlZCB0aGUgZnJlcXVlbnQg aGFuZy4gIEV4cGxpY2l0bHkgZGlzYWJsaW5nIFBTTUkKc2xlZXAgb24gdGhlIFJDUyByaW5nIHdh cyBpbnN1ZmZpY2llbnQsIGFsbCB0aGUgcmluZ3MgaGFkIHRvIGJlIGF3YWtlIHRvCnByZXZlbnQg dGhlIGhhbmdzLiBGb3J0dW5hdGVseSwgd2UgY2FuIHJlZHVjZSB0aGUgd2FrZWxvY2sgdG8gdGhl Ck1JX1NFVF9DT05URVhUIG9wZXJhdGlvbiBpdHNlbGYsIGFuZCBzbyBzaG91bGQgYmUgYWJsZSB0 byBsaW1pdCB0aGUgZXh0cmEKcG93ZXIgaW1wbGljYXRpb25zLgoKU2luY2UgdGhlIE1JX0FSQl9P Tl9PRkYgd29ya2Fyb3VuZCBpcyBsaXN0ZWQgZm9yIGFsbCBnZW43IGFuZCBhYm92ZQpwcm9kdWN0 cywgd2Ugc2hvdWxkIGFwcGx5IHRoaXMgZXh0cmEgaGFtbWVyIGZvciBhbGwgb2YgdGhlIHNhbWUK cGxhdGZvcm1zIGRlc3BpdGUgc28gZmFyIHRoYXQgd2UgaGF2ZSBvbmx5IGJlZW4gYWJsZSB0byBy ZXByb2R1Y2UgdGhlCmhhbmcgb24gY2VydGFpbiBpdmIgYW5kIGhzdyBtb2RlbHMuIFRoZSBsYXN0 IHF1ZXN0aW9uIGlzIHdoZXRoZXIgd2Ugd2FudAp0byBhbHdheXMgdXNlIHRoZSBleHRyYSBoYW1t ZXIgb3Igb25seSB3aGVuIHdlIGtub3cgc2VtYXBob3JlcyBhcmUgaW4Kb3BlcmF0aW9uLiBBdCB0 aGUgbW9tZW50LCB3ZSBvbmx5IHVzZSBMUkkgb24gbm9uLVJDUyByaW5ncyBmb3IKc2VtYXBob3Jl cywgYnV0IHRoYXQgbWF5IGNoYW5nZSBpbiB0aGUgZnV0dXJlIHdpdGggdGhlIHBvc3NpYmlsaXR5 IG9mCnJlaW50cm9kdWNpbmcgdGhpcyBidWcgdW5kZXIgc3VidGxlIGNvbmRpdGlvbnMuCgp2Mjog TWFrZSBpdCBleHBsaWNpdCB0aGF0IHRoZSBQU01JIExSSSBhcmUgYW4gZXh0ZW5zaW9uIHRvIHRo ZSBvcmlnaW5hbAp3b3JrYXJvdW5kIGZvciB0aGUgb3RoZXIgcmluZ3MuCnYzOiBCaWtlc2hlZGRp bmcgdmFyaWFibGUgbmFtZXMgYW5kIHdoaXRlc3BhY2luZwoKQnVnemlsbGE6IGh0dHBzOi8vYnVn cy5mcmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTgwNjYwCkJ1Z3ppbGxhOiBodHRwczov L2J1Z3MuZnJlZWRlc2t0b3Aub3JnL3Nob3dfYnVnLmNnaT9pZD04MzY3NwpDYzogU2ltb24gRmFy bnN3b3J0aCA8c2ltb25AZmFybnoub3JnLnVrPgpDYzogRGFuaWVsIFZldHRlciA8ZGFuaWVsQGZm d2xsLmNoPgpDYzogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNv bT4KU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ ClRlc3RlZC1ieTogUGV0ZXIgRnLDvGhiZXJnZXIgPGZyaXRzY2hAeGJtYy5vcmc+ClJldmlld2Vk LWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWxAZmZ3bGwuY2g+CkNjOiBzdGFibGVAdmdlci5rZXJu ZWwub3JnClNpZ25lZC1vZmYtYnk6IEphbmkgTmlrdWxhIDxqYW5pLm5pa3VsYUBpbnRlbC5jb20+ Cltid2g6IEJhY2twb3J0ZWQgdG8gMy4xNjogYWRqdXN0IGNvbnRleHRdClNpZ25lZC1vZmYtYnk6 IEJlbiBIdXRjaGluZ3MgPGJlbkBkZWNhZGVudC5vcmcudWs+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fY29udGV4dC5jIHwgNDggKysrKysrKysrKysrKysrKysrKysrKysrKysr LS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oICAgICAgICAgfCAgMiArKwog MiBmaWxlcyBjaGFuZ2VkLCA0MiBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYwppbmRleCBhNWRkZjNiLi4xNGY5MjY0IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCkBAIC01NDUsNyArNTQ1LDEy IEBAIG1pX3NldF9jb250ZXh0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJICAgICAg IHN0cnVjdCBpbnRlbF9jb250ZXh0ICpuZXdfY29udGV4dCwKIAkgICAgICAgdTMyIGh3X2ZsYWdz KQogewotCWludCByZXQ7CisJY29uc3QgaW50IG51bV9yaW5ncyA9CisJCS8qIFVzZSBhbiBleHRl bmRlZCB3L2Egb24gaXZiKyBpZiBzaWduYWxsaW5nIGZyb20gb3RoZXIgcmluZ3MgKi8KKwkJaTkx NV9zZW1hcGhvcmVfaXNfZW5hYmxlZChyaW5nLT5kZXYpID8KKwkJaHdlaWdodDMyKElOVEVMX0lO Rk8ocmluZy0+ZGV2KS0+cmluZ19tYXNrKSAtIDEgOgorCQkwOworCWludCBsZW4sIGksIHJldDsK IAogCS8qIHcvYTogSWYgRmx1c2ggVExCIEludmFsaWRhdGlvbiBNb2RlIGlzIGVuYWJsZWQsIGRy aXZlciBtdXN0IGRvIGEgVExCCiAJICogaW52YWxpZGF0aW9uIHByaW9yIHRvIE1JX1NFVF9DT05U RVhULiBPbiBHRU42IHdlIGRvbid0IHNldCB0aGUgdmFsdWUKQEAgLTU1OCwxNSArNTYzLDMxIEBA IG1pX3NldF9jb250ZXh0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJCQlyZXR1cm4g cmV0OwogCX0KIAotCXJldCA9IGludGVsX3JpbmdfYmVnaW4ocmluZywgNik7CisKKwlsZW4gPSA0 OworCWlmIChJTlRFTF9JTkZPKHJpbmctPmRldiktPmdlbiA+PSA3KQorCQlsZW4gKz0gMiArIChu dW1fcmluZ3MgPyA0Km51bV9yaW5ncyArIDIgOiAwKTsKKworCXJldCA9IGludGVsX3JpbmdfYmVn aW4ocmluZywgbGVuKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCiAJLyogV2FQcm9ncmFt TWlBcmJPbk9mZkFyb3VuZE1pU2V0Q29udGV4dDppdmIsdmx2LGhzdyxiZHcsY2h2ICovCi0JaWYg KElOVEVMX0lORk8ocmluZy0+ZGV2KS0+Z2VuID49IDcpCisJaWYgKElOVEVMX0lORk8ocmluZy0+ ZGV2KS0+Z2VuID49IDcpIHsKIAkJaW50ZWxfcmluZ19lbWl0KHJpbmcsIE1JX0FSQl9PTl9PRkYg fCBNSV9BUkJfRElTQUJMRSk7Ci0JZWxzZQotCQlpbnRlbF9yaW5nX2VtaXQocmluZywgTUlfTk9P UCk7CisJCWlmIChudW1fcmluZ3MpIHsKKwkJCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnNpZ25h bGxlcjsKKworCQkJaW50ZWxfcmluZ19lbWl0KHJpbmcsIE1JX0xPQURfUkVHSVNURVJfSU1NKG51 bV9yaW5ncykpOworCQkJZm9yX2VhY2hfcmluZyhzaWduYWxsZXIsIHRvX2k5MTUocmluZy0+ZGV2 KSwgaSkgeworCQkJCWlmIChzaWduYWxsZXIgPT0gcmluZykKKwkJCQkJY29udGludWU7CisKKwkJ CQlpbnRlbF9yaW5nX2VtaXQocmluZywgUklOR19QU01JX0NUTChzaWduYWxsZXItPm1taW9fYmFz ZSkpOworCQkJCWludGVsX3JpbmdfZW1pdChyaW5nLCBfTUFTS0VEX0JJVF9FTkFCTEUoR0VONl9Q U01JX1NMRUVQX01TR19ESVNBQkxFKSk7CisJCQl9CisJCX0KKwl9CiAKIAlpbnRlbF9yaW5nX2Vt aXQocmluZywgTUlfTk9PUCk7CiAJaW50ZWxfcmluZ19lbWl0KHJpbmcsIE1JX1NFVF9DT05URVhU KTsKQEAgLTU4MSwxMCArNjAyLDIxIEBAIG1pX3NldF9jb250ZXh0KHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKnJpbmcsCiAJICovCiAJaW50ZWxfcmluZ19lbWl0KHJpbmcsIE1JX05PT1ApOwogCi0J aWYgKElOVEVMX0lORk8ocmluZy0+ZGV2KS0+Z2VuID49IDcpCisJaWYgKElOVEVMX0lORk8ocmlu Zy0+ZGV2KS0+Z2VuID49IDcpIHsKKwkJaWYgKG51bV9yaW5ncykgeworCQkJc3RydWN0IGludGVs X2VuZ2luZV9jcyAqc2lnbmFsbGVyOworCisJCQlpbnRlbF9yaW5nX2VtaXQocmluZywgTUlfTE9B RF9SRUdJU1RFUl9JTU0obnVtX3JpbmdzKSk7CisJCQlmb3JfZWFjaF9yaW5nKHNpZ25hbGxlciwg dG9faTkxNShyaW5nLT5kZXYpLCBpKSB7CisJCQkJaWYgKHNpZ25hbGxlciA9PSByaW5nKQorCQkJ CQljb250aW51ZTsKKworCQkJCWludGVsX3JpbmdfZW1pdChyaW5nLCBSSU5HX1BTTUlfQ1RMKHNp Z25hbGxlci0+bW1pb19iYXNlKSk7CisJCQkJaW50ZWxfcmluZ19lbWl0KHJpbmcsIF9NQVNLRURf QklUX0RJU0FCTEUoR0VONl9QU01JX1NMRUVQX01TR19ESVNBQkxFKSk7CisJCQl9CisJCX0KIAkJ aW50ZWxfcmluZ19lbWl0KHJpbmcsIE1JX0FSQl9PTl9PRkYgfCBNSV9BUkJfRU5BQkxFKTsKLQll bHNlCi0JCWludGVsX3JpbmdfZW1pdChyaW5nLCBNSV9OT09QKTsKKwl9CiAKIAlpbnRlbF9yaW5n X2FkdmFuY2UocmluZyk7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf cmVnLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCmluZGV4IGZhMGVjNWEuLjgx OTY0MDggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaApAQCAtOTc4LDYgKzk3OCw3IEBAIGVudW0g cHVuaXRfcG93ZXJfd2VsbCB7CiAjZGVmaW5lIEdFTjZfVkVSU1lOQwkoUklOR19TWU5DXzEoVkVC T1hfUklOR19CQVNFKSkKICNkZWZpbmUgR0VONl9WRVZTWU5DCShSSU5HX1NZTkNfMihWRUJPWF9S SU5HX0JBU0UpKQogI2RlZmluZSBHRU42X05PU1lOQyAwCisjZGVmaW5lIFJJTkdfUFNNSV9DVEwo YmFzZSkJKChiYXNlKSsweDUwKQogI2RlZmluZSBSSU5HX01BWF9JRExFKGJhc2UpCSgoYmFzZSkr MHg1NCkKICNkZWZpbmUgUklOR19IV1NfUEdBKGJhc2UpCSgoYmFzZSkrMHg4MCkKICNkZWZpbmUg UklOR19IV1NfUEdBX0dFTjYoYmFzZSkJKChiYXNlKSsweDIwODApCkBAIC0xMzAxLDYgKzEzMDIs NyBAQCBlbnVtIHB1bml0X3Bvd2VyX3dlbGwgewogI2RlZmluZSAgIEdFTjZfQkxJVFRFUl9GQkNf Tk9USUZZCQkJKDE8PDMpCiAKICNkZWZpbmUgR0VONl9SQ19TTEVFUF9QU01JX0NPTlRST0wJMHgy MDUwCisjZGVmaW5lICAgR0VONl9QU01JX1NMRUVQX01TR19ESVNBQkxFCSgxIDw8IDApCiAjZGVm aW5lICAgR0VOOF9SQ19TRU1BX0lETEVfTVNHX0RJU0FCTEUJKDEgPDwgMTIpCiAjZGVmaW5lICAg R0VOOF9GRl9ET1BfQ0xPQ0tfR0FURV9ESVNBQkxFCSgxPDwxMCkKIAo= --=-EU1zWOgOV8daPirFKggS-- --=-7gILDbutuxQYUwnboH15 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIVAwUAVoRbNee/yOyVhhEJAQqjWA/8DnaqqqH1U1VKkVbmiH6g1cOOY4qEG+5F bzDNEyPQ3ckJKoidjaan+ns/+UCmupvVvIBBGweGBVFeuwV3A9vr8ilQWORq0vlq 8og7tNOM4olTeSDikQq073abe3CpCuP7AFgCaTie/YOZtmbSw+ZGegKkF0NEl7Uv xBOmwn0/NQnMLSN91q0FQ+NbJ/ytFGO1KFv66UoF5lrfQeJBkdPWZ0RrBxE8JMXC BPY1PdwKVTWEKP/MGrRlEqa7JwtE6IXUUpJ2BxptAAgCkq/gID9lrwHnEcAtf6gv pfGqt8r20SShrwrAwYjAT5cxnjNRTA6I+1iWVHsjkaWp+rO6q61AAUtvXG5CoGXL 6ddYJ21iftjSHKxOA9SgYGfSkenYzFLLE5kteYLW2F38qliqyERj9D3AAq7LdQQy 7wMAto06cYKSm+FR06lIA3z9ybzjKuSrI6h0azwOCZ1FTo/PtP6MpClWzDyeWP/C AfPTBKMrk+MXAJ5eYYF7i41G+MenKNdDash+/0QcLsAM6d6Q96p0VcJXUrWO2Fcj luhumNAvYvT9eOoUpCrL2efe7RJnu2QK9wb8YRqQwypOOnXr+5ymnj1UbltgevWt UmRE9KC+xGDy7h6NTOE2YGsiMWjvUKBPWu3qJB+oW5OjD+nVHs2qexGDzxuwxnyK KwwPKtih/+4= =Ne2D -----END PGP SIGNATURE----- --=-7gILDbutuxQYUwnboH15--