From: Subject: [PATCH 28/81] drm/amd/display: Hook dm private state into atomic_check Date: Tue, 25 Jul 2017 09:53:48 -0400 Message-ID: <1500990881-6100-29-git-send-email-sunpeng.li@amd.com> References: <1500990881-6100-1-git-send-email-sunpeng.li@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1500990881-6100-1-git-send-email-sunpeng.li-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 RnJvbTogSGFycnkgV2VudGxhbmQgPGhhcnJ5LndlbnRsYW5kQGFtZC5jb20+CgpDaGFuZ2UtSWQ6 IElhMzlmZjEzOGU2NDRlNmNiZTBhY2FlZjc1NWE4Yzc3YmI1YzU5MTljClNpZ25lZC1vZmYtYnk6 IEhhcnJ5IFdlbnRsYW5kIDxoYXJyeS53ZW50bGFuZEBhbWQuY29tPgpSZXZpZXdlZC1ieTogVG9u eSBDaGVuZyA8VG9ueS5DaGVuZ0BhbWQuY29tPgpBY2tlZC1ieTogSGFycnkgV2VudGxhbmQgPEhh cnJ5LldlbnRsYW5kQGFtZC5jb20+Ci0tLQogLi4uL2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0v YW1kZ3B1X2RtX3R5cGVzLmMgICAgfCA2NCArKysrKysrKysrKy0tLS0tLS0tLS0tCiAuLi4vZHJt L2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG1fdHlwZXMuaCAgICB8ICA1ICsrCiAyIGZp bGVzIGNoYW5nZWQsIDM3IGluc2VydGlvbnMoKyksIDMyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtX3R5cGVz LmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbV90eXBl cy5jCmluZGV4IGVkNDhjNWUuLjUyZDE5MjIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtX3R5cGVzLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG1fdHlwZXMuYwpAQCAtMzEyNiwxNSAr MzEyNiwxNCBAQCBzdGF0aWMgaW50IGRvX2FxdWlyZV9nbG9iYWxfbG9jaygKIGludCBhbWRncHVf ZG1fYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQlzdHJ1Y3QgZHJtX2F0 b21pY19zdGF0ZSAqc3RhdGUpCiB7CisJc3RydWN0IGRtX2F0b21pY19zdGF0ZSAqZG1fc3RhdGU7 CiAJc3RydWN0IGRybV9jcnRjICpjcnRjOwogCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19z dGF0ZTsKIAlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZTsKIAlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRl ICpwbGFuZV9zdGF0ZTsKIAlpbnQgaSwgajsKIAlpbnQgcmV0OwotCWludCBzZXRfY291bnQ7CiAJ aW50IG5ld19zdHJlYW1fY291bnQ7Ci0Jc3RydWN0IGRjX3ZhbGlkYXRpb25fc2V0IHNldFtNQVhf U1RSRUFNU10gPSB7eyAwIH19OwogCXN0cnVjdCBkY19zdHJlYW0gKm5ld19zdHJlYW1zW01BWF9T VFJFQU1TXSA9IHsgMCB9OwogCXN0cnVjdCBkcm1fY3J0YyAqY3J0Y19zZXRbTUFYX1NUUkVBTVNd ID0geyAwIH07CiAJc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYgPSBkZXYtPmRldl9wcml2YXRl OwpAQCAtMzE1OSwxNyArMzE1OCwxOSBAQCBpbnQgYW1kZ3B1X2RtX2F0b21pY19jaGVjayhzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LAogCiAJcmV0ID0gLUVJTlZBTDsKIAorCWRtX3N0YXRlID0gdG9f ZG1fYXRvbWljX3N0YXRlKHN0YXRlKTsKKwogCS8qIGNvcHkgZXhpc3RpbmcgY29uZmlndXJhdGlv biAqLwogCW5ld19zdHJlYW1fY291bnQgPSAwOwotCXNldF9jb3VudCA9IDA7CisJZG1fc3RhdGUt PnNldF9jb3VudCA9IDA7CiAJbGlzdF9mb3JfZWFjaF9lbnRyeShjcnRjLCAmZGV2LT5tb2RlX2Nv bmZpZy5jcnRjX2xpc3QsIGhlYWQpIHsKIAogCQlzdHJ1Y3QgYW1kZ3B1X2NydGMgKmFjcnRjID0g dG9fYW1kZ3B1X2NydGMoY3J0Yyk7CiAKIAkJaWYgKGFjcnRjLT5zdHJlYW0pIHsKLQkJCXNldFtz ZXRfY291bnRdLnN0cmVhbSA9IGFjcnRjLT5zdHJlYW07Ci0JCQljcnRjX3NldFtzZXRfY291bnRd ID0gY3J0YzsKLQkJCSsrc2V0X2NvdW50OworCQkJZG1fc3RhdGUtPnNldFtkbV9zdGF0ZS0+c2V0 X2NvdW50XS5zdHJlYW0gPSBhY3J0Yy0+c3RyZWFtOworCQkJY3J0Y19zZXRbZG1fc3RhdGUtPnNl dF9jb3VudF0gPSBjcnRjOworCQkJKytkbV9zdGF0ZS0+c2V0X2NvdW50OwogCQl9CiAJfQogCkBA IC0zMTk4LDE2ICszMTk5LDE2IEBAIGludCBhbWRncHVfZG1fYXRvbWljX2NoZWNrKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsCiAKIAkJCXN0cnVjdCBkY19zdHJlYW0gKm5ld19zdHJlYW0gPSBOVUxM OwogCQkJc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5fc3RhdGUgPSBOVUxMOwotCQkJ c3RydWN0IGRtX2Nvbm5lY3Rvcl9zdGF0ZSAqZG1fc3RhdGUgPSBOVUxMOworCQkJc3RydWN0IGRt X2Nvbm5lY3Rvcl9zdGF0ZSAqZG1fY29ubl9zdGF0ZSA9IE5VTEw7CiAKIAkJCWlmIChhY29ubmVj dG9yKSB7CiAJCQkJY29ubl9zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X2Nvbm5lY3Rvcl9zdGF0ZShz dGF0ZSwgJmFjb25uZWN0b3ItPmJhc2UpOwogCQkJCWlmIChJU19FUlIoY29ubl9zdGF0ZSkpCiAJ CQkJCXJldHVybiByZXQ7Ci0JCQkJZG1fc3RhdGUgPSB0b19kbV9jb25uZWN0b3Jfc3RhdGUoY29u bl9zdGF0ZSk7CisJCQkJZG1fY29ubl9zdGF0ZSA9IHRvX2RtX2Nvbm5lY3Rvcl9zdGF0ZShjb25u X3N0YXRlKTsKIAkJCX0KIAotCQkJbmV3X3N0cmVhbSA9IGNyZWF0ZV9zdHJlYW1fZm9yX3Npbmso YWNvbm5lY3RvciwgJmNydGNfc3RhdGUtPm1vZGUsIGRtX3N0YXRlKTsKKwkJCW5ld19zdHJlYW0g PSBjcmVhdGVfc3RyZWFtX2Zvcl9zaW5rKGFjb25uZWN0b3IsICZjcnRjX3N0YXRlLT5tb2RlLCBk bV9jb25uX3N0YXRlKTsKIAogCQkJLyoKIAkJCSAqIHdlIGNhbiBoYXZlIG5vIHN0cmVhbSBvbiBB Q1RJT05fU0VUIGlmIGEgZGlzcGxheQpAQCAtMzIyMiwxMCArMzIyMywxMCBAQCBpbnQgYW1kZ3B1 X2RtX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJfQogCiAJCQluZXdf c3RyZWFtc1tuZXdfc3RyZWFtX2NvdW50XSA9IG5ld19zdHJlYW07Ci0JCQlzZXRfY291bnQgPSB1 cGRhdGVfaW5fdmFsX3NldHNfc3RyZWFtKAotCQkJCQlzZXQsCisJCQlkbV9zdGF0ZS0+c2V0X2Nv dW50ID0gdXBkYXRlX2luX3ZhbF9zZXRzX3N0cmVhbSgKKwkJCQkJZG1fc3RhdGUtPnNldCwKIAkJ CQkJY3J0Y19zZXQsCi0JCQkJCXNldF9jb3VudCwKKwkJCQkJZG1fc3RhdGUtPnNldF9jb3VudCwK IAkJCQkJYWNydGMtPnN0cmVhbSwKIAkJCQkJbmV3X3N0cmVhbSwKIAkJCQkJY3J0Yyk7CkBAIC0z MjM4LDkgKzMyMzksOSBAQCBpbnQgYW1kZ3B1X2RtX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LAogCiAJCQkvKiBpLmUuIHJlc2V0IG1vZGUgKi8KIAkJCWlmIChhY3J0Yy0+c3Ry ZWFtKSB7Ci0JCQkJc2V0X2NvdW50ID0gcmVtb3ZlX2Zyb21fdmFsX3NldHMoCi0JCQkJCQlzZXQs Ci0JCQkJCQlzZXRfY291bnQsCisJCQkJZG1fc3RhdGUtPnNldF9jb3VudCA9IHJlbW92ZV9mcm9t X3ZhbF9zZXRzKAorCQkJCQkJZG1fc3RhdGUtPnNldCwKKwkJCQkJCWRtX3N0YXRlLT5zZXRfY291 bnQsCiAJCQkJCQlhY3J0Yy0+c3RyZWFtKTsKIAkJCQlhcXVpcmVfZ2xvYmFsX2xvY2sgPSB0cnVl OwogCQkJfQpAQCAtMzI5MSwxMCArMzI5MiwxMCBAQCBpbnQgYW1kZ3B1X2RtX2F0b21pY19jaGVj ayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQl9CiAKIAkJbmV3X3N0cmVhbXNbbmV3X3N0cmVh bV9jb3VudF0gPSBuZXdfc3RyZWFtOwotCQlzZXRfY291bnQgPSB1cGRhdGVfaW5fdmFsX3NldHNf c3RyZWFtKAotCQkJCXNldCwKKwkJZG1fc3RhdGUtPnNldF9jb3VudCA9IHVwZGF0ZV9pbl92YWxf c2V0c19zdHJlYW0oCisJCQkJZG1fc3RhdGUtPnNldCwKIAkJCQljcnRjX3NldCwKLQkJCQlzZXRf Y291bnQsCisJCQkJZG1fc3RhdGUtPnNldF9jb3VudCwKIAkJCQlhY3J0Yy0+c3RyZWFtLAogCQkJ CW5ld19zdHJlYW0sCiAJCQkJJmFjcnRjLT5iYXNlKTsKQEAgLTMzMDQsMTIgKzMzMDUsMTIgQEAg aW50IGFtZGdwdV9kbV9hdG9taWNfY2hlY2soc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJYXF1 aXJlX2dsb2JhbF9sb2NrID0gdHJ1ZTsKIAl9CiAKLQlmb3IgKGkgPSAwOyBpIDwgc2V0X2NvdW50 OyBpKyspIHsKKwlmb3IgKGkgPSAwOyBpIDwgZG1fc3RhdGUtPnNldF9jb3VudDsgaSsrKSB7CiAJ CWZvcl9lYWNoX3BsYW5lX2luX3N0YXRlKHN0YXRlLCBwbGFuZSwgcGxhbmVfc3RhdGUsIGopIHsK IAkJCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IHBsYW5lX3N0YXRlLT5jcnRjOwogCQkJc3RydWN0 IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSBwbGFuZV9zdGF0ZS0+ZmI7CiAJCQlzdHJ1Y3QgZHJtX2Nv bm5lY3RvciAqY29ubmVjdG9yOwotCQkJc3RydWN0IGRtX2Nvbm5lY3Rvcl9zdGF0ZSAqZG1fc3Rh dGUgPSBOVUxMOworCQkJc3RydWN0IGRtX2Nvbm5lY3Rvcl9zdGF0ZSAqZG1fY29ubl9zdGF0ZSA9 IE5VTEw7CiAJCQlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7CiAJCQlib29sIHBm bGlwX25lZWRlZDsKIApAQCAtMzMzMCw3ICszMzMxLDcgQEAgaW50IGFtZGdwdV9kbV9hdG9taWNf Y2hlY2soc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCQlsaXN0X2Zvcl9lYWNoX2VudHJ5KGNv bm5lY3RvciwKIAkJCQkJJmRldi0+bW9kZV9jb25maWcuY29ubmVjdG9yX2xpc3QsIGhlYWQpCXsK IAkJCQkJaWYgKGNvbm5lY3Rvci0+c3RhdGUtPmNydGMgPT0gY3J0YykgewotCQkJCQkJZG1fc3Rh dGUgPSB0b19kbV9jb25uZWN0b3Jfc3RhdGUoCisJCQkJCQlkbV9jb25uX3N0YXRlID0gdG9fZG1f Y29ubmVjdG9yX3N0YXRlKAogCQkJCQkJCWNvbm5lY3Rvci0+c3RhdGUpOwogCQkJCQkJYnJlYWs7 CiAJCQkJCX0KQEAgLTMzNTAsNyArMzM1MSw3IEBAIGludCBhbWRncHVfZG1fYXRvbWljX2NoZWNr KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJICogQWxzbyBpdCBzaG91bGQgYmUgbmVlZGVk IHdoZW4gdXNlZCB3aXRoIGFjdHVhbAogCQkJCSAqIGRybV9hdG9taWNfY29tbWl0IGlvY3RsIGlu IGZ1dHVyZQogCQkJCSAqLwotCQkJCWlmICghZG1fc3RhdGUpCisJCQkJaWYgKCFkbV9jb25uX3N0 YXRlKQogCQkJCQljb250aW51ZTsKIAogCQkJCXN1cmZhY2UgPSBkY19jcmVhdGVfc3VyZmFjZShk Yyk7CkBAIC0zMzYwLDExICszMzYxLDEwIEBAIGludCBhbWRncHVfZG1fYXRvbWljX2NoZWNrKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJCXBsYW5lX3N0YXRlLAogCQkJCQlmYWxzZSk7CiAK LQkJCQlhZGRfdmFsX3NldHNfc3VyZmFjZSgKLQkJCQkJCQlzZXQsCi0JCQkJCQkJc2V0X2NvdW50 LAotCQkJCQkJCXNldFtpXS5zdHJlYW0sCi0JCQkJCQkJc3VyZmFjZSk7CisJCQkJYWRkX3ZhbF9z ZXRzX3N1cmZhY2UoZG1fc3RhdGUtPnNldCwKKwkJCQkJCSAgICAgZG1fc3RhdGUtPnNldF9jb3Vu dCwKKwkJCQkJCSAgICAgZG1fc3RhdGUtPnNldFtpXS5zdHJlYW0sCisJCQkJCQkgICAgIHN1cmZh Y2UpOwogCiAJCQkJbmVlZF90b192YWxpZGF0ZSA9IHRydWU7CiAJCQkJYXF1aXJlX2dsb2JhbF9s b2NrID0gdHJ1ZTsKQEAgLTMzNzIsOSArMzM3Miw5IEBAIGludCBhbWRncHVfZG1fYXRvbWljX2No ZWNrKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCX0KIAl9CiAKLQljb250ZXh0ID0gZGNfZ2V0 X3ZhbGlkYXRlX2NvbnRleHQoZGMsIHNldCwgc2V0X2NvdW50KTsKKwljb250ZXh0ID0gZGNfZ2V0 X3ZhbGlkYXRlX2NvbnRleHQoZGMsIGRtX3N0YXRlLT5zZXQsIGRtX3N0YXRlLT5zZXRfY291bnQp OwogCi0JaWYgKG5lZWRfdG9fdmFsaWRhdGUgPT0gZmFsc2UgfHwgc2V0X2NvdW50ID09IDAgfHwg Y29udGV4dCkgeworCWlmIChuZWVkX3RvX3ZhbGlkYXRlID09IGZhbHNlIHx8IGRtX3N0YXRlLT5z ZXRfY291bnQgPT0gMCB8fCBjb250ZXh0KSB7CiAKIAkJcmV0ID0gMDsKIAkJLyoKQEAgLTMzOTYs OSArMzM5Niw5IEBAIGludCBhbWRncHVfZG1fYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsCiAJCWRtX2ZyZWUoY29udGV4dCk7CiAJfQogCi0JZm9yIChpID0gMDsgaSA8IHNldF9j b3VudDsgaSsrKQotCQlmb3IgKGogPSAwOyBqIDwgc2V0W2ldLnN1cmZhY2VfY291bnQ7IGorKykK LQkJCWRjX3N1cmZhY2VfcmVsZWFzZShzZXRbaV0uc3VyZmFjZXNbal0pOworCWZvciAoaSA9IDA7 IGkgPCBkbV9zdGF0ZS0+c2V0X2NvdW50OyBpKyspCisJCWZvciAoaiA9IDA7IGogPCBkbV9zdGF0 ZS0+c2V0W2ldLnN1cmZhY2VfY291bnQ7IGorKykKKwkJCWRjX3N1cmZhY2VfcmVsZWFzZShkbV9z dGF0ZS0+c2V0W2ldLnN1cmZhY2VzW2pdKTsKIAogCWZvciAoaSA9IDA7IGkgPCBuZXdfc3RyZWFt X2NvdW50OyBpKyspCiAJCWRjX3N0cmVhbV9yZWxlYXNlKG5ld19zdHJlYW1zW2ldKTsKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtX3R5 cGVzLmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbV90 eXBlcy5oCmluZGV4IDliYTdmZGQuLmE3YWRmOGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtX3R5cGVzLmgKKysrIGIvZHJpdmVycy9n cHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG1fdHlwZXMuaApAQCAtMjgsNiAr MjgsNyBAQAogCiAjaW5jbHVkZSA8ZHJtL2RybVAuaD4KICNpbmNsdWRlIDxkcm0vZHJtX2F0b21p Yy5oPgorI2luY2x1ZGUgImRjLmgiCiAKIHN0cnVjdCBhbWRncHVfZnJhbWVidWZmZXI7CiBzdHJ1 Y3QgYW1kZ3B1X2Rpc3BsYXlfbWFuYWdlcjsKQEAgLTUxLDYgKzUyLDEwIEBAIHN0cnVjdCBkbV9j cnRjX3N0YXRlIHsKIAogc3RydWN0IGRtX2F0b21pY19zdGF0ZSB7CiAJc3RydWN0IGRybV9hdG9t aWNfc3RhdGUgYmFzZTsKKworCXN0cnVjdCBkY192YWxpZGF0aW9uX3NldCBzZXRbTUFYX1NUUkVB TVNdOworCWludCBzZXRfY291bnQ7CisKIH07CiAKICNkZWZpbmUgdG9fZG1fYXRvbWljX3N0YXRl KHgpIGNvbnRhaW5lcl9vZih4LCBzdHJ1Y3QgZG1fYXRvbWljX3N0YXRlLCBiYXNlKQotLSAKMi43 LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1n ZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=