From: Rex Zhu Subject: [PATCH] drm/amdgpu: Remove duplicate code in gfx_v8_0.c Date: Fri, 17 Aug 2018 13:31:15 +0800 Message-ID: <1534483875-22933-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 ZSByaW5nIGNvbXBsZXRlLCByZW1vdmUgdGhlIGR1cGxpY2F0ZSBjb2RlLgoKU2lnbmVkLW9mZi1i eTogUmV4IFpodSA8UmV4LlpodUBhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2dmeF92OF8wLmMgfCA4MCArKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQog MSBmaWxlIGNoYW5nZWQsIDEzIGluc2VydGlvbnMoKyksIDY3IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OF8wLmMgYi9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9nZnhfdjhfMC5jCmluZGV4IDI4MmRiYTYuLjY4MGY5YTIgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OF8wLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y4XzAuYwpAQCAtNDYwNCw3ICs0NjA0LDYgQEAgc3Rh dGljIHZvaWQgZ2Z4X3Y4XzBfa2lxX3NldHRpbmcoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKQog c3RhdGljIGludCBnZnhfdjhfMF9raXFfa2NxX2VuYWJsZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAq YWRldikKIHsKIAlzdHJ1Y3QgYW1kZ3B1X3JpbmcgKmtpcV9yaW5nID0gJmFkZXYtPmdmeC5raXEu cmluZzsKLQl1aW50MzJfdCBzY3JhdGNoLCB0bXAgPSAwOwogCXVpbnQ2NF90IHF1ZXVlX21hc2sg PSAwOwogCWludCByLCBpOwogCkBAIC00NjIzLDE3ICs0NjIyLDEwIEBAIHN0YXRpYyBpbnQgZ2Z4 X3Y4XzBfa2lxX2tjcV9lbmFibGUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJCXF1ZXVl X21hc2sgfD0gKDF1bGwgPDwgaSk7CiAJfQogCi0JciA9IGFtZGdwdV9nZnhfc2NyYXRjaF9nZXQo YWRldiwgJnNjcmF0Y2gpOwotCWlmIChyKSB7Ci0JCURSTV9FUlJPUigiRmFpbGVkIHRvIGdldCBz Y3JhdGNoIHJlZyAoJWQpLlxuIiwgcik7Ci0JCXJldHVybiByOwotCX0KLQlXUkVHMzIoc2NyYXRj aCwgMHhDQUZFREVBRCk7Ci0KLQlyID0gYW1kZ3B1X3JpbmdfYWxsb2Moa2lxX3JpbmcsICg4ICog YWRldi0+Z2Z4Lm51bV9jb21wdXRlX3JpbmdzKSArIDExKTsKKwlraXFfcmluZy0+cmVhZHkgPSB0 cnVlOworCXIgPSBhbWRncHVfcmluZ19hbGxvYyhraXFfcmluZywgKDggKiBhZGV2LT5nZngubnVt X2NvbXB1dGVfcmluZ3MpICsgOCk7CiAJaWYgKHIpIHsKIAkJRFJNX0VSUk9SKCJGYWlsZWQgdG8g bG9jayBLSVEgKCVkKS5cbiIsIHIpOwotCQlhbWRncHVfZ2Z4X3NjcmF0Y2hfZnJlZShhZGV2LCBz Y3JhdGNoKTsKIAkJcmV0dXJuIHI7CiAJfQogCS8qIHNldCByZXNvdXJjZXMgKi8KQEAgLTQ2NjUs MjUgKzQ2NTcsMTIgQEAgc3RhdGljIGludCBnZnhfdjhfMF9raXFfa2NxX2VuYWJsZShzdHJ1Y3Qg YW1kZ3B1X2RldmljZSAqYWRldikKIAkJYW1kZ3B1X3Jpbmdfd3JpdGUoa2lxX3JpbmcsIGxvd2Vy XzMyX2JpdHMod3B0cl9hZGRyKSk7CiAJCWFtZGdwdV9yaW5nX3dyaXRlKGtpcV9yaW5nLCB1cHBl cl8zMl9iaXRzKHdwdHJfYWRkcikpOwogCX0KLQkvKiB3cml0ZSB0byBzY3JhdGNoIGZvciBjb21w bGV0aW9uICovCi0JYW1kZ3B1X3Jpbmdfd3JpdGUoa2lxX3JpbmcsIFBBQ0tFVDMoUEFDS0VUM19T RVRfVUNPTkZJR19SRUcsIDEpKTsKLQlhbWRncHVfcmluZ193cml0ZShraXFfcmluZywgKHNjcmF0 Y2ggLSBQQUNLRVQzX1NFVF9VQ09ORklHX1JFR19TVEFSVCkpOwotCWFtZGdwdV9yaW5nX3dyaXRl KGtpcV9yaW5nLCAweERFQURCRUVGKTsKLQlhbWRncHVfcmluZ19jb21taXQoa2lxX3JpbmcpOwog Ci0JZm9yIChpID0gMDsgaSA8IGFkZXYtPnVzZWNfdGltZW91dDsgaSsrKSB7Ci0JCXRtcCA9IFJS RUczMihzY3JhdGNoKTsKLQkJaWYgKHRtcCA9PSAweERFQURCRUVGKQotCQkJYnJlYWs7Ci0JCURS TV9VREVMQVkoMSk7Ci0JfQotCWlmIChpID49IGFkZXYtPnVzZWNfdGltZW91dCkgewotCQlEUk1f RVJST1IoIktDUSBlbmFibGUgZmFpbGVkIChzY3JhdGNoKDB4JTA0WCk9MHglMDhYKVxuIiwKLQkJ CSAgc2NyYXRjaCwgdG1wKTsKLQkJciA9IC1FSU5WQUw7CisJciA9IGFtZGdwdV9yaW5nX3Rlc3Rf cmluZyhraXFfcmluZyk7CisJaWYgKHIpIHsKKwkJRFJNX0VSUk9SKCJLQ1EgZW5hYmxlIGZhaWxl ZFxuIik7CisJCWtpcV9yaW5nLT5yZWFkeSA9IGZhbHNlOwogCX0KLQlhbWRncHVfZ2Z4X3NjcmF0 Y2hfZnJlZShhZGV2LCBzY3JhdGNoKTsKLQogCXJldHVybiByOwogfQogCkBAIC01MDE0LDE1ICs0 OTkzLDYgQEAgc3RhdGljIGludCBnZnhfdjhfMF9raXFfcmVzdW1lKHN0cnVjdCBhbWRncHVfZGV2 aWNlICphZGV2KQogCWlmIChyKQogCQlnb3RvIGRvbmU7CiAKLQkvKiBUZXN0IEtJUSAqLwotCXJp bmcgPSAmYWRldi0+Z2Z4LmtpcS5yaW5nOwotCXJpbmctPnJlYWR5ID0gdHJ1ZTsKLQlyID0gYW1k Z3B1X3JpbmdfdGVzdF9yaW5nKHJpbmcpOwotCWlmIChyKSB7Ci0JCXJpbmctPnJlYWR5ID0gZmFs c2U7Ci0JCWdvdG8gZG9uZTsKLQl9Ci0KIAkvKiBUZXN0IEtDUXMgKi8KIAlmb3IgKGkgPSAwOyBp IDwgYWRldi0+Z2Z4Lm51bV9jb21wdXRlX3JpbmdzOyBpKyspIHsKIAkJcmluZyA9ICZhZGV2LT5n ZnguY29tcHV0ZV9yaW5nW2ldOwpAQCAtNTA5MiwyMyArNTA2MiwxMSBAQCBzdGF0aWMgaW50IGdm eF92OF8wX2h3X2luaXQodm9pZCAqaGFuZGxlKQogCiBzdGF0aWMgaW50IGdmeF92OF8wX2tjcV9k aXNhYmxlKHN0cnVjdCBhbWRncHVfcmluZyAqa2lxX3Jpbmcsc3RydWN0IGFtZGdwdV9yaW5nICpy aW5nKQogewotCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0ga2lxX3JpbmctPmFkZXY7Ci0J dWludDMyX3Qgc2NyYXRjaCwgdG1wID0gMDsKLQlpbnQgciwgaTsKLQotCXIgPSBhbWRncHVfZ2Z4 X3NjcmF0Y2hfZ2V0KGFkZXYsICZzY3JhdGNoKTsKLQlpZiAocikgewotCQlEUk1fRVJST1IoIkZh aWxlZCB0byBnZXQgc2NyYXRjaCByZWcgKCVkKS5cbiIsIHIpOwotCQlyZXR1cm4gcjsKLQl9Ci0J V1JFRzMyKHNjcmF0Y2gsIDB4Q0FGRURFQUQpOworCWludCByOwogCi0JciA9IGFtZGdwdV9yaW5n X2FsbG9jKGtpcV9yaW5nLCAxMCk7Ci0JaWYgKHIpIHsKKwlyID0gYW1kZ3B1X3JpbmdfYWxsb2Mo a2lxX3JpbmcsIDcpOworCWlmIChyKQogCQlEUk1fRVJST1IoIkZhaWxlZCB0byBsb2NrIEtJUSAo JWQpLlxuIiwgcik7Ci0JCWFtZGdwdV9nZnhfc2NyYXRjaF9mcmVlKGFkZXYsIHNjcmF0Y2gpOwot CQlyZXR1cm4gcjsKLQl9CiAKIAkvKiB1bm1hcCBxdWV1ZXMgKi8KIAlhbWRncHVfcmluZ193cml0 ZShraXFfcmluZywgUEFDS0VUMyhQQUNLRVQzX1VOTUFQX1FVRVVFUywgNCkpOwpAQCAtNTEyMSwy MyArNTA3OSwxMSBAQCBzdGF0aWMgaW50IGdmeF92OF8wX2tjcV9kaXNhYmxlKHN0cnVjdCBhbWRn cHVfcmluZyAqa2lxX3Jpbmcsc3RydWN0IGFtZGdwdV9yaW5nCiAJYW1kZ3B1X3Jpbmdfd3JpdGUo a2lxX3JpbmcsIDApOwogCWFtZGdwdV9yaW5nX3dyaXRlKGtpcV9yaW5nLCAwKTsKIAlhbWRncHVf cmluZ193cml0ZShraXFfcmluZywgMCk7Ci0JLyogd3JpdGUgdG8gc2NyYXRjaCBmb3IgY29tcGxl dGlvbiAqLwotCWFtZGdwdV9yaW5nX3dyaXRlKGtpcV9yaW5nLCBQQUNLRVQzKFBBQ0tFVDNfU0VU X1VDT05GSUdfUkVHLCAxKSk7Ci0JYW1kZ3B1X3Jpbmdfd3JpdGUoa2lxX3JpbmcsIChzY3JhdGNo IC0gUEFDS0VUM19TRVRfVUNPTkZJR19SRUdfU1RBUlQpKTsKLQlhbWRncHVfcmluZ193cml0ZShr aXFfcmluZywgMHhERUFEQkVFRik7Ci0JYW1kZ3B1X3JpbmdfY29tbWl0KGtpcV9yaW5nKTsKIAot CWZvciAoaSA9IDA7IGkgPCBhZGV2LT51c2VjX3RpbWVvdXQ7IGkrKykgewotCQl0bXAgPSBSUkVH MzIoc2NyYXRjaCk7Ci0JCWlmICh0bXAgPT0gMHhERUFEQkVFRikKLQkJCWJyZWFrOwotCQlEUk1f VURFTEFZKDEpOwotCX0KLQlpZiAoaSA+PSBhZGV2LT51c2VjX3RpbWVvdXQpIHsKLQkJRFJNX0VS Uk9SKCJLQ1EgZGlzYWJsZWQgZmFpbGVkIChzY3JhdGNoKDB4JTA0WCk9MHglMDhYKVxuIiwgc2Ny YXRjaCwgdG1wKTsKLQkJciA9IC1FSU5WQUw7Ci0JfQotCWFtZGdwdV9nZnhfc2NyYXRjaF9mcmVl KGFkZXYsIHNjcmF0Y2gpOworCXIgPSBhbWRncHVfcmluZ190ZXN0X3Jpbmcoa2lxX3JpbmcpOwor CWlmIChyKQorCQlEUk1fRVJST1IoIktDUSBkaXNhYmxlIGZhaWxlZFxuIik7CisKIAlyZXR1cm4g cjsKIH0KIAotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdm eAo=