From: Tom St Denis Subject: [PATCH 09/10] drm/amd/amdgpu: Port PSP v10.0 over to new SOC15 macros Date: Mon, 12 Jun 2017 13:54:30 -0400 Message-ID: <20170612175431.32764-10-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 aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3BzcF92MTBfMC5jIHwgMTQgKysrKysrKy0tLS0tLS0K IDEgZmlsZSBjaGFuZ2VkLCA3IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvcHNwX3YxMF8wLmMgYi9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9wc3BfdjEwXzAuYwppbmRleCA4ZWIyMWZkODMxNzIuLjAwYzBmMjgx Zjk3MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvcHNwX3YxMF8wLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvcHNwX3YxMF8wLmMKQEAgLTEzMywyMSAr MTMzLDIxIEBAIGludCBwc3BfdjEwXzBfcmluZ19pbml0KHN0cnVjdCBwc3BfY29udGV4dCAqcHNw LCBlbnVtIHBzcF9yaW5nX3R5cGUgcmluZ190eXBlKQogCiAJLyogV3JpdGUgbG93IGFkZHJlc3Mg b2YgdGhlIHJpbmcgdG8gQzJQTVNHXzY5ICovCiAJcHNwX3JpbmdfcmVnID0gbG93ZXJfMzJfYml0 cyhyaW5nLT5yaW5nX21lbV9tY19hZGRyKTsKLQlXUkVHMzIoU09DMTVfUkVHX09GRlNFVChNUDAs IDAsIG1tTVAwX1NNTl9DMlBNU0dfNjkpLCBwc3BfcmluZ19yZWcpOworCVdSRUczMl9TT0MxNShN UDAsIDAsIG1tTVAwX1NNTl9DMlBNU0dfNjksIHBzcF9yaW5nX3JlZyk7CiAJLyogV3JpdGUgaGln aCBhZGRyZXNzIG9mIHRoZSByaW5nIHRvIEMyUE1TR183MCAqLwogCXBzcF9yaW5nX3JlZyA9IHVw cGVyXzMyX2JpdHMocmluZy0+cmluZ19tZW1fbWNfYWRkcik7Ci0JV1JFRzMyKFNPQzE1X1JFR19P RkZTRVQoTVAwLCAwLCBtbU1QMF9TTU5fQzJQTVNHXzcwKSwgcHNwX3JpbmdfcmVnKTsKKwlXUkVH MzJfU09DMTUoTVAwLCAwLCBtbU1QMF9TTU5fQzJQTVNHXzcwLCBwc3BfcmluZ19yZWcpOwogCS8q IFdyaXRlIHNpemUgb2YgcmluZyB0byBDMlBNU0dfNzEgKi8KIAlwc3BfcmluZ19yZWcgPSByaW5n LT5yaW5nX3NpemU7Ci0JV1JFRzMyKFNPQzE1X1JFR19PRkZTRVQoTVAwLCAwLCBtbU1QMF9TTU5f QzJQTVNHXzcxKSwgcHNwX3JpbmdfcmVnKTsKKwlXUkVHMzJfU09DMTUoTVAwLCAwLCBtbU1QMF9T TU5fQzJQTVNHXzcxLCBwc3BfcmluZ19yZWcpOwogCS8qIFdyaXRlIHRoZSByaW5nIGluaXRpYWxp emF0aW9uIGNvbW1hbmQgdG8gQzJQTVNHXzY0ICovCiAJcHNwX3JpbmdfcmVnID0gcmluZ190eXBl OwogCXBzcF9yaW5nX3JlZyA9IHBzcF9yaW5nX3JlZyA8PCAxNjsKLQlXUkVHMzIoU09DMTVfUkVH X09GRlNFVChNUDAsIDAsIG1tTVAwX1NNTl9DMlBNU0dfNjQpLCBwc3BfcmluZ19yZWcpOworCVdS RUczMl9TT0MxNShNUDAsIDAsIG1tTVAwX1NNTl9DMlBNU0dfNjQsIHBzcF9yaW5nX3JlZyk7CiAJ LyogV2FpdCBmb3IgcmVzcG9uc2UgZmxhZyAoYml0IDMxKSBpbiBDMlBNU0dfNjQgKi8KIAlwc3Bf cmluZ19yZWcgPSAwOwogCXdoaWxlICgocHNwX3JpbmdfcmVnICYgMHg4MDAwMDAwMCkgPT0gMCkg ewotCQlwc3BfcmluZ19yZWcgPSBSUkVHMzIoU09DMTVfUkVHX09GRlNFVChNUDAsIDAsIG1tTVAw X1NNTl9DMlBNU0dfNjQpKTsKKwkJcHNwX3JpbmdfcmVnID0gUlJFRzMyX1NPQzE1KE1QMCwgMCwg bW1NUDBfU01OX0MyUE1TR182NCk7CiAJfQogCiAJcmV0dXJuIDA7CkBAIC0xNjQsNyArMTY0LDcg QEAgaW50IHBzcF92MTBfMF9jbWRfc3VibWl0KHN0cnVjdCBwc3BfY29udGV4dCAqcHNwLAogCXN0 cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gcHNwLT5hZGV2OwogCiAJLyogS00gKEdQQ09NKSBw cmVwYXJlIHdyaXRlIHBvaW50ZXIgKi8KLQlwc3Bfd3JpdGVfcHRyX3JlZyA9IFJSRUczMihTT0Mx NV9SRUdfT0ZGU0VUKE1QMCwgMCwgbW1NUDBfU01OX0MyUE1TR182NykpOworCXBzcF93cml0ZV9w dHJfcmVnID0gUlJFRzMyX1NPQzE1KE1QMCwgMCwgbW1NUDBfU01OX0MyUE1TR182Nyk7CiAKIAkv KiBVcGRhdGUgS00gUkIgZnJhbWUgcG9pbnRlciB0byBuZXcgZnJhbWUgKi8KIAlpZiAoKHBzcF93 cml0ZV9wdHJfcmVnICUgcmluZy0+cmluZ19zaXplKSA9PSAwKQpAQCAtMTgyLDcgKzE4Miw3IEBA IGludCBwc3BfdjEwXzBfY21kX3N1Ym1pdChzdHJ1Y3QgcHNwX2NvbnRleHQgKnBzcCwKIAkvKiBV cGRhdGUgdGhlIHdyaXRlIFBvaW50ZXIgaW4gRFdPUkRzICovCiAJcHNwX3dyaXRlX3B0cl9yZWcg Kz0gc2l6ZW9mKHN0cnVjdCBwc3BfZ2Z4X3JiX2ZyYW1lKSAvIDQ7CiAJcHNwX3dyaXRlX3B0cl9y ZWcgPSAocHNwX3dyaXRlX3B0cl9yZWcgPj0gcmluZy0+cmluZ19zaXplKSA/IDAgOiBwc3Bfd3Jp dGVfcHRyX3JlZzsKLQlXUkVHMzIoU09DMTVfUkVHX09GRlNFVChNUDAsIDAsIG1tTVAwX1NNTl9D MlBNU0dfNjcpLCBwc3Bfd3JpdGVfcHRyX3JlZyk7CisJV1JFRzMyX1NPQzE1KE1QMCwgMCwgbW1N UDBfU01OX0MyUE1TR182NywgcHNwX3dyaXRlX3B0cl9yZWcpOwogCiAJcmV0dXJuIDA7CiB9Ci0t IAoyLjEyLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=