From: Alex Deucher Subject: [PATCH 3/6] drm/amdgpu: move mec queue helpers to amdgpu_gfx.h Date: Wed, 7 Jun 2017 15:34:54 -0400 Message-ID: <1496864097-4322-3-git-send-email-alexander.deucher@amd.com> References: <1496864097-4322-1-git-send-email-alexander.deucher@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1496864097-4322-1-git-send-email-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 VGhleSBhcmUgZ2Z4IHJlbGF0ZWQsIG5vdCBnZW5lcmFsIGhlbHBlcnMuCgpTaWduZWQtb2ZmLWJ5 OiBBbGV4IERldWNoZXIgPGFsZXhhbmRlci5kZXVjaGVyQGFtZC5jb20+Ci0tLQogZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmggICAgICAgIHwgMzAgLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfYW1ka2ZkLmMg fCAgOSArKysrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9nZnguaCAg ICB8IDMwICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRncHUvZ2Z4X3Y3XzAuYyAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2dmeF92OF8wLmMgICAgICB8ICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L2dmeF92OV8wLmMgICAgICB8ICA0ICsrLS0KIDYgZmlsZXMgY2hhbmdlZCwgNDAgaW5zZXJ0aW9u cygrKSwgMzkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvYW1kZ3B1LmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaAppbmRl eCBlZjM0ZmYyLi4zMzA4ZTYyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9hbWRncHUuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaApAQCAt MTgzMSwzNiArMTgzMSw2IEBAIGFtZGdwdV9nZXRfc2RtYV9pbnN0YW5jZShzdHJ1Y3QgYW1kZ3B1 X3JpbmcgKnJpbmcpCiAJCXJldHVybiBOVUxMOwogfQogCi1zdGF0aWMgaW5saW5lIGludCBhbWRn cHVfcXVldWVfdG9fYml0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAotCQkJCSAgICAgIGlu dCBtZWMsIGludCBwaXBlLCBpbnQgcXVldWUpCi17Ci0JaW50IGJpdCA9IDA7Ci0KLQliaXQgKz0g bWVjICogYWRldi0+Z2Z4Lm1lYy5udW1fcGlwZV9wZXJfbWVjCi0JCSogYWRldi0+Z2Z4Lm1lYy5u dW1fcXVldWVfcGVyX3BpcGU7Ci0JYml0ICs9IHBpcGUgKiBhZGV2LT5nZngubWVjLm51bV9xdWV1 ZV9wZXJfcGlwZTsKLQliaXQgKz0gcXVldWU7Ci0KLQlyZXR1cm4gYml0OwotfQotCi1zdGF0aWMg aW5saW5lIHZvaWQgYW1kZ3B1X2JpdF90b19xdWV1ZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRl diwgaW50IGJpdCwKLQkJCQkgICAgICAgaW50ICptZWMsIGludCAqcGlwZSwgaW50ICpxdWV1ZSkK LXsKLQkqcXVldWUgPSBiaXQgJSBhZGV2LT5nZngubWVjLm51bV9xdWV1ZV9wZXJfcGlwZTsKLQkq cGlwZSA9IChiaXQgLyBhZGV2LT5nZngubWVjLm51bV9xdWV1ZV9wZXJfcGlwZSkKLQkJJSBhZGV2 LT5nZngubWVjLm51bV9waXBlX3Blcl9tZWM7Ci0JKm1lYyA9IChiaXQgLyBhZGV2LT5nZngubWVj Lm51bV9xdWV1ZV9wZXJfcGlwZSkKLQkgICAgICAgLyBhZGV2LT5nZngubWVjLm51bV9waXBlX3Bl cl9tZWM7Ci0KLX0KLXN0YXRpYyBpbmxpbmUgYm9vbCBhbWRncHVfaXNfbWVjX3F1ZXVlX2VuYWJs ZWQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCi0JCQkJCSAgICAgICBpbnQgbWVjLCBpbnQg cGlwZSwgaW50IHF1ZXVlKQotewotCXJldHVybiB0ZXN0X2JpdChhbWRncHVfcXVldWVfdG9fYml0 KGFkZXYsIG1lYywgcGlwZSwgcXVldWUpLAotCQkJYWRldi0+Z2Z4Lm1lYy5xdWV1ZV9iaXRtYXAp OwotfQotCiAvKgogICogQVNJQ3MgbWFjcm8uCiAgKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9hbWRrZmQuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2FtZGdwdV9hbWRrZmQuYwppbmRleCAzMzllOGNkLi41ZjhhZGExIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfYW1ka2ZkLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2FtZGtmZC5jCkBAIC0yNCw2ICsyNCw3IEBACiAjaW5j bHVkZSAiYW1kX3NoYXJlZC5oIgogI2luY2x1ZGUgPGRybS9kcm1QLmg+CiAjaW5jbHVkZSAiYW1k Z3B1LmgiCisjaW5jbHVkZSAiYW1kZ3B1X2dmeC5oIgogI2luY2x1ZGUgPGxpbnV4L21vZHVsZS5o PgogCiBjb25zdCBzdHJ1Y3Qga2ZkMmtnZF9jYWxscyAqa2ZkMmtnZDsKQEAgLTExMywxMCArMTE0 LDEwIEBAIHZvaWQgYW1kZ3B1X2FtZGtmZF9kZXZpY2VfaW5pdChzdHJ1Y3QgYW1kZ3B1X2Rldmlj ZSAqYWRldikKIAogCQkvKiByZW1vdmUgdGhlIEtJUSBiaXQgYXMgd2VsbCAqLwogCQlpZiAoYWRl di0+Z2Z4LmtpcS5yaW5nLnJlYWR5KQotCQkJY2xlYXJfYml0KGFtZGdwdV9xdWV1ZV90b19iaXQo YWRldiwKLQkJCQkJCSAgICAgIGFkZXYtPmdmeC5raXEucmluZy5tZSAtIDEsCi0JCQkJCQkgICAg ICBhZGV2LT5nZngua2lxLnJpbmcucGlwZSwKLQkJCQkJCSAgICAgIGFkZXYtPmdmeC5raXEucmlu Zy5xdWV1ZSksCisJCQljbGVhcl9iaXQoYW1kZ3B1X2dmeF9xdWV1ZV90b19iaXQoYWRldiwKKwkJ CQkJCQkgIGFkZXYtPmdmeC5raXEucmluZy5tZSAtIDEsCisJCQkJCQkJICBhZGV2LT5nZngua2lx LnJpbmcucGlwZSwKKwkJCQkJCQkgIGFkZXYtPmdmeC5raXEucmluZy5xdWV1ZSksCiAJCQkJICBn cHVfcmVzb3VyY2VzLnF1ZXVlX2JpdG1hcCk7CiAKIAkJLyogQWNjb3JkaW5nIHRvIGxpbnV4L2Jp dG1hcC5oIHdlIHNob3VsZG4ndCB1c2UgYml0bWFwX2NsZWFyIGlmCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZ2Z4LmggYi9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9hbWRncHVfZ2Z4LmgKaW5kZXggOWI5ZWE2ZS4uZmEyMDQzOCAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2dmeC5oCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9nZnguaApAQCAtNDUsNCArNDUsMzQgQEAgc3RhdGljIGlu bGluZSB1MzIgYW1kZ3B1X2dmeF9jcmVhdGVfYml0bWFzayh1MzIgYml0X3dpZHRoKQogCXJldHVy biAodTMyKSgoMVVMTCA8PCBiaXRfd2lkdGgpIC0gMSk7CiB9CiAKK3N0YXRpYyBpbmxpbmUgaW50 IGFtZGdwdV9nZnhfcXVldWVfdG9fYml0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAorCQkJ CQkgIGludCBtZWMsIGludCBwaXBlLCBpbnQgcXVldWUpCit7CisJaW50IGJpdCA9IDA7CisKKwli aXQgKz0gbWVjICogYWRldi0+Z2Z4Lm1lYy5udW1fcGlwZV9wZXJfbWVjCisJCSogYWRldi0+Z2Z4 Lm1lYy5udW1fcXVldWVfcGVyX3BpcGU7CisJYml0ICs9IHBpcGUgKiBhZGV2LT5nZngubWVjLm51 bV9xdWV1ZV9wZXJfcGlwZTsKKwliaXQgKz0gcXVldWU7CisKKwlyZXR1cm4gYml0OworfQorCitz dGF0aWMgaW5saW5lIHZvaWQgYW1kZ3B1X2dmeF9iaXRfdG9fcXVldWUoc3RydWN0IGFtZGdwdV9k ZXZpY2UgKmFkZXYsIGludCBiaXQsCisJCQkJCSAgIGludCAqbWVjLCBpbnQgKnBpcGUsIGludCAq cXVldWUpCit7CisJKnF1ZXVlID0gYml0ICUgYWRldi0+Z2Z4Lm1lYy5udW1fcXVldWVfcGVyX3Bp cGU7CisJKnBpcGUgPSAoYml0IC8gYWRldi0+Z2Z4Lm1lYy5udW1fcXVldWVfcGVyX3BpcGUpCisJ CSUgYWRldi0+Z2Z4Lm1lYy5udW1fcGlwZV9wZXJfbWVjOworCSptZWMgPSAoYml0IC8gYWRldi0+ Z2Z4Lm1lYy5udW1fcXVldWVfcGVyX3BpcGUpCisJICAgICAgIC8gYWRldi0+Z2Z4Lm1lYy5udW1f cGlwZV9wZXJfbWVjOworCit9CitzdGF0aWMgaW5saW5lIGJvb2wgYW1kZ3B1X2dmeF9pc19tZWNf cXVldWVfZW5hYmxlZChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKKwkJCQkJCSAgIGludCBt ZWMsIGludCBwaXBlLCBpbnQgcXVldWUpCit7CisJcmV0dXJuIHRlc3RfYml0KGFtZGdwdV9nZnhf cXVldWVfdG9fYml0KGFkZXYsIG1lYywgcGlwZSwgcXVldWUpLAorCQkJYWRldi0+Z2Z4Lm1lYy5x dWV1ZV9iaXRtYXApOworfQorCiAjZW5kaWYKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2dmeF92N18wLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjdf MC5jCmluZGV4IDZmZmIyZGEuLmQ4MGNmNzIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2dmeF92N18wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4 X3Y3XzAuYwpAQCAtNDc3Niw3ICs0Nzc2LDcgQEAgc3RhdGljIGludCBnZnhfdjdfMF9zd19pbml0 KHZvaWQgKmhhbmRsZSkKIAlmb3IgKGkgPSAwOyBpIDwgYWRldi0+Z2Z4Lm1lYy5udW1fbWVjOyAr K2kpIHsKIAkJZm9yIChqID0gMDsgaiA8IGFkZXYtPmdmeC5tZWMubnVtX3F1ZXVlX3Blcl9waXBl OyBqKyspIHsKIAkJCWZvciAoayA9IDA7IGsgPCBhZGV2LT5nZngubWVjLm51bV9waXBlX3Blcl9t ZWM7IGsrKykgewotCQkJCWlmICghYW1kZ3B1X2lzX21lY19xdWV1ZV9lbmFibGVkKGFkZXYsIGks IGssIGopKQorCQkJCWlmICghYW1kZ3B1X2dmeF9pc19tZWNfcXVldWVfZW5hYmxlZChhZGV2LCBp LCBrLCBqKSkKIAkJCQkJY29udGludWU7CiAKIAkJCQlyID0gZ2Z4X3Y3XzBfY29tcHV0ZV9yaW5n X2luaXQoYWRldiwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92 OF8wLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjhfMC5jCmluZGV4IDhkMzll N2QuLmZjOGUwM2IgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92 OF8wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y4XzAuYwpAQCAtMTM5 Myw3ICsxMzkzLDcgQEAgc3RhdGljIGludCBnZnhfdjhfMF9raXFfYWNxdWlyZShzdHJ1Y3QgYW1k Z3B1X2RldmljZSAqYWRldiwKIAkJaWYgKHRlc3RfYml0KHF1ZXVlX2JpdCwgYWRldi0+Z2Z4Lm1l Yy5xdWV1ZV9iaXRtYXApKQogCQkJY29udGludWU7CiAKLQkJYW1kZ3B1X2JpdF90b19xdWV1ZShh ZGV2LCBxdWV1ZV9iaXQsICZtZWMsICZwaXBlLCAmcXVldWUpOworCQlhbWRncHVfZ2Z4X2JpdF90 b19xdWV1ZShhZGV2LCBxdWV1ZV9iaXQsICZtZWMsICZwaXBlLCAmcXVldWUpOwogCiAJCS8qIFVz aW5nIHBpcGVzIDIvMyBmcm9tIE1FQyAyIHNlZW1zIGNhdXNlIHByb2JsZW1zICovCiAJCWlmICht ZWMgPT0gMSAmJiBwaXBlID4gMSkKQEAgLTIxNzgsNyArMjE3OCw3IEBAIHN0YXRpYyBpbnQgZ2Z4 X3Y4XzBfc3dfaW5pdCh2b2lkICpoYW5kbGUpCiAJZm9yIChpID0gMDsgaSA8IGFkZXYtPmdmeC5t ZWMubnVtX21lYzsgKytpKSB7CiAJCWZvciAoaiA9IDA7IGogPCBhZGV2LT5nZngubWVjLm51bV9x dWV1ZV9wZXJfcGlwZTsgaisrKSB7CiAJCQlmb3IgKGsgPSAwOyBrIDwgYWRldi0+Z2Z4Lm1lYy5u dW1fcGlwZV9wZXJfbWVjOyBrKyspIHsKLQkJCQlpZiAoIWFtZGdwdV9pc19tZWNfcXVldWVfZW5h YmxlZChhZGV2LCBpLCBrLCBqKSkKKwkJCQlpZiAoIWFtZGdwdV9nZnhfaXNfbWVjX3F1ZXVlX2Vu YWJsZWQoYWRldiwgaSwgaywgaikpCiAJCQkJCWNvbnRpbnVlOwogCiAJCQkJciA9IGdmeF92OF8w X2NvbXB1dGVfcmluZ19pbml0KGFkZXYsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9nZnhfdjlfMC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y5XzAu YwppbmRleCA0YzQ3NzU0Zi4uNmQzMDQ3NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRncHUvZ2Z4X3Y5XzAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhf djlfMC5jCkBAIC0xMDE1LDcgKzEwMTUsNyBAQCBzdGF0aWMgaW50IGdmeF92OV8wX2tpcV9hY3F1 aXJlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogCQlpZiAodGVzdF9iaXQocXVldWVfYml0 LCBhZGV2LT5nZngubWVjLnF1ZXVlX2JpdG1hcCkpCiAJCQljb250aW51ZTsKIAotCQlhbWRncHVf Yml0X3RvX3F1ZXVlKGFkZXYsIHF1ZXVlX2JpdCwgJm1lYywgJnBpcGUsICZxdWV1ZSk7CisJCWFt ZGdwdV9nZnhfYml0X3RvX3F1ZXVlKGFkZXYsIHF1ZXVlX2JpdCwgJm1lYywgJnBpcGUsICZxdWV1 ZSk7CiAKIAkJLyogVXNpbmcgcGlwZXMgMi8zIGZyb20gTUVDIDIgc2VlbXMgY2F1c2UgcHJvYmxl bXMgKi8KIAkJaWYgKG1lYyA9PSAxICYmIHBpcGUgPiAxKQpAQCAtMTU1Niw3ICsxNTU2LDcgQEAg c3RhdGljIGludCBnZnhfdjlfMF9zd19pbml0KHZvaWQgKmhhbmRsZSkKIAlmb3IgKGkgPSAwOyBp IDwgYWRldi0+Z2Z4Lm1lYy5udW1fbWVjOyArK2kpIHsKIAkJZm9yIChqID0gMDsgaiA8IGFkZXYt PmdmeC5tZWMubnVtX3F1ZXVlX3Blcl9waXBlOyBqKyspIHsKIAkJCWZvciAoayA9IDA7IGsgPCBh ZGV2LT5nZngubWVjLm51bV9waXBlX3Blcl9tZWM7IGsrKykgewotCQkJCWlmICghYW1kZ3B1X2lz X21lY19xdWV1ZV9lbmFibGVkKGFkZXYsIGksIGssIGopKQorCQkJCWlmICghYW1kZ3B1X2dmeF9p c19tZWNfcXVldWVfZW5hYmxlZChhZGV2LCBpLCBrLCBqKSkKIAkJCQkJY29udGludWU7CiAKIAkJ CQlyID0gZ2Z4X3Y5XzBfY29tcHV0ZV9yaW5nX2luaXQoYWRldiwKLS0gCjIuNS41CgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcg bGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK