From: Alex Deucher Subject: [PATCH 08/12] drm/amdgpu: split gfx_v9_0_kiq_init_queue into two Date: Mon, 17 Apr 2017 18:00:43 -0400 Message-ID: <1492466447-27614-9-git-send-email-alexander.deucher@amd.com> References: <1492466447-27614-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: <1492466447-27614-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 T25lIGZvciBLSVEgYW5kIG9uZSBmb3IgdGhlIEtDUS4gVGhpcyBzaW1wbGlmaWVzIHRoZSBsb2dp YyBhbmQKYWxsb3dzIGZvciBmdXR1cmUgb3B0aW1pemF0aW9ucy4KClNpZ25lZC1vZmYtYnk6IEFs ZXggRGV1Y2hlciA8YWxleGFuZGVyLmRldWNoZXJAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9nZnhfdjlfMC5jIHwgNjMgKysrKysrKysrKysrKysrKysrKysrKystLS0t LS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0MiBpbnNlcnRpb25zKCspLCAyMSBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjlfMC5jIGIv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y5XzAuYwppbmRleCAwOTdhNTI0Li44MTVm OTg1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjlfMC5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OV8wLmMKQEAgLTIxOTQsMjUgKzIx OTQsMTggQEAgc3RhdGljIGludCBnZnhfdjlfMF9raXFfaW5pdF9yZWdpc3RlcihzdHJ1Y3QgYW1k Z3B1X3JpbmcgKnJpbmcpCiBzdGF0aWMgaW50IGdmeF92OV8wX2tpcV9pbml0X3F1ZXVlKHN0cnVj dCBhbWRncHVfcmluZyAqcmluZykKIHsKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IHJp bmctPmFkZXY7Ci0Jc3RydWN0IGFtZGdwdV9raXEgKmtpcSA9ICZhZGV2LT5nZngua2lxOwogCXN0 cnVjdCB2OV9tcWQgKm1xZCA9IHJpbmctPm1xZF9wdHI7Ci0JYm9vbCBpc19raXEgPSAocmluZy0+ ZnVuY3MtPnR5cGUgPT0gQU1ER1BVX1JJTkdfVFlQRV9LSVEpOwogCWludCBtcWRfaWR4ID0gQU1E R1BVX01BWF9DT01QVVRFX1JJTkdTOwogCWludCByOwogCi0JaWYgKGlzX2tpcSkgewotCQlnZnhf djlfMF9raXFfc2V0dGluZygma2lxLT5yaW5nKTsKLQl9IGVsc2UgewotCQltcWRfaWR4ID0gcmlu ZyAtICZhZGV2LT5nZnguY29tcHV0ZV9yaW5nWzBdOwotCX0KKwlnZnhfdjlfMF9raXFfc2V0dGlu ZyhyaW5nKTsKIAogCWlmICghYWRldi0+Z2Z4LmluX3Jlc2V0KSB7CiAJCW1lbXNldCgodm9pZCAq KW1xZCwgMCwgc2l6ZW9mKCptcWQpKTsKIAkJbXV0ZXhfbG9jaygmYWRldi0+c3JibV9tdXRleCk7 CiAJCXNvYzE1X2dyYm1fc2VsZWN0KGFkZXYsIHJpbmctPm1lLCByaW5nLT5waXBlLCByaW5nLT5x dWV1ZSwgMCk7CiAJCWdmeF92OV8wX21xZF9pbml0KHJpbmcpOwotCQlpZiAoaXNfa2lxKQotCQkJ Z2Z4X3Y5XzBfa2lxX2luaXRfcmVnaXN0ZXIocmluZyk7CisJCWdmeF92OV8wX2tpcV9pbml0X3Jl Z2lzdGVyKHJpbmcpOwogCQlzb2MxNV9ncmJtX3NlbGVjdChhZGV2LCAwLCAwLCAwLCAwKTsKIAkJ bXV0ZXhfdW5sb2NrKCZhZGV2LT5zcmJtX211dGV4KTsKIApAQCAtMjIyNywxOSArMjIyMCw0NyBA QCBzdGF0aWMgaW50IGdmeF92OV8wX2tpcV9pbml0X3F1ZXVlKHN0cnVjdCBhbWRncHVfcmluZyAq cmluZykKIAkJcmluZy0+d3B0ciA9IDA7CiAJCWFtZGdwdV9yaW5nX2NsZWFyX3JpbmcocmluZyk7 CiAKLQkJaWYgKGlzX2tpcSkgewotCQkgICAgbXV0ZXhfbG9jaygmYWRldi0+c3JibV9tdXRleCk7 Ci0JCSAgICBzb2MxNV9ncmJtX3NlbGVjdChhZGV2LCByaW5nLT5tZSwgcmluZy0+cGlwZSwgcmlu Zy0+cXVldWUsIDApOwotCQkgICAgZ2Z4X3Y5XzBfa2lxX2luaXRfcmVnaXN0ZXIocmluZyk7Ci0J CSAgICBzb2MxNV9ncmJtX3NlbGVjdChhZGV2LCAwLCAwLCAwLCAwKTsKLQkJICAgIG11dGV4X3Vu bG9jaygmYWRldi0+c3JibV9tdXRleCk7Ci0JCX0KKwkJbXV0ZXhfbG9jaygmYWRldi0+c3JibV9t dXRleCk7CisJCXNvYzE1X2dyYm1fc2VsZWN0KGFkZXYsIHJpbmctPm1lLCByaW5nLT5waXBlLCBy aW5nLT5xdWV1ZSwgMCk7CisJCWdmeF92OV8wX2tpcV9pbml0X3JlZ2lzdGVyKHJpbmcpOworCQlz b2MxNV9ncmJtX3NlbGVjdChhZGV2LCAwLCAwLCAwLCAwKTsKKwkJbXV0ZXhfdW5sb2NrKCZhZGV2 LT5zcmJtX211dGV4KTsKIAl9CiAKLQlpZiAoaXNfa2lxKQotCQlyID0gZ2Z4X3Y5XzBfa2lxX2Vu YWJsZShyaW5nKTsKLQllbHNlCi0JCXIgPSBnZnhfdjlfMF9tYXBfcXVldWVfZW5hYmxlKCZraXEt PnJpbmcsIHJpbmcpOworCXIgPSBnZnhfdjlfMF9raXFfZW5hYmxlKHJpbmcpOworCisJcmV0dXJu IHI7Cit9CisKK3N0YXRpYyBpbnQgZ2Z4X3Y5XzBfa2NxX2luaXRfcXVldWUoc3RydWN0IGFtZGdw dV9yaW5nICpyaW5nKQoreworCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gcmluZy0+YWRl djsKKwlzdHJ1Y3QgYW1kZ3B1X2tpcSAqa2lxID0gJmFkZXYtPmdmeC5raXE7CisJc3RydWN0IHY5 X21xZCAqbXFkID0gcmluZy0+bXFkX3B0cjsKKwlpbnQgbXFkX2lkeCA9IHJpbmcgLSAmYWRldi0+ Z2Z4LmNvbXB1dGVfcmluZ1swXTsKKwlpbnQgcjsKKworCWlmICghYWRldi0+Z2Z4LmluX3Jlc2V0 KSB7CisJCW1lbXNldCgodm9pZCAqKW1xZCwgMCwgc2l6ZW9mKCptcWQpKTsKKwkJbXV0ZXhfbG9j aygmYWRldi0+c3JibV9tdXRleCk7CisJCXNvYzE1X2dyYm1fc2VsZWN0KGFkZXYsIHJpbmctPm1l LCByaW5nLT5waXBlLCByaW5nLT5xdWV1ZSwgMCk7CisJCWdmeF92OV8wX21xZF9pbml0KHJpbmcp OworCQlzb2MxNV9ncmJtX3NlbGVjdChhZGV2LCAwLCAwLCAwLCAwKTsKKwkJbXV0ZXhfdW5sb2Nr KCZhZGV2LT5zcmJtX211dGV4KTsKKworCQlpZiAoYWRldi0+Z2Z4Lm1lYy5tcWRfYmFja3VwW21x ZF9pZHhdKQorCQkJbWVtY3B5KGFkZXYtPmdmeC5tZWMubXFkX2JhY2t1cFttcWRfaWR4XSwgbXFk LCBzaXplb2YoKm1xZCkpOworCX0gZWxzZSB7IC8qIGZvciBHUFVfUkVTRVQgY2FzZSAqLworCQkv KiByZXNldCBNUUQgdG8gYSBjbGVhbiBzdGF0dXMgKi8KKwkJaWYgKGFkZXYtPmdmeC5tZWMubXFk X2JhY2t1cFttcWRfaWR4XSkKKwkJCW1lbWNweShtcWQsIGFkZXYtPmdmeC5tZWMubXFkX2JhY2t1 cFttcWRfaWR4XSwgc2l6ZW9mKCptcWQpKTsKKworCQkvKiByZXNldCByaW5nIGJ1ZmZlciAqLwor CQlyaW5nLT53cHRyID0gMDsKKwkJYW1kZ3B1X3JpbmdfY2xlYXJfcmluZyhyaW5nKTsKKwl9CisK KwlyID0gZ2Z4X3Y5XzBfbWFwX3F1ZXVlX2VuYWJsZSgma2lxLT5yaW5nLCByaW5nKTsKIAogCXJl dHVybiByOwogfQpAQCAtMjI3NSw3ICsyMjk2LDcgQEAgc3RhdGljIGludCBnZnhfdjlfMF9raXFf cmVzdW1lKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCQkJZ290byBkb25lOwogCQlyID0g YW1kZ3B1X2JvX2ttYXAocmluZy0+bXFkX29iaiwgKHZvaWQgKiopJnJpbmctPm1xZF9wdHIpOwog CQlpZiAoIXIpIHsKLQkJCXIgPSBnZnhfdjlfMF9raXFfaW5pdF9xdWV1ZShyaW5nKTsKKwkJCXIg PSBnZnhfdjlfMF9rY3FfaW5pdF9xdWV1ZShyaW5nKTsKIAkJCWFtZGdwdV9ib19rdW5tYXAocmlu Zy0+bXFkX29iaik7CiAJCQlyaW5nLT5tcWRfcHRyID0gTlVMTDsKIAkJfQotLSAKMi41LjUKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFp bGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=