From: Harry Wentland Subject: [PATCH 02/31] drm/amd/display: Don't call PSR func if DMCU is off Date: Fri, 12 May 2017 11:20:35 -0400 Message-ID: <20170512152104.5354-3-harry.wentland@amd.com> References: <20170512152104.5354-1-harry.wentland@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170512152104.5354-1-harry.wentland-5C7GfCeVMHo@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Harry Wentland Q2hhbmdlLUlkOiBJM2U1YjRmOTU0MjlhOTU5ZDA5ODFiYTU3ZjIzYmQ0ZDlmYzYwYTYwNApTaWdu ZWQtb2ZmLWJ5OiBIYXJyeSBXZW50bGFuZCA8aGFycnkud2VudGxhbmRAYW1kLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kY19saW5rLmMgICB8ICA4IC0tLS0t LS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlL2RjZV9hYm0uYyAgICB8IDIz ICsrKysrKysrKysrKysrKy0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMv ZGNlL2RjZV9jbG9ja3MuYyB8IDExICsrKysrKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Rp c3BsYXkvZGMvaW5jL2h3L2FibS5oICAgICB8ICAxICsKIDQgZmlsZXMgY2hhbmdlZCwgMjQgaW5z ZXJ0aW9ucygrKSwgMTkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2FtZC9kaXNwbGF5L2RjL2NvcmUvZGNfbGluay5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNw bGF5L2RjL2NvcmUvZGNfbGluay5jCmluZGV4IDZmNzg0MDNlMmQ2NC4uOTVkMDQyYTE1NDA5IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kY19saW5rLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGNfbGluay5jCkBAIC00 NiwxNCArNDYsNiBAQAogI2luY2x1ZGUgImRjZS9kY2VfMTFfMF9lbnVtLmgiCiAjaW5jbHVkZSAi ZGNlL2RjZV8xMV8wX3NoX21hc2suaCIKIAotI2lmbmRlZiBtbURNQ1VfU1RBVFVTX19VQ19JTl9S RVNFVF9fU0hJRlQKLSNkZWZpbmUgbW1ETUNVX1NUQVRVU19fVUNfSU5fUkVTRVRfX1NISUZUIDB4 MAotI2VuZGlmCi0KLSNpZm5kZWYgbW1ETUNVX1NUQVRVU19fVUNfSU5fUkVTRVRfTUFTSwotI2Rl ZmluZSBtbURNQ1VfU1RBVFVTX19VQ19JTl9SRVNFVF9NQVNLIDB4MDAwMDAwMDFMCi0jZW5kaWYK LQogI2RlZmluZSBMSU5LX0lORk8oLi4uKSBcCiAJZG1fbG9nZ2VyX3dyaXRlKGRjX2N0eC0+bG9n Z2VyLCBMT0dfSFdfSE9UUExVRywgXAogCQlfX1ZBX0FSR1NfXykKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2UvZGNlX2FibS5jIGIvZHJpdmVycy9ncHUvZHJt L2FtZC9kaXNwbGF5L2RjL2RjZS9kY2VfYWJtLmMKaW5kZXggNDVhMzA3OWMwOTczLi4zOTNjNDM1 NTk4MjUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2UvZGNl X2FibS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2UvZGNlX2FibS5j CkBAIC0zNjYsNiArMzY2LDE2IEBAIHN0YXRpYyBib29sIGRjZV9hYm1faW5pdF9iYWNrbGlnaHQo c3RydWN0IGFibSAqYWJtKQogCXJldHVybiB0cnVlOwogfQogCitzdGF0aWMgYm9vbCBpc19kbWN1 X2luaXRpYWxpemVkKHN0cnVjdCBhYm0gKmFibSkKK3sKKwlzdHJ1Y3QgZGNlX2FibSAqYWJtX2Rj ZSA9IFRPX0RDRV9BQk0oYWJtKTsKKwl1bnNpZ25lZCBpbnQgZG1jdV91Y19yZXNldDsKKworCVJF R19HRVQoRE1DVV9TVEFUVVMsIFVDX0lOX1JFU0VULCAmZG1jdV91Y19yZXNldCk7CisKKwlyZXR1 cm4gIWRtY3VfdWNfcmVzZXQ7Cit9CisKIHN0YXRpYyBib29sIGRjZV9hYm1fc2V0X2JhY2tsaWdo dF9sZXZlbCgKIAkJc3RydWN0IGFibSAqYWJtLAogCQl1bnNpZ25lZCBpbnQgYmFja2xpZ2h0X2xl dmVsLApAQCAtMzczLDIzICszODMsMTkgQEAgc3RhdGljIGJvb2wgZGNlX2FibV9zZXRfYmFja2xp Z2h0X2xldmVsKAogCQl1bnNpZ25lZCBpbnQgY29udHJvbGxlcl9pZCkKIHsKIAlzdHJ1Y3QgZGNl X2FibSAqYWJtX2RjZSA9IFRPX0RDRV9BQk0oYWJtKTsKLQl1bnNpZ25lZCBpbnQgZG1jdV91Y19y ZXNldDsKIAogCWRtX2xvZ2dlcl93cml0ZShhYm0tPmN0eC0+bG9nZ2VyLCBMT0dfQkFDS0xJR0hU LAogCQkJIk5ldyBCYWNrbGlnaHQgbGV2ZWw6ICVkICgweCVYKVxuIiwKIAkJCWJhY2tsaWdodF9s ZXZlbCwgYmFja2xpZ2h0X2xldmVsKTsKIAotCVJFR19HRVQoRE1DVV9TVEFUVVMsIFVDX0lOX1JF U0VULCAmZG1jdV91Y19yZXNldCk7Ci0KIAkvKiBJZiBETUNVIGlzIGluIHJlc2V0IHN0YXRlLCBE TUNVIGlzIHVuaW5pdGlhbGl6ZWQgKi8KLQlpZiAoZG1jdV91Y19yZXNldCkgewotCQlkcml2ZXJf c2V0X2JhY2tsaWdodF9sZXZlbChhYm1fZGNlLCBiYWNrbGlnaHRfbGV2ZWwpOwotCX0gZWxzZSB7 CisJaWYgKGlzX2RtY3VfaW5pdGlhbGl6ZWQoYWJtKSkKIAkJZG1jdV9zZXRfYmFja2xpZ2h0X2xl dmVsKGFibV9kY2UsCiAJCQkJYmFja2xpZ2h0X2xldmVsLAogCQkJCWZyYW1lX3JhbXAsCiAJCQkJ Y29udHJvbGxlcl9pZCk7Ci0JfQorCWVsc2UKKwkJZHJpdmVyX3NldF9iYWNrbGlnaHRfbGV2ZWwo YWJtX2RjZSwgYmFja2xpZ2h0X2xldmVsKTsKIAogCXJldHVybiB0cnVlOwogfQpAQCAtMzk4LDcg KzQwNCw4IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgYWJtX2Z1bmNzIGRjZV9mdW5jcyA9IHsKIAku YWJtX2luaXQgPSBkY2VfYWJtX2luaXQsCiAJLnNldF9hYm1fbGV2ZWwgPSBkY2VfYWJtX3NldF9s ZXZlbCwKIAkuaW5pdF9iYWNrbGlnaHQgPSBkY2VfYWJtX2luaXRfYmFja2xpZ2h0LAotCS5zZXRf YmFja2xpZ2h0X2xldmVsID0gZGNlX2FibV9zZXRfYmFja2xpZ2h0X2xldmVsCisJLnNldF9iYWNr bGlnaHRfbGV2ZWwgPSBkY2VfYWJtX3NldF9iYWNrbGlnaHRfbGV2ZWwsCisJLmlzX2RtY3VfaW5p dGlhbGl6ZWQgPSBpc19kbWN1X2luaXRpYWxpemVkCiB9OwogCiBzdGF0aWMgdm9pZCBkY2VfYWJt X2NvbnN0cnVjdCgKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9k Y2UvZGNlX2Nsb2Nrcy5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZS9kY2Vf Y2xvY2tzLmMKaW5kZXggNmU1NmQ4MzA4ZDY2Li44YmMwZDBmZjNhMmUgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2UvZGNlX2Nsb2Nrcy5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2UvZGNlX2Nsb2Nrcy5jCkBAIC0yOSwxMSArMjks MTUgQEAKICNpbmNsdWRlICJmaXhlZDMyXzMyLmgiCiAjaW5jbHVkZSAiYmlvc19wYXJzZXJfaW50 ZXJmYWNlLmgiCiAjaW5jbHVkZSAiZGMuaCIKKyNpbmNsdWRlICJjb3JlX2RjLmgiCisjaW5jbHVk ZSAiZGNlX2FibS5oIgogI2lmIGRlZmluZWQoQ09ORklHX0RSTV9BTURfRENfRENOMV8wKQogI2lu Y2x1ZGUgImRjbl9jYWxjcy5oIgogI2luY2x1ZGUgImNvcmVfZGMuaCIKICNlbmRpZgogCisKKwog I2RlZmluZSBUT19EQ0VfQ0xPQ0tTKGNsb2NrcylcCiAJY29udGFpbmVyX29mKGNsb2Nrcywgc3Ry dWN0IGRjZV9kaXNwX2NsaywgYmFzZSkKIApAQCAtMzc0LDYgKzM3OCw4IEBAIHN0YXRpYyB2b2lk IGRjZTExMl9zZXRfY2xvY2soCiAJc3RydWN0IGRjZV9kaXNwX2NsayAqY2xrX2RjZSA9IFRPX0RD RV9DTE9DS1MoY2xrKTsKIAlzdHJ1Y3QgYnBfc2V0X2RjZV9jbG9ja19wYXJhbWV0ZXJzIGRjZV9j bGtfcGFyYW1zOwogCXN0cnVjdCBkY19iaW9zICpicCA9IGNsay0+Y3R4LT5kY19iaW9zOworCXN0 cnVjdCBjb3JlX2RjICpjb3JlX2RjID0gRENfVE9fQ09SRShjbGstPmN0eC0+ZGMpOworCXN0cnVj dCBhYm0gKmFibSA9ICBjb3JlX2RjLT5yZXNfcG9vbC0+YWJtOwogCiAJLyogUHJlcGFyZSB0byBw cm9ncmFtIGRpc3BsYXkgY2xvY2sqLwogCW1lbXNldCgmZGNlX2Nsa19wYXJhbXMsIDAsIHNpemVv ZihkY2VfY2xrX3BhcmFtcykpOwpAQCAtNDA0LDkgKzQxMCw4IEBAIHN0YXRpYyB2b2lkIGRjZTEx Ml9zZXRfY2xvY2soCiAKIAlicC0+ZnVuY3MtPnNldF9kY2VfY2xvY2soYnAsICZkY2VfY2xrX3Bh cmFtcyk7CiAKLSNpZiBkZWZpbmVkKENPTkZJR19EUk1fQU1EX0RDX0RDTjFfMCkKLQlkY2VfcHNy X3dhaXRfbG9vcChjbGtfZGNlLCByZXF1ZXN0ZWRfY2xrX2toeik7Ci0jZW5kaWYKKwlpZiAoYWJt LT5mdW5jcy0+aXNfZG1jdV9pbml0aWFsaXplZChhYm0pKQorCQlkY2VfcHNyX3dhaXRfbG9vcChj bGtfZGNlLCByZXF1ZXN0ZWRfY2xrX2toeik7CiAKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2FtZC9kaXNwbGF5L2RjL2luYy9ody9hYm0uaCBiL2RyaXZlcnMvZ3B1L2RybS9hbWQv ZGlzcGxheS9kYy9pbmMvaHcvYWJtLmgKaW5kZXggN2QwN2I3OTIyMzkxLi5jZWFiYmQzYmY1Zjgg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9pbmMvaHcvYWJtLmgK KysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2luYy9ody9hYm0uaApAQCAtNDAs NiArNDAsNyBAQCBzdHJ1Y3QgYWJtX2Z1bmNzIHsKIAkJCXVuc2lnbmVkIGludCBiYWNrbGlnaHRf bGV2ZWwsCiAJCQl1bnNpZ25lZCBpbnQgZnJhbWVfcmFtcCwKIAkJCXVuc2lnbmVkIGludCBjb250 cm9sbGVyX2lkKTsKKwlib29sICgqaXNfZG1jdV9pbml0aWFsaXplZCkoc3RydWN0IGFibSAqYWJt KTsKIH07CiAKICNlbmRpZgotLSAKMi4xMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2FtZC1nZngK