From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Airlie Subject: [PATCH 8/9] amdgpu: fixup construct to void paths on some more dc objects. Date: Fri, 29 Sep 2017 14:34:41 +1000 Message-ID: <20170929043442.7984-8-airlied@gmail.com> References: <20170929043442.7984-1-airlied@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170929043442.7984-1-airlied-Re5JQEeQqe8AvxtiuMwx3w@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 RnJvbTogRGF2ZSBBaXJsaWUgPGFpcmxpZWRAcmVkaGF0LmNvbT4KClNpZ25lZC1vZmYtYnk6IERh dmUgQWlybGllIDxhaXJsaWVkQHJlZGhhdC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9k aXNwbGF5L2RjL2NvcmUvZGNfbGlua19kZGMuYyB8IDEwICsrKy0tLS0tLS0KIGRyaXZlcnMvZ3B1 L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX3N0cmVhbS5jICAgfCAxOCArKysrKy0tLS0tLS0t LS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX3N1cmZhY2UuYyAg fCAxNSArKystLS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTEgaW5zZXJ0aW9ucygrKSwg MzIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5 L2RjL2NvcmUvZGNfbGlua19kZGMuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9j b3JlL2RjX2xpbmtfZGRjLmMKaW5kZXggMjI2NTEyYy4uMzE1MTYwZCAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGNfbGlua19kZGMuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kY19saW5rX2RkYy5jCkBAIC0yNDUsNyAr MjQ1LDcgQEAgdm9pZCBkYWxfZGRjX2F1eF9wYXlsb2Fkc19hZGQoCiAJfQogfQogCi1zdGF0aWMg Ym9vbCBjb25zdHJ1Y3QoCitzdGF0aWMgdm9pZCBjb25zdHJ1Y3QoCiAJc3RydWN0IGRkY19zZXJ2 aWNlICpkZGNfc2VydmljZSwKIAlzdHJ1Y3QgZGRjX3NlcnZpY2VfaW5pdF9kYXRhICppbml0X2Rh dGEpCiB7CkBAIC0yODIsNyArMjgyLDYgQEAgc3RhdGljIGJvb2wgY29uc3RydWN0KAogCQljb25u ZWN0b3JfaWQgPT0gQ09OTkVDVE9SX0lEX0xWRFM7CiAKIAlkZGNfc2VydmljZS0+d2EucmF3ID0g MDsKLQlyZXR1cm4gdHJ1ZTsKIH0KIAogc3RydWN0IGRkY19zZXJ2aWNlICpkYWxfZGRjX3NlcnZp Y2VfY3JlYXRlKApAQCAtMjk1LDExICsyOTQsOCBAQCBzdHJ1Y3QgZGRjX3NlcnZpY2UgKmRhbF9k ZGNfc2VydmljZV9jcmVhdGUoCiAJaWYgKCFkZGNfc2VydmljZSkKIAkJcmV0dXJuIE5VTEw7CiAK LQlpZiAoY29uc3RydWN0KGRkY19zZXJ2aWNlLCBpbml0X2RhdGEpKQotCQlyZXR1cm4gZGRjX3Nl cnZpY2U7Ci0KLQlrZnJlZShkZGNfc2VydmljZSk7Ci0JcmV0dXJuIE5VTEw7CisJY29uc3RydWN0 KGRkY19zZXJ2aWNlLCBpbml0X2RhdGEpOworCXJldHVybiBkZGNfc2VydmljZTsKIH0KIAogc3Rh dGljIHZvaWQgZGVzdHJ1Y3Qoc3RydWN0IGRkY19zZXJ2aWNlICpkZGMpCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kY19zdHJlYW0uYyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX3N0cmVhbS5jCmluZGV4IGQ1ZGE4NDcuLmE5 OTE5NjQxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9k Y19zdHJlYW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kY19z dHJlYW0uYwpAQCAtNTYsNyArNTYsNyBAQCBzdGF0aWMgdm9pZCB1cGRhdGVfc3RyZWFtX3NpZ25h bChzdHJ1Y3QgZGNfc3RyZWFtX3N0YXRlICpzdHJlYW0pCiAJfQogfQogCi1zdGF0aWMgYm9vbCBj b25zdHJ1Y3Qoc3RydWN0IGRjX3N0cmVhbV9zdGF0ZSAqc3RyZWFtLAorc3RhdGljIHZvaWQgY29u c3RydWN0KHN0cnVjdCBkY19zdHJlYW1fc3RhdGUgKnN0cmVhbSwKIAlzdHJ1Y3QgZGNfc2luayAq ZGNfc2lua19kYXRhKQogewogCXVpbnQzMl90IGkgPSAwOwpAQCAtMTA0LDcgKzEwNCw2IEBAIHN0 YXRpYyBib29sIGNvbnN0cnVjdChzdHJ1Y3QgZGNfc3RyZWFtX3N0YXRlICpzdHJlYW0sCiAJc3Ry ZWFtLT5zdGF0dXMubGluayA9IHN0cmVhbS0+c2luay0+bGluazsKIAogCXVwZGF0ZV9zdHJlYW1f c2lnbmFsKHN0cmVhbSk7Ci0JcmV0dXJuIHRydWU7CiB9CiAKIHN0YXRpYyB2b2lkIGRlc3RydWN0 KHN0cnVjdCBkY19zdHJlYW1fc3RhdGUgKnN0cmVhbSkKQEAgLTE0MiwyNSArMTQxLDE4IEBAIHN0 cnVjdCBkY19zdHJlYW1fc3RhdGUgKmRjX2NyZWF0ZV9zdHJlYW1fZm9yX3NpbmsoCiAJc3RydWN0 IGRjX3N0cmVhbV9zdGF0ZSAqc3RyZWFtOwogCiAJaWYgKHNpbmsgPT0gTlVMTCkKLQkJZ290byBh bGxvY19mYWlsOworCQlyZXR1cm4gTlVMTDsKIAogCXN0cmVhbSA9IGt6YWxsb2Moc2l6ZW9mKHN0 cnVjdCBkY19zdHJlYW1fc3RhdGUpLCBHRlBfS0VSTkVMKTsKKwlpZiAoc3RyZWFtID09IE5VTEwp CisJCXJldHVybiBOVUxMOwogCi0JaWYgKE5VTEwgPT0gc3RyZWFtKQotCQlnb3RvIGFsbG9jX2Zh aWw7Ci0KLQlpZiAoZmFsc2UgPT0gY29uc3RydWN0KHN0cmVhbSwgc2luaykpCi0JCQlnb3RvIGNv bnN0cnVjdF9mYWlsOworCWNvbnN0cnVjdChzdHJlYW0sIHNpbmspOwogCiAJYXRvbWljX2luYygm c3RyZWFtLT5yZWZfY291bnQpOwogCiAJcmV0dXJuIHN0cmVhbTsKIAotY29uc3RydWN0X2ZhaWw6 Ci0Ja2ZyZWUoc3RyZWFtKTsKLQotYWxsb2NfZmFpbDoKLQlyZXR1cm4gTlVMTDsKIH0KIAogc3Ry dWN0IGRjX3N0cmVhbV9zdGF0dXMgKmRjX3N0cmVhbV9nZXRfc3RhdHVzKApkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGNfc3VyZmFjZS5jIGIvZHJpdmVy cy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGNfc3VyZmFjZS5jCmluZGV4IDUxMWFkYTku LmYxNzBhZTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3Jl L2RjX3N1cmZhY2UuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9k Y19zdXJmYWNlLmMKQEAgLTM0LDEyICszNCwxMSBAQAogLyoqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioK ICAqIFByaXZhdGUgZnVuY3Rpb25zCiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwotc3RhdGljIGJv b2wgY29uc3RydWN0KHN0cnVjdCBkY19jb250ZXh0ICpjdHgsIHN0cnVjdCBkY19wbGFuZV9zdGF0 ZSAqcGxhbmVfc3RhdGUpCitzdGF0aWMgdm9pZCBjb25zdHJ1Y3Qoc3RydWN0IGRjX2NvbnRleHQg KmN0eCwgc3RydWN0IGRjX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSkKIHsKIAlwbGFuZV9zdGF0 ZS0+Y3R4ID0gY3R4OwogCW1lbXNldCgmcGxhbmVfc3RhdGUtPmhkcl9zdGF0aWNfY3R4LAogCQkJ MCwgc2l6ZW9mKHN0cnVjdCBkY19oZHJfc3RhdGljX21ldGFkYXRhKSk7Ci0JcmV0dXJuIHRydWU7 CiB9CiAKIHN0YXRpYyB2b2lkIGRlc3RydWN0KHN0cnVjdCBkY19wbGFuZV9zdGF0ZSAqcGxhbmVf c3RhdGUpCkBAIC03MiwyMCArNzEsMTIgQEAgc3RydWN0IGRjX3BsYW5lX3N0YXRlICpkY19jcmVh dGVfcGxhbmVfc3RhdGUoc3RydWN0IGRjICpkYykKIAkJCQkJCSAgICAgR0ZQX0tFUk5FTCk7CiAK IAlpZiAoTlVMTCA9PSBwbGFuZV9zdGF0ZSkKLQkJZ290byBhbGxvY19mYWlsOwotCi0JaWYgKGZh bHNlID09IGNvbnN0cnVjdChjb3JlX2RjLT5jdHgsIHBsYW5lX3N0YXRlKSkKLQkJZ290byBjb25z dHJ1Y3RfZmFpbDsKKwkJcmV0dXJuIE5VTEw7CiAKKwljb25zdHJ1Y3QoY29yZV9kYy0+Y3R4LCBw bGFuZV9zdGF0ZSk7CiAJYXRvbWljX2luYygmcGxhbmVfc3RhdGUtPnJlZl9jb3VudCk7CiAKIAly ZXR1cm4gcGxhbmVfc3RhdGU7Ci0KLWNvbnN0cnVjdF9mYWlsOgotCWtmcmVlKHBsYW5lX3N0YXRl KTsKLQotYWxsb2NfZmFpbDoKLQlyZXR1cm4gTlVMTDsKIH0KIAogY29uc3Qgc3RydWN0IGRjX3Bs YW5lX3N0YXR1cyAqZGNfcGxhbmVfZ2V0X3N0YXR1cygKLS0gCjIuOS40CgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAph bWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK