From: Tom St Denis Subject: [PATCH 06/10] drm/amd/amdgpu: Port NBIO v6.1 driver over to new SOC15 macros Date: Mon, 12 Jun 2017 13:54:27 -0400 Message-ID: <20170612175431.32764-7-tom.stdenis@amd.com> References: <20170612175431.32764-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: <20170612175431.32764-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 aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L25iaW9fdjZfMS5jIHwgNTQgKysrKysrKysrKysrKysr LS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDIzIGluc2VydGlvbnMoKyksIDMx IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L25i aW9fdjZfMS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvbmJpb192Nl8xLmMKaW5kZXgg OTcwNTdmNGExMGRlLi4xZTI3MmY3ODVkZWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L25iaW9fdjZfMS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L25i aW9fdjZfMS5jCkBAIC0zNSw3ICszNSw3IEBACiAKIHUzMiBuYmlvX3Y2XzFfZ2V0X3Jldl9pZChz dHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIHsKLSAgICAgICAgdTMyIHRtcCA9IFJSRUczMihT T0MxNV9SRUdfT0ZGU0VUKE5CSU8sIDAsIG1tUkNDX0RFVjBfRVBGMF9TVFJBUDApKTsKKyAgICAg ICAgdTMyIHRtcCA9IFJSRUczMl9TT0MxNShOQklPLCAwLCBtbVJDQ19ERVYwX0VQRjBfU1RSQVAw KTsKIAogCXRtcCAmPSBSQ0NfREVWMF9FUEYwX1NUUkFQMF9fU1RSQVBfQVRJX1JFVl9JRF9ERVYw X0YwX01BU0s7CiAJdG1wID4+PSBSQ0NfREVWMF9FUEYwX1NUUkFQMF9fU1RSQVBfQVRJX1JFVl9J RF9ERVYwX0YwX19TSElGVDsKQEAgLTQ2LDMyICs0NiwzMyBAQCB1MzIgbmJpb192Nl8xX2dldF9y ZXZfaWQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiB1MzIgbmJpb192Nl8xX2dldF9hdG9t Ymlvc19zY3JhdGNoX3JlZ3Moc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAJCQkJCXVpbnQz Ml90IGlkeCkKIHsKLQlyZXR1cm4gUlJFRzMyKFNPQzE1X1JFR19PRkZTRVQoTkJJTywgMCwgbW1C SU9TX1NDUkFUQ0hfMCkgKyBpZHgpOworCXJldHVybiBSUkVHMzJfU09DMTVfT0ZGU0VUKE5CSU8s IDAsIG1tQklPU19TQ1JBVENIXzAsIGlkeCk7CiB9CiAKIHZvaWQgbmJpb192Nl8xX3NldF9hdG9t Ymlvc19zY3JhdGNoX3JlZ3Moc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAJCQkJCSB1aW50 MzJfdCBpZHgsIHVpbnQzMl90IHZhbCkKIHsKLQlXUkVHMzIoU09DMTVfUkVHX09GRlNFVChOQklP LCAwLCBtbUJJT1NfU0NSQVRDSF8wKSArIGlkeCwgdmFsKTsKKwlXUkVHMzJfU09DMTVfT0ZGU0VU KE5CSU8sIDAsIG1tQklPU19TQ1JBVENIXzAsIGlkeCwgdmFsKTsKIH0KIAogdm9pZCBuYmlvX3Y2 XzFfbWNfYWNjZXNzX2VuYWJsZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgYm9vbCBlbmFi bGUpCiB7CiAJaWYgKGVuYWJsZSkKLQkJV1JFRzMyKFNPQzE1X1JFR19PRkZTRVQoTkJJTywgMCwg bW1CSUZfRkJfRU4pLAotCQkJQklGX0ZCX0VOX19GQl9SRUFEX0VOX01BU0sgfCBCSUZfRkJfRU5f X0ZCX1dSSVRFX0VOX01BU0spOworCQlXUkVHMzJfU09DMTUoTkJJTywgMCwgbW1CSUZfRkJfRU4s CisJCQkgICAgIEJJRl9GQl9FTl9fRkJfUkVBRF9FTl9NQVNLIHwKKwkJCSAgICAgQklGX0ZCX0VO X19GQl9XUklURV9FTl9NQVNLKTsKIAllbHNlCi0JCVdSRUczMihTT0MxNV9SRUdfT0ZGU0VUKE5C SU8sIDAsIG1tQklGX0ZCX0VOKSwgMCk7CisJCVdSRUczMl9TT0MxNShOQklPLCAwLCBtbUJJRl9G Ql9FTiwgMCk7CiB9CiAKIHZvaWQgbmJpb192Nl8xX2hkcF9mbHVzaChzdHJ1Y3QgYW1kZ3B1X2Rl dmljZSAqYWRldikKIHsKLQlXUkVHMzIoU09DMTVfUkVHX09GRlNFVChOQklPLCAwLCBtbUJJRl9C WF9QRjBfSERQX01FTV9DT0hFUkVOQ1lfRkxVU0hfQ05UTCksIDApOworCVdSRUczMl9TT0MxNShO QklPLCAwLCBtbUJJRl9CWF9QRjBfSERQX01FTV9DT0hFUkVOQ1lfRkxVU0hfQ05UTCwgMCk7CiB9 CiAKIHUzMiBuYmlvX3Y2XzFfZ2V0X21lbXNpemUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYp CiB7Ci0JcmV0dXJuIFJSRUczMihTT0MxNV9SRUdfT0ZGU0VUKE5CSU8sIDAsIG1tUkNDX1BGXzBf MF9SQ0NfQ09ORklHX01FTVNJWkUpKTsKKwlyZXR1cm4gUlJFRzMyX1NPQzE1KE5CSU8sIDAsIG1t UkNDX1BGXzBfMF9SQ0NfQ09ORklHX01FTVNJWkUpOwogfQogCiBzdGF0aWMgY29uc3QgdTMyIG5i aW9fc2RtYV9kb29yYmVsbF9yYW5nZV9yZWdbXSA9CkBAIC05NywxNSArOTgsNyBAQCB2b2lkIG5i aW9fdjZfMV9zZG1hX2Rvb3JiZWxsX3JhbmdlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCBp bnQgaW5zdGFuY2UsCiB2b2lkIG5iaW9fdjZfMV9lbmFibGVfZG9vcmJlbGxfYXBlcnR1cmUoc3Ry dWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAJCQkJCWJvb2wgZW5hYmxlKQogewotCXUzMiB0bXA7 Ci0KLQl0bXAgPSBSUkVHMzIoU09DMTVfUkVHX09GRlNFVChOQklPLCAwLCBtbVJDQ19QRl8wXzBf UkNDX0RPT1JCRUxMX0FQRVJfRU4pKTsKLQlpZiAoZW5hYmxlKQotCQl0bXAgPSBSRUdfU0VUX0ZJ RUxEKHRtcCwgUkNDX1BGXzBfMF9SQ0NfRE9PUkJFTExfQVBFUl9FTiwgQklGX0RPT1JCRUxMX0FQ RVJfRU4sIDEpOwotCWVsc2UKLQkJdG1wID0gUkVHX1NFVF9GSUVMRCh0bXAsIFJDQ19QRl8wXzBf UkNDX0RPT1JCRUxMX0FQRVJfRU4sIEJJRl9ET09SQkVMTF9BUEVSX0VOLCAwKTsKLQotCVdSRUcz MihTT0MxNV9SRUdfT0ZGU0VUKE5CSU8sIDAsIG1tUkNDX1BGXzBfMF9SQ0NfRE9PUkJFTExfQVBF Ul9FTiksIHRtcCk7CisJV1JFRzMyX0ZJRUxEMTUoTkJJTywgMCwgUkNDX1BGXzBfMF9SQ0NfRE9P UkJFTExfQVBFUl9FTiwgQklGX0RPT1JCRUxMX0FQRVJfRU4sIGVuYWJsZSA/IDEgOiAwKTsKIH0K IAogdm9pZCBuYmlvX3Y2XzFfZW5hYmxlX2Rvb3JiZWxsX3NlbGZyaW5nX2FwZXJ0dXJlKHN0cnVj dCBhbWRncHVfZGV2aWNlICphZGV2LApAQCAtMTE1LDIzICsxMDgsMjMgQEAgdm9pZCBuYmlvX3Y2 XzFfZW5hYmxlX2Rvb3JiZWxsX3NlbGZyaW5nX2FwZXJ0dXJlKHN0cnVjdCBhbWRncHVfZGV2aWNl ICphZGV2LAogCiAJaWYgKGVuYWJsZSkgewogCQl0bXAgPSBSRUdfU0VUX0ZJRUxEKHRtcCwgQklG X0JYX1BGMF9ET09SQkVMTF9TRUxGUklOR19HUEFfQVBFUl9DTlRMLCBET09SQkVMTF9TRUxGUklO R19HUEFfQVBFUl9FTiwgMSkgfAotCQkJUkVHX1NFVF9GSUVMRCh0bXAsIEJJRl9CWF9QRjBfRE9P UkJFTExfU0VMRlJJTkdfR1BBX0FQRVJfQ05UTCwgRE9PUkJFTExfU0VMRlJJTkdfR1BBX0FQRVJf TU9ERSwgMSkgfAotCQkJUkVHX1NFVF9GSUVMRCh0bXAsIEJJRl9CWF9QRjBfRE9PUkJFTExfU0VM RlJJTkdfR1BBX0FQRVJfQ05UTCwgRE9PUkJFTExfU0VMRlJJTkdfR1BBX0FQRVJfU0laRSwgMCk7 CisJCSAgICAgIFJFR19TRVRfRklFTEQodG1wLCBCSUZfQlhfUEYwX0RPT1JCRUxMX1NFTEZSSU5H X0dQQV9BUEVSX0NOVEwsIERPT1JCRUxMX1NFTEZSSU5HX0dQQV9BUEVSX01PREUsIDEpIHwKKwkJ ICAgICAgUkVHX1NFVF9GSUVMRCh0bXAsIEJJRl9CWF9QRjBfRE9PUkJFTExfU0VMRlJJTkdfR1BB X0FQRVJfQ05UTCwgRE9PUkJFTExfU0VMRlJJTkdfR1BBX0FQRVJfU0laRSwgMCk7CiAKLQkJV1JF RzMyKFNPQzE1X1JFR19PRkZTRVQoTkJJTywgMCwgbW1CSUZfQlhfUEYwX0RPT1JCRUxMX1NFTEZS SU5HX0dQQV9BUEVSX0JBU0VfTE9XKSwKLQkJCQkgICAgICAgbG93ZXJfMzJfYml0cyhhZGV2LT5k b29yYmVsbC5iYXNlKSk7Ci0JCVdSRUczMihTT0MxNV9SRUdfT0ZGU0VUKE5CSU8sIDAsIG1tQklG X0JYX1BGMF9ET09SQkVMTF9TRUxGUklOR19HUEFfQVBFUl9CQVNFX0hJR0gpLAotCQkJCSAgICAg ICB1cHBlcl8zMl9iaXRzKGFkZXYtPmRvb3JiZWxsLmJhc2UpKTsKKwkJV1JFRzMyX1NPQzE1KE5C SU8sIDAsIG1tQklGX0JYX1BGMF9ET09SQkVMTF9TRUxGUklOR19HUEFfQVBFUl9CQVNFX0xPVywK KwkJCSAgICAgbG93ZXJfMzJfYml0cyhhZGV2LT5kb29yYmVsbC5iYXNlKSk7CisJCVdSRUczMl9T T0MxNShOQklPLCAwLCBtbUJJRl9CWF9QRjBfRE9PUkJFTExfU0VMRlJJTkdfR1BBX0FQRVJfQkFT RV9ISUdILAorCQkJICAgICB1cHBlcl8zMl9iaXRzKGFkZXYtPmRvb3JiZWxsLmJhc2UpKTsKIAl9 CiAKLQlXUkVHMzIoU09DMTVfUkVHX09GRlNFVChOQklPLCAwLCBtbUJJRl9CWF9QRjBfRE9PUkJF TExfU0VMRlJJTkdfR1BBX0FQRVJfQ05UTCksIHRtcCk7CisJV1JFRzMyX1NPQzE1KE5CSU8sIDAs IG1tQklGX0JYX1BGMF9ET09SQkVMTF9TRUxGUklOR19HUEFfQVBFUl9DTlRMLCB0bXApOwogfQog CiAKIHZvaWQgbmJpb192Nl8xX2loX2Rvb3JiZWxsX3JhbmdlKHN0cnVjdCBhbWRncHVfZGV2aWNl ICphZGV2LAogCQkJCWJvb2wgdXNlX2Rvb3JiZWxsLCBpbnQgZG9vcmJlbGxfaW5kZXgpCiB7Ci0J dTMyIGloX2Rvb3JiZWxsX3JhbmdlID0gUlJFRzMyKFNPQzE1X1JFR19PRkZTRVQoTkJJTywgMCAs IG1tQklGX0lIX0RPT1JCRUxMX1JBTkdFKSk7CisJdTMyIGloX2Rvb3JiZWxsX3JhbmdlID0gUlJF RzMyX1NPQzE1KE5CSU8sIDAgLCBtbUJJRl9JSF9ET09SQkVMTF9SQU5HRSk7CiAKIAlpZiAodXNl X2Rvb3JiZWxsKSB7CiAJCWloX2Rvb3JiZWxsX3JhbmdlID0gUkVHX1NFVF9GSUVMRChpaF9kb29y YmVsbF9yYW5nZSwgQklGX0lIX0RPT1JCRUxMX1JBTkdFLCBPRkZTRVQsIGRvb3JiZWxsX2luZGV4 KTsKQEAgLTEzOSw3ICsxMzIsNyBAQCB2b2lkIG5iaW9fdjZfMV9paF9kb29yYmVsbF9yYW5nZShz dHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAl9IGVsc2UKIAkJaWhfZG9vcmJlbGxfcmFuZ2Ug PSBSRUdfU0VUX0ZJRUxEKGloX2Rvb3JiZWxsX3JhbmdlLCBCSUZfSUhfRE9PUkJFTExfUkFOR0Us IFNJWkUsIDApOwogCi0JV1JFRzMyKFNPQzE1X1JFR19PRkZTRVQoTkJJTywgMCwgbW1CSUZfSUhf RE9PUkJFTExfUkFOR0UpLCBpaF9kb29yYmVsbF9yYW5nZSk7CisJV1JFRzMyX1NPQzE1KE5CSU8s IDAsIG1tQklGX0lIX0RPT1JCRUxMX1JBTkdFLCBpaF9kb29yYmVsbF9yYW5nZSk7CiB9CiAKIHZv aWQgbmJpb192Nl8xX2loX2NvbnRyb2woc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCkBAIC0x NDcsMTUgKzE0MCwxNSBAQCB2b2lkIG5iaW9fdjZfMV9paF9jb250cm9sKHN0cnVjdCBhbWRncHVf ZGV2aWNlICphZGV2KQogCXUzMiBpbnRlcnJ1cHRfY250bDsKIAogCS8qIHNldHVwIGludGVycnVw dCBjb250cm9sICovCi0JV1JFRzMyKFNPQzE1X1JFR19PRkZTRVQoTkJJTywgMCwgbW1JTlRFUlJV UFRfQ05UTDIpLCBhZGV2LT5kdW1teV9wYWdlLmFkZHIgPj4gOCk7Ci0JaW50ZXJydXB0X2NudGwg PSBSUkVHMzIoU09DMTVfUkVHX09GRlNFVChOQklPLCAwLCBtbUlOVEVSUlVQVF9DTlRMKSk7CisJ V1JFRzMyX1NPQzE1KE5CSU8sIDAsIG1tSU5URVJSVVBUX0NOVEwyLCBhZGV2LT5kdW1teV9wYWdl LmFkZHIgPj4gOCk7CisJaW50ZXJydXB0X2NudGwgPSBSUkVHMzJfU09DMTUoTkJJTywgMCwgbW1J TlRFUlJVUFRfQ05UTCk7CiAJLyogSU5URVJSVVBUX0NOVExfX0lIX0RVTU1ZX1JEX09WRVJSSURF X01BU0s9MCAtIGR1bW15IHJlYWQgZGlzYWJsZWQgd2l0aCBtc2ksIGVuYWJsZWQgd2l0aG91dCBt c2kKIAkgKiBJTlRFUlJVUFRfQ05UTF9fSUhfRFVNTVlfUkRfT1ZFUlJJREVfTUFTSz0xIC0gZHVt bXkgcmVhZCBjb250cm9sbGVkIGJ5IElIX0RVTU1ZX1JEX0VOCiAJICovCiAJaW50ZXJydXB0X2Nu dGwgPSBSRUdfU0VUX0ZJRUxEKGludGVycnVwdF9jbnRsLCBJTlRFUlJVUFRfQ05UTCwgSUhfRFVN TVlfUkRfT1ZFUlJJREUsIDApOwogCS8qIElOVEVSUlVQVF9DTlRMX19JSF9SRVFfTk9OU05PT1Bf RU5fTUFTSz0xIGlmIHJpbmcgaXMgaW4gbm9uLWNhY2hlYWJsZSBtZW1vcnksIGUuZy4sIHZyYW0g Ki8KIAlpbnRlcnJ1cHRfY250bCA9IFJFR19TRVRfRklFTEQoaW50ZXJydXB0X2NudGwsIElOVEVS UlVQVF9DTlRMLCBJSF9SRVFfTk9OU05PT1BfRU4sIDApOwotCVdSRUczMihTT0MxNV9SRUdfT0ZG U0VUKE5CSU8sIDAsIG1tSU5URVJSVVBUX0NOVEwpLCBpbnRlcnJ1cHRfY250bCk7CisJV1JFRzMy X1NPQzE1KE5CSU8sIDAsIG1tSU5URVJSVVBUX0NOVEwsIGludGVycnVwdF9jbnRsKTsKIH0KIAog dm9pZCBuYmlvX3Y2XzFfdXBkYXRlX21lZGl1bV9ncmFpbl9jbG9ja19nYXRpbmcoc3RydWN0IGFt ZGdwdV9kZXZpY2UgKmFkZXYsCkBAIC0yNTEsOCArMjQ0LDcgQEAgdm9pZCBuYmlvX3Y2XzFfZGV0 ZWN0X2h3X3ZpcnQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiB7CiAJdWludDMyX3QgcmVn OwogCi0JcmVnID0gUlJFRzMyKFNPQzE1X1JFR19PRkZTRVQoTkJJTywgMCwKLQkJCQkgICAgICBt bVJDQ19QRl8wXzBfUkNDX0lPVl9GVU5DX0lERU5USUZJRVIpKTsKKwlyZWcgPSBSUkVHMzJfU09D MTUoTkJJTywgMCwgbW1SQ0NfUEZfMF8wX1JDQ19JT1ZfRlVOQ19JREVOVElGSUVSKTsKIAlpZiAo cmVnICYgMSkKIAkJYWRldi0+dmlydC5jYXBzIHw9IEFNREdQVV9TUklPVl9DQVBTX0lTX1ZGOwog Ci0tIAoyLjEyLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=