From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Subject: [PATCH] drm/amdgpu: reserve GDS resources on the gfx ring for gfx10 Date: Tue, 16 Jul 2019 20:06:06 -0400 Message-ID: <20190717000606.7181-1-maraeo@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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 RnJvbTogTWFyZWsgT2zFocOhayA8bWFyZWsub2xzYWtAYW1kLmNvbT4KCkhvcGVmdWxseSB3ZSds bCBvbmx5IHVzZSAxIGdmeCByaW5nLCBiZWNhdXNlIG90aGVyd2lzZSB3ZSdkIGhhdmUgdG8gaGF2 ZQpzZXBhcmF0ZSBHRFMgYnVmZmVycyBmb3IgZWFjaCBnZnggcmluZy4KClRoaXMgaXMgYSB3b3Jr YXJvdW5kIHRvIGVuc3VyZSBzdGFiaWxpdHkgb2YgdHJhbnNmb3JtIGZlZWRiYWNrLiBTaGFkZXJz IGhhbmcKd2FpdGluZyBmb3IgYSBHRFMgaW5zdHJ1Y3Rpb24gKGRzX3N1Yiwgbm90IGRzX29yZGVy ZWRfY291bnQpLgoKVGhlIGRpc2FkdmFudGFnZSBpcyB0aGF0IGNvbXB1dGUgSUJzIG1pZ2h0IGdl dCBhIGRpZmZlcmVudCBWTUlELApiZWNhdXNlIG5vdyBnZnggYWx3YXlzIGhhcyBHRFMgYW5kIGNv bXB1dGUgZG9lc24ndC4KClNpZ25lZC1vZmYtYnk6IE1hcmVrIE9sxaHDoWsgPG1hcmVrLm9sc2Fr QGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmggICAgIHwg IDEgKwogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2NzLmMgIHwgMTAgKysrKysr KysrKwogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2dkcy5oIHwgIDYgKysrKysr CiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjEwXzAuYyAgfCAyMCArKysrKysrKysr KysrKysrKysrKwogNCBmaWxlcyBjaGFuZ2VkLCAzNyBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmggYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9hbWRncHUuaAppbmRleCA0YjUxNGE0NDE4NGMuLmNiZDU1ZDA2MWI3MiAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgKQEAgLTQ1NiwyMCArNDU2LDIxIEBAIHN0cnVj dCBhbWRncHVfY3NfcGFyc2VyIHsKIAlzdHJ1Y3QgZHJtX2ZpbGUJCSpmaWxwOwogCXN0cnVjdCBh bWRncHVfY3R4CSpjdHg7CiAKIAkvKiBjaHVua3MgKi8KIAl1bnNpZ25lZAkJbmNodW5rczsKIAlz dHJ1Y3QgYW1kZ3B1X2NzX2NodW5rCSpjaHVua3M7CiAKIAkvKiBzY2hlZHVsZXIgam9iIG9iamVj dCAqLwogCXN0cnVjdCBhbWRncHVfam9iCSpqb2I7CiAJc3RydWN0IGRybV9zY2hlZF9lbnRpdHkJ KmVudGl0eTsKKwl1bnNpZ25lZAkJaHdfaXA7CiAKIAkvKiBidWZmZXIgb2JqZWN0cyAqLwogCXN0 cnVjdCB3d19hY3F1aXJlX2N0eAkJdGlja2V0OwogCXN0cnVjdCBhbWRncHVfYm9fbGlzdAkJKmJv X2xpc3Q7CiAJc3RydWN0IGFtZGdwdV9tbgkJKm1uOwogCXN0cnVjdCBhbWRncHVfYm9fbGlzdF9l bnRyeQl2bV9wZDsKIAlzdHJ1Y3QgbGlzdF9oZWFkCQl2YWxpZGF0ZWQ7CiAJc3RydWN0IGRtYV9m ZW5jZQkJKmZlbmNlOwogCXVpbnQ2NF90CQkJYnl0ZXNfbW92ZWRfdGhyZXNob2xkOwogCXVpbnQ2 NF90CQkJYnl0ZXNfbW92ZWRfdmlzX3RocmVzaG9sZDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9jcy5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv YW1kZ3B1X2NzLmMKaW5kZXggYzY5MWRmNmY3YTU3Li45MTI1Y2Q2OWExMjQgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9jcy5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9jcy5jCkBAIC02NzgsMjAgKzY3OCwyOCBAQCBzdGF0aWMg aW50IGFtZGdwdV9jc19wYXJzZXJfYm9zKHN0cnVjdCBhbWRncHVfY3NfcGFyc2VyICpwLAogCWlm IChyKQogCQlnb3RvIGVycm9yX3ZhbGlkYXRlOwogCiAJYW1kZ3B1X2NzX3JlcG9ydF9tb3ZlZF9i eXRlcyhwLT5hZGV2LCBwLT5ieXRlc19tb3ZlZCwKIAkJCQkgICAgIHAtPmJ5dGVzX21vdmVkX3Zp cyk7CiAKIAlnZHMgPSBwLT5ib19saXN0LT5nZHNfb2JqOwogCWd3cyA9IHAtPmJvX2xpc3QtPmd3 c19vYmo7CiAJb2EgPSBwLT5ib19saXN0LT5vYV9vYmo7CiAKKwlpZiAocC0+aHdfaXAgPT0gQU1E R1BVX0hXX0lQX0dGWCkgeworCQkvKiBPbmx5IGdmeDEwIGFsbG9jYXRlcyB0aGVzZS4gKi8KKwkJ aWYgKCFnZHMpCisJCQlnZHMgPSBwLT5hZGV2LT5nZHMuZ2RzX2dmeF9ibzsKKwkJaWYgKCFvYSkK KwkJCW9hID0gcC0+YWRldi0+Z2RzLm9hX2dmeF9ibzsKKwl9CisKIAlhbWRncHVfYm9fbGlzdF9m b3JfZWFjaF9lbnRyeShlLCBwLT5ib19saXN0KSB7CiAJCXN0cnVjdCBhbWRncHVfYm8gKmJvID0g dHRtX3RvX2FtZGdwdV9ibyhlLT50di5ibyk7CiAKIAkJLyogTWFrZSBzdXJlIHdlIHVzZSB0aGUg ZXhjbHVzaXZlIHNsb3QgZm9yIHNoYXJlZCBCT3MgKi8KIAkJaWYgKGJvLT5wcmltZV9zaGFyZWRf Y291bnQpCiAJCQllLT50di5udW1fc2hhcmVkID0gMDsKIAkJZS0+Ym9fdmEgPSBhbWRncHVfdm1f Ym9fZmluZCh2bSwgYm8pOwogCX0KIAogCWlmIChnZHMpIHsKQEAgLTk1NCwyMCArOTYyLDIyIEBA IHN0YXRpYyBpbnQgYW1kZ3B1X2NzX2liX2ZpbGwoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYs CiAJCXN0cnVjdCBkcm1fYW1kZ3B1X2NzX2NodW5rX2liICpjaHVua19pYjsKIAkJc3RydWN0IGRy bV9zY2hlZF9lbnRpdHkgKmVudGl0eTsKIAogCQljaHVuayA9ICZwYXJzZXItPmNodW5rc1tpXTsK IAkJaWIgPSAmcGFyc2VyLT5qb2ItPmlic1tqXTsKIAkJY2h1bmtfaWIgPSAoc3RydWN0IGRybV9h bWRncHVfY3NfY2h1bmtfaWIgKiljaHVuay0+a2RhdGE7CiAKIAkJaWYgKGNodW5rLT5jaHVua19p ZCAhPSBBTURHUFVfQ0hVTktfSURfSUIpCiAJCQljb250aW51ZTsKIAorCQlwYXJzZXItPmh3X2lw ID0gY2h1bmtfaWItPmlwX3R5cGU7CisKIAkJaWYgKGNodW5rX2liLT5pcF90eXBlID09IEFNREdQ VV9IV19JUF9HRlggJiYKIAkJICAgIChhbWRncHVfbWNicCB8fCBhbWRncHVfc3Jpb3ZfdmYoYWRl dikpKSB7CiAJCQlpZiAoY2h1bmtfaWItPmZsYWdzICYgQU1ER1BVX0lCX0ZMQUdfUFJFRU1QVCkg ewogCQkJCWlmIChjaHVua19pYi0+ZmxhZ3MgJiBBTURHUFVfSUJfRkxBR19DRSkKIAkJCQkJY2Vf cHJlZW1wdCsrOwogCQkJCWVsc2UKIAkJCQkJZGVfcHJlZW1wdCsrOwogCQkJfQogCiAJCQkvKiBl YWNoIEdGWCBjb21tYW5kIHN1Ym1pdCBhbGxvd3MgMCBvciAxIElCIHByZWVtcHRpYmxlIGZvciBD RSAmIERFICovCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVf Z2RzLmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZ2RzLmgKaW5kZXggZGY4 YTIzNTU0ODMxLi4wOTQzYjhlMWQ5N2UgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2FtZGdwdV9nZHMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRn cHVfZ2RzLmgKQEAgLTI2LDIwICsyNiwyNiBAQAogCiBzdHJ1Y3QgYW1kZ3B1X3Jpbmc7CiBzdHJ1 Y3QgYW1kZ3B1X2JvOwogCiBzdHJ1Y3QgYW1kZ3B1X2dkcyB7CiAJdWludDMyX3QgZ2RzX3NpemU7 CiAJdWludDMyX3QgZ3dzX3NpemU7CiAJdWludDMyX3Qgb2Ffc2l6ZTsKIAl1aW50MzJfdCBnZHNf Y29tcHV0ZV9tYXhfd2F2ZV9pZDsKIAl1aW50MzJfdCB2Z3RfZ3NfbWF4X3dhdmVfaWQ7CisKKwkv KiBSZXNlcnZlZCBPQSBmb3IgdGhlIGdmeCByaW5nLiAoZ2Z4MTApICovCisJdWludDMyX3QgZ2Rz X2dmeF9yZXNlcnZhdGlvbl9zaXplOworCXVpbnQzMl90IG9hX2dmeF9yZXNlcnZhdGlvbl9zaXpl OworCXN0cnVjdCBhbWRncHVfYm8gKmdkc19nZnhfYm87CisJc3RydWN0IGFtZGdwdV9ibyAqb2Ff Z2Z4X2JvOwogfTsKIAogc3RydWN0IGFtZGdwdV9nZHNfcmVnX29mZnNldCB7CiAJdWludDMyX3QJ bWVtX2Jhc2U7CiAJdWludDMyX3QJbWVtX3NpemU7CiAJdWludDMyX3QJZ3dzOwogCXVpbnQzMl90 CW9hOwogfTsKIAogI2VuZGlmIC8qIF9fQU1ER1BVX0dEU19IX18gKi8KZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92MTBfMC5jIGIvZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRncHUvZ2Z4X3YxMF8wLmMKaW5kZXggNjE4MjkxZGY2NTliLi4zOTUyNzU0YzA0ZmYgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92MTBfMC5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92MTBfMC5jCkBAIC0xMzE0LDIwICsxMzE0LDMz IEBAIHN0YXRpYyBpbnQgZ2Z4X3YxMF8wX3N3X2luaXQodm9pZCAqaGFuZGxlKQogCiAJa2lxID0g JmFkZXYtPmdmeC5raXE7CiAJciA9IGFtZGdwdV9nZnhfa2lxX2luaXRfcmluZyhhZGV2LCAma2lx LT5yaW5nLCAma2lxLT5pcnEpOwogCWlmIChyKQogCQlyZXR1cm4gcjsKIAogCXIgPSBhbWRncHVf Z2Z4X21xZF9zd19pbml0KGFkZXYsIHNpemVvZihzdHJ1Y3QgdjEwX2NvbXB1dGVfbXFkKSk7CiAJ aWYgKHIpCiAJCXJldHVybiByOwogCisJLyogYWxsb2NhdGUgcmVzZXJ2ZWQgR0RTIHJlc291cmNl cyBmb3IgdHJhbnNmb3JtIGZlZWRiYWNrICovCisJciA9IGFtZGdwdV9ib19jcmVhdGVfa2VybmVs KGFkZXYsIGFkZXYtPmdkcy5nZHNfZ2Z4X3Jlc2VydmF0aW9uX3NpemUsCisJCQkJICAgIDQsIEFN REdQVV9HRU1fRE9NQUlOX0dEUywKKwkJCQkgICAgJmFkZXYtPmdkcy5nZHNfZ2Z4X2JvLCBOVUxM LCBOVUxMKTsKKwlpZiAocikKKwkJcmV0dXJuIHI7CisKKwlyID0gYW1kZ3B1X2JvX2NyZWF0ZV9r ZXJuZWwoYWRldiwgYWRldi0+Z2RzLm9hX2dmeF9yZXNlcnZhdGlvbl9zaXplLAorCQkJCSAgICAx LCBBTURHUFVfR0VNX0RPTUFJTl9PQSwKKwkJCQkgICAgJmFkZXYtPmdkcy5vYV9nZnhfYm8sIE5V TEwsIE5VTEwpOworCWlmIChyKQorCQlyZXR1cm4gcjsKKwogCS8qIGFsbG9jYXRlIHZpc2libGUg RkIgZm9yIHJsYyBhdXRvLWxvYWRpbmcgZncgKi8KIAlpZiAoYWRldi0+ZmlybXdhcmUubG9hZF90 eXBlID09IEFNREdQVV9GV19MT0FEX1JMQ19CQUNLRE9PUl9BVVRPKSB7CiAJCXIgPSBnZnhfdjEw XzBfcmxjX2JhY2tkb29yX2F1dG9sb2FkX2J1ZmZlcl9pbml0KGFkZXYpOwogCQlpZiAocikKIAkJ CXJldHVybiByOwogCX0KIAogCWFkZXYtPmdmeC5jZV9yYW1fc2l6ZSA9IEYzMl9DRV9QUk9HUkFN X1JBTV9TSVpFOwogCiAJZ2Z4X3YxMF8wX2dwdV9lYXJseV9pbml0KGFkZXYpOwpAQCAtMTM1NCwy MCArMTM2NywyMyBAQCBzdGF0aWMgdm9pZCBnZnhfdjEwXzBfbWVfZmluaShzdHJ1Y3QgYW1kZ3B1 X2RldmljZSAqYWRldikKIAlhbWRncHVfYm9fZnJlZV9rZXJuZWwoJmFkZXYtPmdmeC5tZS5tZV9m d19vYmosCiAJCQkgICAgICAmYWRldi0+Z2Z4Lm1lLm1lX2Z3X2dwdV9hZGRyLAogCQkJICAgICAg KHZvaWQgKiopJmFkZXYtPmdmeC5tZS5tZV9md19wdHIpOwogfQogCiBzdGF0aWMgaW50IGdmeF92 MTBfMF9zd19maW5pKHZvaWQgKmhhbmRsZSkKIHsKIAlpbnQgaTsKIAlzdHJ1Y3QgYW1kZ3B1X2Rl dmljZSAqYWRldiA9IChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqKWhhbmRsZTsKIAorCWFtZGdwdV9i b19mcmVlX2tlcm5lbCgmYWRldi0+Z2RzLmdkc19nZnhfYm8sIE5VTEwsIE5VTEwpOworCWFtZGdw dV9ib19mcmVlX2tlcm5lbCgmYWRldi0+Z2RzLm9hX2dmeF9ibywgTlVMTCwgTlVMTCk7CisKIAlm b3IgKGkgPSAwOyBpIDwgYWRldi0+Z2Z4Lm51bV9nZnhfcmluZ3M7IGkrKykKIAkJYW1kZ3B1X3Jp bmdfZmluaSgmYWRldi0+Z2Z4LmdmeF9yaW5nW2ldKTsKIAlmb3IgKGkgPSAwOyBpIDwgYWRldi0+ Z2Z4Lm51bV9jb21wdXRlX3JpbmdzOyBpKyspCiAJCWFtZGdwdV9yaW5nX2ZpbmkoJmFkZXYtPmdm eC5jb21wdXRlX3JpbmdbaV0pOwogCiAJYW1kZ3B1X2dmeF9tcWRfc3dfZmluaShhZGV2KTsKIAlh bWRncHVfZ2Z4X2tpcV9mcmVlX3JpbmcoJmFkZXYtPmdmeC5raXEucmluZywgJmFkZXYtPmdmeC5r aXEuaXJxKTsKIAlhbWRncHVfZ2Z4X2tpcV9maW5pKGFkZXYpOwogCiAJZ2Z4X3YxMF8wX3BmcF9m aW5pKGFkZXYpOwpAQCAtNTE4MSwyMCArNTE5NywyNCBAQCBzdGF0aWMgdm9pZCBnZnhfdjEwXzBf c2V0X2dkc19pbml0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCWNhc2UgQ0hJUF9OQVZJ MTA6CiAJZGVmYXVsdDoKIAkJYWRldi0+Z2RzLmdkc19zaXplID0gMHgxMDAwMDsKIAkJYWRldi0+ Z2RzLmdkc19jb21wdXRlX21heF93YXZlX2lkID0gMHg0ZmY7CiAJCWFkZXYtPmdkcy52Z3RfZ3Nf bWF4X3dhdmVfaWQgPSAweDNmZjsKIAkJYnJlYWs7CiAJfQogCiAJYWRldi0+Z2RzLmd3c19zaXpl ID0gNjQ7CiAJYWRldi0+Z2RzLm9hX3NpemUgPSAxNjsKKworCS8qIFJlc2VydmVkIGZvciB0cmFu c2Zvcm0gZmVlZGJhY2suICovCisJYWRldi0+Z2RzLmdkc19nZnhfcmVzZXJ2YXRpb25fc2l6ZSA9 IDI1NjsKKwlhZGV2LT5nZHMub2FfZ2Z4X3Jlc2VydmF0aW9uX3NpemUgPSA0OwogfQogCiBzdGF0 aWMgdm9pZCBnZnhfdjEwXzBfc2V0X3VzZXJfd2dwX2luYWN0aXZlX2JpdG1hcF9wZXJfc2goc3Ry dWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAJCQkJCQkJICB1MzIgYml0bWFwKQogewogCXUzMiBk YXRhOwogCiAJaWYgKCFiaXRtYXApCiAJCXJldHVybjsKIAotLSAKMi4xNy4xCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlz dAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZng=