From: Andres Rodriguez Subject: [PATCH 5/6] drm/amdgpu: guarantee bijective mapping of ring ids for LRU v3 Date: Fri, 21 Apr 2017 19:48:35 -0400 Message-ID: <20170421234836.18620-6-andresx7@gmail.com> References: <20170421234836.18620-1-andresx7@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170421234836.18620-1-andresx7-Re5JQEeQqe8AvxtiuMwx3w@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: andresx7-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org RGVwZW5kaW5nIG9uIHVzYWdlIHBhdHRlcm5zLCB0aGUgY3VycmVudCBMUlUgcG9saWN5IG1heSBj cmVhdGUgYQpub24taW5qZWN0aXZlIG1hcHBpbmcgYmV0d2VlbiB1c2Vyc3BhY2UgcmluZyBpZHMg YW5kIGtlcm5lbCByaW5ncy4KClRoaXMgYmVoYXZpb3VyIGlzIHVuZGVzaXJlZCBhcyBhcHBzIHRo YXQgYXR0ZW1wdCB0byBmaWxsIGFsbCBIVyBibG9ja3MKd291bGQgYmUgdW5hYmxlIHRvIHJlYWNo IHNvbWUgb2YgdGhlbS4KClRoaXMgY2hhbmdlIGZvcmNlcyB0aGUgTFJVIHBvbGljeSB0byBjcmVh dGUgYmlqZWN0aXZlIG1hcHBpbmdzIG9ubHkuCgp2MjogY29tcHJlc3MgcmluZ19ibGFja2xpc3QK djM6IHNpbXBsaWZ5IGFtZGdwdV9yaW5nX2lzX2JsYWNrbGlzdGVkKCkgbG9naWMKClNpZ25lZC1v ZmYtYnk6IEFuZHJlcyBSb2RyaWd1ZXogPGFuZHJlc3g3QGdtYWlsLmNvbT4KUmV2aWV3ZWQtYnk6 IE5pY29sYWkgSMOkaG5sZSA8bmljb2xhaS5oYWVobmxlQGFtZC5jb20+Ci0tLQogZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3F1ZXVlX21nci5jIHwgMTYgKysrKysrKysrKystLQog ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3JpbmcuYyAgICAgIHwgMzMgKysrKysr KysrKysrKysrKysrKysrLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVf cmluZy5oICAgICAgfCAgNCArKy0tCiAzIGZpbGVzIGNoYW5nZWQsIDQyIGluc2VydGlvbnMoKyks IDExIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L2FtZGdwdV9xdWV1ZV9tZ3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9x dWV1ZV9tZ3IuYwppbmRleCAwNTRkNzUwLi41YTdjNjkxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfcXVldWVfbWdyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvYW1kZ3B1X3F1ZXVlX21nci5jCkBAIC05OCw0NCArOTgsNTYgQEAgc3RhdGlj IGVudW0gYW1kZ3B1X3JpbmdfdHlwZSBhbWRncHVfaHdfaXBfdG9fcmluZ190eXBlKGludCBod19p cCkKIAkJcmV0dXJuIEFNREdQVV9SSU5HX1RZUEVfR0ZYOwogCWNhc2UgQU1ER1BVX0hXX0lQX0NP TVBVVEU6CiAJCXJldHVybiBBTURHUFVfUklOR19UWVBFX0NPTVBVVEU7CiAJY2FzZSBBTURHUFVf SFdfSVBfRE1BOgogCQlyZXR1cm4gQU1ER1BVX1JJTkdfVFlQRV9TRE1BOwogCWNhc2UgQU1ER1BV X0hXX0lQX1VWRDoKIAkJcmV0dXJuIEFNREdQVV9SSU5HX1RZUEVfVVZEOwogCWNhc2UgQU1ER1BV X0hXX0lQX1ZDRToKIAkJcmV0dXJuIEFNREdQVV9SSU5HX1RZUEVfVkNFOwogCWRlZmF1bHQ6CiAJ CURSTV9FUlJPUigiSW52YWxpZCBIVyBJUCBzcGVjaWZpZWQgJWRcbiIsIGh3X2lwKTsKIAkJcmV0 dXJuIC0xOwogCX0KIH0KIAogc3RhdGljIGludCBhbWRncHVfbHJ1X21hcChzdHJ1Y3QgYW1kZ3B1 X2RldmljZSAqYWRldiwKIAkJCSAgc3RydWN0IGFtZGdwdV9xdWV1ZV9tYXBwZXIgKm1hcHBlciwK IAkJCSAgaW50IHVzZXJfcmluZywKIAkJCSAgc3RydWN0IGFtZGdwdV9yaW5nICoqb3V0X3Jpbmcp CiB7Ci0JaW50IHI7CisJaW50IHIsIGksIGo7CiAJaW50IHJpbmdfdHlwZSA9IGFtZGdwdV9od19p cF90b19yaW5nX3R5cGUobWFwcGVyLT5od19pcCk7CisJaW50IHJpbmdfYmxhY2tsaXN0W0FNREdQ VV9NQVhfUklOR1NdOworCXN0cnVjdCBhbWRncHVfcmluZyAqcmluZzsKIAotCXIgPSBhbWRncHVf cmluZ19scnVfZ2V0KGFkZXYsIHJpbmdfdHlwZSwgb3V0X3JpbmcpOworCS8qIDAgaXMgYSB2YWxp ZCByaW5nIGluZGV4LCBzbyBpbml0aWFsaXplIHRvIC0xICovCisJbWVtc2V0KHJpbmdfYmxhY2ts aXN0LCAweGZmLCBzaXplb2YocmluZ19ibGFja2xpc3QpKTsKKworCWZvciAoaSA9IDAsIGogPSAw OyBpIDwgQU1ER1BVX01BWF9SSU5HUzsgaSsrKSB7CisJCXJpbmcgPSBtYXBwZXItPnF1ZXVlX21h cFtpXTsKKwkJaWYgKHJpbmcpCisJCQlyaW5nX2JsYWNrbGlzdFtqKytdID0gcmluZy0+aWR4Owor CX0KKworCXIgPSBhbWRncHVfcmluZ19scnVfZ2V0KGFkZXYsIHJpbmdfdHlwZSwgcmluZ19ibGFj a2xpc3QsCisJCQkJaiwgb3V0X3JpbmcpOwogCWlmIChyKQogCQlyZXR1cm4gcjsKIAogCXJldHVy biBhbWRncHVfdXBkYXRlX2NhY2hlZF9tYXAobWFwcGVyLCB1c2VyX3JpbmcsICpvdXRfcmluZyk7 CiB9CiAKIC8qKgogICogYW1kZ3B1X3F1ZXVlX21ncl9pbml0IC0gaW5pdCBhbiBhbWRncHVfcXVl dWVfbWdyIHN0cnVjdAogICoKICAqIEBhZGV2OiBhbWRncHVfZGV2aWNlIHBvaW50ZXIKICAqIEBt Z3I6IGFtZGdwdV9xdWV1ZV9tZ3Igc3RydWN0dXJlIGhvbGRpbmcgcXVldWUgaW5mb3JtYXRpb24K ICAqCiAgKiBJbml0aWFsaXplIHRoZSB0aGUgc2VsZWN0ZWQgQG1nciAoYWxsIGFzaWNzKS4KICAq CiAgKiBSZXR1cm5zIDAgb24gc3VjY2VzcywgZXJyb3Igb24gZmFpbHVyZS4KICAqLwogaW50IGFt ZGdwdV9xdWV1ZV9tZ3JfaW5pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAkJCSAgc3Ry dWN0IGFtZGdwdV9xdWV1ZV9tZ3IgKm1ncikKIHsKIAlpbnQgaSwgcjsKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9yaW5nLmMgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9hbWRncHVfcmluZy5jCmluZGV4IDJiNDUyYjAuLjc0ODYyNzcgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9yaW5nLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3JpbmcuYwpAQCAtMzMzLDY2ICszMzMsODUgQEAg dm9pZCBhbWRncHVfcmluZ19maW5pKHN0cnVjdCBhbWRncHVfcmluZyAqcmluZykKIAkJYW1kZ3B1 X3diX2ZyZWUocmluZy0+YWRldiwgcmluZy0+d3B0cl9vZmZzKTsKIAl9CiAKIAogCWFtZGdwdV9i b19mcmVlX2tlcm5lbCgmcmluZy0+cmluZ19vYmosCiAJCQkgICAgICAmcmluZy0+Z3B1X2FkZHIs CiAJCQkgICAgICAodm9pZCAqKikmcmluZy0+cmluZyk7CiAKIAlhbWRncHVfZGVidWdmc19yaW5n X2ZpbmkocmluZyk7CiAKIAlyaW5nLT5hZGV2LT5yaW5nc1tyaW5nLT5pZHhdID0gTlVMTDsKIH0K IAogc3RhdGljIHZvaWQgYW1kZ3B1X3JpbmdfbHJ1X3RvdWNoX2xvY2tlZChzdHJ1Y3QgYW1kZ3B1 X2RldmljZSAqYWRldiwKIAkJCQkJIHN0cnVjdCBhbWRncHVfcmluZyAqcmluZykKIHsKIAkvKiBs aXN0X21vdmVfdGFpbCBoYW5kbGVzIHRoZSBjYXNlIHdoZXJlIHJpbmcgaXNuJ3QgcGFydCBvZiB0 aGUgbGlzdCAqLwogCWxpc3RfbW92ZV90YWlsKCZyaW5nLT5scnVfbGlzdCwgJmFkZXYtPnJpbmdf bHJ1X2xpc3QpOwogfQogCitzdGF0aWMgYm9vbCBhbWRncHVfcmluZ19pc19ibGFja2xpc3RlZChz dHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcsCisJCQkJICAgICAgIGludCAqYmxhY2tsaXN0LCBpbnQg bnVtX2JsYWNrbGlzdCkKK3sKKwlpbnQgaTsKKworCWZvciAoaSA9IDA7IGkgPCBudW1fYmxhY2ts aXN0OyBpKyspIHsKKwkJaWYgKHJpbmctPmlkeCA9PSBibGFja2xpc3RbaV0pCisJCQlyZXR1cm4g dHJ1ZTsKKwl9CisKKwlyZXR1cm4gZmFsc2U7Cit9CisKIC8qKgogICogYW1kZ3B1X3JpbmdfbHJ1 X2dldCAtIGdldCB0aGUgbGVhc3QgcmVjZW50bHkgdXNlZCByaW5nIGZvciBhIEhXIElQIGJsb2Nr CiAgKgogICogQGFkZXY6IGFtZGdwdV9kZXZpY2UgcG9pbnRlcgogICogQHR5cGU6IGFtZGdwdV9y aW5nX3R5cGUgZW51bQorICogQGJsYWNrbGlzdDogYmxhY2tsaXN0ZWQgcmluZyBpZHMgYXJyYXkK KyAqIEBudW1fYmxhY2tsaXN0OiBudW1iZXIgb2YgZW50cmllcyBpbiBAYmxhY2tsaXN0CiAgKiBA cmluZzogb3V0cHV0IHJpbmcKICAqCiAgKiBSZXRyaWV2ZSB0aGUgYW1kZ3B1X3Jpbmcgc3RydWN0 dXJlIGZvciB0aGUgbGVhc3QgcmVjZW50bHkgdXNlZCByaW5nIG9mCiAgKiBhIHNwZWNpZmljIElQ IGJsb2NrIChhbGwgYXNpY3MpLgogICogUmV0dXJucyAwIG9uIHN1Y2Nlc3MsIGVycm9yIG9uIGZh aWx1cmUuCiAgKi8KLWludCBhbWRncHVfcmluZ19scnVfZ2V0KHN0cnVjdCBhbWRncHVfZGV2aWNl ICphZGV2LCBpbnQgdHlwZSwKLQkJCXN0cnVjdCBhbWRncHVfcmluZyAqKnJpbmcpCitpbnQgYW1k Z3B1X3JpbmdfbHJ1X2dldChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgaW50IHR5cGUsIGlu dCAqYmxhY2tsaXN0LAorCQkJaW50IG51bV9ibGFja2xpc3QsIHN0cnVjdCBhbWRncHVfcmluZyAq KnJpbmcpCiB7CiAJc3RydWN0IGFtZGdwdV9yaW5nICplbnRyeTsKIAogCS8qIExpc3QgaXMgc29y dGVkIGluIExSVSBvcmRlciwgZmluZCBmaXJzdCBlbnRyeSBjb3JyZXNwb25kaW5nCiAJICogdG8g dGhlIGRlc2lyZWQgSFcgSVAgKi8KIAkqcmluZyA9IE5VTEw7CiAJc3Bpbl9sb2NrKCZhZGV2LT5y aW5nX2xydV9saXN0X2xvY2spOwogCWxpc3RfZm9yX2VhY2hfZW50cnkoZW50cnksICZhZGV2LT5y aW5nX2xydV9saXN0LCBscnVfbGlzdCkgewotCQlpZiAoZW50cnktPmZ1bmNzLT50eXBlID09IHR5 cGUpIHsKLQkJCSpyaW5nID0gZW50cnk7Ci0JCQlhbWRncHVfcmluZ19scnVfdG91Y2hfbG9ja2Vk KGFkZXYsICpyaW5nKTsKLQkJCWJyZWFrOwotCQl9CisJCWlmIChlbnRyeS0+ZnVuY3MtPnR5cGUg IT0gdHlwZSkKKwkJCWNvbnRpbnVlOworCisJCWlmIChhbWRncHVfcmluZ19pc19ibGFja2xpc3Rl ZChlbnRyeSwgYmxhY2tsaXN0LCBudW1fYmxhY2tsaXN0KSkKKwkJCWNvbnRpbnVlOworCisJCSpy aW5nID0gZW50cnk7CisJCWFtZGdwdV9yaW5nX2xydV90b3VjaF9sb2NrZWQoYWRldiwgKnJpbmcp OworCQlicmVhazsKIAl9CiAJc3Bpbl91bmxvY2soJmFkZXYtPnJpbmdfbHJ1X2xpc3RfbG9jayk7 CiAKIAlpZiAoISpyaW5nKSB7CiAJCURSTV9FUlJPUigiUmluZyBMUlUgY29udGFpbnMgbm8gZW50 cmllcyBmb3IgcmluZyB0eXBlOiVkXG4iLCB0eXBlKTsKIAkJcmV0dXJuIC1FSU5WQUw7CiAJfQog CiAJcmV0dXJuIDA7CiB9CiAKIC8qKgogICogYW1kZ3B1X3JpbmdfbHJ1X3RvdWNoIC0gbWFyayBh IHJpbmcgYXMgcmVjZW50bHkgYmVpbmcgdXNlZAogICoKICAqIEBhZGV2OiBhbWRncHVfZGV2aWNl IHBvaW50ZXIKICAqIEByaW5nOiByaW5nIHRvIHRvdWNoCiAgKgogICogTW92ZSBAcmluZyB0byB0 aGUgdGFpbCBvZiB0aGUgbHJ1IGxpc3QKICAqLwogdm9pZCBhbWRncHVfcmluZ19scnVfdG91Y2go c3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIHN0cnVjdCBhbWRncHVfcmluZyAqcmluZykKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9yaW5nLmggYi9kcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfcmluZy5oCmluZGV4IDM5NjdmN2IuLjEwZDY2 OTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9yaW5nLmgK KysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3JpbmcuaApAQCAtMTgwLDMy ICsxODAsMzIgQEAgc3RydWN0IGFtZGdwdV9yaW5nIHsKIAl1bnNpZ25lZAkJY29uZF9leGVfb2Zm czsKIAl1NjQJCQljb25kX2V4ZV9ncHVfYWRkcjsKIAl2b2xhdGlsZSB1MzIJCSpjb25kX2V4ZV9j cHVfYWRkcjsKIAl1bnNpZ25lZAkJdm1faW52X2VuZzsKICNpZiBkZWZpbmVkKENPTkZJR19ERUJV R19GUykKIAlzdHJ1Y3QgZGVudHJ5ICplbnQ7CiAjZW5kaWYKIH07CiAKIGludCBhbWRncHVfcmlu Z19pc192YWxpZF9pbmRleChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAkJCSAgICAgICBp bnQgaHdfaXAsIGludCByaW5nKTsKIGludCBhbWRncHVfcmluZ19hbGxvYyhzdHJ1Y3QgYW1kZ3B1 X3JpbmcgKnJpbmcsIHVuc2lnbmVkIG5kdyk7CiB2b2lkIGFtZGdwdV9yaW5nX2luc2VydF9ub3Ao c3RydWN0IGFtZGdwdV9yaW5nICpyaW5nLCB1aW50MzJfdCBjb3VudCk7CiB2b2lkIGFtZGdwdV9y aW5nX2dlbmVyaWNfcGFkX2liKHN0cnVjdCBhbWRncHVfcmluZyAqcmluZywgc3RydWN0IGFtZGdw dV9pYiAqaWIpOwogdm9pZCBhbWRncHVfcmluZ19jb21taXQoc3RydWN0IGFtZGdwdV9yaW5nICpy aW5nKTsKIHZvaWQgYW1kZ3B1X3JpbmdfdW5kbyhzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcpOwog aW50IGFtZGdwdV9yaW5nX2luaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIHN0cnVjdCBh bWRncHVfcmluZyAqcmluZywKIAkJICAgICB1bnNpZ25lZCByaW5nX3NpemUsIHN0cnVjdCBhbWRn cHVfaXJxX3NyYyAqaXJxX3NyYywKIAkJICAgICB1bnNpZ25lZCBpcnFfdHlwZSk7CiB2b2lkIGFt ZGdwdV9yaW5nX2Zpbmkoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKTsKLWludCBhbWRncHVfcmlu Z19scnVfZ2V0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCBpbnQgaHdfaXAsCi0JCQlzdHJ1 Y3QgYW1kZ3B1X3JpbmcgKipyaW5nKTsKK2ludCBhbWRncHVfcmluZ19scnVfZ2V0KHN0cnVjdCBh bWRncHVfZGV2aWNlICphZGV2LCBpbnQgdHlwZSwgaW50ICpibGFja2xpc3QsCisJCQlpbnQgbnVt X2JsYWNrbGlzdCwgc3RydWN0IGFtZGdwdV9yaW5nICoqcmluZyk7CiB2b2lkIGFtZGdwdV9yaW5n X2xydV90b3VjaChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgc3RydWN0IGFtZGdwdV9yaW5n ICpyaW5nKTsKIHN0YXRpYyBpbmxpbmUgdm9pZCBhbWRncHVfcmluZ19jbGVhcl9yaW5nKHN0cnVj dCBhbWRncHVfcmluZyAqcmluZykKIHsKIAlpbnQgaSA9IDA7CiAJd2hpbGUgKGkgPD0gcmluZy0+ YnVmX21hc2spCiAJCXJpbmctPnJpbmdbaSsrXSA9IHJpbmctPmZ1bmNzLT5ub3A7CiAKIH0KIAog I2VuZGlmCi0tIAoyLjkuMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4 Cg==