From: Harry Wentland Subject: [PATCH 04/31] drm/amd/display: Disable ABM when eDP is disabled Date: Tue, 23 May 2017 10:08:42 -0400 Message-ID: <20170523140909.9924-5-harry.wentland@amd.com> References: <20170523140909.9924-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: <20170523140909.9924-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: Amy Zhang RnJvbTogQW15IFpoYW5nIDxBbXkuWmhhbmdAYW1kLmNvbT4KCi0gQWRkIGltbWVkaWF0ZSBBQk0g ZGlzYWJsZSB3aGVuIGVEUCBpcyBkaXNhYmxlZAotIEZpeCBwdXJwbGUgc2NyZWVuIHdoZW4gQUJN IGlzIG1pc3Rha2VubHkgZW5hYmxlZApvbiBub24gZURQIGRpc3BsYXkKCkNoYW5nZS1JZDogSWZm MDk4MDdmNzA1MTEyNmJhOTViMDQzMDYxYTJmN2IxNjAwYjM0YTIKU2lnbmVkLW9mZi1ieTogQW15 IFpoYW5nIDxBbXkuWmhhbmdAYW1kLmNvbT4KUmV2aWV3ZWQtYnk6IFRvbnkgQ2hlbmcgPFRvbnku Q2hlbmdAYW1kLmNvbT4KQWNrZWQtYnk6IEhhcnJ5IFdlbnRsYW5kIDxIYXJyeS5XZW50bGFuZEBh bWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX2xpbmsu YyB8IDE2ICsrKysrKysrKysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9k Yy5oICAgICAgICAgICB8ICAyICsrCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNl L2RjZV9hYm0uYyAgfCAyMSArKysrKysrKysrKysrKysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9h bWQvZGlzcGxheS9kYy9pbmMvaHcvYWJtLmggICB8ICAxICsKIDQgZmlsZXMgY2hhbmdlZCwgNDAg aW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9k Yy9jb3JlL2RjX2xpbmsuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2Rj X2xpbmsuYwppbmRleCBmZmMwZWVhYWQxNzUuLjU5OTc3NjQwZjkzOCAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGNfbGluay5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX2xpbmsuYwpAQCAtMTQxNSw2ICsxNDE1LDIy IEBAIGJvb2wgZGNfbGlua19zZXRfYmFja2xpZ2h0X2xldmVsKGNvbnN0IHN0cnVjdCBkY19saW5r ICpkY19saW5rLCB1aW50MzJfdCBsZXZlbCwKIAlyZXR1cm4gdHJ1ZTsKIH0KIAorCitib29sIGRj X2xpbmtfc2V0X2FibV9kaXNhYmxlKGNvbnN0IHN0cnVjdCBkY19saW5rICpkY19saW5rKQorewor CXN0cnVjdCBjb3JlX2xpbmsgKmxpbmsgPSBEQ19MSU5LX1RPX0NPUkUoZGNfbGluayk7CisJc3Ry dWN0IGNvcmVfZGMgKmNvcmVfZGMgPSBEQ19UT19DT1JFKGxpbmstPmN0eC0+ZGMpOworCXN0cnVj dCBhYm0gKmFibSA9IGNvcmVfZGMtPnJlc19wb29sLT5hYm07CisKKwlpZiAoKGFibSA9PSBOVUxM KSB8fCAoYWJtLT5mdW5jcy0+c2V0X2JhY2tsaWdodF9sZXZlbCA9PSBOVUxMKSkKKwkJcmV0dXJu IGZhbHNlOworCisJYWJtLT5mdW5jcy0+c2V0X2FibV9pbW1lZGlhdGVfZGlzYWJsZShhYm0pOwor CisJcmV0dXJuIHRydWU7Cit9CisKKwogYm9vbCBkY19saW5rX3NldF9wc3JfZW5hYmxlKGNvbnN0 IHN0cnVjdCBkY19saW5rICpkY19saW5rLCBib29sIGVuYWJsZSkKIHsKIAlzdHJ1Y3QgY29yZV9s aW5rICpsaW5rID0gRENfTElOS19UT19DT1JFKGRjX2xpbmspOwpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjLmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3Bs YXkvZGMvZGMuaAppbmRleCA5YTE5ZDZmNWE2YTMuLjA2MTA4MDVjZGIwNSAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjLmgKKysrIGIvZHJpdmVycy9ncHUvZHJt L2FtZC9kaXNwbGF5L2RjL2RjLmgKQEAgLTcxNCw2ICs3MTQsOCBAQCBjb25zdCBzdHJ1Y3QgZ3Jh cGhpY3Nfb2JqZWN0X2lkIGRjX2dldF9saW5rX2lkX2F0X2luZGV4KAogYm9vbCBkY19saW5rX3Nl dF9iYWNrbGlnaHRfbGV2ZWwoY29uc3Qgc3RydWN0IGRjX2xpbmsgKmRjX2xpbmssIHVpbnQzMl90 IGxldmVsLAogCQl1aW50MzJfdCBmcmFtZV9yYW1wLCBjb25zdCBzdHJ1Y3QgZGNfc3RyZWFtICpz dHJlYW0pOwogCitib29sIGRjX2xpbmtfc2V0X2FibV9kaXNhYmxlKGNvbnN0IHN0cnVjdCBkY19s aW5rICpkY19saW5rKTsKKwogYm9vbCBkY19saW5rX3NldF9wc3JfZW5hYmxlKGNvbnN0IHN0cnVj dCBkY19saW5rICpkY19saW5rLCBib29sIGVuYWJsZSk7CiAKIGJvb2wgZGNfbGlua19zZXR1cF9w c3IoY29uc3Qgc3RydWN0IGRjX2xpbmsgKmRjX2xpbmssCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlL2RjZV9hYm0uYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQv ZGlzcGxheS9kYy9kY2UvZGNlX2FibS5jCmluZGV4IGNlZmZmZTE2NGZlMC4uYjRmYTc4MjkyYWQy IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlL2RjZV9hYm0u YworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlL2RjZV9hYm0uYwpAQCAt NDksNiArNDksOCBAQAogI2RlZmluZSBNQ1BfQUJNX1BJUEVfU0VUIDB4NjYKICNkZWZpbmUgTUNQ X0JMX1NFVCAweDY3CiAKKyNkZWZpbmUgTUNQX0RJU0FCTEVfQUJNX0lNTUVESUFURUxZIDI1NQor CiBzdHJ1Y3QgYWJtX2JhY2tsaWdodF9yZWdpc3RlcnMgewogCXVuc2lnbmVkIGludCBCTF9QV01f Q05UTDsKIAl1bnNpZ25lZCBpbnQgQkxfUFdNX0NOVEwyOwpAQCAtMzE1LDYgKzMxNywyNCBAQCBz dGF0aWMgYm9vbCBkY2VfYWJtX3NldF9sZXZlbChzdHJ1Y3QgYWJtICphYm0sIHVpbnQzMl90IGxl dmVsKQogCXJldHVybiB0cnVlOwogfQogCitzdGF0aWMgYm9vbCBkY2VfYWJtX2ltbWVkaWF0ZV9k aXNhYmxlKHN0cnVjdCBhYm0gKmFibSkKK3sKKwlzdHJ1Y3QgZGNlX2FibSAqYWJtX2RjZSA9IFRP X0RDRV9BQk0oYWJtKTsKKworCVJFR19XQUlUKE1BU1RFUl9DT01NX0NOVExfUkVHLCBNQVNURVJf Q09NTV9JTlRFUlJVUFQsIDAsCisJCQkxMDAsIDgwMCk7CisKKwkvKiBzZXRETUNVUGFyYW1fQUJN TGV2ZWwgKi8KKwlSRUdfVVBEQVRFXzIoTUFTVEVSX0NPTU1fQ01EX1JFRywKKwkJCU1BU1RFUl9D T01NX0NNRF9SRUdfQllURTAsIE1DUF9BQk1fTEVWRUxfU0VULAorCQkJTUFTVEVSX0NPTU1fQ01E X1JFR19CWVRFMiwgTUNQX0RJU0FCTEVfQUJNX0lNTUVESUFURUxZKTsKKworCS8qIG5vdGlmeURN Q1VNc2cgKi8KKwlSRUdfVVBEQVRFKE1BU1RFUl9DT01NX0NOVExfUkVHLCBNQVNURVJfQ09NTV9J TlRFUlJVUFQsIDEpOworCisJcmV0dXJuIHRydWU7Cit9CisKIHN0YXRpYyBib29sIGRjZV9hYm1f aW5pdF9iYWNrbGlnaHQoc3RydWN0IGFibSAqYWJtKQogewogCXN0cnVjdCBkY2VfYWJtICphYm1f ZGNlID0gVE9fRENFX0FCTShhYm0pOwpAQCAtNDE0LDYgKzQzNCw3IEBAIHN0YXRpYyBjb25zdCBz dHJ1Y3QgYWJtX2Z1bmNzIGRjZV9mdW5jcyA9IHsKIAkuaW5pdF9iYWNrbGlnaHQgPSBkY2VfYWJt X2luaXRfYmFja2xpZ2h0LAogCS5zZXRfYmFja2xpZ2h0X2xldmVsID0gZGNlX2FibV9zZXRfYmFj a2xpZ2h0X2xldmVsLAogCS5nZXRfY3VycmVudF9iYWNrbGlnaHRfOF9iaXQgPSBkY2VfYWJtX2dl dF9jdXJyZW50X2JhY2tsaWdodF84X2JpdCwKKwkuc2V0X2FibV9pbW1lZGlhdGVfZGlzYWJsZSA9 IGRjZV9hYm1faW1tZWRpYXRlX2Rpc2FibGUsCiAJLmlzX2RtY3VfaW5pdGlhbGl6ZWQgPSBpc19k bWN1X2luaXRpYWxpemVkCiB9OwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rp c3BsYXkvZGMvaW5jL2h3L2FibS5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2lu Yy9ody9hYm0uaAppbmRleCBkYTQ2NWIzZTk4ZTguLmM5M2I5YjlhODE3YyAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2luYy9ody9hYm0uaAorKysgYi9kcml2ZXJz L2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvaW5jL2h3L2FibS5oCkBAIC0zNSw2ICszNSw3IEBAIHN0 cnVjdCBhYm0gewogc3RydWN0IGFibV9mdW5jcyB7CiAJdm9pZCAoKmFibV9pbml0KShzdHJ1Y3Qg YWJtICphYm0pOwogCWJvb2wgKCpzZXRfYWJtX2xldmVsKShzdHJ1Y3QgYWJtICphYm0sIHVuc2ln bmVkIGludCBhYm1fbGV2ZWwpOworCWJvb2wgKCpzZXRfYWJtX2ltbWVkaWF0ZV9kaXNhYmxlKShz dHJ1Y3QgYWJtICphYm0pOwogCWJvb2wgKCppbml0X2JhY2tsaWdodCkoc3RydWN0IGFibSAqYWJt KTsKIAlib29sICgqc2V0X2JhY2tsaWdodF9sZXZlbCkoc3RydWN0IGFibSAqYWJtLAogCQkJdW5z aWduZWQgaW50IGJhY2tsaWdodF9sZXZlbCwKLS0gCjIuMTEuMAoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==