From: Rex Zhu Subject: [PATCH 1/2] drm/amdgpu: Remove duplicate code in gfx_v8_0.c Date: Fri, 17 Aug 2018 15:06:58 +0800 Message-ID: <1534489619-1491-1-git-send-email-Rex.Zhu@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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: Rex Zhu VGhlcmUgYXJlIG5vIGFueSBsb2dpY2FsIGNoYW5nZXMgaGVyZS4KCjEuIGlmIGtjcSBjYW4gYmUg ZW5hYmxlZCB2aWEga2lxLCB3ZSBkb24ndCBuZWVkIHRvCiAgIGRvIGtpcSByaW5nIHRlc3QuCjIu IGFtZGdwdV9yaW5nX3Rlc3RfcmluZyBmdW5jdGlvbiBjYW4gYmUgdXNlZCB0bwogICBzeW5jIHRo ZSByaW5nIGNvbXBsZXRlLCByZW1vdmUgdGhlIGR1cGxpY2F0ZSBjb2RlLgoKdjI6IGFsbG9jIDYg KG5vdCA3KSBkd3MgZm9yIHVubWFwX3F1ZXVlcwoKU2lnbmVkLW9mZi1ieTogUmV4IFpodSA8UmV4 LlpodUBhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OF8wLmMg fCA4MCArKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQs IDEzIGluc2VydGlvbnMoKyksIDY3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OF8wLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9nZnhfdjhfMC5jCmluZGV4IDI4MmRiYTYuLjkwNmQ0YTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OF8wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvZ2Z4X3Y4XzAuYwpAQCAtNDYwNCw3ICs0NjA0LDYgQEAgc3RhdGljIHZvaWQgZ2Z4X3Y4 XzBfa2lxX3NldHRpbmcoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKQogc3RhdGljIGludCBnZnhf djhfMF9raXFfa2NxX2VuYWJsZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIHsKIAlzdHJ1 Y3QgYW1kZ3B1X3JpbmcgKmtpcV9yaW5nID0gJmFkZXYtPmdmeC5raXEucmluZzsKLQl1aW50MzJf dCBzY3JhdGNoLCB0bXAgPSAwOwogCXVpbnQ2NF90IHF1ZXVlX21hc2sgPSAwOwogCWludCByLCBp OwogCkBAIC00NjIzLDE3ICs0NjIyLDEwIEBAIHN0YXRpYyBpbnQgZ2Z4X3Y4XzBfa2lxX2tjcV9l bmFibGUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJCXF1ZXVlX21hc2sgfD0gKDF1bGwg PDwgaSk7CiAJfQogCi0JciA9IGFtZGdwdV9nZnhfc2NyYXRjaF9nZXQoYWRldiwgJnNjcmF0Y2gp OwotCWlmIChyKSB7Ci0JCURSTV9FUlJPUigiRmFpbGVkIHRvIGdldCBzY3JhdGNoIHJlZyAoJWQp LlxuIiwgcik7Ci0JCXJldHVybiByOwotCX0KLQlXUkVHMzIoc2NyYXRjaCwgMHhDQUZFREVBRCk7 Ci0KLQlyID0gYW1kZ3B1X3JpbmdfYWxsb2Moa2lxX3JpbmcsICg4ICogYWRldi0+Z2Z4Lm51bV9j b21wdXRlX3JpbmdzKSArIDExKTsKKwlraXFfcmluZy0+cmVhZHkgPSB0cnVlOworCXIgPSBhbWRn cHVfcmluZ19hbGxvYyhraXFfcmluZywgKDggKiBhZGV2LT5nZngubnVtX2NvbXB1dGVfcmluZ3Mp ICsgOCk7CiAJaWYgKHIpIHsKIAkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gbG9jayBLSVEgKCVkKS5c biIsIHIpOwotCQlhbWRncHVfZ2Z4X3NjcmF0Y2hfZnJlZShhZGV2LCBzY3JhdGNoKTsKIAkJcmV0 dXJuIHI7CiAJfQogCS8qIHNldCByZXNvdXJjZXMgKi8KQEAgLTQ2NjUsMjUgKzQ2NTcsMTIgQEAg c3RhdGljIGludCBnZnhfdjhfMF9raXFfa2NxX2VuYWJsZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAq YWRldikKIAkJYW1kZ3B1X3Jpbmdfd3JpdGUoa2lxX3JpbmcsIGxvd2VyXzMyX2JpdHMod3B0cl9h ZGRyKSk7CiAJCWFtZGdwdV9yaW5nX3dyaXRlKGtpcV9yaW5nLCB1cHBlcl8zMl9iaXRzKHdwdHJf YWRkcikpOwogCX0KLQkvKiB3cml0ZSB0byBzY3JhdGNoIGZvciBjb21wbGV0aW9uICovCi0JYW1k Z3B1X3Jpbmdfd3JpdGUoa2lxX3JpbmcsIFBBQ0tFVDMoUEFDS0VUM19TRVRfVUNPTkZJR19SRUcs IDEpKTsKLQlhbWRncHVfcmluZ193cml0ZShraXFfcmluZywgKHNjcmF0Y2ggLSBQQUNLRVQzX1NF VF9VQ09ORklHX1JFR19TVEFSVCkpOwotCWFtZGdwdV9yaW5nX3dyaXRlKGtpcV9yaW5nLCAweERF QURCRUVGKTsKLQlhbWRncHVfcmluZ19jb21taXQoa2lxX3JpbmcpOwogCi0JZm9yIChpID0gMDsg aSA8IGFkZXYtPnVzZWNfdGltZW91dDsgaSsrKSB7Ci0JCXRtcCA9IFJSRUczMihzY3JhdGNoKTsK LQkJaWYgKHRtcCA9PSAweERFQURCRUVGKQotCQkJYnJlYWs7Ci0JCURSTV9VREVMQVkoMSk7Ci0J fQotCWlmIChpID49IGFkZXYtPnVzZWNfdGltZW91dCkgewotCQlEUk1fRVJST1IoIktDUSBlbmFi bGUgZmFpbGVkIChzY3JhdGNoKDB4JTA0WCk9MHglMDhYKVxuIiwKLQkJCSAgc2NyYXRjaCwgdG1w KTsKLQkJciA9IC1FSU5WQUw7CisJciA9IGFtZGdwdV9yaW5nX3Rlc3RfcmluZyhraXFfcmluZyk7 CisJaWYgKHIpIHsKKwkJRFJNX0VSUk9SKCJLQ1EgZW5hYmxlIGZhaWxlZFxuIik7CisJCWtpcV9y aW5nLT5yZWFkeSA9IGZhbHNlOwogCX0KLQlhbWRncHVfZ2Z4X3NjcmF0Y2hfZnJlZShhZGV2LCBz Y3JhdGNoKTsKLQogCXJldHVybiByOwogfQogCkBAIC01MDE0LDE1ICs0OTkzLDYgQEAgc3RhdGlj IGludCBnZnhfdjhfMF9raXFfcmVzdW1lKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCWlm IChyKQogCQlnb3RvIGRvbmU7CiAKLQkvKiBUZXN0IEtJUSAqLwotCXJpbmcgPSAmYWRldi0+Z2Z4 LmtpcS5yaW5nOwotCXJpbmctPnJlYWR5ID0gdHJ1ZTsKLQlyID0gYW1kZ3B1X3JpbmdfdGVzdF9y aW5nKHJpbmcpOwotCWlmIChyKSB7Ci0JCXJpbmctPnJlYWR5ID0gZmFsc2U7Ci0JCWdvdG8gZG9u ZTsKLQl9Ci0KIAkvKiBUZXN0IEtDUXMgKi8KIAlmb3IgKGkgPSAwOyBpIDwgYWRldi0+Z2Z4Lm51 bV9jb21wdXRlX3JpbmdzOyBpKyspIHsKIAkJcmluZyA9ICZhZGV2LT5nZnguY29tcHV0ZV9yaW5n W2ldOwpAQCAtNTA5MiwyMyArNTA2MiwxMSBAQCBzdGF0aWMgaW50IGdmeF92OF8wX2h3X2luaXQo dm9pZCAqaGFuZGxlKQogCiBzdGF0aWMgaW50IGdmeF92OF8wX2tjcV9kaXNhYmxlKHN0cnVjdCBh bWRncHVfcmluZyAqa2lxX3Jpbmcsc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKQogewotCXN0cnVj dCBhbWRncHVfZGV2aWNlICphZGV2ID0ga2lxX3JpbmctPmFkZXY7Ci0JdWludDMyX3Qgc2NyYXRj aCwgdG1wID0gMDsKLQlpbnQgciwgaTsKLQotCXIgPSBhbWRncHVfZ2Z4X3NjcmF0Y2hfZ2V0KGFk ZXYsICZzY3JhdGNoKTsKLQlpZiAocikgewotCQlEUk1fRVJST1IoIkZhaWxlZCB0byBnZXQgc2Ny YXRjaCByZWcgKCVkKS5cbiIsIHIpOwotCQlyZXR1cm4gcjsKLQl9Ci0JV1JFRzMyKHNjcmF0Y2gs IDB4Q0FGRURFQUQpOworCWludCByOwogCi0JciA9IGFtZGdwdV9yaW5nX2FsbG9jKGtpcV9yaW5n LCAxMCk7Ci0JaWYgKHIpIHsKKwlyID0gYW1kZ3B1X3JpbmdfYWxsb2Moa2lxX3JpbmcsIDYpOwor CWlmIChyKQogCQlEUk1fRVJST1IoIkZhaWxlZCB0byBsb2NrIEtJUSAoJWQpLlxuIiwgcik7Ci0J CWFtZGdwdV9nZnhfc2NyYXRjaF9mcmVlKGFkZXYsIHNjcmF0Y2gpOwotCQlyZXR1cm4gcjsKLQl9 CiAKIAkvKiB1bm1hcCBxdWV1ZXMgKi8KIAlhbWRncHVfcmluZ193cml0ZShraXFfcmluZywgUEFD S0VUMyhQQUNLRVQzX1VOTUFQX1FVRVVFUywgNCkpOwpAQCAtNTEyMSwyMyArNTA3OSwxMSBAQCBz dGF0aWMgaW50IGdmeF92OF8wX2tjcV9kaXNhYmxlKHN0cnVjdCBhbWRncHVfcmluZyAqa2lxX3Jp bmcsc3RydWN0IGFtZGdwdV9yaW5nCiAJYW1kZ3B1X3Jpbmdfd3JpdGUoa2lxX3JpbmcsIDApOwog CWFtZGdwdV9yaW5nX3dyaXRlKGtpcV9yaW5nLCAwKTsKIAlhbWRncHVfcmluZ193cml0ZShraXFf cmluZywgMCk7Ci0JLyogd3JpdGUgdG8gc2NyYXRjaCBmb3IgY29tcGxldGlvbiAqLwotCWFtZGdw dV9yaW5nX3dyaXRlKGtpcV9yaW5nLCBQQUNLRVQzKFBBQ0tFVDNfU0VUX1VDT05GSUdfUkVHLCAx KSk7Ci0JYW1kZ3B1X3Jpbmdfd3JpdGUoa2lxX3JpbmcsIChzY3JhdGNoIC0gUEFDS0VUM19TRVRf VUNPTkZJR19SRUdfU1RBUlQpKTsKLQlhbWRncHVfcmluZ193cml0ZShraXFfcmluZywgMHhERUFE QkVFRik7Ci0JYW1kZ3B1X3JpbmdfY29tbWl0KGtpcV9yaW5nKTsKIAotCWZvciAoaSA9IDA7IGkg PCBhZGV2LT51c2VjX3RpbWVvdXQ7IGkrKykgewotCQl0bXAgPSBSUkVHMzIoc2NyYXRjaCk7Ci0J CWlmICh0bXAgPT0gMHhERUFEQkVFRikKLQkJCWJyZWFrOwotCQlEUk1fVURFTEFZKDEpOwotCX0K LQlpZiAoaSA+PSBhZGV2LT51c2VjX3RpbWVvdXQpIHsKLQkJRFJNX0VSUk9SKCJLQ1EgZGlzYWJs ZWQgZmFpbGVkIChzY3JhdGNoKDB4JTA0WCk9MHglMDhYKVxuIiwgc2NyYXRjaCwgdG1wKTsKLQkJ ciA9IC1FSU5WQUw7Ci0JfQotCWFtZGdwdV9nZnhfc2NyYXRjaF9mcmVlKGFkZXYsIHNjcmF0Y2gp OworCXIgPSBhbWRncHVfcmluZ190ZXN0X3Jpbmcoa2lxX3JpbmcpOworCWlmIChyKQorCQlEUk1f RVJST1IoIktDUSBkaXNhYmxlIGZhaWxlZFxuIik7CisKIAlyZXR1cm4gcjsKIH0KIAotLSAKMS45 LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1n ZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=