From: Alex Deucher Subject: [PATCH 4/5] drm/amdgpu/gfx9: fix resume of KIQ and KCQs (v2) Date: Thu, 11 May 2017 14:35:29 -0400 Message-ID: <1494527730-30128-5-git-send-email-alexander.deucher@amd.com> References: <1494527730-30128-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: <1494527730-30128-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 b24gc3VzcGVuZCwKc28gdGhlcmUgaXMgbm8gbmVlZCB0byByZXNldCBpdCBhcyB3ZWxsLgoKdjI6 IGZpeCBmcm9tIGdmeDggKFJleCkKCkFjay1ieTogbW9uayBsaXUgPG1vbmsubGl1QGFtZC5jb20+ ClNpZ25lZC1vZmYtYnk6IEFsZXggRGV1Y2hlciA8YWxleGFuZGVyLmRldWNoZXJAYW1kLmNvbT4K LS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjlfMC5jIHwgMjggKysrKysrKysr KysrKysrLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE1IGluc2VydGlvbnMoKyksIDEz IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dm eF92OV8wLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjlfMC5jCmluZGV4IDkw NTE1OTAuLjQyMzkwYzUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dm eF92OV8wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y5XzAuYwpAQCAt Mjc5NywxOCArMjc5Nyw3IEBAIHN0YXRpYyBpbnQgZ2Z4X3Y5XzBfa2lxX2luaXRfcXVldWUoc3Ry dWN0IGFtZGdwdV9yaW5nICpyaW5nKQogCiAJZ2Z4X3Y5XzBfa2lxX3NldHRpbmcocmluZyk7CiAK LQlpZiAoIWFkZXYtPmdmeC5pbl9yZXNldCkgewotCQltZW1zZXQoKHZvaWQgKiltcWQsIDAsIHNp emVvZigqbXFkKSk7Ci0JCW11dGV4X2xvY2soJmFkZXYtPnNyYm1fbXV0ZXgpOwotCQlzb2MxNV9n cmJtX3NlbGVjdChhZGV2LCByaW5nLT5tZSwgcmluZy0+cGlwZSwgcmluZy0+cXVldWUsIDApOwot CQlnZnhfdjlfMF9tcWRfaW5pdChyaW5nKTsKLQkJZ2Z4X3Y5XzBfa2lxX2luaXRfcmVnaXN0ZXIo cmluZyk7Ci0JCXNvYzE1X2dyYm1fc2VsZWN0KGFkZXYsIDAsIDAsIDAsIDApOwotCQltdXRleF91 bmxvY2soJmFkZXYtPnNyYm1fbXV0ZXgpOwotCi0JCWlmIChhZGV2LT5nZngubWVjLm1xZF9iYWNr dXBbbXFkX2lkeF0pCi0JCQltZW1jcHkoYWRldi0+Z2Z4Lm1lYy5tcWRfYmFja3VwW21xZF9pZHhd LCBtcWQsIHNpemVvZigqbXFkKSk7Ci0JfSBlbHNlIHsgLyogZm9yIEdQVV9SRVNFVCBjYXNlICov CisJaWYgKGFkZXYtPmdmeC5pbl9yZXNldCkgeyAvKiBmb3IgR1BVX1JFU0VUIGNhc2UgKi8KIAkJ LyogcmVzZXQgTVFEIHRvIGEgY2xlYW4gc3RhdHVzICovCiAJCWlmIChhZGV2LT5nZngubWVjLm1x ZF9iYWNrdXBbbXFkX2lkeF0pCiAJCQltZW1jcHkobXFkLCBhZGV2LT5nZngubWVjLm1xZF9iYWNr dXBbbXFkX2lkeF0sIHNpemVvZigqbXFkKSk7CkBAIC0yODIyLDYgKzI4MTEsMTcgQEAgc3RhdGlj IGludCBnZnhfdjlfMF9raXFfaW5pdF9xdWV1ZShzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcpCiAJ CWdmeF92OV8wX2tpcV9pbml0X3JlZ2lzdGVyKHJpbmcpOwogCQlzb2MxNV9ncmJtX3NlbGVjdChh ZGV2LCAwLCAwLCAwLCAwKTsKIAkJbXV0ZXhfdW5sb2NrKCZhZGV2LT5zcmJtX211dGV4KTsKKwl9 IGVsc2UgeworCQltZW1zZXQoKHZvaWQgKiltcWQsIDAsIHNpemVvZigqbXFkKSk7CisJCW11dGV4 X2xvY2soJmFkZXYtPnNyYm1fbXV0ZXgpOworCQlzb2MxNV9ncmJtX3NlbGVjdChhZGV2LCByaW5n LT5tZSwgcmluZy0+cGlwZSwgcmluZy0+cXVldWUsIDApOworCQlnZnhfdjlfMF9tcWRfaW5pdChy aW5nKTsKKwkJZ2Z4X3Y5XzBfa2lxX2luaXRfcmVnaXN0ZXIocmluZyk7CisJCXNvYzE1X2dyYm1f c2VsZWN0KGFkZXYsIDAsIDAsIDAsIDApOworCQltdXRleF91bmxvY2soJmFkZXYtPnNyYm1fbXV0 ZXgpOworCisJCWlmIChhZGV2LT5nZngubWVjLm1xZF9iYWNrdXBbbXFkX2lkeF0pCisJCQltZW1j cHkoYWRldi0+Z2Z4Lm1lYy5tcWRfYmFja3VwW21xZF9pZHhdLCBtcWQsIHNpemVvZigqbXFkKSk7 CiAJfQogCiAJcmV0dXJuIDA7CkBAIC0yODQzLDcgKzI4NDMsNyBAQCBzdGF0aWMgaW50IGdmeF92 OV8wX2tjcV9pbml0X3F1ZXVlKHN0cnVjdCBhbWRncHVfcmluZyAqcmluZykKIAogCQlpZiAoYWRl di0+Z2Z4Lm1lYy5tcWRfYmFja3VwW21xZF9pZHhdKQogCQkJbWVtY3B5KGFkZXYtPmdmeC5tZWMu bXFkX2JhY2t1cFttcWRfaWR4XSwgbXFkLCBzaXplb2YoKm1xZCkpOwotCX0gZWxzZSB7IC8qIGZv ciBHUFVfUkVTRVQgY2FzZSAqLworCX0gZWxzZSBpZiAoYWRldi0+Z2Z4LmluX3Jlc2V0KSB7IC8q IGZvciBHUFVfUkVTRVQgY2FzZSAqLwogCQkvKiByZXNldCBNUUQgdG8gYSBjbGVhbiBzdGF0dXMg Ki8KIAkJaWYgKGFkZXYtPmdmeC5tZWMubXFkX2JhY2t1cFttcWRfaWR4XSkKIAkJCW1lbWNweSht cWQsIGFkZXYtPmdmeC5tZWMubXFkX2JhY2t1cFttcWRfaWR4XSwgc2l6ZW9mKCptcWQpKTsKQEAg LTI4NTEsNiArMjg1MSw4IEBAIHN0YXRpYyBpbnQgZ2Z4X3Y5XzBfa2NxX2luaXRfcXVldWUoc3Ry dWN0IGFtZGdwdV9yaW5nICpyaW5nKQogCQkvKiByZXNldCByaW5nIGJ1ZmZlciAqLwogCQlyaW5n LT53cHRyID0gMDsKIAkJYW1kZ3B1X3JpbmdfY2xlYXJfcmluZyhyaW5nKTsKKwl9IGVsc2Ugewor CQlhbWRncHVfcmluZ19jbGVhcl9yaW5nKHJpbmcpOwogCX0KIAogCXJldHVybiAwOwotLSAKMi41 LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1n ZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=