From: Alex Deucher Subject: [PATCH 11/12] drm/amdgpu/gfx9: fix resume of KIQ and KCQs Date: Mon, 17 Apr 2017 18:00:46 -0400 Message-ID: <1492466447-27614-12-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 Tm8gbmVlZCB0byByZXNldCB0aGUgd3B0ciBhbmQgY2xlYXIgdGhlIHJpbmdzLiAgVGhlIFVOTUFQ X1FVRVVFUwpwYWNrZXQgd3JpdGVzIHRoZSBjdXJyZW50IE1RRCBzdGF0ZSBiYWNrIHRoZSBNUUQg b24gc3VzcGVuZCwKc28gdGhlcmUgaXMgbm8gbmVlZCB0byByZXNldCBpdCBhcyB3ZWxsLgoKU2ln bmVkLW9mZi1ieTogQWxleCBEZXVjaGVyIDxhbGV4YW5kZXIuZGV1Y2hlckBhbWQuY29tPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OV8wLmMgfCAyNiArKysrKysrKysrKysr LS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEzIGluc2VydGlvbnMoKyksIDEzIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OV8w LmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjlfMC5jCmluZGV4IGQyNmJhZDIu LmY4NmE3ZjYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OV8w LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y5XzAuYwpAQCAtMjE1OCwx OCArMjE1OCw3IEBAIHN0YXRpYyBpbnQgZ2Z4X3Y5XzBfa2lxX2luaXRfcXVldWUoc3RydWN0IGFt ZGdwdV9yaW5nICpyaW5nKQogCiAJZ2Z4X3Y5XzBfa2lxX3NldHRpbmcocmluZyk7CiAKLQlpZiAo IWFkZXYtPmdmeC5pbl9yZXNldCkgewotCQltZW1zZXQoKHZvaWQgKiltcWQsIDAsIHNpemVvZigq bXFkKSk7Ci0JCW11dGV4X2xvY2soJmFkZXYtPnNyYm1fbXV0ZXgpOwotCQlzb2MxNV9ncmJtX3Nl bGVjdChhZGV2LCByaW5nLT5tZSwgcmluZy0+cGlwZSwgcmluZy0+cXVldWUsIDApOwotCQlnZnhf djlfMF9tcWRfaW5pdChyaW5nKTsKLQkJZ2Z4X3Y5XzBfa2lxX2luaXRfcmVnaXN0ZXIocmluZyk7 Ci0JCXNvYzE1X2dyYm1fc2VsZWN0KGFkZXYsIDAsIDAsIDAsIDApOwotCQltdXRleF91bmxvY2so JmFkZXYtPnNyYm1fbXV0ZXgpOwotCi0JCWlmIChhZGV2LT5nZngubWVjLm1xZF9iYWNrdXBbbXFk X2lkeF0pCi0JCQltZW1jcHkoYWRldi0+Z2Z4Lm1lYy5tcWRfYmFja3VwW21xZF9pZHhdLCBtcWQs IHNpemVvZigqbXFkKSk7Ci0JfSBlbHNlIHsgLyogZm9yIEdQVV9SRVNFVCBjYXNlICovCisJaWYg KGFkZXYtPmdmeC5pbl9yZXNldCkgeyAvKiBmb3IgR1BVX1JFU0VUIGNhc2UgKi8KIAkJLyogcmVz ZXQgTVFEIHRvIGEgY2xlYW4gc3RhdHVzICovCiAJCWlmIChhZGV2LT5nZngubWVjLm1xZF9iYWNr dXBbbXFkX2lkeF0pCiAJCQltZW1jcHkobXFkLCBhZGV2LT5nZngubWVjLm1xZF9iYWNrdXBbbXFk X2lkeF0sIHNpemVvZigqbXFkKSk7CkBAIC0yMTgzLDYgKzIxNzIsMTcgQEAgc3RhdGljIGludCBn ZnhfdjlfMF9raXFfaW5pdF9xdWV1ZShzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcpCiAJCWdmeF92 OV8wX2tpcV9pbml0X3JlZ2lzdGVyKHJpbmcpOwogCQlzb2MxNV9ncmJtX3NlbGVjdChhZGV2LCAw LCAwLCAwLCAwKTsKIAkJbXV0ZXhfdW5sb2NrKCZhZGV2LT5zcmJtX211dGV4KTsKKwl9IGVsc2Ug eworCQltZW1zZXQoKHZvaWQgKiltcWQsIDAsIHNpemVvZigqbXFkKSk7CisJCW11dGV4X2xvY2so JmFkZXYtPnNyYm1fbXV0ZXgpOworCQlzb2MxNV9ncmJtX3NlbGVjdChhZGV2LCByaW5nLT5tZSwg cmluZy0+cGlwZSwgcmluZy0+cXVldWUsIDApOworCQlnZnhfdjlfMF9tcWRfaW5pdChyaW5nKTsK KwkJZ2Z4X3Y5XzBfa2lxX2luaXRfcmVnaXN0ZXIocmluZyk7CisJCXNvYzE1X2dyYm1fc2VsZWN0 KGFkZXYsIDAsIDAsIDAsIDApOworCQltdXRleF91bmxvY2soJmFkZXYtPnNyYm1fbXV0ZXgpOwor CisJCWlmIChhZGV2LT5nZngubWVjLm1xZF9iYWNrdXBbbXFkX2lkeF0pCisJCQltZW1jcHkoYWRl di0+Z2Z4Lm1lYy5tcWRfYmFja3VwW21xZF9pZHhdLCBtcWQsIHNpemVvZigqbXFkKSk7CiAJfQog CiAJcmV0dXJuIDA7CkBAIC0yMjA0LDcgKzIyMDQsNyBAQCBzdGF0aWMgaW50IGdmeF92OV8wX2tj cV9pbml0X3F1ZXVlKHN0cnVjdCBhbWRncHVfcmluZyAqcmluZykKIAogCQlpZiAoYWRldi0+Z2Z4 Lm1lYy5tcWRfYmFja3VwW21xZF9pZHhdKQogCQkJbWVtY3B5KGFkZXYtPmdmeC5tZWMubXFkX2Jh Y2t1cFttcWRfaWR4XSwgbXFkLCBzaXplb2YoKm1xZCkpOwotCX0gZWxzZSB7IC8qIGZvciBHUFVf UkVTRVQgY2FzZSAqLworCX0gZWxzZSBpZiAoYWRldi0+Z2Z4LmluX3Jlc2V0KSB7IC8qIGZvciBH UFVfUkVTRVQgY2FzZSAqLwogCQkvKiByZXNldCBNUUQgdG8gYSBjbGVhbiBzdGF0dXMgKi8KIAkJ aWYgKGFkZXYtPmdmeC5tZWMubXFkX2JhY2t1cFttcWRfaWR4XSkKIAkJCW1lbWNweShtcWQsIGFk ZXYtPmdmeC5tZWMubXFkX2JhY2t1cFttcWRfaWR4XSwgc2l6ZW9mKCptcWQpKTsKLS0gCjIuNS41 CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4 IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK