From: Tom St Denis Subject: [PATCH 10/10] drm/amd/amdgpu: Port PSP v3.1 over to new SOC15 macros Date: Mon, 10 Apr 2017 12:19:21 -0400 Message-ID: <20170410161921.4281-11-tom.stdenis@amd.com> References: <20170410161921.4281-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: <20170410161921.4281-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 aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3BzcF92M18xLmMgfCAzNCArKysrKysrKysrKysrKysr Ky0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTcgaW5zZXJ0aW9ucygrKSwgMTcg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvcHNw X3YzXzEuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3BzcF92M18xLmMKaW5kZXggZDM1 MTU4Mzc4NWU1Li4zNGRiYjYwZGE3NTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L3BzcF92M18xLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvcHNwX3Yz XzEuYwpAQCAtMTcyLDcgKzE3Miw3IEBAIGludCBwc3BfdjNfMV9ib290bG9hZGVyX2xvYWRfc3lz ZHJ2KHN0cnVjdCBwc3BfY29udGV4dCAqcHNwKQogCS8qIENoZWNrIHNPUyBzaWduIG9mIGxpZmUg cmVnaXN0ZXIgdG8gY29uZmlybSBzeXMgZHJpdmVyIGFuZCBzT1MKIAkgKiBhcmUgYWxyZWFkeSBi ZWVuIGxvYWRlZC4KIAkgKi8KLQlzb2xfcmVnID0gUlJFRzMyKFNPQzE1X1JFR19PRkZTRVQoTVAw LCAwLCBtbU1QMF9TTU5fQzJQTVNHXzgxKSk7CisJc29sX3JlZyA9IFJSRUczMl9TT0MxNShNUDAs IDAsIG1tTVAwX1NNTl9DMlBNU0dfODEpOwogCWlmIChzb2xfcmVnKQogCQlyZXR1cm4gMDsKIApA QCAtMTg4LDExICsxODgsMTEgQEAgaW50IHBzcF92M18xX2Jvb3Rsb2FkZXJfbG9hZF9zeXNkcnYo c3RydWN0IHBzcF9jb250ZXh0ICpwc3ApCiAJbWVtY3B5KHBzcC0+ZndfcHJpX2J1ZiwgcHNwLT5z eXNfc3RhcnRfYWRkciwgcHNwLT5zeXNfYmluX3NpemUpOwogCiAJLyogUHJvdmlkZSB0aGUgc3lz IGRyaXZlciB0byBib290cm9tICovCi0JV1JFRzMyKFNPQzE1X1JFR19PRkZTRVQoTVAwLCAwLCBt bU1QMF9TTU5fQzJQTVNHXzM2KSwKLQkgICAgICAgKHVpbnQzMl90KShwc3AtPmZ3X3ByaV9tY19h ZGRyID4+IDIwKSk7CisJV1JFRzMyX1NPQzE1KE1QMCwgMCwgIG1tTVAwX1NNTl9DMlBNU0dfMzYs CisJCSAgICAgKHVpbnQzMl90KShwc3AtPmZ3X3ByaV9tY19hZGRyID4+IDIwKSk7CiAJcHNwX2dm eGRydl9jb21tYW5kX3JlZyA9IDEgPDwgMTY7Ci0JV1JFRzMyKFNPQzE1X1JFR19PRkZTRVQoTVAw LCAwLCBtbU1QMF9TTU5fQzJQTVNHXzM1KSwKLQkgICAgICAgcHNwX2dmeGRydl9jb21tYW5kX3Jl Zyk7CisJV1JFRzMyX1NPQzE1KE1QMCwgMCwgIG1tTVAwX1NNTl9DMlBNU0dfMzUsCisJCSAgICAg cHNwX2dmeGRydl9jb21tYW5kX3JlZyk7CiAKIAkvKiB0aGVyZSBtaWdodCBiZSBoYW5kc2hha2Ug aXNzdWUgd2l0aCBoYXJkd2FyZSB3aGljaCBuZWVkcyBkZWxheSAqLwogCW1kZWxheSgyMCk7CkBA IC0yMTMsNyArMjEzLDcgQEAgaW50IHBzcF92M18xX2Jvb3Rsb2FkZXJfbG9hZF9zb3Moc3RydWN0 IHBzcF9jb250ZXh0ICpwc3ApCiAJLyogQ2hlY2sgc09TIHNpZ24gb2YgbGlmZSByZWdpc3RlciB0 byBjb25maXJtIHN5cyBkcml2ZXIgYW5kIHNPUwogCSAqIGFyZSBhbHJlYWR5IGJlZW4gbG9hZGVk LgogCSAqLwotCXNvbF9yZWcgPSBSUkVHMzIoU09DMTVfUkVHX09GRlNFVChNUDAsIDAsIG1tTVAw X1NNTl9DMlBNU0dfODEpKTsKKwlzb2xfcmVnID0gUlJFRzMyX1NPQzE1KE1QMCwgMCwgbW1NUDBf U01OX0MyUE1TR184MSk7CiAJaWYgKHNvbF9yZWcpCiAJCXJldHVybiAwOwogCkBAIC0yMjksMTcg KzIyOSwxNyBAQCBpbnQgcHNwX3YzXzFfYm9vdGxvYWRlcl9sb2FkX3NvcyhzdHJ1Y3QgcHNwX2Nv bnRleHQgKnBzcCkKIAltZW1jcHkocHNwLT5md19wcmlfYnVmLCBwc3AtPnNvc19zdGFydF9hZGRy LCBwc3AtPnNvc19iaW5fc2l6ZSk7CiAKIAkvKiBQcm92aWRlIHRoZSBQU1Agc2VjdXJlIE9TIHRv IGJvb3Ryb20gKi8KLQlXUkVHMzIoU09DMTVfUkVHX09GRlNFVChNUDAsIDAsIG1tTVAwX1NNTl9D MlBNU0dfMzYpLAotCSAgICAgICAodWludDMyX3QpKHBzcC0+ZndfcHJpX21jX2FkZHIgPj4gMjAp KTsKKwlXUkVHMzJfU09DMTUoTVAwLCAwLCAgbW1NUDBfU01OX0MyUE1TR18zNiwKKwkJICAgICAo dWludDMyX3QpKHBzcC0+ZndfcHJpX21jX2FkZHIgPj4gMjApKTsKIAlwc3BfZ2Z4ZHJ2X2NvbW1h bmRfcmVnID0gMiA8PCAxNjsKLQlXUkVHMzIoU09DMTVfUkVHX09GRlNFVChNUDAsIDAsIG1tTVAw X1NNTl9DMlBNU0dfMzUpLAotCSAgICAgICBwc3BfZ2Z4ZHJ2X2NvbW1hbmRfcmVnKTsKKwlXUkVH MzJfU09DMTUoTVAwLCAwLCAgbW1NUDBfU01OX0MyUE1TR18zNSwKKwkJICAgICBwc3BfZ2Z4ZHJ2 X2NvbW1hbmRfcmVnKTsKIAogCS8qIHRoZXJlIG1pZ2h0IGJlIGhhbmRzaGFrZSBpc3N1ZSB3aXRo IGhhcmR3YXJlIHdoaWNoIG5lZWRzIGRlbGF5ICovCiAJbWRlbGF5KDIwKTsKICNpZiAwCiAJcmV0 ID0gcHNwX3dhaXRfZm9yKHBzcCwgU09DMTVfUkVHX09GRlNFVChNUDAsIDAsIG1tTVAwX1NNTl9D MlBNU0dfODEpLAotCQkJICAgUlJFRzMyKFNPQzE1X1JFR19PRkZTRVQoTVAwLCAwLCBtbU1QMF9T TU5fQzJQTVNHXzgxKSksCisJCQkgICBSUkVHMzJfU09DMTUoTVAwLCAwLCBtbU1QMF9TTU5fQzJQ TVNHXzgxKSwKIAkJCSAgIDAsIHRydWUpOwogI2VuZGlmCiAKQEAgLTI5OSwxNyArMjk5LDE3IEBA IGludCBwc3BfdjNfMV9yaW5nX2NyZWF0ZShzdHJ1Y3QgcHNwX2NvbnRleHQgKnBzcCwgZW51bSBw c3BfcmluZ190eXBlIHJpbmdfdHlwZSkKIAogCS8qIFdyaXRlIGxvdyBhZGRyZXNzIG9mIHRoZSBy aW5nIHRvIEMyUE1TR182OSAqLwogCXBzcF9yaW5nX3JlZyA9IGxvd2VyXzMyX2JpdHMocmluZy0+ cmluZ19tZW1fbWNfYWRkcik7Ci0JV1JFRzMyKFNPQzE1X1JFR19PRkZTRVQoTVAwLCAwLCBtbU1Q MF9TTU5fQzJQTVNHXzY5KSwgcHNwX3JpbmdfcmVnKTsKKwlXUkVHMzJfU09DMTUoTVAwLCAwLCAg bW1NUDBfU01OX0MyUE1TR182OSwgcHNwX3JpbmdfcmVnKTsKIAkvKiBXcml0ZSBoaWdoIGFkZHJl c3Mgb2YgdGhlIHJpbmcgdG8gQzJQTVNHXzcwICovCiAJcHNwX3JpbmdfcmVnID0gdXBwZXJfMzJf Yml0cyhyaW5nLT5yaW5nX21lbV9tY19hZGRyKTsKLQlXUkVHMzIoU09DMTVfUkVHX09GRlNFVChN UDAsIDAsIG1tTVAwX1NNTl9DMlBNU0dfNzApLCBwc3BfcmluZ19yZWcpOworCVdSRUczMl9TT0Mx NShNUDAsIDAsICBtbU1QMF9TTU5fQzJQTVNHXzcwLCBwc3BfcmluZ19yZWcpOwogCS8qIFdyaXRl IHNpemUgb2YgcmluZyB0byBDMlBNU0dfNzEgKi8KIAlwc3BfcmluZ19yZWcgPSByaW5nLT5yaW5n X3NpemU7Ci0JV1JFRzMyKFNPQzE1X1JFR19PRkZTRVQoTVAwLCAwLCBtbU1QMF9TTU5fQzJQTVNH XzcxKSwgcHNwX3JpbmdfcmVnKTsKKwlXUkVHMzJfU09DMTUoTVAwLCAwLCAgbW1NUDBfU01OX0My UE1TR183MSwgcHNwX3JpbmdfcmVnKTsKIAkvKiBXcml0ZSB0aGUgcmluZyBpbml0aWFsaXphdGlv biBjb21tYW5kIHRvIEMyUE1TR182NCAqLwogCXBzcF9yaW5nX3JlZyA9IHJpbmdfdHlwZTsKIAlw c3BfcmluZ19yZWcgPSBwc3BfcmluZ19yZWcgPDwgMTY7Ci0JV1JFRzMyKFNPQzE1X1JFR19PRkZT RVQoTVAwLCAwLCBtbU1QMF9TTU5fQzJQTVNHXzY0KSwgcHNwX3JpbmdfcmVnKTsKKwlXUkVHMzJf U09DMTUoTVAwLCAwLCAgbW1NUDBfU01OX0MyUE1TR182NCwgcHNwX3JpbmdfcmVnKTsKIAogCS8q IHRoZXJlIG1pZ2h0IGJlIGhhbmRzaGFrZSBpc3N1ZSB3aXRoIGhhcmR3YXJlIHdoaWNoIG5lZWRz IGRlbGF5ICovCiAJbWRlbGF5KDIwKTsKQEAgLTMzNCw3ICszMzQsNyBAQCBpbnQgcHNwX3YzXzFf Y21kX3N1Ym1pdChzdHJ1Y3QgcHNwX2NvbnRleHQgKnBzcCwKIAl1aW50MzJfdCByYl9mcmFtZV9z aXplX2R3ID0gc2l6ZW9mKHN0cnVjdCBwc3BfZ2Z4X3JiX2ZyYW1lKSAvIDQ7CiAKIAkvKiBLTSAo R1BDT00pIHByZXBhcmUgd3JpdGUgcG9pbnRlciAqLwotCXBzcF93cml0ZV9wdHJfcmVnID0gUlJF RzMyKFNPQzE1X1JFR19PRkZTRVQoTVAwLCAwLCBtbU1QMF9TTU5fQzJQTVNHXzY3KSk7CisJcHNw X3dyaXRlX3B0cl9yZWcgPSBSUkVHMzJfU09DMTUoTVAwLCAwLCBtbU1QMF9TTU5fQzJQTVNHXzY3 KTsKIAogCS8qIFVwZGF0ZSBLTSBSQiBmcmFtZSBwb2ludGVyIHRvIG5ldyBmcmFtZSAqLwogCS8q IHdyaXRlX2ZyYW1lIHB0ciBpbmNyZW1lbnRzIGJ5IHNpemUgb2YgcmJfZnJhbWUgaW4gYnl0ZXMg Ki8KQEAgLTM1Niw3ICszNTYsNyBAQCBpbnQgcHNwX3YzXzFfY21kX3N1Ym1pdChzdHJ1Y3QgcHNw X2NvbnRleHQgKnBzcCwKIAogCS8qIFVwZGF0ZSB0aGUgd3JpdGUgUG9pbnRlciBpbiBEV09SRHMg Ki8KIAlwc3Bfd3JpdGVfcHRyX3JlZyA9IChwc3Bfd3JpdGVfcHRyX3JlZyArIHJiX2ZyYW1lX3Np emVfZHcpICUgcmluZ19zaXplX2R3OwotCVdSRUczMihTT0MxNV9SRUdfT0ZGU0VUKE1QMCwgMCwg bW1NUDBfU01OX0MyUE1TR182NyksIHBzcF93cml0ZV9wdHJfcmVnKTsKKwlXUkVHMzJfU09DMTUo TVAwLCAwLCAgbW1NUDBfU01OX0MyUE1TR182NywgcHNwX3dyaXRlX3B0cl9yZWcpOwogCiAJcmV0 dXJuIDA7CiB9Ci0tIAoyLjEyLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1k LWdmeAo=