From: Alex Deucher Subject: [PATCH 074/117] drm/amdgpu: re-group the functions in amdgpu_vcn.c Date: Wed, 10 May 2017 14:47:05 -0400 Message-ID: <1494442068-8202-67-git-send-email-alexander.deucher@amd.com> References: <1494442068-8202-1-git-send-email-alexander.deucher@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1494442068-8202-1-git-send-email-alexander.deucher-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: Alex Deucher , Leo Liu RnJvbTogTGVvIExpdSA8bGVvLmxpdUBhbWQuY29tPgoKU2lnbmVkLW9mZi1ieTogTGVvIExpdSA8 bGVvLmxpdUBhbWQuY29tPgpSZXZpZXdlZC1ieTogQWxleCBEZXVjaGVyIDxhbGV4YW5kZXIuZGV1 Y2hlckBhbWQuY29tPgpTaWduZWQtb2ZmLWJ5OiBBbGV4IERldWNoZXIgPGFsZXhhbmRlci5kZXVj aGVyQGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3Zjbi5j IHwgMTQwICsrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwg NzAgaW5zZXJ0aW9ucygrKSwgNzAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3Zjbi5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvYW1kZ3B1X3Zjbi5jCmluZGV4IDliYjU5Y2MuLjVkZWNlZjcgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92Y24uYworKysgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9hbWRncHVfdmNuLmMKQEAgLTE5Niw2ICsxOTYsNDIgQEAgaW50IGFtZGdwdV92 Y25fcmVzdW1lKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCXJldHVybiAwOwogfQogCitz dGF0aWMgdm9pZCBhbWRncHVfdmNuX2lkbGVfd29ya19oYW5kbGVyKHN0cnVjdCB3b3JrX3N0cnVj dCAqd29yaykKK3sKKwlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9CisJCWNvbnRhaW5lcl9v Zih3b3JrLCBzdHJ1Y3QgYW1kZ3B1X2RldmljZSwgdmNuLmlkbGVfd29yay53b3JrKTsKKwl1bnNp Z25lZCBmZW5jZXMgPSBhbWRncHVfZmVuY2VfY291bnRfZW1pdHRlZCgmYWRldi0+dmNuLnJpbmdf ZGVjKTsKKworCWlmIChmZW5jZXMgPT0gMCkgeworCQlpZiAoYWRldi0+cG0uZHBtX2VuYWJsZWQp IHsKKwkJCWFtZGdwdV9kcG1fZW5hYmxlX3V2ZChhZGV2LCBmYWxzZSk7CisJCX0gZWxzZSB7CisJ CQlhbWRncHVfYXNpY19zZXRfdXZkX2Nsb2NrcyhhZGV2LCAwLCAwKTsKKwkJfQorCX0gZWxzZSB7 CisJCXNjaGVkdWxlX2RlbGF5ZWRfd29yaygmYWRldi0+dmNuLmlkbGVfd29yaywgVkNOX0lETEVf VElNRU9VVCk7CisJfQorfQorCit2b2lkIGFtZGdwdV92Y25fcmluZ19iZWdpbl91c2Uoc3RydWN0 IGFtZGdwdV9yaW5nICpyaW5nKQoreworCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gcmlu Zy0+YWRldjsKKwlib29sIHNldF9jbG9ja3MgPSAhY2FuY2VsX2RlbGF5ZWRfd29ya19zeW5jKCZh ZGV2LT52Y24uaWRsZV93b3JrKTsKKworCWlmIChzZXRfY2xvY2tzKSB7CisJCWlmIChhZGV2LT5w bS5kcG1fZW5hYmxlZCkgeworCQkJYW1kZ3B1X2RwbV9lbmFibGVfdXZkKGFkZXYsIHRydWUpOwor CQl9IGVsc2UgeworCQkJYW1kZ3B1X2FzaWNfc2V0X3V2ZF9jbG9ja3MoYWRldiwgNTMzMDAsIDQw MDAwKTsKKwkJfQorCX0KK30KKwordm9pZCBhbWRncHVfdmNuX3JpbmdfZW5kX3VzZShzdHJ1Y3Qg YW1kZ3B1X3JpbmcgKnJpbmcpCit7CisJc2NoZWR1bGVfZGVsYXllZF93b3JrKCZyaW5nLT5hZGV2 LT52Y24uaWRsZV93b3JrLCBWQ05fSURMRV9USU1FT1VUKTsKK30KKwogc3RhdGljIGludCBhbWRn cHVfdmNuX2RlY19zZW5kX21zZyhzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcsIHN0cnVjdCBhbWRn cHVfYm8gKmJvLAogCQkJICAgICAgIGJvb2wgZGlyZWN0LCBzdHJ1Y3QgZG1hX2ZlbmNlICoqZmVu Y2UpCiB7CkBAIC0zNjUsNDIgKzQwMSw2IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X3Zjbl9kZWNfZ2V0 X2Rlc3Ryb3lfbXNnKHN0cnVjdCBhbWRncHVfcmluZyAqcmluZywgdWludDMyX3QgaGFuCiAJcmV0 dXJuIGFtZGdwdV92Y25fZGVjX3NlbmRfbXNnKHJpbmcsIGJvLCBkaXJlY3QsIGZlbmNlKTsKIH0K IAotc3RhdGljIHZvaWQgYW1kZ3B1X3Zjbl9pZGxlX3dvcmtfaGFuZGxlcihzdHJ1Y3Qgd29ya19z dHJ1Y3QgKndvcmspCi17Ci0Jc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYgPQotCQljb250YWlu ZXJfb2Yod29yaywgc3RydWN0IGFtZGdwdV9kZXZpY2UsIHZjbi5pZGxlX3dvcmsud29yayk7Ci0J dW5zaWduZWQgZmVuY2VzID0gYW1kZ3B1X2ZlbmNlX2NvdW50X2VtaXR0ZWQoJmFkZXYtPnZjbi5y aW5nX2RlYyk7Ci0KLQlpZiAoZmVuY2VzID09IDApIHsKLQkJaWYgKGFkZXYtPnBtLmRwbV9lbmFi bGVkKSB7Ci0JCQlhbWRncHVfZHBtX2VuYWJsZV91dmQoYWRldiwgZmFsc2UpOwotCQl9IGVsc2Ug ewotCQkJYW1kZ3B1X2FzaWNfc2V0X3V2ZF9jbG9ja3MoYWRldiwgMCwgMCk7Ci0JCX0KLQl9IGVs c2UgewotCQlzY2hlZHVsZV9kZWxheWVkX3dvcmsoJmFkZXYtPnZjbi5pZGxlX3dvcmssIFZDTl9J RExFX1RJTUVPVVQpOwotCX0KLX0KLQotdm9pZCBhbWRncHVfdmNuX3JpbmdfYmVnaW5fdXNlKHN0 cnVjdCBhbWRncHVfcmluZyAqcmluZykKLXsKLQlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9 IHJpbmctPmFkZXY7Ci0JYm9vbCBzZXRfY2xvY2tzID0gIWNhbmNlbF9kZWxheWVkX3dvcmtfc3lu YygmYWRldi0+dmNuLmlkbGVfd29yayk7Ci0KLQlpZiAoc2V0X2Nsb2NrcykgewotCQlpZiAoYWRl di0+cG0uZHBtX2VuYWJsZWQpIHsKLQkJCWFtZGdwdV9kcG1fZW5hYmxlX3V2ZChhZGV2LCB0cnVl KTsKLQkJfSBlbHNlIHsKLQkJCWFtZGdwdV9hc2ljX3NldF91dmRfY2xvY2tzKGFkZXYsIDUzMzAw LCA0MDAwMCk7Ci0JCX0KLQl9Ci19Ci0KLXZvaWQgYW1kZ3B1X3Zjbl9yaW5nX2VuZF91c2Uoc3Ry dWN0IGFtZGdwdV9yaW5nICpyaW5nKQotewotCXNjaGVkdWxlX2RlbGF5ZWRfd29yaygmcmluZy0+ YWRldi0+dmNuLmlkbGVfd29yaywgVkNOX0lETEVfVElNRU9VVCk7Ci19Ci0KIGludCBhbWRncHVf dmNuX2RlY19yaW5nX3Rlc3RfaWIoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nLCBsb25nIHRpbWVv dXQpCiB7CiAJc3RydWN0IGRtYV9mZW5jZSAqZmVuY2U7CkBAIC00MzUsNiArNDM1LDQwIEBAIGlu dCBhbWRncHVfdmNuX2RlY19yaW5nX3Rlc3RfaWIoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nLCBs b25nIHRpbWVvdXQpCiAJcmV0dXJuIHI7CiB9CiAKK2ludCBhbWRncHVfdmNuX2VuY19yaW5nX3Rl c3RfcmluZyhzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcpCit7CisJc3RydWN0IGFtZGdwdV9kZXZp Y2UgKmFkZXYgPSByaW5nLT5hZGV2OworCXVpbnQzMl90IHJwdHIgPSBhbWRncHVfcmluZ19nZXRf cnB0cihyaW5nKTsKKwl1bnNpZ25lZCBpOworCWludCByOworCisJciA9IGFtZGdwdV9yaW5nX2Fs bG9jKHJpbmcsIDE2KTsKKwlpZiAocikgeworCQlEUk1fRVJST1IoImFtZGdwdTogdmNuIGVuYyBm YWlsZWQgdG8gbG9jayByaW5nICVkICglZCkuXG4iLAorCQkJICByaW5nLT5pZHgsIHIpOworCQly ZXR1cm4gcjsKKwl9CisJYW1kZ3B1X3Jpbmdfd3JpdGUocmluZywgVkNFX0NNRF9FTkQpOworCWFt ZGdwdV9yaW5nX2NvbW1pdChyaW5nKTsKKworCWZvciAoaSA9IDA7IGkgPCBhZGV2LT51c2VjX3Rp bWVvdXQ7IGkrKykgeworCQlpZiAoYW1kZ3B1X3JpbmdfZ2V0X3JwdHIocmluZykgIT0gcnB0cikK KwkJCWJyZWFrOworCQlEUk1fVURFTEFZKDEpOworCX0KKworCWlmIChpIDwgYWRldi0+dXNlY190 aW1lb3V0KSB7CisJCURSTV9JTkZPKCJyaW5nIHRlc3Qgb24gJWQgc3VjY2VlZGVkIGluICVkIHVz ZWNzXG4iLAorCQkJIHJpbmctPmlkeCwgaSk7CisJfSBlbHNlIHsKKwkJRFJNX0VSUk9SKCJhbWRn cHU6IHJpbmcgJWQgdGVzdCBmYWlsZWRcbiIsCisJCQkgIHJpbmctPmlkeCk7CisJCXIgPSAtRVRJ TUVET1VUOworCX0KKworCXJldHVybiByOworfQorCiBzdGF0aWMgaW50IGFtZGdwdV92Y25fZW5j X2dldF9jcmVhdGVfbXNnKHN0cnVjdCBhbWRncHVfcmluZyAqcmluZywgdWludDMyX3QgaGFuZGxl LAogCQkJICAgICAgc3RydWN0IGRtYV9mZW5jZSAqKmZlbmNlKQogewpAQCAtNTYxLDQwICs1OTUs NiBAQCBzdGF0aWMgaW50IGFtZGdwdV92Y25fZW5jX2dldF9kZXN0cm95X21zZyhzdHJ1Y3QgYW1k Z3B1X3JpbmcgKnJpbmcsIHVpbnQzMl90IGhhbgogCXJldHVybiByOwogfQogCi1pbnQgYW1kZ3B1 X3Zjbl9lbmNfcmluZ190ZXN0X3Jpbmcoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKQotewotCXN0 cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gcmluZy0+YWRldjsKLQl1aW50MzJfdCBycHRyID0g YW1kZ3B1X3JpbmdfZ2V0X3JwdHIocmluZyk7Ci0JdW5zaWduZWQgaTsKLQlpbnQgcjsKLQotCXIg PSBhbWRncHVfcmluZ19hbGxvYyhyaW5nLCAxNik7Ci0JaWYgKHIpIHsKLQkJRFJNX0VSUk9SKCJh bWRncHU6IHZjbiBlbmMgZmFpbGVkIHRvIGxvY2sgcmluZyAlZCAoJWQpLlxuIiwKLQkJCSAgcmlu Zy0+aWR4LCByKTsKLQkJcmV0dXJuIHI7Ci0JfQotCWFtZGdwdV9yaW5nX3dyaXRlKHJpbmcsIFZD RV9DTURfRU5EKTsKLQlhbWRncHVfcmluZ19jb21taXQocmluZyk7Ci0KLQlmb3IgKGkgPSAwOyBp IDwgYWRldi0+dXNlY190aW1lb3V0OyBpKyspIHsKLQkJaWYgKGFtZGdwdV9yaW5nX2dldF9ycHRy KHJpbmcpICE9IHJwdHIpCi0JCQlicmVhazsKLQkJRFJNX1VERUxBWSgxKTsKLQl9Ci0KLQlpZiAo aSA8IGFkZXYtPnVzZWNfdGltZW91dCkgewotCQlEUk1fSU5GTygicmluZyB0ZXN0IG9uICVkIHN1 Y2NlZWRlZCBpbiAlZCB1c2Vjc1xuIiwKLQkJCSByaW5nLT5pZHgsIGkpOwotCX0gZWxzZSB7Ci0J CURSTV9FUlJPUigiYW1kZ3B1OiByaW5nICVkIHRlc3QgZmFpbGVkXG4iLAotCQkJICByaW5nLT5p ZHgpOwotCQlyID0gLUVUSU1FRE9VVDsKLQl9Ci0KLQlyZXR1cm4gcjsKLX0KLQogaW50IGFtZGdw dV92Y25fZW5jX3JpbmdfdGVzdF9pYihzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcsIGxvbmcgdGlt ZW91dCkKIHsKIAlzdHJ1Y3QgZG1hX2ZlbmNlICpmZW5jZSA9IE5VTEw7Ci0tIAoyLjUuNQoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWls aW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==