From: Tom St Denis Subject: [PATCH 09/10] drm/amd/amdgpu: Port NBIO v6.1 driver over to new SOC15 macros Date: Mon, 10 Apr 2017 12:19:20 -0400 Message-ID: <20170410161921.4281-10-tom.stdenis@amd.com> References: <20170410161921.4281-1-tom.stdenis@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170410161921.4281-1-tom.stdenis-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: Tom St Denis U2lnbmVkLW9mZi1ieTogVG9tIFN0IERlbmlzIDx0b20uc3RkZW5pc0BhbWQuY29tPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L25iaW9fdjZfMS5jIHwgNDQgKysrKysrKysrKysrKyst LS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE4IGluc2VydGlvbnMoKyksIDI2 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L25i aW9fdjZfMS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvbmJpb192Nl8xLmMKaW5kZXgg OTcwNTdmNGExMGRlLi41N2RkNmFhZTQ5NjEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L25iaW9fdjZfMS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L25i aW9fdjZfMS5jCkBAIC0zNSw3ICszNSw3IEBACiAKIHUzMiBuYmlvX3Y2XzFfZ2V0X3Jldl9pZChz dHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIHsKLSAgICAgICAgdTMyIHRtcCA9IFJSRUczMihT T0MxNV9SRUdfT0ZGU0VUKE5CSU8sIDAsIG1tUkNDX0RFVjBfRVBGMF9TVFJBUDApKTsKKwl1MzIg dG1wID0gUlJFRzMyX1NPQzE1KE5CSU8sIDAsICBtbVJDQ19ERVYwX0VQRjBfU1RSQVAwKTsKIAog CXRtcCAmPSBSQ0NfREVWMF9FUEYwX1NUUkFQMF9fU1RSQVBfQVRJX1JFVl9JRF9ERVYwX0YwX01B U0s7CiAJdG1wID4+PSBSQ0NfREVWMF9FUEYwX1NUUkFQMF9fU1RSQVBfQVRJX1JFVl9JRF9ERVYw X0YwX19TSElGVDsKQEAgLTQ2LDMyICs0NiwzMiBAQCB1MzIgbmJpb192Nl8xX2dldF9yZXZfaWQo c3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiB1MzIgbmJpb192Nl8xX2dldF9hdG9tYmlvc19z Y3JhdGNoX3JlZ3Moc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAJCQkJCXVpbnQzMl90IGlk eCkKIHsKLQlyZXR1cm4gUlJFRzMyKFNPQzE1X1JFR19PRkZTRVQoTkJJTywgMCwgbW1CSU9TX1ND UkFUQ0hfMCkgKyBpZHgpOworCXJldHVybiBSUkVHMzJfU09DMTVfT0ZGU0VUKE5CSU8sIDAsICBt bUJJT1NfU0NSQVRDSF8wLCBpZHgpOwogfQogCiB2b2lkIG5iaW9fdjZfMV9zZXRfYXRvbWJpb3Nf c2NyYXRjaF9yZWdzKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogCQkJCQkgdWludDMyX3Qg aWR4LCB1aW50MzJfdCB2YWwpCiB7Ci0JV1JFRzMyKFNPQzE1X1JFR19PRkZTRVQoTkJJTywgMCwg bW1CSU9TX1NDUkFUQ0hfMCkgKyBpZHgsIHZhbCk7CisJV1JFRzMyX1NPQzE1X09GRlNFVChOQklP LCAwLCAgbW1CSU9TX1NDUkFUQ0hfMCwgaWR4LCB2YWwpOwogfQogCiB2b2lkIG5iaW9fdjZfMV9t Y19hY2Nlc3NfZW5hYmxlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCBib29sIGVuYWJsZSkK IHsKIAlpZiAoZW5hYmxlKQotCQlXUkVHMzIoU09DMTVfUkVHX09GRlNFVChOQklPLCAwLCBtbUJJ Rl9GQl9FTiksCi0JCQlCSUZfRkJfRU5fX0ZCX1JFQURfRU5fTUFTSyB8IEJJRl9GQl9FTl9fRkJf V1JJVEVfRU5fTUFTSyk7CisJCVdSRUczMl9TT0MxNShOQklPLCAwLCAgbW1CSUZfRkJfRU4sCisJ CQkgICAgIEJJRl9GQl9FTl9fRkJfUkVBRF9FTl9NQVNLIHwgQklGX0ZCX0VOX19GQl9XUklURV9F Tl9NQVNLKTsKIAllbHNlCi0JCVdSRUczMihTT0MxNV9SRUdfT0ZGU0VUKE5CSU8sIDAsIG1tQklG X0ZCX0VOKSwgMCk7CisJCVdSRUczMl9TT0MxNShOQklPLCAwLCAgbW1CSUZfRkJfRU4sIDApOwog fQogCiB2b2lkIG5iaW9fdjZfMV9oZHBfZmx1c2goc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYp CiB7Ci0JV1JFRzMyKFNPQzE1X1JFR19PRkZTRVQoTkJJTywgMCwgbW1CSUZfQlhfUEYwX0hEUF9N RU1fQ09IRVJFTkNZX0ZMVVNIX0NOVEwpLCAwKTsKKwlXUkVHMzJfU09DMTUoTkJJTywgMCwgIG1t QklGX0JYX1BGMF9IRFBfTUVNX0NPSEVSRU5DWV9GTFVTSF9DTlRMLCAwKTsKIH0KIAogdTMyIG5i aW9fdjZfMV9nZXRfbWVtc2l6ZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIHsKLQlyZXR1 cm4gUlJFRzMyKFNPQzE1X1JFR19PRkZTRVQoTkJJTywgMCwgbW1SQ0NfUEZfMF8wX1JDQ19DT05G SUdfTUVNU0laRSkpOworCXJldHVybiBSUkVHMzJfU09DMTUoTkJJTywgMCwgIG1tUkNDX1BGXzBf MF9SQ0NfQ09ORklHX01FTVNJWkUpOwogfQogCiBzdGF0aWMgY29uc3QgdTMyIG5iaW9fc2RtYV9k b29yYmVsbF9yYW5nZV9yZWdbXSA9CkBAIC05NywxNSArOTcsOCBAQCB2b2lkIG5iaW9fdjZfMV9z ZG1hX2Rvb3JiZWxsX3JhbmdlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCBpbnQgaW5zdGFu Y2UsCiB2b2lkIG5iaW9fdjZfMV9lbmFibGVfZG9vcmJlbGxfYXBlcnR1cmUoc3RydWN0IGFtZGdw dV9kZXZpY2UgKmFkZXYsCiAJCQkJCWJvb2wgZW5hYmxlKQogewotCXUzMiB0bXA7Ci0KLQl0bXAg PSBSUkVHMzIoU09DMTVfUkVHX09GRlNFVChOQklPLCAwLCBtbVJDQ19QRl8wXzBfUkNDX0RPT1JC RUxMX0FQRVJfRU4pKTsKLQlpZiAoZW5hYmxlKQotCQl0bXAgPSBSRUdfU0VUX0ZJRUxEKHRtcCwg UkNDX1BGXzBfMF9SQ0NfRE9PUkJFTExfQVBFUl9FTiwgQklGX0RPT1JCRUxMX0FQRVJfRU4sIDEp OwotCWVsc2UKLQkJdG1wID0gUkVHX1NFVF9GSUVMRCh0bXAsIFJDQ19QRl8wXzBfUkNDX0RPT1JC RUxMX0FQRVJfRU4sIEJJRl9ET09SQkVMTF9BUEVSX0VOLCAwKTsKLQotCVdSRUczMihTT0MxNV9S RUdfT0ZGU0VUKE5CSU8sIDAsIG1tUkNDX1BGXzBfMF9SQ0NfRE9PUkJFTExfQVBFUl9FTiksIHRt cCk7CisJV1JFRzMyX0ZJRUxEMTUoTkJJTywgMCwgUkNDX1BGXzBfMF9SQ0NfRE9PUkJFTExfQVBF Ul9FTiwKKwkJICAgICAgIEJJRl9ET09SQkVMTF9BUEVSX0VOLCBlbmFibGUgPyAxIDogMCk7CiB9 CiAKIHZvaWQgbmJpb192Nl8xX2VuYWJsZV9kb29yYmVsbF9zZWxmcmluZ19hcGVydHVyZShzdHJ1 Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKQEAgLTExOCwxMyArMTExLDEzIEBAIHZvaWQgbmJpb192 Nl8xX2VuYWJsZV9kb29yYmVsbF9zZWxmcmluZ19hcGVydHVyZShzdHJ1Y3QgYW1kZ3B1X2Rldmlj ZSAqYWRldiwKIAkJCVJFR19TRVRfRklFTEQodG1wLCBCSUZfQlhfUEYwX0RPT1JCRUxMX1NFTEZS SU5HX0dQQV9BUEVSX0NOVEwsIERPT1JCRUxMX1NFTEZSSU5HX0dQQV9BUEVSX01PREUsIDEpIHwK IAkJCVJFR19TRVRfRklFTEQodG1wLCBCSUZfQlhfUEYwX0RPT1JCRUxMX1NFTEZSSU5HX0dQQV9B UEVSX0NOVEwsIERPT1JCRUxMX1NFTEZSSU5HX0dQQV9BUEVSX1NJWkUsIDApOwogCi0JCVdSRUcz MihTT0MxNV9SRUdfT0ZGU0VUKE5CSU8sIDAsIG1tQklGX0JYX1BGMF9ET09SQkVMTF9TRUxGUklO R19HUEFfQVBFUl9CQVNFX0xPVyksCisJCVdSRUczMl9TT0MxNShOQklPLCAwLCAgbW1CSUZfQlhf UEYwX0RPT1JCRUxMX1NFTEZSSU5HX0dQQV9BUEVSX0JBU0VfTE9XLAogCQkJCSAgICAgICBsb3dl cl8zMl9iaXRzKGFkZXYtPmRvb3JiZWxsLmJhc2UpKTsKLQkJV1JFRzMyKFNPQzE1X1JFR19PRkZT RVQoTkJJTywgMCwgbW1CSUZfQlhfUEYwX0RPT1JCRUxMX1NFTEZSSU5HX0dQQV9BUEVSX0JBU0Vf SElHSCksCisJCVdSRUczMl9TT0MxNShOQklPLCAwLCAgbW1CSUZfQlhfUEYwX0RPT1JCRUxMX1NF TEZSSU5HX0dQQV9BUEVSX0JBU0VfSElHSCwKIAkJCQkgICAgICAgdXBwZXJfMzJfYml0cyhhZGV2 LT5kb29yYmVsbC5iYXNlKSk7CiAJfQogCi0JV1JFRzMyKFNPQzE1X1JFR19PRkZTRVQoTkJJTywg MCwgbW1CSUZfQlhfUEYwX0RPT1JCRUxMX1NFTEZSSU5HX0dQQV9BUEVSX0NOVEwpLCB0bXApOwor CVdSRUczMl9TT0MxNShOQklPLCAwLCAgbW1CSUZfQlhfUEYwX0RPT1JCRUxMX1NFTEZSSU5HX0dQ QV9BUEVSX0NOVEwsIHRtcCk7CiB9CiAKIApAQCAtMTM5LDcgKzEzMiw3IEBAIHZvaWQgbmJpb192 Nl8xX2loX2Rvb3JiZWxsX3JhbmdlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogCX0gZWxz ZQogCQlpaF9kb29yYmVsbF9yYW5nZSA9IFJFR19TRVRfRklFTEQoaWhfZG9vcmJlbGxfcmFuZ2Us IEJJRl9JSF9ET09SQkVMTF9SQU5HRSwgU0laRSwgMCk7CiAKLQlXUkVHMzIoU09DMTVfUkVHX09G RlNFVChOQklPLCAwLCBtbUJJRl9JSF9ET09SQkVMTF9SQU5HRSksIGloX2Rvb3JiZWxsX3Jhbmdl KTsKKwlXUkVHMzJfU09DMTUoTkJJTywgMCwgIG1tQklGX0lIX0RPT1JCRUxMX1JBTkdFLCBpaF9k b29yYmVsbF9yYW5nZSk7CiB9CiAKIHZvaWQgbmJpb192Nl8xX2loX2NvbnRyb2woc3RydWN0IGFt ZGdwdV9kZXZpY2UgKmFkZXYpCkBAIC0xNDcsMTUgKzE0MCwxNSBAQCB2b2lkIG5iaW9fdjZfMV9p aF9jb250cm9sKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCXUzMiBpbnRlcnJ1cHRfY250 bDsKIAogCS8qIHNldHVwIGludGVycnVwdCBjb250cm9sICovCi0JV1JFRzMyKFNPQzE1X1JFR19P RkZTRVQoTkJJTywgMCwgbW1JTlRFUlJVUFRfQ05UTDIpLCBhZGV2LT5kdW1teV9wYWdlLmFkZHIg Pj4gOCk7Ci0JaW50ZXJydXB0X2NudGwgPSBSUkVHMzIoU09DMTVfUkVHX09GRlNFVChOQklPLCAw LCBtbUlOVEVSUlVQVF9DTlRMKSk7CisJV1JFRzMyX1NPQzE1KE5CSU8sIDAsICBtbUlOVEVSUlVQ VF9DTlRMMiwgYWRldi0+ZHVtbXlfcGFnZS5hZGRyID4+IDgpOworCWludGVycnVwdF9jbnRsID0g UlJFRzMyX1NPQzE1KE5CSU8sIDAsICBtbUlOVEVSUlVQVF9DTlRMKTsKIAkvKiBJTlRFUlJVUFRf Q05UTF9fSUhfRFVNTVlfUkRfT1ZFUlJJREVfTUFTSz0wIC0gZHVtbXkgcmVhZCBkaXNhYmxlZCB3 aXRoIG1zaSwgZW5hYmxlZCB3aXRob3V0IG1zaQogCSAqIElOVEVSUlVQVF9DTlRMX19JSF9EVU1N WV9SRF9PVkVSUklERV9NQVNLPTEgLSBkdW1teSByZWFkIGNvbnRyb2xsZWQgYnkgSUhfRFVNTVlf UkRfRU4KIAkgKi8KIAlpbnRlcnJ1cHRfY250bCA9IFJFR19TRVRfRklFTEQoaW50ZXJydXB0X2Nu dGwsIElOVEVSUlVQVF9DTlRMLCBJSF9EVU1NWV9SRF9PVkVSUklERSwgMCk7CiAJLyogSU5URVJS VVBUX0NOVExfX0lIX1JFUV9OT05TTk9PUF9FTl9NQVNLPTEgaWYgcmluZyBpcyBpbiBub24tY2Fj aGVhYmxlIG1lbW9yeSwgZS5nLiwgdnJhbSAqLwogCWludGVycnVwdF9jbnRsID0gUkVHX1NFVF9G SUVMRChpbnRlcnJ1cHRfY250bCwgSU5URVJSVVBUX0NOVEwsIElIX1JFUV9OT05TTk9PUF9FTiwg MCk7Ci0JV1JFRzMyKFNPQzE1X1JFR19PRkZTRVQoTkJJTywgMCwgbW1JTlRFUlJVUFRfQ05UTCks IGludGVycnVwdF9jbnRsKTsKKwlXUkVHMzJfU09DMTUoTkJJTywgMCwgIG1tSU5URVJSVVBUX0NO VEwsIGludGVycnVwdF9jbnRsKTsKIH0KIAogdm9pZCBuYmlvX3Y2XzFfdXBkYXRlX21lZGl1bV9n cmFpbl9jbG9ja19nYXRpbmcoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCkBAIC0yNTEsOCAr MjQ0LDcgQEAgdm9pZCBuYmlvX3Y2XzFfZGV0ZWN0X2h3X3ZpcnQoc3RydWN0IGFtZGdwdV9kZXZp Y2UgKmFkZXYpCiB7CiAJdWludDMyX3QgcmVnOwogCi0JcmVnID0gUlJFRzMyKFNPQzE1X1JFR19P RkZTRVQoTkJJTywgMCwKLQkJCQkgICAgICBtbVJDQ19QRl8wXzBfUkNDX0lPVl9GVU5DX0lERU5U SUZJRVIpKTsKKwlyZWcgPSBSUkVHMzJfU09DMTUoTkJJTywgMCwgbW1SQ0NfUEZfMF8wX1JDQ19J T1ZfRlVOQ19JREVOVElGSUVSKTsKIAlpZiAocmVnICYgMSkKIAkJYWRldi0+dmlydC5jYXBzIHw9 IEFNREdQVV9TUklPVl9DQVBTX0lTX1ZGOwogCi0tIAoyLjEyLjAKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=