From: Tom St Denis Subject: [PATCH 02/10] drm/amd/amdgpu: Port GFXHUB over to new SOC15 macros Date: Mon, 12 Jun 2017 13:54:23 -0400 Message-ID: <20170612175431.32764-3-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 aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeGh1Yl92MV8wLmMgfCAyNiArKysrKysrKysrKyst LS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEyIGluc2VydGlvbnMoKyksIDE0IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeGh1Yl92 MV8wLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhodWJfdjFfMC5jCmluZGV4IDkw ZTZjMjg1NjhlYi4uMWMwYjFhYWFhNDhiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9nZnhodWJfdjFfMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dm eGh1Yl92MV8wLmMKQEAgLTMzLDcgKzMzLDcgQEAKIAogdTY0IGdmeGh1Yl92MV8wX2dldF9tY19m Yl9vZmZzZXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiB7Ci0JcmV0dXJuICh1NjQpUlJF RzMyKFNPQzE1X1JFR19PRkZTRVQoR0MsIDAsIG1tTUNfVk1fRkJfT0ZGU0VUKSkgPDwgMjQ7CisJ cmV0dXJuICh1NjQpUlJFRzMyX1NPQzE1KEdDLCAwLCBtbU1DX1ZNX0ZCX09GRlNFVCkgPDwgMjQ7 CiB9CiAKIHN0YXRpYyB2b2lkIGdmeGh1Yl92MV8wX2luaXRfZ2FydF9wdF9yZWdzKHN0cnVjdCBh bWRncHVfZGV2aWNlICphZGV2KQpAQCAtMTg4LDcgKzE4OCw3IEBAIHN0YXRpYyB2b2lkIGdmeGh1 Yl92MV8wX3NldHVwX3ZtaWRfY29uZmlnKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCXVp bnQzMl90IHRtcDsKIAogCWZvciAoaSA9IDA7IGkgPD0gMTQ7IGkrKykgewotCQl0bXAgPSBSUkVH MzIoU09DMTVfUkVHX09GRlNFVChHQywgMCwgbW1WTV9DT05URVhUMV9DTlRMKSArIGkpOworCQl0 bXAgPSBSUkVHMzJfU09DMTVfT0ZGU0VUKEdDLCAwLCBtbVZNX0NPTlRFWFQxX0NOVEwsIGkpOwog CQl0bXAgPSBSRUdfU0VUX0ZJRUxEKHRtcCwgVk1fQ09OVEVYVDFfQ05UTCwgRU5BQkxFX0NPTlRF WFQsIDEpOwogCQl0bXAgPSBSRUdfU0VUX0ZJRUxEKHRtcCwgVk1fQ09OVEVYVDFfQ05UTCwgUEFH RV9UQUJMRV9ERVBUSCwKIAkJCQkgICAgYWRldi0+dm1fbWFuYWdlci5udW1fbGV2ZWwpOwpAQCAt MjA5LDEyICsyMDksMTIgQEAgc3RhdGljIHZvaWQgZ2Z4aHViX3YxXzBfc2V0dXBfdm1pZF9jb25m aWcoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJCXRtcCA9IFJFR19TRVRfRklFTEQodG1w LCBWTV9DT05URVhUMV9DTlRMLAogCQkJCVBBR0VfVEFCTEVfQkxPQ0tfU0laRSwKIAkJCQlhZGV2 LT52bV9tYW5hZ2VyLmJsb2NrX3NpemUgLSA5KTsKLQkJV1JFRzMyKFNPQzE1X1JFR19PRkZTRVQo R0MsIDAsIG1tVk1fQ09OVEVYVDFfQ05UTCkgKyBpLCB0bXApOwotCQlXUkVHMzIoU09DMTVfUkVH X09GRlNFVChHQywgMCwgbW1WTV9DT05URVhUMV9QQUdFX1RBQkxFX1NUQVJUX0FERFJfTE8zMikg KyBpKjIsIDApOwotCQlXUkVHMzIoU09DMTVfUkVHX09GRlNFVChHQywgMCwgbW1WTV9DT05URVhU MV9QQUdFX1RBQkxFX1NUQVJUX0FERFJfSEkzMikgKyBpKjIsIDApOwotCQlXUkVHMzIoU09DMTVf UkVHX09GRlNFVChHQywgMCwgbW1WTV9DT05URVhUMV9QQUdFX1RBQkxFX0VORF9BRERSX0xPMzIp ICsgaSoyLAorCQlXUkVHMzJfU09DMTVfT0ZGU0VUKEdDLCAwLCBtbVZNX0NPTlRFWFQxX0NOVEws IGksIHRtcCk7CisJCVdSRUczMl9TT0MxNV9PRkZTRVQoR0MsIDAsIG1tVk1fQ09OVEVYVDFfUEFH RV9UQUJMRV9TVEFSVF9BRERSX0xPMzIsIGkqMiwgMCk7CisJCVdSRUczMl9TT0MxNV9PRkZTRVQo R0MsIDAsIG1tVk1fQ09OVEVYVDFfUEFHRV9UQUJMRV9TVEFSVF9BRERSX0hJMzIsIGkqMiwgMCk7 CisJCVdSRUczMl9TT0MxNV9PRkZTRVQoR0MsIDAsIG1tVk1fQ09OVEVYVDFfUEFHRV9UQUJMRV9F TkRfQUREUl9MTzMyLCAgaSoyLAogCQkJbG93ZXJfMzJfYml0cyhhZGV2LT52bV9tYW5hZ2VyLm1h eF9wZm4gLSAxKSk7Ci0JCVdSRUczMihTT0MxNV9SRUdfT0ZGU0VUKEdDLCAwLCBtbVZNX0NPTlRF WFQxX1BBR0VfVEFCTEVfRU5EX0FERFJfSEkzMikgKyBpKjIsCisJCVdSRUczMl9TT0MxNV9PRkZT RVQoR0MsIDAsIG1tVk1fQ09OVEVYVDFfUEFHRV9UQUJMRV9FTkRfQUREUl9ISTMyLCBpKjIsCiAJ CQl1cHBlcl8zMl9iaXRzKGFkZXYtPnZtX21hbmFnZXIubWF4X3BmbiAtIDEpKTsKIAl9CiB9CkBA IC0yMjQsMTIgKzIyNCwxMCBAQCBzdGF0aWMgdm9pZCBnZnhodWJfdjFfMF9wcm9ncmFtX2ludmFs aWRhdGlvbihzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAl1bnNpZ25lZCBpOwogCiAJZm9y IChpID0gMCA7IGkgPCAxODsgKytpKSB7Ci0JCVdSRUczMihTT0MxNV9SRUdfT0ZGU0VUKEdDLCAw LAotCQkJCQltbVZNX0lOVkFMSURBVEVfRU5HMF9BRERSX1JBTkdFX0xPMzIpICsKLQkJICAgICAg IDIgKiBpLCAweGZmZmZmZmZmKTsKLQkJV1JFRzMyKFNPQzE1X1JFR19PRkZTRVQoR0MsIDAsCi0J CQkJCW1tVk1fSU5WQUxJREFURV9FTkcwX0FERFJfUkFOR0VfSEkzMikgKwotCQkgICAgICAgMiAq IGksIDB4MWYpOworCQlXUkVHMzJfU09DMTVfT0ZGU0VUKEdDLCAwLCBtbVZNX0lOVkFMSURBVEVf RU5HMF9BRERSX1JBTkdFX0xPMzIsCisJCQkJICAgIDIgKiBpLCAweGZmZmZmZmZmKTsKKwkJV1JF RzMyX1NPQzE1X09GRlNFVChHQywgMCwgbW1WTV9JTlZBTElEQVRFX0VORzBfQUREUl9SQU5HRV9I STMyLAorCQkJCSAgICAyICogaSwgMHgxZik7CiAJfQogfQogCkBAIC0yNjgsNyArMjY2LDcgQEAg dm9pZCBnZnhodWJfdjFfMF9nYXJ0X2Rpc2FibGUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYp CiAKIAkvKiBEaXNhYmxlIGFsbCB0YWJsZXMgKi8KIAlmb3IgKGkgPSAwOyBpIDwgMTY7IGkrKykK LQkJV1JFRzMyKFNPQzE1X1JFR19PRkZTRVQoR0MsIDAsIG1tVk1fQ09OVEVYVDBfQ05UTCkgKyBp LCAwKTsKKwkJV1JFRzMyX1NPQzE1X09GRlNFVChHQywgMCwgbW1WTV9DT05URVhUMF9DTlRMLCBp LCAwKTsKIAogCS8qIFNldHVwIFRMQiBjb250cm9sICovCiAJdG1wID0gUlJFRzMyX1NPQzE1KEdD LCAwLCBtbU1DX1ZNX01YX0wxX1RMQl9DTlRMKTsKLS0gCjIuMTIuMAoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1k LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==