From: "Zhao, Yong" Subject: [PATCH 2/2] Revert "drm/amdgpu: Fix bugs in setting CP RB/MEC DOORBELL_RANGE registers" Date: Tue, 19 Feb 2019 16:29:09 +0000 Message-ID: <20190219162848.16824-2-Yong.Zhao@amd.com> References: <20190219162848.16824-1-Yong.Zhao@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190219162848.16824-1-Yong.Zhao-5C7GfCeVMHo@public.gmane.org> Content-Language: en-US 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: "Zhao, Yong" VGhlIG9yaWdpbmFsIGNoYW5nZSBjYXVzZWQgcmVncmVzc2lvbiwgc28gcmV2ZXJ0IGl0IHVudGls IHRoZSBuZXcgZml4IGlzCnJlYWR5LgpodHRwczovL2J1Z3MuZnJlZWRlc2t0b3Aub3JnL3Nob3df YnVnLmNnaT9pZD0xMDk2NTAKClRoaXMgcmV2ZXJ0cyBjb21taXQgNzY0Yzg1ZmVmNDE3MjJkYjBm MjE1NThjNmMyZmIzOGJlZTE3MmQxOS4KCkNoYW5nZS1JZDogSTZjNjM0ZDhiZGI5OGVmY2ZkZWMz MzU4MWQ5MmY3YmEwMjQxNjA2MWIKU2lnbmVkLW9mZi1ieTogWW9uZyBaaGFvIDxZb25nLlpoYW9A YW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjhfMC5jIHwgMTkg KysrKy0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y5XzAu YyB8IDE5ICsrKysrLS0tLS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgOSBpbnNlcnRpb25z KCspLCAyOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9nZnhfdjhfMC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y4XzAuYwpp bmRleCA0MWNmOWQwMjI0ZDkuLmI4ZTUwYTM0YmRiMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvZ2Z4X3Y4XzAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9nZnhfdjhfMC5jCkBAIC00MjIzLDggKzQyMjMsOCBAQCBzdGF0aWMgdm9pZCBnZnhfdjhfMF9z ZXRfY3BnX2Rvb3JfYmVsbChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgc3RydWN0IGFtZGdw dQogCQkJCQlhZGV2LT5kb29yYmVsbF9pbmRleC5nZnhfcmluZzApOwogCVdSRUczMihtbUNQX1JC X0RPT1JCRUxMX1JBTkdFX0xPV0VSLCB0bXApOwogCi0JLyogVGhlcmUgaXMgb25seSBvbmUgR0ZY IHF1ZXVlICovCi0JV1JFRzMyKG1tQ1BfUkJfRE9PUkJFTExfUkFOR0VfVVBQRVIsIHRtcCk7CisJ V1JFRzMyKG1tQ1BfUkJfRE9PUkJFTExfUkFOR0VfVVBQRVIsCisJCUNQX1JCX0RPT1JCRUxMX1JB TkdFX1VQUEVSX19ET09SQkVMTF9SQU5HRV9VUFBFUl9NQVNLKTsKIH0KIAogc3RhdGljIGludCBn ZnhfdjhfMF9jcF9nZnhfcmVzdW1lKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQpAQCAtNDY0 NiwxOSArNDY0Niw4IEBAIHN0YXRpYyBpbnQgZ2Z4X3Y4XzBfa2NxX2luaXRfcXVldWUoc3RydWN0 IGFtZGdwdV9yaW5nICpyaW5nKQogc3RhdGljIHZvaWQgZ2Z4X3Y4XzBfc2V0X21lY19kb29yYmVs bF9yYW5nZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIHsKIAlpZiAoYWRldi0+YXNpY190 eXBlID4gQ0hJUF9UT05HQSkgewotCQkvKiBUaGUgZmlyc3QgZmV3IGRvb3JiZWxscyBpbiBwY2kg ZG9vcmJlbGwgYmFyIGFyZSBmb3IgR0ZYIFJCCi0JCSAqIHJpbmdzIGFuZCBhbGwgdGhlIGxlZnRv dmVyIGZvciBNRUMuCi0JCSAqIFNvIENQX01FQ19ET09SQkVMTF9SQU5HRV9MT1dFUiBzaG91bGQg YmUgc2V0IG9uZSBpbmRleCBhZnRlcgotCQkgKiBDUF9SQl9ET09SQkVMTF9SQU5HRV9VUFBFUiwg YXMgd2UgYXNzdW1lIHRoZXJlIGlzIG9ubHkgb25lCi0JCSAqIEdGWCBSQiByaW5ncy4KLQkJICov Ci0JCXUzMiB0bXAgPSBSRUdfU0VUX0ZJRUxEKDAsIENQX01FQ19ET09SQkVMTF9SQU5HRV9MT1dF UiwKLQkJCQlET09SQkVMTF9SQU5HRV9MT1dFUiwKLQkJCQlhZGV2LT5nZnguZ2Z4X3JpbmdbMF0u ZG9vcmJlbGxfaW5kZXggKyAxKTsKLQotCQlXUkVHMzIobW1DUF9NRUNfRE9PUkJFTExfUkFOR0Vf TE9XRVIsIHRtcCk7Ci0JCVdSRUczMihtbUNQX01FQ19ET09SQkVMTF9SQU5HRV9VUFBFUiwKLQkJ CQlDUF9NRUNfRE9PUkJFTExfUkFOR0VfVVBQRVJfX0RPT1JCRUxMX1JBTkdFX1VQUEVSX01BU0sp OworCQlXUkVHMzIobW1DUF9NRUNfRE9PUkJFTExfUkFOR0VfTE9XRVIsIGFkZXYtPmRvb3JiZWxs X2luZGV4LmtpcSA8PCAyKTsKKwkJV1JFRzMyKG1tQ1BfTUVDX0RPT1JCRUxMX1JBTkdFX1VQUEVS LCBhZGV2LT5kb29yYmVsbF9pbmRleC5tZWNfcmluZzcgPDwgMik7CiAJfQogCS8qIGVuYWJsZSBk b29yYmVsbHMgKi8KIAlXUkVHMzJfRklFTEQoQ1BfUFFfU1RBVFVTLCBET09SQkVMTF9FTkFCTEUs IDEpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y5XzAuYyBi L2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OV8wLmMKaW5kZXggMzZmNDE3ZmQ2YmE5 Li41NTMzZjZlNGY0YTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dm eF92OV8wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y5XzAuYwpAQCAt MjYzMSw4ICsyNjMxLDggQEAgc3RhdGljIGludCBnZnhfdjlfMF9jcF9nZnhfcmVzdW1lKHN0cnVj dCBhbWRncHVfZGV2aWNlICphZGV2KQogCQkJRE9PUkJFTExfUkFOR0VfTE9XRVIsIHJpbmctPmRv b3JiZWxsX2luZGV4KTsKIAlXUkVHMzJfU09DMTUoR0MsIDAsIG1tQ1BfUkJfRE9PUkJFTExfUkFO R0VfTE9XRVIsIHRtcCk7CiAKLQkvKiBUaGVyZSBpcyBvbmx5IG9uZSBHRlggcXVldWUgKi8KLQlX UkVHMzJfU09DMTUoR0MsIDAsIG1tQ1BfUkJfRE9PUkJFTExfUkFOR0VfVVBQRVIsIHRtcCk7CisJ V1JFRzMyX1NPQzE1KEdDLCAwLCBtbUNQX1JCX0RPT1JCRUxMX1JBTkdFX1VQUEVSLAorCQkgICAg ICAgQ1BfUkJfRE9PUkJFTExfUkFOR0VfVVBQRVJfX0RPT1JCRUxMX1JBTkdFX1VQUEVSX01BU0sp OwogCiAKIAkvKiBzdGFydCB0aGUgcmluZyAqLwpAQCAtMjk5NSwxOSArMjk5NSwxMCBAQCBzdGF0 aWMgaW50IGdmeF92OV8wX2tpcV9pbml0X3JlZ2lzdGVyKHN0cnVjdCBhbWRncHVfcmluZyAqcmlu ZykKIAogCS8qIGVuYWJsZSB0aGUgZG9vcmJlbGwgaWYgcmVxdWVzdGVkICovCiAJaWYgKHJpbmct PnVzZV9kb29yYmVsbCkgewotCQkvKiBUaGUgZmlyc3QgZmV3IGRvb3JiZWxscyBpbiBwY2kgZG9v cmJlbGwgYmFyIGFyZSBmb3IgR0ZYIFJCCi0JCSAqIHJpbmdzIGFuZCBhbGwgdGhlIGxlZnRvdmVy IGZvciBNRUMuCi0JCSAqIFNvIENQX01FQ19ET09SQkVMTF9SQU5HRV9MT1dFUiBzaG91bGQgYmUg c2V0IG9uZSBpbmRleCBhZnRlcgotCQkgKiBDUF9SQl9ET09SQkVMTF9SQU5HRV9VUFBFUiwgYXMg d2UgYXNzdW1lIHRoZXJlIGlzIG9ubHkgb25lCi0JCSAqIEdGWCBSQiByaW5ncy4KLQkJICovCi0J CXUzMiB0bXAgPSBSRUdfU0VUX0ZJRUxEKDAsIENQX01FQ19ET09SQkVMTF9SQU5HRV9MT1dFUiwK LQkJCQlET09SQkVMTF9SQU5HRV9MT1dFUiwKLQkJCQlhZGV2LT5nZnguZ2Z4X3JpbmdbMF0uZG9v cmJlbGxfaW5kZXggKyAyKTsKLQotCQlXUkVHMzJfU09DMTUoR0MsIDAsIG1tQ1BfTUVDX0RPT1JC RUxMX1JBTkdFX0xPV0VSLCB0bXApOworCQlXUkVHMzJfU09DMTUoR0MsIDAsIG1tQ1BfTUVDX0RP T1JCRUxMX1JBTkdFX0xPV0VSLAorCQkJCQkoYWRldi0+ZG9vcmJlbGxfaW5kZXgua2lxICogMikg PDwgMik7CiAJCVdSRUczMl9TT0MxNShHQywgMCwgbW1DUF9NRUNfRE9PUkJFTExfUkFOR0VfVVBQ RVIsCi0JCQkJQ1BfTUVDX0RPT1JCRUxMX1JBTkdFX1VQUEVSX19ET09SQkVMTF9SQU5HRV9VUFBF Ul9NQVNLKTsKKwkJCQkJKGFkZXYtPmRvb3JiZWxsX2luZGV4LnVzZXJxdWV1ZV9lbmQgKiAyKSA8 PCAyKTsKIAl9CiAKIAlXUkVHMzJfU09DMTUoR0MsIDAsIG1tQ1BfSFFEX1BRX0RPT1JCRUxMX0NP TlRST0wsCi0tIAoyLjE3LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdm eA==