From: Mika Kuoppala Subject: [PATCH 3/3] drm/i915: Disable PSMI idle messaging when stopping ring Date: Wed, 27 Feb 2019 18:58:50 +0200 Message-ID: <20190227165850.17277-3-mika.kuoppala@linux.intel.com> References: <20190227165850.17277-1-mika.kuoppala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 71C656E0F2 for ; Wed, 27 Feb 2019 16:59:26 +0000 (UTC) In-Reply-To: <20190227165850.17277-1-mika.kuoppala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org SGFyZHdhcmUgY2Fubm90IGJlIGluIGEgbWlkZGxlIG9mIGlkbGUgZmxvdyBtZXNzYWdpbmcKd2hl biB3ZSBwdWxsIHRoZSBwbHVnIGZyb20gcmluZ2J1ZmZlci4gRGlzYWJsZSBpZGxlCm1lc3NhZ2lu ZyBiZWZvcmUgd2UgZG8gc28gdG8gYXZvaWQgcG90ZW50aWFsIGRlYWRsb2NrCm9uIGVuZ2luZSBp bml0aWFsaXphdGlvbiBhbmQgcmVzZXQuCgp2MjogSU5WQUxJRF9NTUlPX1JFRywgdW5jb25kaXRp b25hbCBlbmFibGUgKENocmlzKQoKQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29u LmNvLnVrPgpTaWduZWQtb2ZmLWJ5OiBNaWthIEt1b3BwYWxhIDxtaWthLmt1b3BwYWxhQGxpbnV4 LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVfY3MuYyB8 IDU2ICsrKysrKysrKysrKysrKysrKysrKysrKystCiAxIGZpbGUgY2hhbmdlZCwgNTUgaW5zZXJ0 aW9ucygrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2VuZ2luZV9jcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2Nz LmMKaW5kZXggYThlNDdjZmE2ZTM1Li5mZTdmY2EzOTJiNjMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2VuZ2luZV9jcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2VuZ2luZV9jcy5jCkBAIC03MjUsNyArNzI1LDcgQEAgaW50IGludGVsX2VuZ2luZV9p bml0X2NvbW1vbihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAKIC8qKgogICogaW50 ZWxfZW5naW5lc19jbGVhbnVwX2NvbW1vbiAtIGNsZWFucyB1cCB0aGUgZW5naW5lIHN0YXRlIGNy ZWF0ZWQgYnkKLSAqICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0aGUgY29tbW9uIGlu aXRpYWlsaXplcnMuCisgKiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGhlIGNvbW1v biBpbml0aWFsaXplcnMuCiAgKiBAZW5naW5lOiBFbmdpbmUgdG8gY2xlYW51cC4KICAqCiAgKiBU aGlzIGNsZWFucyB1cCBldmVyeXRoaW5nIGNyZWF0ZWQgYnkgdGhlIGNvbW1vbiBoZWxwZXJzLgpA QCAtODI2LDYgKzgyNiw1NSBAQCB2b2lkIGludGVsX2VuZ2luZV9jYW5jZWxfc3RvcF9jcyhzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJCSAgICAgIF9NQVNLRURfQklUX0RJU0FCTEUo U1RPUF9SSU5HKSk7CiB9CiAKK3N0YXRpYyBpOTE1X3JlZ190IGdldF9pZGxlX3BvbGxfcmVnKGNv bnN0IHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK3sKKwlpZiAoZW5naW5lLT5pZCAh PSBSQ1MpCisJCXJldHVybiBJTlZBTElEX01NSU9fUkVHOworCisJaWYgKElTX0dFTihlbmdpbmUt Pmk5MTUsIDkpKQorCQlyZXR1cm4gR0VOOV9SQ1NfRkVfRlNNMjsKKworCWlmIChJU19HRU4oZW5n aW5lLT5pOTE1LCA4KSkKKwkJcmV0dXJuIEdFTjZfUkNTX1BXUl9GU007CisKKwlyZXR1cm4gSU5W QUxJRF9NTUlPX1JFRzsKK30KKworc3RhdGljIHZvaWQgZGlzYWJsZV9pZGxlX21lc3NhZ2luZyhz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCit7CisJc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gZW5naW5lLT5pOTE1OworCWk5MTVfcmVnX3QgcG9sbF9yZWc7CisKKwlw b2xsX3JlZyA9IGdldF9pZGxlX3BvbGxfcmVnKGVuZ2luZSk7CisJaWYgKCFpOTE1X21taW9fcmVn X3ZhbGlkKHBvbGxfcmVnKSkKKwkJcmV0dXJuOworCisJR0VNX0RFQlVHX1dBUk5fT04oSTkxNV9S RUFEX0ZXKEdFTjZfUkNfU0xFRVBfUFNNSV9DT05UUk9MKSAmCisJCQkgIEdFTjZfUFNNSV9TTEVF UF9NU0dfRElTQUJMRSk7CisKKwlJOTE1X1dSSVRFX0ZXKEdFTjZfUkNfU0xFRVBfUFNNSV9DT05U Uk9MLAorCQkgICAgICBfTUFTS0VEX0JJVF9FTkFCTEUoR0VONl9QU01JX1NMRUVQX01TR19ESVNB QkxFKSk7CisKKwlpZiAoX19pbnRlbF93YWl0X2Zvcl9yZWdpc3Rlcl9mdyhkZXZfcHJpdiwgcG9s bF9yZWcsCisJCQkJCSAweDdmLCAweDMwLAorCQkJCQkgNTAwMCwgMCwKKwkJCQkJIE5VTEwpKQor CQlEUk1fREVCVUdfRFJJVkVSKCJwc21pIGlkbGUgbXNnIHBvbGwgdGltZW91dFxuIik7Cit9CisK K3N0YXRpYyB2b2lkIGVuYWJsZV9pZGxlX21lc3NhZ2luZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICplbmdpbmUpCit7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZW5naW5l LT5pOTE1OworCWk5MTVfcmVnX3QgcG9sbF9yZWc7CisKKwlwb2xsX3JlZyA9IGdldF9pZGxlX3Bv bGxfcmVnKGVuZ2luZSk7CisJaWYgKCFpOTE1X21taW9fcmVnX3ZhbGlkKHBvbGxfcmVnKSkKKwkJ cmV0dXJuOworCisJSTkxNV9XUklURV9GVyhHRU42X1JDX1NMRUVQX1BTTUlfQ09OVFJPTCwKKwkJ ICAgICAgX01BU0tFRF9CSVRfRElTQUJMRShHRU42X1BTTUlfU0xFRVBfTVNHX0RJU0FCTEUpKTsK K30KKwogaW50IGludGVsX2VuZ2luZV9zdG9wX3JpbmdidWZmZXIoc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqZW5naW5lKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGVu Z2luZS0+aTkxNTsKQEAgLTg0MSw5ICs4OTAsMTQgQEAgaW50IGludGVsX2VuZ2luZV9zdG9wX3Jp bmdidWZmZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCUk5MTVfV1JJVEVfRlco UklOR19UQUlMKGJhc2UpLCAwKTsKIAlQT1NUSU5HX1JFQURfRlcoUklOR19UQUlMKGJhc2UpKTsK IAorCS8qIElkbGUgbWVzc2FnaW5nIG5lZWRzIHRvIGJlIG9mZiBkdXJpbmcgcmluZyBkaXNhYmxl ICovCisJZGlzYWJsZV9pZGxlX21lc3NhZ2luZyhlbmdpbmUpOworCiAJLyogVGhlIHJpbmcgbXVz dCBiZSBlbXB0eSBiZWZvcmUgaXQgaXMgZGlzYWJsZWQgKi8KIAlJOTE1X1dSSVRFX0ZXKFJJTkdf Q1RMKGJhc2UpLCAwKTsKIAorCWVuYWJsZV9pZGxlX21lc3NhZ2luZyhlbmdpbmUpOworCiAJLyog Q2hlY2sgYWN0cyBhcyBhIHBvc3QgKi8KIAlpZiAoSTkxNV9SRUFEX0ZXKFJJTkdfSEVBRChiYXNl KSkpIHsKIAkJR0VNX1RSQUNFKCIlczogcmluZyBoZWFkIFsleF0gbm90IHBhcmtlZFxuIiwKLS0g CjIuMTcuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4