From: Tom St Denis Subject: [PATCH 07/10] drm/amd/amdgpu: Port NBIO v7.0 driver over to new SOC15 macros Date: Mon, 12 Jun 2017 13:54:28 -0400 Message-ID: <20170612175431.32764-8-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 aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L25iaW9fdjdfMC5jIHwgNDIgKysrKysrKysrKysrKyst LS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE3IGluc2VydGlvbnMoKyksIDI1 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L25i aW9fdjdfMC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvbmJpb192N18wLmMKaW5kZXgg N2UxMjA2ZDFkZjZhLi5hYTA0NjMyNTIzZmEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L25iaW9fdjdfMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L25i aW9fdjdfMC5jCkBAIC0zNCw3ICszNCw3IEBACiAKIHUzMiBuYmlvX3Y3XzBfZ2V0X3Jldl9pZChz dHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIHsKLSAgICAgICAgdTMyIHRtcCA9IFJSRUczMihT T0MxNV9SRUdfT0ZGU0VUKE5CSU8sIDAsIG1tUkNDX0RFVjBfRVBGMF9TVFJBUDApKTsKKyAgICAg ICAgdTMyIHRtcCA9IFJSRUczMl9TT0MxNShOQklPLCAwLCBtbVJDQ19ERVYwX0VQRjBfU1RSQVAw KTsKIAogCXRtcCAmPSBSQ0NfREVWMF9FUEYwX1NUUkFQMF9fU1RSQVBfQVRJX1JFVl9JRF9ERVYw X0YwX01BU0s7CiAJdG1wID4+PSBSQ0NfREVWMF9FUEYwX1NUUkFQMF9fU1RSQVBfQVRJX1JFVl9J RF9ERVYwX0YwX19TSElGVDsKQEAgLTQ1LDMyICs0NSwzMiBAQCB1MzIgbmJpb192N18wX2dldF9y ZXZfaWQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiB1MzIgbmJpb192N18wX2dldF9hdG9t Ymlvc19zY3JhdGNoX3JlZ3Moc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAJCQkJCXVpbnQz Ml90IGlkeCkKIHsKLQlyZXR1cm4gUlJFRzMyKFNPQzE1X1JFR19PRkZTRVQoTkJJTywgMCwgbW1C SU9TX1NDUkFUQ0hfMCkgKyBpZHgpOworCXJldHVybiBSUkVHMzJfU09DMTVfT0ZGU0VUKE5CSU8s IDAsIG1tQklPU19TQ1JBVENIXzAsIGlkeCk7CiB9CiAKIHZvaWQgbmJpb192N18wX3NldF9hdG9t Ymlvc19zY3JhdGNoX3JlZ3Moc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAJCQkJCSB1aW50 MzJfdCBpZHgsIHVpbnQzMl90IHZhbCkKIHsKLQlXUkVHMzIoU09DMTVfUkVHX09GRlNFVChOQklP LCAwLCBtbUJJT1NfU0NSQVRDSF8wKSArIGlkeCwgdmFsKTsKKwlXUkVHMzJfU09DMTVfT0ZGU0VU KE5CSU8sIDAsIG1tQklPU19TQ1JBVENIXzAsIGlkeCwgdmFsKTsKIH0KIAogdm9pZCBuYmlvX3Y3 XzBfbWNfYWNjZXNzX2VuYWJsZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgYm9vbCBlbmFi bGUpCiB7CiAJaWYgKGVuYWJsZSkKLQkJV1JFRzMyKFNPQzE1X1JFR19PRkZTRVQoTkJJTywgMCwg bW1CSUZfRkJfRU4pLAorCQlXUkVHMzJfU09DMTUoTkJJTywgMCwgbW1CSUZfRkJfRU4sCiAJCQlC SUZfRkJfRU5fX0ZCX1JFQURfRU5fTUFTSyB8IEJJRl9GQl9FTl9fRkJfV1JJVEVfRU5fTUFTSyk7 CiAJZWxzZQotCQlXUkVHMzIoU09DMTVfUkVHX09GRlNFVChOQklPLCAwLCBtbUJJRl9GQl9FTiks IDApOworCQlXUkVHMzJfU09DMTUoTkJJTywgMCwgbW1CSUZfRkJfRU4sIDApOwogfQogCiB2b2lk IG5iaW9fdjdfMF9oZHBfZmx1c2goc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiB7Ci0JV1JF RzMyKFNPQzE1X1JFR19PRkZTRVQoTkJJTywgMCwgbW1IRFBfTUVNX0NPSEVSRU5DWV9GTFVTSF9D TlRMKSwgMCk7CisJV1JFRzMyX1NPQzE1KE5CSU8sIDAsIG1tSERQX01FTV9DT0hFUkVOQ1lfRkxV U0hfQ05UTCwgMCk7CiB9CiAKIHUzMiBuYmlvX3Y3XzBfZ2V0X21lbXNpemUoc3RydWN0IGFtZGdw dV9kZXZpY2UgKmFkZXYpCiB7Ci0JcmV0dXJuIFJSRUczMihTT0MxNV9SRUdfT0ZGU0VUKE5CSU8s IDAsIG1tUkNDX0NPTkZJR19NRU1TSVpFKSk7CisJcmV0dXJuIFJSRUczMl9TT0MxNShOQklPLCAw LCBtbVJDQ19DT05GSUdfTUVNU0laRSk7CiB9CiAKIHN0YXRpYyBjb25zdCB1MzIgbmJpb19zZG1h X2Rvb3JiZWxsX3JhbmdlX3JlZ1tdID0KQEAgLTk2LDIxICs5NiwxMyBAQCB2b2lkIG5iaW9fdjdf MF9zZG1hX2Rvb3JiZWxsX3JhbmdlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCBpbnQgaW5z dGFuY2UsCiB2b2lkIG5iaW9fdjdfMF9lbmFibGVfZG9vcmJlbGxfYXBlcnR1cmUoc3RydWN0IGFt ZGdwdV9kZXZpY2UgKmFkZXYsCiAJCQkJCWJvb2wgZW5hYmxlKQogewotCXUzMiB0bXA7Ci0KLQl0 bXAgPSBSUkVHMzIoU09DMTVfUkVHX09GRlNFVChOQklPLCAwLCAgbW1SQ0NfRE9PUkJFTExfQVBF Ul9FTikpOwotCWlmIChlbmFibGUpCi0JCXRtcCA9IFJFR19TRVRfRklFTEQodG1wLCAgUkNDX0RP T1JCRUxMX0FQRVJfRU4sIEJJRl9ET09SQkVMTF9BUEVSX0VOLCAxKTsKLQllbHNlCi0JCXRtcCA9 IFJFR19TRVRfRklFTEQodG1wLCAgUkNDX0RPT1JCRUxMX0FQRVJfRU4sIEJJRl9ET09SQkVMTF9B UEVSX0VOLCAwKTsKLQotCVdSRUczMihTT0MxNV9SRUdfT0ZGU0VUKE5CSU8sIDAsICBtbVJDQ19E T09SQkVMTF9BUEVSX0VOKSwgdG1wKTsKKwlXUkVHMzJfRklFTEQxNShOQklPLCAwLCBSQ0NfRE9P UkJFTExfQVBFUl9FTiwgQklGX0RPT1JCRUxMX0FQRVJfRU4sIGVuYWJsZSA/IDEgOiAwKTsKIH0K IAogdm9pZCBuYmlvX3Y3XzBfaWhfZG9vcmJlbGxfcmFuZ2Uoc3RydWN0IGFtZGdwdV9kZXZpY2Ug KmFkZXYsCiAJCQkJYm9vbCB1c2VfZG9vcmJlbGwsIGludCBkb29yYmVsbF9pbmRleCkKIHsKLQl1 MzIgaWhfZG9vcmJlbGxfcmFuZ2UgPSBSUkVHMzIoU09DMTVfUkVHX09GRlNFVChOQklPLCAwICwg bW1CSUZfSUhfRE9PUkJFTExfUkFOR0UpKTsKKwl1MzIgaWhfZG9vcmJlbGxfcmFuZ2UgPSBSUkVH MzJfU09DMTUoTkJJTywgMCAsIG1tQklGX0lIX0RPT1JCRUxMX1JBTkdFKTsKIAogCWlmICh1c2Vf ZG9vcmJlbGwpIHsKIAkJaWhfZG9vcmJlbGxfcmFuZ2UgPSBSRUdfU0VUX0ZJRUxEKGloX2Rvb3Ji ZWxsX3JhbmdlLCBCSUZfSUhfRE9PUkJFTExfUkFOR0UsIE9GRlNFVCwgZG9vcmJlbGxfaW5kZXgp OwpAQCAtMTE4LDE1ICsxMTAsMTUgQEAgdm9pZCBuYmlvX3Y3XzBfaWhfZG9vcmJlbGxfcmFuZ2Uo c3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAJfSBlbHNlCiAJCWloX2Rvb3JiZWxsX3Jhbmdl ID0gUkVHX1NFVF9GSUVMRChpaF9kb29yYmVsbF9yYW5nZSwgQklGX0lIX0RPT1JCRUxMX1JBTkdF LCBTSVpFLCAwKTsKIAotCVdSRUczMihTT0MxNV9SRUdfT0ZGU0VUKE5CSU8sIDAsIG1tQklGX0lI X0RPT1JCRUxMX1JBTkdFKSwgaWhfZG9vcmJlbGxfcmFuZ2UpOworCVdSRUczMl9TT0MxNShOQklP LCAwLCBtbUJJRl9JSF9ET09SQkVMTF9SQU5HRSwgaWhfZG9vcmJlbGxfcmFuZ2UpOwogfQogCiBz dGF0aWMgdWludDMyX3QgbmJpb183XzBfcmVhZF9zeXNodWJfaW5kX21tcihzdHJ1Y3QgYW1kZ3B1 X2RldmljZSAqYWRldiwgdWludDMyX3Qgb2Zmc2V0KQogewogCXVpbnQzMl90IGRhdGE7CiAKLQlX UkVHMzIoU09DMTVfUkVHX09GRlNFVChOQklPLCAwLCBtbVNZU0hVQl9JTkRFWCksIG9mZnNldCk7 Ci0JZGF0YSA9IFJSRUczMihTT0MxNV9SRUdfT0ZGU0VUKE5CSU8sIDAsIG1tU1lTSFVCX0RBVEEp KTsKKwlXUkVHMzJfU09DMTUoTkJJTywgMCwgbW1TWVNIVUJfSU5ERVgsIG9mZnNldCk7CisJZGF0 YSA9IFJSRUczMl9TT0MxNShOQklPLCAwLCBtbVNZU0hVQl9EQVRBKTsKIAogCXJldHVybiBkYXRh OwogfQpAQCAtMTM0LDggKzEyNiw4IEBAIHN0YXRpYyB1aW50MzJfdCBuYmlvXzdfMF9yZWFkX3N5 c2h1Yl9pbmRfbW1yKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCB1aW50MzJfCiBzdGF0aWMg dm9pZCBuYmlvXzdfMF93cml0ZV9zeXNodWJfaW5kX21tcihzdHJ1Y3QgYW1kZ3B1X2RldmljZSAq YWRldiwgdWludDMyX3Qgb2Zmc2V0LAogCQkJCSAgICAgICB1aW50MzJfdCBkYXRhKQogewotCVdS RUczMihTT0MxNV9SRUdfT0ZGU0VUKE5CSU8sIDAsIG1tU1lTSFVCX0lOREVYKSwgb2Zmc2V0KTsK LQlXUkVHMzIoU09DMTVfUkVHX09GRlNFVChOQklPLCAwLCBtbVNZU0hVQl9EQVRBKSwgZGF0YSk7 CisJV1JFRzMyX1NPQzE1KE5CSU8sIDAsIG1tU1lTSFVCX0lOREVYLCBvZmZzZXQpOworCVdSRUcz Ml9TT0MxNShOQklPLCAwLCBtbVNZU0hVQl9EQVRBLCBkYXRhKTsKIH0KIAogdm9pZCBuYmlvX3Y3 XzBfdXBkYXRlX21lZGl1bV9ncmFpbl9jbG9ja19nYXRpbmcoc3RydWN0IGFtZGdwdV9kZXZpY2Ug KmFkZXYsCkBAIC0xODIsMTUgKzE3NCwxNSBAQCB2b2lkIG5iaW9fdjdfMF9paF9jb250cm9sKHN0 cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCXUzMiBpbnRlcnJ1cHRfY250bDsKIAogCS8qIHNl dHVwIGludGVycnVwdCBjb250cm9sICovCi0JV1JFRzMyKFNPQzE1X1JFR19PRkZTRVQoTkJJTywg MCwgbW1JTlRFUlJVUFRfQ05UTDIpLCBhZGV2LT5kdW1teV9wYWdlLmFkZHIgPj4gOCk7Ci0JaW50 ZXJydXB0X2NudGwgPSBSUkVHMzIoU09DMTVfUkVHX09GRlNFVChOQklPLCAwLCBtbUlOVEVSUlVQ VF9DTlRMKSk7CisJV1JFRzMyX1NPQzE1KE5CSU8sIDAsIG1tSU5URVJSVVBUX0NOVEwyLCBhZGV2 LT5kdW1teV9wYWdlLmFkZHIgPj4gOCk7CisJaW50ZXJydXB0X2NudGwgPSBSUkVHMzJfU09DMTUo TkJJTywgMCwgbW1JTlRFUlJVUFRfQ05UTCk7CiAJLyogSU5URVJSVVBUX0NOVExfX0lIX0RVTU1Z X1JEX09WRVJSSURFX01BU0s9MCAtIGR1bW15IHJlYWQgZGlzYWJsZWQgd2l0aCBtc2ksIGVuYWJs ZWQgd2l0aG91dCBtc2kKIAkgKiBJTlRFUlJVUFRfQ05UTF9fSUhfRFVNTVlfUkRfT1ZFUlJJREVf TUFTSz0xIC0gZHVtbXkgcmVhZCBjb250cm9sbGVkIGJ5IElIX0RVTU1ZX1JEX0VOCiAJICovCiAJ aW50ZXJydXB0X2NudGwgPSBSRUdfU0VUX0ZJRUxEKGludGVycnVwdF9jbnRsLCBJTlRFUlJVUFRf Q05UTCwgSUhfRFVNTVlfUkRfT1ZFUlJJREUsIDApOwogCS8qIElOVEVSUlVQVF9DTlRMX19JSF9S RVFfTk9OU05PT1BfRU5fTUFTSz0xIGlmIHJpbmcgaXMgaW4gbm9uLWNhY2hlYWJsZSBtZW1vcnks IGUuZy4sIHZyYW0gKi8KIAlpbnRlcnJ1cHRfY250bCA9IFJFR19TRVRfRklFTEQoaW50ZXJydXB0 X2NudGwsIElOVEVSUlVQVF9DTlRMLCBJSF9SRVFfTk9OU05PT1BfRU4sIDApOwotCVdSRUczMihT T0MxNV9SRUdfT0ZGU0VUKE5CSU8sIDAsIG1tSU5URVJSVVBUX0NOVEwpLCBpbnRlcnJ1cHRfY250 bCk7CisJV1JFRzMyX1NPQzE1KE5CSU8sIDAsIG1tSU5URVJSVVBUX0NOVEwsIGludGVycnVwdF9j bnRsKTsKIH0KIAogc3RydWN0IG5iaW9faGRwX2ZsdXNoX3JlZyBuYmlvX3Y3XzBfaGRwX2ZsdXNo X3JlZzsKLS0gCjIuMTIuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4 Cg==