From: Alex Deucher Subject: [PATCH 05/38] Revert "drm/amdgpu: Add nbio support for vega20 (v2)" Date: Tue, 14 Aug 2018 11:52:15 -0500 Message-ID: <20180814165248.27987-2-alexander.deucher@amd.com> References: <20180814165248.27987-1-alexander.deucher@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180814165248.27987-1-alexander.deucher-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: Alex Deucher UmV2ZXJ0IHRoaXMgdG8gYWRkIHByb3BlciBuYmlvIDcuNCBzdXBwb3J0LgoKVGhpcyByZXZlcnRz IGNvbW1pdCBmNWIyZTFmYTMyMWVmZjIwYTk0MThlYmQ0OTdkOGE0NjZmMDI0YTg1LgoKU2lnbmVk LW9mZi1ieTogQWxleCBEZXVjaGVyIDxhbGV4YW5kZXIuZGV1Y2hlckBhbWQuY29tPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L25iaW9fdjdfMC5jIHwgMTggKy0tLS0tLS0tLS0tLS0t LS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9zb2MxNS5jICAgICB8ICAyIC0tCiAyIGZp bGVzIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCAxOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9uYmlvX3Y3XzAuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvYW1kZ3B1L25iaW9fdjdfMC5jCmluZGV4IDM2NTUxN2MwMTIxZS4uZGYzNGRjNzlkNDQ0 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9uYmlvX3Y3XzAuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9uYmlvX3Y3XzAuYwpAQCAtMzQsMTkgKzM0LDEw IEBACiAjZGVmaW5lIHNtbkNQTV9DT05UUk9MICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDB4MTEx ODA0NjAKICNkZWZpbmUgc21uUENJRV9DTlRMMiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMHgx MTE4MDA3MAogCi0vKiB2ZWdhMjAgKi8KLSNkZWZpbmUgbW1SQ0NfREVWMF9FUEYwX1NUUkFQMF9W RzIwICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIDB4MDAxMQotI2RlZmluZSBtbVJDQ19ERVYwX0VQRjBfU1RSQVAw X1ZHMjBfQkFTRV9JRFggICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgMgotCiBzdGF0aWMgdTMyIG5iaW9fdjdfMF9nZXRfcmV2X2lk KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogewogICAgICAgICB1MzIgdG1wID0gUlJFRzMy X1NPQzE1KE5CSU8sIDAsIG1tUkNDX0RFVjBfRVBGMF9TVFJBUDApOwogCi0JaWYgKGFkZXYtPmFz aWNfdHlwZSA9PSBDSElQX1ZFR0EyMCkKLQkJdG1wID0gUlJFRzMyX1NPQzE1KE5CSU8sIDAsIG1t UkNDX0RFVjBfRVBGMF9TVFJBUDBfVkcyMCk7Ci0JZWxzZQotCQl0bXAgPSBSUkVHMzJfU09DMTUo TkJJTywgMCwgbW1SQ0NfREVWMF9FUEYwX1NUUkFQMCk7Ci0KIAl0bXAgJj0gUkNDX0RFVjBfRVBG MF9TVFJBUDBfX1NUUkFQX0FUSV9SRVZfSURfREVWMF9GMF9NQVNLOwogCXRtcCA+Pj0gUkNDX0RF VjBfRVBGMF9TVFJBUDBfX1NUUkFQX0FUSV9SRVZfSURfREVWMF9GMF9fU0hJRlQ7CiAKQEAgLTg0 LDE0ICs3NSwxMCBAQCBzdGF0aWMgdm9pZCBuYmlvX3Y3XzBfc2RtYV9kb29yYmVsbF9yYW5nZShz dHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgaW50IGluc3RhbgogCQkJU09DMTVfUkVHX09GRlNF VChOQklPLCAwLCBtbUJJRl9TRE1BMV9ET09SQkVMTF9SQU5HRSk7CiAKIAl1MzIgZG9vcmJlbGxf cmFuZ2UgPSBSUkVHMzIocmVnKTsKLQl1MzIgcmFuZ2UgPSAyOwotCi0JaWYgKGFkZXYtPmFzaWNf dHlwZSA9PSBDSElQX1ZFR0EyMCkKLQkJcmFuZ2UgPSA4OwogCiAJaWYgKHVzZV9kb29yYmVsbCkg ewogCQlkb29yYmVsbF9yYW5nZSA9IFJFR19TRVRfRklFTEQoZG9vcmJlbGxfcmFuZ2UsIEJJRl9T RE1BMF9ET09SQkVMTF9SQU5HRSwgT0ZGU0VULCBkb29yYmVsbF9pbmRleCk7Ci0JCWRvb3JiZWxs X3JhbmdlID0gUkVHX1NFVF9GSUVMRChkb29yYmVsbF9yYW5nZSwgQklGX1NETUEwX0RPT1JCRUxM X1JBTkdFLCBTSVpFLCByYW5nZSk7CisJCWRvb3JiZWxsX3JhbmdlID0gUkVHX1NFVF9GSUVMRChk b29yYmVsbF9yYW5nZSwgQklGX1NETUEwX0RPT1JCRUxMX1JBTkdFLCBTSVpFLCAyKTsKIAl9IGVs c2UKIAkJZG9vcmJlbGxfcmFuZ2UgPSBSRUdfU0VUX0ZJRUxEKGRvb3JiZWxsX3JhbmdlLCBCSUZf U0RNQTBfRE9PUkJFTExfUkFOR0UsIFNJWkUsIDApOwogCkBAIC0xNDYsOSArMTMzLDYgQEAgc3Rh dGljIHZvaWQgbmJpb192N18wX3VwZGF0ZV9tZWRpdW1fZ3JhaW5fY2xvY2tfZ2F0aW5nKHN0cnVj dCBhbWRncHVfZGV2aWNlICphZGUKIHsKIAl1aW50MzJfdCBkZWYsIGRhdGE7CiAKLQlpZiAoYWRl di0+YXNpY190eXBlID09IENISVBfVkVHQTIwKQotCQlyZXR1cm47Ci0KIAkvKiBOQklGX01HQ0df Q1RSTF9MQ0xLICovCiAJZGVmID0gZGF0YSA9IFJSRUczMl9QQ0lFKHNtbk5CSUZfTUdDR19DVFJM X0xDTEspOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9zb2MxNS5j IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc29jMTUuYwppbmRleCA4M2YyNzE3ZmNmODEu LjZiZDgwMzY5Njg1ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc29j MTUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9zb2MxNS5jCkBAIC00OTcsOCAr NDk3LDYgQEAgaW50IHNvYzE1X3NldF9pcF9ibG9ja3Moc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFk ZXYpCiAKIAlpZiAoYWRldi0+ZmxhZ3MgJiBBTURfSVNfQVBVKQogCQlhZGV2LT5uYmlvX2Z1bmNz ID0gJm5iaW9fdjdfMF9mdW5jczsKLQllbHNlIGlmIChhZGV2LT5hc2ljX3R5cGUgPT0gQ0hJUF9W RUdBMjApCi0JCWFkZXYtPm5iaW9fZnVuY3MgPSAmbmJpb192N18wX2Z1bmNzOwogCWVsc2UKIAkJ YWRldi0+bmJpb19mdW5jcyA9ICZuYmlvX3Y2XzFfZnVuY3M7CiAKLS0gCjIuMTMuNgoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5n IGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==