From: Felix Kuehling Subject: [PATCH 3/9] drm/amdkfd: Fix MQD updates Date: Wed, 27 Sep 2017 00:09:50 -0400 Message-ID: <1506485396-6326-4-git-send-email-Felix.Kuehling@amd.com> References: <1506485396-6326-1-git-send-email-Felix.Kuehling@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1506485396-6326-1-git-send-email-Felix.Kuehling-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, oded.gabbay-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org Cc: Felix Kuehling , Oak Zeng V2hlbiBhIHF1ZXVlIGlzIG1hcHBlZCwgdGhlIE1RRCBpcyBvd25lZCBieSB0aGUgRlcuIFRoZSBG VyBvdmVyd3JpdGVzCnRoZSBNUUQgb24gdGhlIG5leHQgdW5tYXAgb3BlcmF0aW9uLiBUaGVyZWZv cmUgdGhlIHF1ZXVlIG11c3QgYmUKdW5tYXBwZWQgYmVmb3JlIHVwZGF0aW5nIHRoZSBNUUQuCgpG b3IgdGhlIG5vbi1IV1MgY2FzZSwgYWxzbyBmaXggZGlzYWJsaW5nIG9mIHF1ZXVlcyBhbmQgY3Jl YXRpb24gb2YKcXVldWVzIGluIGRpc2FibGVkIHN0YXRlLgoKU2lnbmVkLW9mZi1ieTogT2FrIFpl bmcgPE9hay5aZW5nQGFtZC5jb20+ClNpZ25lZC1vZmYtYnk6IEZlbGl4IEt1ZWhsaW5nIDxGZWxp eC5LdWVobGluZ0BhbWQuY29tPgotLS0KIC4uLi9ncHUvZHJtL2FtZC9hbWRrZmQva2ZkX2Rldmlj ZV9xdWV1ZV9tYW5hZ2VyLmMgIHwgODQgKysrKysrKysrKysrKysrKy0tLS0tLQogMSBmaWxlIGNo YW5nZWQsIDYyIGluc2VydGlvbnMoKyksIDIyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1ka2ZkL2tmZF9kZXZpY2VfcXVldWVfbWFuYWdlci5jIGIvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRrZmQva2ZkX2RldmljZV9xdWV1ZV9tYW5hZ2VyLmMKaW5kZXgg YmU5MjVhNC4uZGNjYjQ5MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRrZmQv a2ZkX2RldmljZV9xdWV1ZV9tYW5hZ2VyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRr ZmQva2ZkX2RldmljZV9xdWV1ZV9tYW5hZ2VyLmMKQEAgLTQ5LDYgKzQ5LDggQEAgc3RhdGljIGlu dCB1bm1hcF9xdWV1ZXNfY3BzY2goc3RydWN0IGRldmljZV9xdWV1ZV9tYW5hZ2VyICpkcW0sCiAJ CQkJZW51bSBrZmRfdW5tYXBfcXVldWVzX2ZpbHRlciBmaWx0ZXIsCiAJCQkJdWludDMyX3QgZmls dGVyX3BhcmFtKTsKIAorc3RhdGljIGludCBtYXBfcXVldWVzX2Nwc2NoKHN0cnVjdCBkZXZpY2Vf cXVldWVfbWFuYWdlciAqZHFtKTsKKwogc3RhdGljIGludCBjcmVhdGVfc2RtYV9xdWV1ZV9ub2Nw c2NoKHN0cnVjdCBkZXZpY2VfcXVldWVfbWFuYWdlciAqZHFtLAogCQkJCQlzdHJ1Y3QgcXVldWUg KnEsCiAJCQkJCXN0cnVjdCBxY21fcHJvY2Vzc19kZXZpY2UgKnFwZCk7CkBAIC0yNzQsNiArMjc2 LDkgQEAgc3RhdGljIGludCBjcmVhdGVfY29tcHV0ZV9xdWV1ZV9ub2Nwc2NoKHN0cnVjdCBkZXZp Y2VfcXVldWVfbWFuYWdlciAqZHFtLAogCWRxbS0+ZGV2LT5rZmQya2dkLT5zZXRfc2NyYXRjaF9i YWNraW5nX3ZhKAogCQkJZHFtLT5kZXYtPmtnZCwgcXBkLT5zaF9oaWRkZW5fcHJpdmF0ZV9iYXNl LCBxcGQtPnZtaWQpOwogCisJaWYgKCFxLT5wcm9wZXJ0aWVzLmlzX2FjdGl2ZSkKKwkJcmV0dXJu IDA7CisKIAlyZXR2YWwgPSBtcWQtPmxvYWRfbXFkKG1xZCwgcS0+bXFkLCBxLT5waXBlLCBxLT5x dWV1ZSwgJnEtPnByb3BlcnRpZXMsCiAJCQkgICAgICAgcS0+cHJvY2Vzcy0+bW0pOwogCWlmIChy ZXR2YWwpCkBAIC0zNjUsMjMgKzM3MCw1MCBAQCBzdGF0aWMgaW50IHVwZGF0ZV9xdWV1ZShzdHJ1 Y3QgZGV2aWNlX3F1ZXVlX21hbmFnZXIgKmRxbSwgc3RydWN0IHF1ZXVlICpxKQogCQlnb3RvIG91 dF91bmxvY2s7CiAJfQogCi0JaWYgKHEtPnByb3BlcnRpZXMuaXNfYWN0aXZlKQotCQlwcmV2X2Fj dGl2ZSA9IHRydWU7CisJLyogU2F2ZSBwcmV2aW91cyBhY3Rpdml0eSBzdGF0ZSBmb3IgY291bnRl cnMgKi8KKwlwcmV2X2FjdGl2ZSA9IHEtPnByb3BlcnRpZXMuaXNfYWN0aXZlOworCisJLyogTWFr ZSBzdXJlIHRoZSBxdWV1ZSBpcyB1bm1hcHBlZCBiZWZvcmUgdXBkYXRpbmcgdGhlIE1RRCAqLwor CWlmIChzY2hlZF9wb2xpY3kgIT0gS0ZEX1NDSEVEX1BPTElDWV9OT19IV1MpIHsKKwkJcmV0dmFs ID0gdW5tYXBfcXVldWVzX2Nwc2NoKGRxbSwKKwkJCQlLRkRfVU5NQVBfUVVFVUVTX0ZJTFRFUl9E WU5BTUlDX1FVRVVFUywgMCk7CisJCWlmIChyZXR2YWwgIT0gMCkgeworCQkJcHJfZXJyKCJ1bm1h cCBxdWV1ZSBmYWlsZWRcbiIpOworCQkJZ290byBvdXRfdW5sb2NrOworCQl9CisJfSBlbHNlIGlm IChzY2hlZF9wb2xpY3kgPT0gS0ZEX1NDSEVEX1BPTElDWV9OT19IV1MgJiYKKwkJICAgcHJldl9h Y3RpdmUgJiYKKwkJICAgKHEtPnByb3BlcnRpZXMudHlwZSA9PSBLRkRfUVVFVUVfVFlQRV9DT01Q VVRFIHx8CisJCSAgICBxLT5wcm9wZXJ0aWVzLnR5cGUgPT0gS0ZEX1FVRVVFX1RZUEVfU0RNQSkp IHsKKwkJcmV0dmFsID0gbXFkLT5kZXN0cm95X21xZChtcWQsIHEtPm1xZCwKKwkJCQlLRkRfUFJF RU1QVF9UWVBFX1dBVkVGUk9OVF9EUkFJTiwKKwkJCQlLRkRfVU5NQVBfTEFURU5DWV9NUywgcS0+ cGlwZSwgcS0+cXVldWUpOworCQlpZiAocmV0dmFsKSB7CisJCQlwcl9lcnIoImRlc3Ryb3kgbXFk IGZhaWxlZFxuIik7CisJCQlnb3RvIG91dF91bmxvY2s7CisJCX0KKwl9CisKKwlyZXR2YWwgPSBt cWQtPnVwZGF0ZV9tcWQobXFkLCBxLT5tcWQsICZxLT5wcm9wZXJ0aWVzKTsKKworCWlmIChzY2hl ZF9wb2xpY3kgIT0gS0ZEX1NDSEVEX1BPTElDWV9OT19IV1MpCisJCXJldHZhbCA9IG1hcF9xdWV1 ZXNfY3BzY2goZHFtKTsKKwllbHNlIGlmIChzY2hlZF9wb2xpY3kgPT0gS0ZEX1NDSEVEX1BPTElD WV9OT19IV1MgJiYKKwkJIHEtPnByb3BlcnRpZXMuaXNfYWN0aXZlICYmCisJCSAocS0+cHJvcGVy dGllcy50eXBlID09IEtGRF9RVUVVRV9UWVBFX0NPTVBVVEUgfHwKKwkJICBxLT5wcm9wZXJ0aWVz LnR5cGUgPT0gS0ZEX1FVRVVFX1RZUEVfU0RNQSkpCisJCXJldHZhbCA9IG1xZC0+bG9hZF9tcWQo bXFkLCBxLT5tcWQsIHEtPnBpcGUsIHEtPnF1ZXVlLAorCQkJCSAgICAgICAmcS0+cHJvcGVydGll cywgcS0+cHJvY2Vzcy0+bW0pOwogCiAJLyoKLQkgKgogCSAqIGNoZWNrIGFjdGl2ZSBzdGF0ZSB2 cy4gdGhlIHByZXZpb3VzIHN0YXRlCiAJICogYW5kIG1vZGlmeSBjb3VudGVyIGFjY29yZGluZ2x5 CiAJICovCi0JcmV0dmFsID0gbXFkLT51cGRhdGVfbXFkKG1xZCwgcS0+bXFkLCAmcS0+cHJvcGVy dGllcyk7Ci0JaWYgKChxLT5wcm9wZXJ0aWVzLmlzX2FjdGl2ZSkgJiYgKCFwcmV2X2FjdGl2ZSkp CisJaWYgKHEtPnByb3BlcnRpZXMuaXNfYWN0aXZlICYmICFwcmV2X2FjdGl2ZSkKIAkJZHFtLT5x dWV1ZV9jb3VudCsrOwogCWVsc2UgaWYgKCFxLT5wcm9wZXJ0aWVzLmlzX2FjdGl2ZSAmJiBwcmV2 X2FjdGl2ZSkKIAkJZHFtLT5xdWV1ZV9jb3VudC0tOwogCi0JaWYgKHNjaGVkX3BvbGljeSAhPSBL RkRfU0NIRURfUE9MSUNZX05PX0hXUykKLQkJcmV0dmFsID0gZXhlY3V0ZV9xdWV1ZXNfY3BzY2go ZHFtKTsKLQogb3V0X3VubG9jazoKIAltdXRleF91bmxvY2soJmRxbS0+bG9jayk7CiAJcmV0dXJu IHJldHZhbDsKQEAgLTg2Myw2ICs4OTUsMjcgQEAgc3RhdGljIGludCB1bm1hcF9zZG1hX3F1ZXVl cyhzdHJ1Y3QgZGV2aWNlX3F1ZXVlX21hbmFnZXIgKmRxbSwKIH0KIAogLyogZHFtLT5sb2NrIG11 dGV4IGhhcyB0byBiZSBsb2NrZWQgYmVmb3JlIGNhbGxpbmcgdGhpcyBmdW5jdGlvbiAqLworc3Rh dGljIGludCBtYXBfcXVldWVzX2Nwc2NoKHN0cnVjdCBkZXZpY2VfcXVldWVfbWFuYWdlciAqZHFt KQoreworCWludCByZXR2YWw7CisKKwlpZiAoZHFtLT5xdWV1ZV9jb3VudCA8PSAwIHx8IGRxbS0+ cHJvY2Vzc2VzX2NvdW50IDw9IDApCisJCXJldHVybiAwOworCisJaWYgKGRxbS0+YWN0aXZlX3J1 bmxpc3QpCisJCXJldHVybiAwOworCisJcmV0dmFsID0gcG1fc2VuZF9ydW5saXN0KCZkcW0tPnBh Y2tldHMsICZkcW0tPnF1ZXVlcyk7CisJaWYgKHJldHZhbCkgeworCQlwcl9lcnIoImZhaWxlZCB0 byBleGVjdXRlIHJ1bmxpc3RcbiIpOworCQlyZXR1cm4gcmV0dmFsOworCX0KKwlkcW0tPmFjdGl2 ZV9ydW5saXN0ID0gdHJ1ZTsKKworCXJldHVybiByZXR2YWw7Cit9CisKKy8qIGRxbS0+bG9jayBt dXRleCBoYXMgdG8gYmUgbG9ja2VkIGJlZm9yZSBjYWxsaW5nIHRoaXMgZnVuY3Rpb24gKi8KIHN0 YXRpYyBpbnQgdW5tYXBfcXVldWVzX2Nwc2NoKHN0cnVjdCBkZXZpY2VfcXVldWVfbWFuYWdlciAq ZHFtLAogCQkJCWVudW0ga2ZkX3VubWFwX3F1ZXVlc19maWx0ZXIgZmlsdGVyLAogCQkJCXVpbnQz Ml90IGZpbHRlcl9wYXJhbSkKQEAgLTkxOCwyMCArOTcxLDcgQEAgc3RhdGljIGludCBleGVjdXRl X3F1ZXVlc19jcHNjaChzdHJ1Y3QgZGV2aWNlX3F1ZXVlX21hbmFnZXIgKmRxbSkKIAkJcmV0dXJu IHJldHZhbDsKIAl9CiAKLQlpZiAoZHFtLT5xdWV1ZV9jb3VudCA8PSAwIHx8IGRxbS0+cHJvY2Vz c2VzX2NvdW50IDw9IDApCi0JCXJldHVybiAwOwotCi0JaWYgKGRxbS0+YWN0aXZlX3J1bmxpc3Qp Ci0JCXJldHVybiAwOwotCi0JcmV0dmFsID0gcG1fc2VuZF9ydW5saXN0KCZkcW0tPnBhY2tldHMs ICZkcW0tPnF1ZXVlcyk7Ci0JaWYgKHJldHZhbCkgewotCQlwcl9lcnIoImZhaWxlZCB0byBleGVj dXRlIHJ1bmxpc3QiKTsKLQkJcmV0dXJuIHJldHZhbDsKLQl9Ci0JZHFtLT5hY3RpdmVfcnVubGlz dCA9IHRydWU7Ci0KLQlyZXR1cm4gcmV0dmFsOworCXJldHVybiBtYXBfcXVldWVzX2Nwc2NoKGRx bSk7CiB9CiAKIHN0YXRpYyBpbnQgZGVzdHJveV9xdWV1ZV9jcHNjaChzdHJ1Y3QgZGV2aWNlX3F1 ZXVlX21hbmFnZXIgKmRxbSwKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2FtZC1nZngK