From: Tom St Denis Subject: [PATCH 08/10] drm/amd/amdgpu: Port PSP v3.1 over to new SOC15 macros Date: Mon, 12 Jun 2017 13:54:29 -0400 Message-ID: <20170612175431.32764-9-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 aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3BzcF92M18xLmMgfCAzMiArKysrKysrKysrKysrKysr LS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE2IGluc2VydGlvbnMoKyksIDE2IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3BzcF92 M18xLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9wc3BfdjNfMS5jCmluZGV4IDYwYTY0 MDdiYTI2Ny4uNThiYTM5NjZmMDcwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9wc3BfdjNfMS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3BzcF92M18x LmMKQEAgLTE3Miw3ICsxNzIsNyBAQCBpbnQgcHNwX3YzXzFfYm9vdGxvYWRlcl9sb2FkX3N5c2Ry dihzdHJ1Y3QgcHNwX2NvbnRleHQgKnBzcCkKIAkvKiBDaGVjayBzT1Mgc2lnbiBvZiBsaWZlIHJl Z2lzdGVyIHRvIGNvbmZpcm0gc3lzIGRyaXZlciBhbmQgc09TCiAJICogYXJlIGFscmVhZHkgYmVl biBsb2FkZWQuCiAJICovCi0Jc29sX3JlZyA9IFJSRUczMihTT0MxNV9SRUdfT0ZGU0VUKE1QMCwg MCwgbW1NUDBfU01OX0MyUE1TR184MSkpOworCXNvbF9yZWcgPSBSUkVHMzJfU09DMTUoTVAwLCAw LCBtbU1QMF9TTU5fQzJQTVNHXzgxKTsKIAlpZiAoc29sX3JlZykKIAkJcmV0dXJuIDA7CiAKQEAg LTE4OCwxMCArMTg4LDEwIEBAIGludCBwc3BfdjNfMV9ib290bG9hZGVyX2xvYWRfc3lzZHJ2KHN0 cnVjdCBwc3BfY29udGV4dCAqcHNwKQogCW1lbWNweShwc3AtPmZ3X3ByaV9idWYsIHBzcC0+c3lz X3N0YXJ0X2FkZHIsIHBzcC0+c3lzX2Jpbl9zaXplKTsKIAogCS8qIFByb3ZpZGUgdGhlIHN5cyBk cml2ZXIgdG8gYm9vdHJvbSAqLwotCVdSRUczMihTT0MxNV9SRUdfT0ZGU0VUKE1QMCwgMCwgbW1N UDBfU01OX0MyUE1TR18zNiksCisJV1JFRzMyX1NPQzE1KE1QMCwgMCwgbW1NUDBfU01OX0MyUE1T R18zNiwKIAkgICAgICAgKHVpbnQzMl90KShwc3AtPmZ3X3ByaV9tY19hZGRyID4+IDIwKSk7CiAJ cHNwX2dmeGRydl9jb21tYW5kX3JlZyA9IDEgPDwgMTY7Ci0JV1JFRzMyKFNPQzE1X1JFR19PRkZT RVQoTVAwLCAwLCBtbU1QMF9TTU5fQzJQTVNHXzM1KSwKKwlXUkVHMzJfU09DMTUoTVAwLCAwLCBt bU1QMF9TTU5fQzJQTVNHXzM1LAogCSAgICAgICBwc3BfZ2Z4ZHJ2X2NvbW1hbmRfcmVnKTsKIAog CS8qIHRoZXJlIG1pZ2h0IGJlIGhhbmRzaGFrZSBpc3N1ZSB3aXRoIGhhcmR3YXJlIHdoaWNoIG5l ZWRzIGRlbGF5ICovCkBAIC0yMTMsNyArMjEzLDcgQEAgaW50IHBzcF92M18xX2Jvb3Rsb2FkZXJf bG9hZF9zb3Moc3RydWN0IHBzcF9jb250ZXh0ICpwc3ApCiAJLyogQ2hlY2sgc09TIHNpZ24gb2Yg bGlmZSByZWdpc3RlciB0byBjb25maXJtIHN5cyBkcml2ZXIgYW5kIHNPUwogCSAqIGFyZSBhbHJl YWR5IGJlZW4gbG9hZGVkLgogCSAqLwotCXNvbF9yZWcgPSBSUkVHMzIoU09DMTVfUkVHX09GRlNF VChNUDAsIDAsIG1tTVAwX1NNTl9DMlBNU0dfODEpKTsKKwlzb2xfcmVnID0gUlJFRzMyX1NPQzE1 KE1QMCwgMCwgbW1NUDBfU01OX0MyUE1TR184MSk7CiAJaWYgKHNvbF9yZWcpCiAJCXJldHVybiAw OwogCkBAIC0yMjksMTcgKzIyOSwxNyBAQCBpbnQgcHNwX3YzXzFfYm9vdGxvYWRlcl9sb2FkX3Nv cyhzdHJ1Y3QgcHNwX2NvbnRleHQgKnBzcCkKIAltZW1jcHkocHNwLT5md19wcmlfYnVmLCBwc3At PnNvc19zdGFydF9hZGRyLCBwc3AtPnNvc19iaW5fc2l6ZSk7CiAKIAkvKiBQcm92aWRlIHRoZSBQ U1Agc2VjdXJlIE9TIHRvIGJvb3Ryb20gKi8KLQlXUkVHMzIoU09DMTVfUkVHX09GRlNFVChNUDAs IDAsIG1tTVAwX1NNTl9DMlBNU0dfMzYpLAorCVdSRUczMl9TT0MxNShNUDAsIDAsIG1tTVAwX1NN Tl9DMlBNU0dfMzYsCiAJICAgICAgICh1aW50MzJfdCkocHNwLT5md19wcmlfbWNfYWRkciA+PiAy MCkpOwogCXBzcF9nZnhkcnZfY29tbWFuZF9yZWcgPSAyIDw8IDE2OwotCVdSRUczMihTT0MxNV9S RUdfT0ZGU0VUKE1QMCwgMCwgbW1NUDBfU01OX0MyUE1TR18zNSksCisJV1JFRzMyX1NPQzE1KE1Q MCwgMCwgbW1NUDBfU01OX0MyUE1TR18zNSwKIAkgICAgICAgcHNwX2dmeGRydl9jb21tYW5kX3Jl Zyk7CiAKIAkvKiB0aGVyZSBtaWdodCBiZSBoYW5kc2hha2UgaXNzdWUgd2l0aCBoYXJkd2FyZSB3 aGljaCBuZWVkcyBkZWxheSAqLwogCW1kZWxheSgyMCk7CiAjaWYgMAogCXJldCA9IHBzcF93YWl0 X2Zvcihwc3AsIFNPQzE1X1JFR19PRkZTRVQoTVAwLCAwLCBtbU1QMF9TTU5fQzJQTVNHXzgxKSwK LQkJCSAgIFJSRUczMihTT0MxNV9SRUdfT0ZGU0VUKE1QMCwgMCwgbW1NUDBfU01OX0MyUE1TR184 MSkpLAorCQkJICAgUlJFRzMyX1NPQzE1KE1QMCwgMCwgbW1NUDBfU01OX0MyUE1TR184MSksCiAJ CQkgICAwLCB0cnVlKTsKICNlbmRpZgogCkBAIC0yOTksMTcgKzI5OSwxNyBAQCBpbnQgcHNwX3Yz XzFfcmluZ19jcmVhdGUoc3RydWN0IHBzcF9jb250ZXh0ICpwc3AsIGVudW0gcHNwX3JpbmdfdHlw ZSByaW5nX3R5cGUpCiAKIAkvKiBXcml0ZSBsb3cgYWRkcmVzcyBvZiB0aGUgcmluZyB0byBDMlBN U0dfNjkgKi8KIAlwc3BfcmluZ19yZWcgPSBsb3dlcl8zMl9iaXRzKHJpbmctPnJpbmdfbWVtX21j X2FkZHIpOwotCVdSRUczMihTT0MxNV9SRUdfT0ZGU0VUKE1QMCwgMCwgbW1NUDBfU01OX0MyUE1T R182OSksIHBzcF9yaW5nX3JlZyk7CisJV1JFRzMyX1NPQzE1KE1QMCwgMCwgbW1NUDBfU01OX0My UE1TR182OSwgcHNwX3JpbmdfcmVnKTsKIAkvKiBXcml0ZSBoaWdoIGFkZHJlc3Mgb2YgdGhlIHJp bmcgdG8gQzJQTVNHXzcwICovCiAJcHNwX3JpbmdfcmVnID0gdXBwZXJfMzJfYml0cyhyaW5nLT5y aW5nX21lbV9tY19hZGRyKTsKLQlXUkVHMzIoU09DMTVfUkVHX09GRlNFVChNUDAsIDAsIG1tTVAw X1NNTl9DMlBNU0dfNzApLCBwc3BfcmluZ19yZWcpOworCVdSRUczMl9TT0MxNShNUDAsIDAsIG1t TVAwX1NNTl9DMlBNU0dfNzAsIHBzcF9yaW5nX3JlZyk7CiAJLyogV3JpdGUgc2l6ZSBvZiByaW5n IHRvIEMyUE1TR183MSAqLwogCXBzcF9yaW5nX3JlZyA9IHJpbmctPnJpbmdfc2l6ZTsKLQlXUkVH MzIoU09DMTVfUkVHX09GRlNFVChNUDAsIDAsIG1tTVAwX1NNTl9DMlBNU0dfNzEpLCBwc3Bfcmlu Z19yZWcpOworCVdSRUczMl9TT0MxNShNUDAsIDAsIG1tTVAwX1NNTl9DMlBNU0dfNzEsIHBzcF9y aW5nX3JlZyk7CiAJLyogV3JpdGUgdGhlIHJpbmcgaW5pdGlhbGl6YXRpb24gY29tbWFuZCB0byBD MlBNU0dfNjQgKi8KIAlwc3BfcmluZ19yZWcgPSByaW5nX3R5cGU7CiAJcHNwX3JpbmdfcmVnID0g cHNwX3JpbmdfcmVnIDw8IDE2OwotCVdSRUczMihTT0MxNV9SRUdfT0ZGU0VUKE1QMCwgMCwgbW1N UDBfU01OX0MyUE1TR182NCksIHBzcF9yaW5nX3JlZyk7CisJV1JFRzMyX1NPQzE1KE1QMCwgMCwg bW1NUDBfU01OX0MyUE1TR182NCwgcHNwX3JpbmdfcmVnKTsKIAogCS8qIHRoZXJlIG1pZ2h0IGJl IGhhbmRzaGFrZSBpc3N1ZSB3aXRoIGhhcmR3YXJlIHdoaWNoIG5lZWRzIGRlbGF5ICovCiAJbWRl bGF5KDIwKTsKQEAgLTMzMiw3ICszMzIsNyBAQCBpbnQgcHNwX3YzXzFfcmluZ19kZXN0cm95KHN0 cnVjdCBwc3BfY29udGV4dCAqcHNwLCBlbnVtIHBzcF9yaW5nX3R5cGUgcmluZ190eXBlKQogCiAJ LyogV3JpdGUgdGhlIHJpbmcgZGVzdHJveSBjb21tYW5kIHRvIEMyUE1TR182NCAqLwogCXBzcF9y aW5nX3JlZyA9IDMgPDwgMTY7Ci0JV1JFRzMyKFNPQzE1X1JFR19PRkZTRVQoTVAwLCAwLCBtbU1Q MF9TTU5fQzJQTVNHXzY0KSwgcHNwX3JpbmdfcmVnKTsKKwlXUkVHMzJfU09DMTUoTVAwLCAwLCBt bU1QMF9TTU5fQzJQTVNHXzY0LCBwc3BfcmluZ19yZWcpOwogCiAJLyogdGhlcmUgbWlnaHQgYmUg aGFuZHNoYWtlIGlzc3VlIHdpdGggaGFyZHdhcmUgd2hpY2ggbmVlZHMgZGVsYXkgKi8KIAltZGVs YXkoMjApOwpAQCAtMzYxLDcgKzM2MSw3IEBAIGludCBwc3BfdjNfMV9jbWRfc3VibWl0KHN0cnVj dCBwc3BfY29udGV4dCAqcHNwLAogCXVpbnQzMl90IHJiX2ZyYW1lX3NpemVfZHcgPSBzaXplb2Yo c3RydWN0IHBzcF9nZnhfcmJfZnJhbWUpIC8gNDsKIAogCS8qIEtNIChHUENPTSkgcHJlcGFyZSB3 cml0ZSBwb2ludGVyICovCi0JcHNwX3dyaXRlX3B0cl9yZWcgPSBSUkVHMzIoU09DMTVfUkVHX09G RlNFVChNUDAsIDAsIG1tTVAwX1NNTl9DMlBNU0dfNjcpKTsKKwlwc3Bfd3JpdGVfcHRyX3JlZyA9 IFJSRUczMl9TT0MxNShNUDAsIDAsIG1tTVAwX1NNTl9DMlBNU0dfNjcpOwogCiAJLyogVXBkYXRl IEtNIFJCIGZyYW1lIHBvaW50ZXIgdG8gbmV3IGZyYW1lICovCiAJLyogd3JpdGVfZnJhbWUgcHRy IGluY3JlbWVudHMgYnkgc2l6ZSBvZiByYl9mcmFtZSBpbiBieXRlcyAqLwpAQCAtMzgzLDcgKzM4 Myw3IEBAIGludCBwc3BfdjNfMV9jbWRfc3VibWl0KHN0cnVjdCBwc3BfY29udGV4dCAqcHNwLAog CiAJLyogVXBkYXRlIHRoZSB3cml0ZSBQb2ludGVyIGluIERXT1JEcyAqLwogCXBzcF93cml0ZV9w dHJfcmVnID0gKHBzcF93cml0ZV9wdHJfcmVnICsgcmJfZnJhbWVfc2l6ZV9kdykgJSByaW5nX3Np emVfZHc7Ci0JV1JFRzMyKFNPQzE1X1JFR19PRkZTRVQoTVAwLCAwLCBtbU1QMF9TTU5fQzJQTVNH XzY3KSwgcHNwX3dyaXRlX3B0cl9yZWcpOworCVdSRUczMl9TT0MxNShNUDAsIDAsIG1tTVAwX1NN Tl9DMlBNU0dfNjcsIHBzcF93cml0ZV9wdHJfcmVnKTsKIAogCXJldHVybiAwOwogfQpAQCAtNTE1 LDcgKzUxNSw3IEBAIGJvb2wgcHNwX3YzXzFfc211X3JlbG9hZF9xdWlyayhzdHJ1Y3QgcHNwX2Nv bnRleHQgKnBzcCkKIAl1aW50MzJfdCByZWc7CiAKIAlyZWcgPSBzbW5NUDFfRklSTVdBUkVfRkxB R1MgfCAweDAzYjAwMDAwOwotCVdSRUczMihTT0MxNV9SRUdfT0ZGU0VUKE5CSU8sIDAsIG1tUENJ RV9JTkRFWDIpLCByZWcpOwotCXJlZyA9IFJSRUczMihTT0MxNV9SRUdfT0ZGU0VUKE5CSU8sIDAs IG1tUENJRV9EQVRBMikpOworCVdSRUczMl9TT0MxNShOQklPLCAwLCBtbVBDSUVfSU5ERVgyLCBy ZWcpOworCXJlZyA9IFJSRUczMl9TT0MxNShOQklPLCAwLCBtbVBDSUVfREFUQTIpOwogCXJldHVy biAocmVnICYgTVAxX0ZJUk1XQVJFX0ZMQUdTX19JTlRFUlJVUFRTX0VOQUJMRURfTUFTSykgPyB0 cnVlIDogZmFsc2U7CiB9Ci0tIAoyLjEyLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vYW1kLWdmeAo=