From: Harry Wentland Subject: [PATCH 037/120] drm/amd/display: separate plane disable sequence Date: Wed, 9 Aug 2017 11:01:23 -0400 Message-ID: <20170809150246.8835-38-harry.wentland@amd.com> References: <20170809150246.8835-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: <20170809150246.8835-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: Tony Cheng RnJvbTogVG9ueSBDaGVuZyA8dG9ueS5jaGVuZ0BhbWQuY29tPgoKLSBkaXNjb25uZWN0OiAgdHJp Z2dlciBodyB0byBkaXNjb25uZWN0IHBsYW5lIG9uIG5leHQgdnN5bmMKLSBkaXNhYmxlOiBkaXNh YmxlcyBIVyBibG9jayBhbmQgZGlzYWJsZSBjbG9ja3MKLSBwb3dlcl9kb3duOiBraWxsIHBvd2Vy CgpDaGFuZ2UtSWQ6IEliZTE0MjQ3Mzc3Y2JkODE5MzE5OGU3Zjc4NDk3NDg4ZDIwNTliODBjClNp Z25lZC1vZmYtYnk6IFRvbnkgQ2hlbmcgPHRvbnkuY2hlbmdAYW1kLmNvbT4KUmV2aWV3ZWQtYnk6 IEVyaWMgWWFuZyA8ZXJpYy55YW5nMkBhbWQuY29tPgpBY2tlZC1ieTogSGFycnkgV2VudGxhbmQg PEhhcnJ5LldlbnRsYW5kQGFtZC5jb20+Ci0tLQogLi4uL2RybS9hbWQvZGlzcGxheS9kYy9kY24x MC9kY24xMF9od19zZXF1ZW5jZXIuYyAgfCA4MyArKysrKysrKysrKysrKysrLS0tLS0tCiAxIGZp bGUgY2hhbmdlZCwgNjEgaW5zZXJ0aW9ucygrKSwgMjIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjbjEwL2RjbjEwX2h3X3NlcXVlbmNl ci5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjbjEwL2RjbjEwX2h3X3NlcXVl bmNlci5jCmluZGV4IGMyNWEzOTIxNDExMS4uM2EwZmNhYWQ4NGMyIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNuMTAvZGNuMTBfaHdfc2VxdWVuY2VyLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjbjEwL2RjbjEwX2h3X3NlcXVlbmNl ci5jCkBAIC04MTUsOCArODE1LDggQEAgc3RhdGljIHZvaWQgcmVzZXRfYmFja19lbmRfZm9yX3Bp cGUoCiAJCQkJCXBpcGVfY3R4LT5waXBlX2lkeCwgcGlwZV9jdHgtPnRnLT5pbnN0KTsKIH0KIAot c3RhdGljIHZvaWQgcGxhbmVfYXRvbWljX3N0b3AoCi0JCXN0cnVjdCBjb3JlX2RjICpkYywKKy8q IHRyaWdnZXIgSFcgdG8gc3RhcnQgZGlzY29ubmVjdCBwbGFuZSBmcm9tIHN0cmVhbSBvbiB0aGUg bmV4dCB2c3luYyAqLworc3RhdGljIHZvaWQgcGxhbmVfYXRvbWljX2Rpc2Nvbm5lY3Qoc3RydWN0 IGNvcmVfZGMgKmRjLAogCQlpbnQgZmVfaWR4KQogewogCXN0cnVjdCBtcGNjX2NmZyBtcGNjX2Nm ZzsKQEAgLTgyNCw2ICs4MjQsMTIgQEAgc3RhdGljIHZvaWQgcGxhbmVfYXRvbWljX3N0b3AoCiAJ c3RydWN0IHRyYW5zZm9ybSAqeGZtID0gZGMtPnJlc19wb29sLT50cmFuc2Zvcm1zW2ZlX2lkeF07 CiAJc3RydWN0IG1wY2MgKm1wY2MgPSBkYy0+cmVzX3Bvb2wtPm1wY2NbZmVfaWR4XTsKIAlzdHJ1 Y3QgdGltaW5nX2dlbmVyYXRvciAqdGcgPSBkYy0+cmVzX3Bvb2wtPnRpbWluZ19nZW5lcmF0b3Jz W21wY2MtPm9wcF9pZF07CisJdW5zaWduZWQgaW50IG9wcF9pZCA9IG1wY2MtPm9wcF9pZDsKKwlp bnQgb3BwX2lkX2NhY2hlZCA9IG1wY2MtPm9wcF9pZDsKKworCS8qQWxyZWFkeSByZXNldCovCisJ aWYgKG9wcF9pZCA9PSAweGYpCisJCXJldHVybjsKIAogCW1pLT5mdW5jcy0+ZGNjX2NvbnRyb2wo bWksIGZhbHNlLCBmYWxzZSk7CiAKQEAgLTgzMywxMSArODM5LDE5IEBAIHN0YXRpYyB2b2lkIHBs YW5lX2F0b21pY19zdG9wKAogCW1wY2NfY2ZnLnRvcF9vZl90cmVlID0gdGctPmluc3QgPT0gbXBj Yy0+aW5zdDsKIAltcGNjLT5mdW5jcy0+c2V0KG1wY2MsICZtcGNjX2NmZyk7CiAKKwkvKiBIYWNr IHRvIHByZXNlcnZlIG9sZCBvcHBfaWQgZm9yIHBsYW5lX2F0b21pY19kaXNhYmxlCisJICogdG8g ZmluZCB0aGUgY29ycmVjdCBvdGcgKi8KKwltcGNjLT5vcHBfaWQgPSBvcHBfaWRfY2FjaGVkOwor CisJLyogdG9kbzpjYWxsIHJlbW92ZSBwaXBlIGZyb20gdHJlZSAqLworCS8qIGZsYWcgbXBjYyBp ZGxlIHBlbmRpbmcgKi8KKwogCXhmbS0+ZnVuY3MtPnRyYW5zZm9ybV9yZXNldCh4Zm0pOwogfQog Ci1zdGF0aWMgdm9pZCByZXNldF9mcm9udF9lbmQoCi0JCXN0cnVjdCBjb3JlX2RjICpkYywKKy8q IGRpc2FibGUgSFcgdXNlZCBieSBwbGFuZS4KKyAqIG5vdGU6ICBjYW5ub3QgZGlzYWJsZSB1bnRp bCBkaXNjb25uZWN0IGlzIGNvbXBsZXRlICovCitzdGF0aWMgdm9pZCBwbGFuZV9hdG9taWNfZGlz YWJsZShzdHJ1Y3QgY29yZV9kYyAqZGMsCiAJCWludCBmZV9pZHgpCiB7CiAJc3RydWN0IGRjZV9o d3NlcSAqaHdzID0gZGMtPmh3c2VxOwpAQCAtODQ2LDI0ICs4NjAsOSBAQCBzdGF0aWMgdm9pZCBy ZXNldF9mcm9udF9lbmQoCiAJc3RydWN0IHRpbWluZ19nZW5lcmF0b3IgKnRnID0gZGMtPnJlc19w b29sLT50aW1pbmdfZ2VuZXJhdG9yc1ttcGNjLT5vcHBfaWRdOwogCXVuc2lnbmVkIGludCBvcHBf aWQgPSBtcGNjLT5vcHBfaWQ7CiAKLQkvKkFscmVhZHkgcmVzZXQqLwogCWlmIChvcHBfaWQgPT0g MHhmKQogCQlyZXR1cm47CiAKLQl0Zy0+ZnVuY3MtPmxvY2sodGcpOwotCi0JcGxhbmVfYXRvbWlj X3N0b3AoZGMsIGZlX2lkeCk7Ci0KLQlSRUdfVVBEQVRFKE9UR19HTE9CQUxfU1lOQ19TVEFUVVNb dGctPmluc3RdLCBWVVBEQVRFX05PX0xPQ0tfRVZFTlRfQ0xFQVIsIDEpOwotCXRnLT5mdW5jcy0+ dW5sb2NrKHRnKTsKLQotCWlmIChkYy0+cHVibGljLmRlYnVnLnNhbml0eV9jaGVja3MpCi0JCXZl cmlmeV9hbGxvd19wc3RhdGVfY2hhbmdlX2hpZ2goZGMtPmh3c2VxKTsKLQotCWlmICh0Zy0+Y3R4 LT5kY2VfZW52aXJvbm1lbnQgIT0gRENFX0VOVl9GUEdBX01BWElNVVMpCi0JCVJFR19XQUlUKE9U R19HTE9CQUxfU1lOQ19TVEFUVVNbdGctPmluc3RdLAotCQkJCVZVUERBVEVfTk9fTE9DS19FVkVO VF9PQ0NVUlJFRCwgMSwgMjAwMDAsIDIwMDAwMCk7Ci0KIAltcGNjLT5mdW5jcy0+d2FpdF9mb3Jf aWRsZShtcGNjKTsKIAogCW1pLT5mdW5jcy0+c2V0X2JsYW5rKG1pLCB0cnVlKTsKQEAgLTg4MCwx NCArODc5LDU0IEBAIHN0YXRpYyB2b2lkIHJlc2V0X2Zyb250X2VuZCgKIAkJUkVHX1VQREFURShP UFBfUElQRV9DT05UUk9MW29wcF9pZF0sCiAJCQkJT1BQX1BJUEVfQ0xPQ0tfRU4sIDApOwogCi0J ZG1fbG9nZ2VyX3dyaXRlKGRjLT5jdHgtPmxvZ2dlciwgTE9HX0RDLAotCQkJCQkiUmVzZXQgZnJv bnQgZW5kICVkXG4iLAotCQkJCQlmZV9pZHgpOworCW1wY2MtPm9wcF9pZCA9IDB4ZjsKIAogCWlm IChkYy0+cHVibGljLmRlYnVnLnNhbml0eV9jaGVja3MpCiAJCXZlcmlmeV9hbGxvd19wc3RhdGVf Y2hhbmdlX2hpZ2goZGMtPmh3c2VxKTsKIH0KIAorLyoga2lsbCBwb3dlciB0byBwbGFuZSBodwor ICogbm90ZTogY2Fubm90IHBvd2VyIGRvd24gdW50aWwgcGxhbmUgaXMgZGlzYWJsZQorc3RhdGlj IHZvaWQgcGxhbmVfYXRvbWljX3Bvd2VyX2Rvd24oKQoreworCit9CisqLworCitzdGF0aWMgdm9p ZCByZXNldF9mcm9udF9lbmQoCisJCXN0cnVjdCBjb3JlX2RjICpkYywKKwkJaW50IGZlX2lkeCkK K3sKKwlzdHJ1Y3QgZGNlX2h3c2VxICpod3MgPSBkYy0+aHdzZXE7CisJc3RydWN0IG1wY2MgKm1w Y2MgPSBkYy0+cmVzX3Bvb2wtPm1wY2NbZmVfaWR4XTsKKwlzdHJ1Y3QgdGltaW5nX2dlbmVyYXRv ciAqdGcgPSBkYy0+cmVzX3Bvb2wtPnRpbWluZ19nZW5lcmF0b3JzW21wY2MtPm9wcF9pZF07CisJ dW5zaWduZWQgaW50IG9wcF9pZCA9IG1wY2MtPm9wcF9pZDsKKworCS8qQWxyZWFkeSByZXNldCov CisJaWYgKG9wcF9pZCA9PSAweGYpCisJCXJldHVybjsKKworCXRnLT5mdW5jcy0+bG9jayh0Zyk7 CisKKwlwbGFuZV9hdG9taWNfZGlzY29ubmVjdChkYywgZmVfaWR4KTsKKworCVJFR19VUERBVEUo T1RHX0dMT0JBTF9TWU5DX1NUQVRVU1t0Zy0+aW5zdF0sIFZVUERBVEVfTk9fTE9DS19FVkVOVF9D TEVBUiwgMSk7CisJdGctPmZ1bmNzLT51bmxvY2sodGcpOworCisJaWYgKGRjLT5wdWJsaWMuZGVi dWcuc2FuaXR5X2NoZWNrcykKKwkJdmVyaWZ5X2FsbG93X3BzdGF0ZV9jaGFuZ2VfaGlnaChkYy0+ aHdzZXEpOworCisJaWYgKHRnLT5jdHgtPmRjZV9lbnZpcm9ubWVudCAhPSBEQ0VfRU5WX0ZQR0Ff TUFYSU1VUykKKwkJUkVHX1dBSVQoT1RHX0dMT0JBTF9TWU5DX1NUQVRVU1t0Zy0+aW5zdF0sCisJ CQkJVlVQREFURV9OT19MT0NLX0VWRU5UX09DQ1VSUkVELCAxLCAyMDAwMCwgMjAwMDAwKTsKKwor CXBsYW5lX2F0b21pY19kaXNhYmxlKGRjLCBmZV9pZHgpOworCisJZG1fbG9nZ2VyX3dyaXRlKGRj LT5jdHgtPmxvZ2dlciwgTE9HX0RDLAorCQkJCQkiUmVzZXQgZnJvbnQgZW5kICVkXG4iLAorCQkJ CQlmZV9pZHgpOworfQorCiBzdGF0aWMgdm9pZCBkY24xMF9wb3dlcl9kb3duX2ZlKHN0cnVjdCBj b3JlX2RjICpkYywgaW50IGZlX2lkeCkKIHsKIAlzdHJ1Y3QgZGNlX2h3c2VxICpod3MgPSBkYy0+ aHdzZXE7Ci0tIAoyLjExLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdm eAo=