From: Alex Deucher Subject: [PATCH 042/102] drm/amdkfd: Extend PM4 packets to support 8 SDMA Date: Mon, 15 Jul 2019 16:23:37 -0500 Message-ID: <20190715212437.31793-40-alexander.deucher@amd.com> References: <20190715212437.31793-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: <20190715212437.31793-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 , Oak Zeng , Felix Kuehling RnJvbTogT2FrIFplbmcgPE9hay5aZW5nQGFtZC5jb20+CgpFeHRlbmQgbWFwX3F1ZXVlIGFuZCB1 bm1hcF9xdWV1ZSBQTTQgcGFja2V0cyB0byBzdXBwb3J0IDgKU0RNQSBlbmdpbmVzLiBUaGUgbmV3 IGZvcm1hdCBpcyBiYWNrd2FyZCBjb21wYXRpYmxlLgoKU2lnbmVkLW9mZi1ieTogT2FrIFplbmcg PE9hay5aZW5nQGFtZC5jb20+ClJldmlld2VkLWJ5OiBGZWxpeCBLdWVobGluZyA8RmVsaXguS3Vl aGxpbmdAYW1kLmNvbT4KU2lnbmVkLW9mZi1ieTogQWxleCBEZXVjaGVyIDxhbGV4YW5kZXIuZGV1 Y2hlckBhbWQuY29tPgotLS0KIC4uLi9ncHUvZHJtL2FtZC9hbWRrZmQva2ZkX2tlcm5lbF9xdWV1 ZV92OS5jICB8IDI2ICsrKysrKysrKysrKysrKystLS0KIC4uLi9ncHUvZHJtL2FtZC9hbWRrZmQv a2ZkX3BtNF9oZWFkZXJzX2FpLmggICB8IDE0ICsrKysrKysrLS0KIDIgZmlsZXMgY2hhbmdlZCwg MzQgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGtmZC9rZmRfa2VybmVsX3F1ZXVlX3Y5LmMgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGtmZC9rZmRfa2VybmVsX3F1ZXVlX3Y5LmMKaW5kZXggMmQ1ZGRmMTk5YmQwLi45MWRh NzJkMGQ0MDUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1ka2ZkL2tmZF9rZXJu ZWxfcXVldWVfdjkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGtmZC9rZmRfa2VybmVs X3F1ZXVlX3Y5LmMKQEAgLTE2MSw2ICsxNjEsOCBAQCBzdGF0aWMgaW50IHBtX21hcF9xdWV1ZXNf djkoc3RydWN0IHBhY2tldF9tYW5hZ2VyICpwbSwgdWludDMyX3QgKmJ1ZmZlciwKIAlwYWNrZXQt PmJpdGZpZWxkczIuZW5naW5lX3NlbCA9CiAJCWVuZ2luZV9zZWxfX21lc19tYXBfcXVldWVzX19j b21wdXRlX3ZpOwogCXBhY2tldC0+Yml0ZmllbGRzMi5nd3NfY29udHJvbF9xdWV1ZSA9IHEtPmd3 cyA/IDEgOiAwOworCXBhY2tldC0+Yml0ZmllbGRzMi5leHRlbmRlZF9lbmdpbmVfc2VsID0KKwkJ ZXh0ZW5kZWRfZW5naW5lX3NlbF9fbWVzX21hcF9xdWV1ZXNfX2xlZ2FjeV9lbmdpbmVfc2VsOwog CXBhY2tldC0+Yml0ZmllbGRzMi5xdWV1ZV90eXBlID0KIAkJcXVldWVfdHlwZV9fbWVzX21hcF9x dWV1ZXNfX25vcm1hbF9jb21wdXRlX3ZpOwogCkBAIC0xNzYsOSArMTc4LDE1IEBAIHN0YXRpYyBp bnQgcG1fbWFwX3F1ZXVlc192OShzdHJ1Y3QgcGFja2V0X21hbmFnZXIgKnBtLCB1aW50MzJfdCAq YnVmZmVyLAogCQlicmVhazsKIAljYXNlIEtGRF9RVUVVRV9UWVBFX1NETUE6CiAJY2FzZSBLRkRf UVVFVUVfVFlQRV9TRE1BX1hHTUk6Ci0JCXBhY2tldC0+Yml0ZmllbGRzMi5lbmdpbmVfc2VsID0g cS0+cHJvcGVydGllcy5zZG1hX2VuZ2luZV9pZCArCi0JCQkJZW5naW5lX3NlbF9fbWVzX21hcF9x dWV1ZXNfX3NkbWEwX3ZpOwogCQl1c2Vfc3RhdGljID0gZmFsc2U7IC8qIG5vIHN0YXRpYyBxdWV1 ZXMgdW5kZXIgU0RNQSAqLworCQlpZiAocS0+cHJvcGVydGllcy5zZG1hX2VuZ2luZV9pZCA8IDIp CisJCQlwYWNrZXQtPmJpdGZpZWxkczIuZW5naW5lX3NlbCA9IHEtPnByb3BlcnRpZXMuc2RtYV9l bmdpbmVfaWQgKworCQkJCWVuZ2luZV9zZWxfX21lc19tYXBfcXVldWVzX19zZG1hMF92aTsKKwkJ ZWxzZSB7CisJCQlwYWNrZXQtPmJpdGZpZWxkczIuZXh0ZW5kZWRfZW5naW5lX3NlbCA9CisJCQkJ ZXh0ZW5kZWRfZW5naW5lX3NlbF9fbWVzX21hcF9xdWV1ZXNfX3NkbWEwX3RvXzdfc2VsOworCQkJ cGFja2V0LT5iaXRmaWVsZHMyLmVuZ2luZV9zZWwgPSBxLT5wcm9wZXJ0aWVzLnNkbWFfZW5naW5l X2lkOworCQl9CiAJCWJyZWFrOwogCWRlZmF1bHQ6CiAJCVdBUk4oMSwgInF1ZXVlIHR5cGUgJWQi LCBxLT5wcm9wZXJ0aWVzLnR5cGUpOwpAQCAtMjE4LDEzICsyMjYsMjMgQEAgc3RhdGljIGludCBw bV91bm1hcF9xdWV1ZXNfdjkoc3RydWN0IHBhY2tldF9tYW5hZ2VyICpwbSwgdWludDMyX3QgKmJ1 ZmZlciwKIAlzd2l0Y2ggKHR5cGUpIHsKIAljYXNlIEtGRF9RVUVVRV9UWVBFX0NPTVBVVEU6CiAJ Y2FzZSBLRkRfUVVFVUVfVFlQRV9ESVE6CisJCXBhY2tldC0+Yml0ZmllbGRzMi5leHRlbmRlZF9l bmdpbmVfc2VsID0KKwkJCWV4dGVuZGVkX2VuZ2luZV9zZWxfX21lc191bm1hcF9xdWV1ZXNfX2xl Z2FjeV9lbmdpbmVfc2VsOwogCQlwYWNrZXQtPmJpdGZpZWxkczIuZW5naW5lX3NlbCA9CiAJCQll bmdpbmVfc2VsX19tZXNfdW5tYXBfcXVldWVzX19jb21wdXRlOwogCQlicmVhazsKIAljYXNlIEtG RF9RVUVVRV9UWVBFX1NETUE6CiAJY2FzZSBLRkRfUVVFVUVfVFlQRV9TRE1BX1hHTUk6Ci0JCXBh Y2tldC0+Yml0ZmllbGRzMi5lbmdpbmVfc2VsID0KLQkJCWVuZ2luZV9zZWxfX21lc191bm1hcF9x dWV1ZXNfX3NkbWEwICsgc2RtYV9lbmdpbmU7CisJCWlmIChzZG1hX2VuZ2luZSA8IDIpIHsKKwkJ CXBhY2tldC0+Yml0ZmllbGRzMi5leHRlbmRlZF9lbmdpbmVfc2VsID0KKwkJCQlleHRlbmRlZF9l bmdpbmVfc2VsX19tZXNfdW5tYXBfcXVldWVzX19sZWdhY3lfZW5naW5lX3NlbDsKKwkJCXBhY2tl dC0+Yml0ZmllbGRzMi5lbmdpbmVfc2VsID0KKwkJCQllbmdpbmVfc2VsX19tZXNfdW5tYXBfcXVl dWVzX19zZG1hMCArIHNkbWFfZW5naW5lOworCQl9IGVsc2UgeworCQkJcGFja2V0LT5iaXRmaWVs ZHMyLmV4dGVuZGVkX2VuZ2luZV9zZWwgPQorCQkJCWV4dGVuZGVkX2VuZ2luZV9zZWxfX21lc191 bm1hcF9xdWV1ZXNfX3NkbWEwX3RvXzdfc2VsOworCQkJcGFja2V0LT5iaXRmaWVsZHMyLmVuZ2lu ZV9zZWwgPSBzZG1hX2VuZ2luZTsKKwkJfQogCQlicmVhazsKIAlkZWZhdWx0OgogCQlXQVJOKDEs ICJxdWV1ZSB0eXBlICVkIiwgdHlwZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGtmZC9rZmRfcG00X2hlYWRlcnNfYWkuaCBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1ka2Zk L2tmZF9wbTRfaGVhZGVyc19haS5oCmluZGV4IGUzZTIxNDA0Y2ZhMC4uNDRlZDk0MjM5NTEzIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGtmZC9rZmRfcG00X2hlYWRlcnNfYWku aAorKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGtmZC9rZmRfcG00X2hlYWRlcnNfYWkuaApA QCAtMjYwLDYgKzI2MCwxMCBAQCBlbnVtIG1lc19tYXBfcXVldWVzX2VuZ2luZV9zZWxfZW51bSB7 CiAJZW5naW5lX3NlbF9fbWVzX21hcF9xdWV1ZXNfX3NkbWExX3ZpID0gMwogfTsKIAorZW51bSBt ZXNfbWFwX3F1ZXVlc19leHRlbmRlZF9lbmdpbmVfc2VsX2VudW0geworCWV4dGVuZGVkX2VuZ2lu ZV9zZWxfX21lc19tYXBfcXVldWVzX19sZWdhY3lfZW5naW5lX3NlbCA9IDAsCisJZXh0ZW5kZWRf ZW5naW5lX3NlbF9fbWVzX21hcF9xdWV1ZXNfX3NkbWEwX3RvXzdfc2VsID0gMQorfTsKIAogc3Ry dWN0IHBtNF9tZXNfbWFwX3F1ZXVlcyB7CiAJdW5pb24gewpAQCAtMjY5LDcgKzI3Myw4IEBAIHN0 cnVjdCBwbTRfbWVzX21hcF9xdWV1ZXMgewogCiAJdW5pb24gewogCQlzdHJ1Y3QgewotCQkJdWlu dDMyX3QgcmVzZXJ2ZWQxOjQ7CisJCQl1aW50MzJfdCByZXNlcnZlZDE6MjsKKwkJCWVudW0gbWVz X21hcF9xdWV1ZXNfZXh0ZW5kZWRfZW5naW5lX3NlbF9lbnVtIGV4dGVuZGVkX2VuZ2luZV9zZWw6 MjsKIAkJCWVudW0gbWVzX21hcF9xdWV1ZXNfcXVldWVfc2VsX2VudW0gcXVldWVfc2VsOjI7CiAJ CQl1aW50MzJfdCByZXNlcnZlZDU6NjsKIAkJCXVpbnQzMl90IGd3c19jb250cm9sX3F1ZXVlOjE7 CkBAIC0zODIsNiArMzg3LDExIEBAIGVudW0gbWVzX3VubWFwX3F1ZXVlc19lbmdpbmVfc2VsX2Vu dW0gewogCWVuZ2luZV9zZWxfX21lc191bm1hcF9xdWV1ZXNfX3NkbWFsID0gMwogfTsKIAorZW51 bSBtZXNfdW5tYXBfcXVldWVzX2V4dGVuZGVkX2VuZ2luZV9zZWxfZW51bSB7CisJZXh0ZW5kZWRf ZW5naW5lX3NlbF9fbWVzX3VubWFwX3F1ZXVlc19fbGVnYWN5X2VuZ2luZV9zZWwgPSAwLAorCWV4 dGVuZGVkX2VuZ2luZV9zZWxfX21lc191bm1hcF9xdWV1ZXNfX3NkbWEwX3RvXzdfc2VsID0gMQor fTsKKwogc3RydWN0IHBtNF9tZXNfdW5tYXBfcXVldWVzIHsKIAl1bmlvbiB7CiAJCXVuaW9uIFBN NF9NRVNfVFlQRV8zX0hFQURFUiAgIGhlYWRlcjsgICAgICAgICAgICAvKiBoZWFkZXIgKi8KQEAg LTM5MSw3ICs0MDEsNyBAQCBzdHJ1Y3QgcG00X21lc191bm1hcF9xdWV1ZXMgewogCXVuaW9uIHsK IAkJc3RydWN0IHsKIAkJCWVudW0gbWVzX3VubWFwX3F1ZXVlc19hY3Rpb25fZW51bSBhY3Rpb246 MjsKLQkJCXVpbnQzMl90IHJlc2VydmVkMToyOworCQkJZW51bSBtZXNfdW5tYXBfcXVldWVzX2V4 dGVuZGVkX2VuZ2luZV9zZWxfZW51bSBleHRlbmRlZF9lbmdpbmVfc2VsOjI7CiAJCQllbnVtIG1l c191bm1hcF9xdWV1ZXNfcXVldWVfc2VsX2VudW0gcXVldWVfc2VsOjI7CiAJCQl1aW50MzJfdCBy ZXNlcnZlZDI6MjA7CiAJCQllbnVtIG1lc191bm1hcF9xdWV1ZXNfZW5naW5lX3NlbF9lbnVtIGVu Z2luZV9zZWw6MzsKLS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9h bWQtZ2Z4