From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Airlie Subject: [PATCH 7/9] amdgpu/dc: remove pointless return from build_pipe_hw_param Date: Fri, 29 Sep 2017 14:34:40 +1000 Message-ID: <20170929043442.7984-7-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 RnJvbTogRGF2ZSBBaXJsaWUgPGFpcmxpZWRAcmVkaGF0LmNvbT4KClRoaXMgbmV2ZXIgcmV0dXJu ZWQgYW55dGhpbmcgZWxzZS4KClNpZ25lZC1vZmYtYnk6IERhdmUgQWlybGllIDxhaXJsaWVkQHJl ZGhhdC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZTEwMC9kY2Ux MDBfcmVzb3VyY2UuYyB8ICA2ICstLS0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2Rj L2RjZTExMC9kY2UxMTBfcmVzb3VyY2UuYyB8IDEwICsrLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2Ry bS9hbWQvZGlzcGxheS9kYy9kY2UxMTAvZGNlMTEwX3Jlc291cmNlLmggfCAgMiArLQogZHJpdmVy cy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZTExMi9kY2UxMTJfcmVzb3VyY2UuYyB8ICA2ICst LS0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZTgwL2RjZTgwX3Jlc291cmNl LmMgICB8ICA2ICstLS0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjbjEwL2Rj bjEwX3Jlc291cmNlLmMgICB8IDExICsrLS0tLS0tLS0tCiA2IGZpbGVzIGNoYW5nZWQsIDggaW5z ZXJ0aW9ucygrKSwgMzMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2FtZC9kaXNwbGF5L2RjL2RjZTEwMC9kY2UxMDBfcmVzb3VyY2UuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvZGlzcGxheS9kYy9kY2UxMDAvZGNlMTAwX3Jlc291cmNlLmMKaW5kZXggMGRiOTg3ZC4u YjFjZjU5MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZTEw MC9kY2UxMDBfcmVzb3VyY2UuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMv ZGNlMTAwL2RjZTEwMF9yZXNvdXJjZS5jCkBAIC02MzEsMTYgKzYzMSwxMiBAQCBzdGF0aWMgZW51 bSBkY19zdGF0dXMgYnVpbGRfbWFwcGVkX3Jlc291cmNlKAogCQlzdHJ1Y3QgZGNfc3RhdGUgKmNv bnRleHQsCiAJCXN0cnVjdCBkY19zdHJlYW1fc3RhdGUgKnN0cmVhbSkKIHsKLQllbnVtIGRjX3N0 YXR1cyBzdGF0dXMgPSBEQ19PSzsKIAlzdHJ1Y3QgcGlwZV9jdHggKnBpcGVfY3R4ID0gcmVzb3Vy Y2VfZ2V0X2hlYWRfcGlwZV9mb3Jfc3RyZWFtKCZjb250ZXh0LT5yZXNfY3R4LCBzdHJlYW0pOwog CiAJaWYgKCFwaXBlX2N0eCkKIAkJcmV0dXJuIERDX0VSUk9SX1VORVhQRUNURUQ7CiAKLQlzdGF0 dXMgPSBkY2UxMTBfcmVzb3VyY2VfYnVpbGRfcGlwZV9od19wYXJhbShwaXBlX2N0eCk7Ci0KLQlp ZiAoc3RhdHVzICE9IERDX09LKQotCQlyZXR1cm4gc3RhdHVzOworCWRjZTExMF9yZXNvdXJjZV9i dWlsZF9waXBlX2h3X3BhcmFtKHBpcGVfY3R4KTsKIAogCXJlc291cmNlX2J1aWxkX2luZm9fZnJh bWUocGlwZV9jdHgpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkv ZGMvZGNlMTEwL2RjZTExMF9yZXNvdXJjZS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5 L2RjL2RjZTExMC9kY2UxMTBfcmVzb3VyY2UuYwppbmRleCAwMTdhMWZkLi44OTAzNmFmIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlMTEwL2RjZTExMF9yZXNv dXJjZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2UxMTAvZGNlMTEw X3Jlc291cmNlLmMKQEAgLTcyNCw3ICs3MjQsNyBAQCBzdGF0aWMgdm9pZCBnZXRfcGl4ZWxfY2xv Y2tfcGFyYW1ldGVycygKIAl9CiB9CiAKLWVudW0gZGNfc3RhdHVzIGRjZTExMF9yZXNvdXJjZV9i dWlsZF9waXBlX2h3X3BhcmFtKHN0cnVjdCBwaXBlX2N0eCAqcGlwZV9jdHgpCit2b2lkIGRjZTEx MF9yZXNvdXJjZV9idWlsZF9waXBlX2h3X3BhcmFtKHN0cnVjdCBwaXBlX2N0eCAqcGlwZV9jdHgp CiB7CiAJZ2V0X3BpeGVsX2Nsb2NrX3BhcmFtZXRlcnMocGlwZV9jdHgsICZwaXBlX2N0eC0+c3Ry ZWFtX3Jlcy5waXhfY2xrX3BhcmFtcyk7CiAJcGlwZV9jdHgtPmNsb2NrX3NvdXJjZS0+ZnVuY3Mt PmdldF9waXhfY2xrX2RpdmlkZXJzKApAQCAtNzM0LDggKzczNCw2IEBAIGVudW0gZGNfc3RhdHVz IGRjZTExMF9yZXNvdXJjZV9idWlsZF9waXBlX2h3X3BhcmFtKHN0cnVjdCBwaXBlX2N0eCAqcGlw ZV9jdHgpCiAJcmVzb3VyY2VfYnVpbGRfYml0X2RlcHRoX3JlZHVjdGlvbl9wYXJhbXMocGlwZV9j dHgtPnN0cmVhbSwKIAkJCSZwaXBlX2N0eC0+c3RyZWFtLT5iaXRfZGVwdGhfcGFyYW1zKTsKIAlw aXBlX2N0eC0+c3RyZWFtLT5jbGFtcGluZy5waXhlbF9lbmNvZGluZyA9IHBpcGVfY3R4LT5zdHJl YW0tPnRpbWluZy5waXhlbF9lbmNvZGluZzsKLQotCXJldHVybiBEQ19PSzsKIH0KIAogc3RhdGlj IGJvb2wgaXNfc3VyZmFjZV9waXhlbF9mb3JtYXRfc3VwcG9ydGVkKHN0cnVjdCBwaXBlX2N0eCAq cGlwZV9jdHgsIHVuc2lnbmVkIGludCB1bmRlcmxheV9pZHgpCkBAIC03NTQsNyArNzUyLDYgQEAg c3RhdGljIGVudW0gZGNfc3RhdHVzIGJ1aWxkX21hcHBlZF9yZXNvdXJjZSgKIAkJc3RydWN0IGRj X3N0YXRlICpjb250ZXh0LAogCQlzdHJ1Y3QgZGNfc3RyZWFtX3N0YXRlICpzdHJlYW0pCiB7Ci0J ZW51bSBkY19zdGF0dXMgc3RhdHVzID0gRENfT0s7CiAJc3RydWN0IHBpcGVfY3R4ICpwaXBlX2N0 eCA9IHJlc291cmNlX2dldF9oZWFkX3BpcGVfZm9yX3N0cmVhbSgmY29udGV4dC0+cmVzX2N0eCwg c3RyZWFtKTsKIAogCWlmICghcGlwZV9jdHgpCkBAIC03NjQsMTAgKzc2MSw3IEBAIHN0YXRpYyBl bnVtIGRjX3N0YXR1cyBidWlsZF9tYXBwZWRfcmVzb3VyY2UoCiAJCQlkYy0+cmVzX3Bvb2wtPnVu ZGVybGF5X3BpcGVfaW5kZXgpKQogCQlyZXR1cm4gRENfU1VSRkFDRV9QSVhFTF9GT1JNQVRfVU5T VVBQT1JURUQ7CiAKLQlzdGF0dXMgPSBkY2UxMTBfcmVzb3VyY2VfYnVpbGRfcGlwZV9od19wYXJh bShwaXBlX2N0eCk7Ci0KLQlpZiAoc3RhdHVzICE9IERDX09LKQotCQlyZXR1cm4gc3RhdHVzOwor CWRjZTExMF9yZXNvdXJjZV9idWlsZF9waXBlX2h3X3BhcmFtKHBpcGVfY3R4KTsKIAogCS8qIFRP RE86IHZhbGlkYXRlIGF1ZGlvIEFTSUMgY2FwcywgZW5jb2RlciAqLwogCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlMTEwL2RjZTExMF9yZXNvdXJjZS5oIGIv ZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZTExMC9kY2UxMTBfcmVzb3VyY2UuaApp bmRleCA1YmI2OTJkLi5lNWYxNjhjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rp c3BsYXkvZGMvZGNlMTEwL2RjZTExMF9yZXNvdXJjZS5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9h bWQvZGlzcGxheS9kYy9kY2UxMTAvZGNlMTEwX3Jlc291cmNlLmgKQEAgLTM4LDcgKzM4LDcgQEAg c3RydWN0IGRjZTExMF9yZXNvdXJjZV9wb29sIHsKIAlzdHJ1Y3QgcmVzb3VyY2VfcG9vbCBiYXNl OwogfTsKIAotZW51bSBkY19zdGF0dXMgZGNlMTEwX3Jlc291cmNlX2J1aWxkX3BpcGVfaHdfcGFy YW0oc3RydWN0IHBpcGVfY3R4ICpwaXBlX2N0eCk7Cit2b2lkIGRjZTExMF9yZXNvdXJjZV9idWls ZF9waXBlX2h3X3BhcmFtKHN0cnVjdCBwaXBlX2N0eCAqcGlwZV9jdHgpOwogCiBzdHJ1Y3QgcmVz b3VyY2VfcG9vbCAqZGNlMTEwX2NyZWF0ZV9yZXNvdXJjZV9wb29sKAogCXVpbnQ4X3QgbnVtX3Zp cnR1YWxfbGlua3MsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMv ZGNlMTEyL2RjZTExMl9yZXNvdXJjZS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2Rj L2RjZTExMi9kY2UxMTJfcmVzb3VyY2UuYwppbmRleCAxMTkwMmEyLi42NjNlMGEwIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlMTEyL2RjZTExMl9yZXNvdXJj ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2UxMTIvZGNlMTEyX3Jl c291cmNlLmMKQEAgLTcwNCwxNiArNzA0LDEyIEBAIHN0YXRpYyBlbnVtIGRjX3N0YXR1cyBidWls ZF9tYXBwZWRfcmVzb3VyY2UoCiAJCXN0cnVjdCBkY19zdGF0ZSAqY29udGV4dCwKIAkJc3RydWN0 IGRjX3N0cmVhbV9zdGF0ZSAqc3RyZWFtKQogewotCWVudW0gZGNfc3RhdHVzIHN0YXR1cyA9IERD X09LOwogCXN0cnVjdCBwaXBlX2N0eCAqcGlwZV9jdHggPSByZXNvdXJjZV9nZXRfaGVhZF9waXBl X2Zvcl9zdHJlYW0oJmNvbnRleHQtPnJlc19jdHgsIHN0cmVhbSk7CiAKIAlpZiAoIXBpcGVfY3R4 KQogCQlyZXR1cm4gRENfRVJST1JfVU5FWFBFQ1RFRDsKIAotCXN0YXR1cyA9IGRjZTExMF9yZXNv dXJjZV9idWlsZF9waXBlX2h3X3BhcmFtKHBpcGVfY3R4KTsKLQotCWlmIChzdGF0dXMgIT0gRENf T0spCi0JCXJldHVybiBzdGF0dXM7CisJZGNlMTEwX3Jlc291cmNlX2J1aWxkX3BpcGVfaHdfcGFy YW0ocGlwZV9jdHgpOwogCiAJcmVzb3VyY2VfYnVpbGRfaW5mb19mcmFtZShwaXBlX2N0eCk7CiAK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2U4MC9kY2U4MF9y ZXNvdXJjZS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZTgwL2RjZTgwX3Jl c291cmNlLmMKaW5kZXggYzY1NzFhOS4uOWMxOGVmZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2FtZC9kaXNwbGF5L2RjL2RjZTgwL2RjZTgwX3Jlc291cmNlLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZTgwL2RjZTgwX3Jlc291cmNlLmMKQEAgLTY2NSwxNiAr NjY1LDEyIEBAIHN0YXRpYyBlbnVtIGRjX3N0YXR1cyBidWlsZF9tYXBwZWRfcmVzb3VyY2UoCiAJ CXN0cnVjdCBkY19zdGF0ZSAqY29udGV4dCwKIAkJc3RydWN0IGRjX3N0cmVhbV9zdGF0ZSAqc3Ry ZWFtKQogewotCWVudW0gZGNfc3RhdHVzIHN0YXR1cyA9IERDX09LOwogCXN0cnVjdCBwaXBlX2N0 eCAqcGlwZV9jdHggPSByZXNvdXJjZV9nZXRfaGVhZF9waXBlX2Zvcl9zdHJlYW0oJmNvbnRleHQt PnJlc19jdHgsIHN0cmVhbSk7CiAKIAlpZiAoIXBpcGVfY3R4KQogCQlyZXR1cm4gRENfRVJST1Jf VU5FWFBFQ1RFRDsKIAotCXN0YXR1cyA9IGRjZTExMF9yZXNvdXJjZV9idWlsZF9waXBlX2h3X3Bh cmFtKHBpcGVfY3R4KTsKLQotCWlmIChzdGF0dXMgIT0gRENfT0spCi0JCXJldHVybiBzdGF0dXM7 CisJZGNlMTEwX3Jlc291cmNlX2J1aWxkX3BpcGVfaHdfcGFyYW0ocGlwZV9jdHgpOwogCiAJcmVz b3VyY2VfYnVpbGRfaW5mb19mcmFtZShwaXBlX2N0eCk7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY24xMC9kY24xMF9yZXNvdXJjZS5jIGIvZHJpdmVycy9n cHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjbjEwL2RjbjEwX3Jlc291cmNlLmMKaW5kZXggZmIzZWYx My4uZGM4NzhmNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2Rj bjEwL2RjbjEwX3Jlc291cmNlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2Rj L2RjbjEwL2RjbjEwX3Jlc291cmNlLmMKQEAgLTgwNSw3ICs4MDUsNyBAQCBzdGF0aWMgdm9pZCBi dWlsZF9jbGFtcGluZ19wYXJhbXMoc3RydWN0IGRjX3N0cmVhbV9zdGF0ZSAqc3RyZWFtKQogCXN0 cmVhbS0+Y2xhbXBpbmcucGl4ZWxfZW5jb2RpbmcgPSBzdHJlYW0tPnRpbWluZy5waXhlbF9lbmNv ZGluZzsKIH0KIAotc3RhdGljIGVudW0gZGNfc3RhdHVzIGJ1aWxkX3BpcGVfaHdfcGFyYW0oc3Ry dWN0IHBpcGVfY3R4ICpwaXBlX2N0eCkKK3N0YXRpYyB2b2lkIGJ1aWxkX3BpcGVfaHdfcGFyYW0o c3RydWN0IHBpcGVfY3R4ICpwaXBlX2N0eCkKIHsKIAogCWdldF9waXhlbF9jbG9ja19wYXJhbWV0 ZXJzKHBpcGVfY3R4LCAmcGlwZV9jdHgtPnN0cmVhbV9yZXMucGl4X2Nsa19wYXJhbXMpOwpAQCAt ODIwLDggKzgyMCw2IEBAIHN0YXRpYyBlbnVtIGRjX3N0YXR1cyBidWlsZF9waXBlX2h3X3BhcmFt KHN0cnVjdCBwaXBlX2N0eCAqcGlwZV9jdHgpCiAJcmVzb3VyY2VfYnVpbGRfYml0X2RlcHRoX3Jl ZHVjdGlvbl9wYXJhbXMocGlwZV9jdHgtPnN0cmVhbSwKIAkJCQkJJnBpcGVfY3R4LT5zdHJlYW0t PmJpdF9kZXB0aF9wYXJhbXMpOwogCWJ1aWxkX2NsYW1waW5nX3BhcmFtcyhwaXBlX2N0eC0+c3Ry ZWFtKTsKLQotCXJldHVybiBEQ19PSzsKIH0KIAogc3RhdGljIGVudW0gZGNfc3RhdHVzIGJ1aWxk X21hcHBlZF9yZXNvdXJjZSgKQEAgLTgyOSw3ICs4MjcsNiBAQCBzdGF0aWMgZW51bSBkY19zdGF0 dXMgYnVpbGRfbWFwcGVkX3Jlc291cmNlKAogCQlzdHJ1Y3QgZGNfc3RhdGUgKmNvbnRleHQsCiAJ CXN0cnVjdCBkY19zdHJlYW1fc3RhdGUgKnN0cmVhbSkKIHsKLQllbnVtIGRjX3N0YXR1cyBzdGF0 dXMgPSBEQ19PSzsKIAlzdHJ1Y3QgcGlwZV9jdHggKnBpcGVfY3R4ID0gcmVzb3VyY2VfZ2V0X2hl YWRfcGlwZV9mb3Jfc3RyZWFtKCZjb250ZXh0LT5yZXNfY3R4LCBzdHJlYW0pOwogCiAJLypUT0RP IFNlZW1zIHVubmVlZGVkIGFueW1vcmUgKi8KQEAgLTg1MywxMSArODUwLDcgQEAgc3RhdGljIGVu dW0gZGNfc3RhdHVzIGJ1aWxkX21hcHBlZF9yZXNvdXJjZSgKIAlpZiAoIXBpcGVfY3R4KQogCQly ZXR1cm4gRENfRVJST1JfVU5FWFBFQ1RFRDsKIAotCXN0YXR1cyA9IGJ1aWxkX3BpcGVfaHdfcGFy YW0ocGlwZV9jdHgpOwotCi0JaWYgKHN0YXR1cyAhPSBEQ19PSykKLQkJcmV0dXJuIHN0YXR1czsK LQorCWJ1aWxkX3BpcGVfaHdfcGFyYW0ocGlwZV9jdHgpOwogCXJldHVybiBEQ19PSzsKIH0KIAot LSAKMi45LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=