From: Andres Rodriguez Subject: [PATCH 1/2] drm/amdgpu: guarantee bijective mapping of ring ids for LRU Date: Mon, 27 Mar 2017 18:36:06 -0400 Message-ID: <20170327223607.2878-2-andresx7@gmail.com> References: <20170327223607.2878-1-andresx7@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170327223607.2878-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: deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org, nhaehnle-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, andresx7-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org RGVwZW5kaW5nIG9uIHVzYWdlIHBhdHRlcm5zLCB0aGUgY3VycmVudCBMUlUgcG9saWN5IG1heSBj cmVhdGUgYQpub24taW5qZWN0aXZlIG1hcHBpbmcgYmV0d2VlbiB1c2Vyc3BhY2UgcmluZyBpZHMg YW5kIGtlcm5lbCByaW5ncy4KClRoaXMgYmVoYXZpb3VyIGlzIHVuZGVzaXJlZCBhcyBhcHBzIHRo YXQgYXR0ZW1wdCB0byBmaWxsIGFsbCBIVyBibG9ja3MKd291bGQgYmUgdW5hYmxlIHRvIHJlYWNo IHNvbWUgb2YgdGhlbS4KClRoaXMgY2hhbmdlIGZvcmNlcyB0aGUgTFJVIHBvbGljeSB0byBjcmVh dGUgYmlqZWN0aXZlIG1hcHBpbmdzIG9ubHkuCgpTaWduZWQtb2ZmLWJ5OiBBbmRyZXMgUm9kcmln dWV6IDxhbmRyZXN4N0BnbWFpbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv YW1kZ3B1X3F1ZXVlX21nci5jIHwgMTYgKysrKysrKysrKystLQogZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRncHUvYW1kZ3B1X3JpbmcuYyAgICAgIHwgMzMgKysrKysrKysrKysrKysrKysrKysrLS0t LS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfcmluZy5oICAgICAgfCAgNCAr Ky0tCiAzIGZpbGVzIGNoYW5nZWQsIDQyIGluc2VydGlvbnMoKyksIDExIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9xdWV1ZV9tZ3Iu YyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9xdWV1ZV9tZ3IuYwppbmRleCAw NTRkNzUwLi5jNjI3NWI0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9h bWRncHVfcXVldWVfbWdyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1 X3F1ZXVlX21nci5jCkBAIC0xMDgsMjQgKzEwOCwzNiBAQCBzdGF0aWMgZW51bSBhbWRncHVfcmlu Z190eXBlIGFtZGdwdV9od19pcF90b19yaW5nX3R5cGUoaW50IGh3X2lwKQogCQlEUk1fRVJST1Io IkludmFsaWQgSFcgSVAgc3BlY2lmaWVkICVkXG4iLCBod19pcCk7CiAJCXJldHVybiAtMTsKIAl9 CiB9CiAKIHN0YXRpYyBpbnQgYW1kZ3B1X2xydV9tYXAoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFk ZXYsCiAJCQkgIHN0cnVjdCBhbWRncHVfcXVldWVfbWFwcGVyICptYXBwZXIsCiAJCQkgIGludCB1 c2VyX3JpbmcsCiAJCQkgIHN0cnVjdCBhbWRncHVfcmluZyAqKm91dF9yaW5nKQogewotCWludCBy OworCWludCByLCBpLCBqOwogCWludCByaW5nX3R5cGUgPSBhbWRncHVfaHdfaXBfdG9fcmluZ190 eXBlKG1hcHBlci0+aHdfaXApOworCWludCByaW5nX2JsYWNrbGlzdFtBTURHUFVfTUFYX1JJTkdT XTsKKwlzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmc7CiAKLQlyID0gYW1kZ3B1X3JpbmdfbHJ1X2dl dChhZGV2LCByaW5nX3R5cGUsIG91dF9yaW5nKTsKKwkvKiAwIGlzIGEgdmFsaWQgcmluZyBpbmRl eCwgc28gaW5pdGlhbGl6ZSB0byAtMSAqLworCW1lbXNldChyaW5nX2JsYWNrbGlzdCwgMHhmZiwg c2l6ZW9mKHJpbmdfYmxhY2tsaXN0KSk7CisKKwlmb3IgKGkgPSAwLCBqID0gMDsgaSA8IEFNREdQ VV9NQVhfUklOR1M7IGkrKykgeworCQlyaW5nID0gbWFwcGVyLT5xdWV1ZV9tYXBbaV07CisJCWlm IChyaW5nKQorCQkJcmluZ19ibGFja2xpc3RbaisrXSA9IHJpbmctPmlkeDsKKwl9CisKKwlyID0g YW1kZ3B1X3JpbmdfbHJ1X2dldChhZGV2LCByaW5nX3R5cGUsIHJpbmdfYmxhY2tsaXN0LAorCQkJ CUFNREdQVV9NQVhfUklOR1MsIG91dF9yaW5nKTsKIAlpZiAocikKIAkJcmV0dXJuIHI7CiAKIAly ZXR1cm4gYW1kZ3B1X3VwZGF0ZV9jYWNoZWRfbWFwKG1hcHBlciwgdXNlcl9yaW5nLCAqb3V0X3Jp bmcpOwogfQogCiAvKioKICAqIGFtZGdwdV9xdWV1ZV9tZ3JfaW5pdCAtIGluaXQgYW4gYW1kZ3B1 X3F1ZXVlX21nciBzdHJ1Y3QKICAqCiAgKiBAYWRldjogYW1kZ3B1X2RldmljZSBwb2ludGVyCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfcmluZy5jIGIvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3JpbmcuYwppbmRleCBjYTQxYjNhLi4yMmM1 YjI4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfcmluZy5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9yaW5nLmMKQEAgLTM5Myw0 NiArMzkzLDY1IEBAIHZvaWQgYW1kZ3B1X3JpbmdfZmluaShzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJp bmcpCiAJcmluZy0+YWRldi0+cmluZ3NbcmluZy0+aWR4XSA9IE5VTEw7CiB9CiAKIHN0YXRpYyB2 b2lkIGFtZGdwdV9yaW5nX2xydV90b3VjaF9sb2NrZWQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFk ZXYsCiAJCQkJCSBzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcpCiB7CiAJLyogbGlzdF9tb3ZlX3Rh aWwgaGFuZGxlcyB0aGUgY2FzZSB3aGVyZSByaW5nIGlzbid0IHBhcnQgb2YgdGhlIGxpc3QgKi8K IAlsaXN0X21vdmVfdGFpbCgmcmluZy0+bHJ1X2xpc3QsICZhZGV2LT5yaW5nX2xydV9saXN0KTsK IH0KIAorc3RhdGljIGJvb2wgYW1kZ3B1X3JpbmdfaXNfYmxhY2tsaXN0ZWQoc3RydWN0IGFtZGdw dV9yaW5nICpyaW5nLAorCQkJCSAgICAgICBpbnQgKmJsYWNrbGlzdCwgaW50IG51bV9ibGFja2xp c3QpCit7CisJaW50IGk7CisKKwlmb3IgKGkgPSAwOyBpIDwgbnVtX2JsYWNrbGlzdCAmJiBibGFj a2xpc3RbaV0gIT0gLTE7IGkrKykgeworCQlpZiAocmluZy0+aWR4ID09IGJsYWNrbGlzdFtpXSkK KwkJCXJldHVybiB0cnVlOworCX0KKworCXJldHVybiBmYWxzZTsKK30KKwogLyoqCiAgKiBhbWRn cHVfcmluZ19scnVfZ2V0IC0gZ2V0IHRoZSBsZWFzdCByZWNlbnRseSB1c2VkIHJpbmcgZm9yIGEg SFcgSVAgYmxvY2sKICAqCiAgKiBAYWRldjogYW1kZ3B1X2RldmljZSBwb2ludGVyCiAgKiBAdHlw ZTogYW1kZ3B1X3JpbmdfdHlwZSBlbnVtCisgKiBAYmxhY2tsaXN0OiBibGFja2xpc3RlZCByaW5n IGlkcyBhcnJheQorICogQG51bV9ibGFja2xpc3Q6IG51bWJlciBvZiBlbnRyaWVzIGluIEBibGFj a2xpc3QKICAqIEByaW5nOiBvdXRwdXQgcmluZwogICoKICAqIFJldHJpZXZlIHRoZSBhbWRncHVf cmluZyBzdHJ1Y3R1cmUgZm9yIHRoZSBsZWFzdCByZWNlbnRseSB1c2VkIHJpbmcgb2YKICAqIGEg c3BlY2lmaWMgSVAgYmxvY2sgKGFsbCBhc2ljcykuCiAgKiBSZXR1cm5zIDAgb24gc3VjY2Vzcywg ZXJyb3Igb24gZmFpbHVyZS4KICAqLwotaW50IGFtZGdwdV9yaW5nX2xydV9nZXQoc3RydWN0IGFt ZGdwdV9kZXZpY2UgKmFkZXYsIGludCB0eXBlLAotCQkJc3RydWN0IGFtZGdwdV9yaW5nICoqcmlu ZykKK2ludCBhbWRncHVfcmluZ19scnVfZ2V0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCBp bnQgdHlwZSwgaW50ICpibGFja2xpc3QsCisJCQlpbnQgbnVtX2JsYWNrbGlzdCwgc3RydWN0IGFt ZGdwdV9yaW5nICoqcmluZykKIHsKIAlzdHJ1Y3QgYW1kZ3B1X3JpbmcgKmVudHJ5OwogCiAJLyog TGlzdCBpcyBzb3J0ZWQgaW4gTFJVIG9yZGVyLCBmaW5kIGZpcnN0IGVudHJ5IGNvcnJlc3BvbmRp bmcKIAkgKiB0byB0aGUgZGVzaXJlZCBIVyBJUCAqLwogCSpyaW5nID0gTlVMTDsKIAlzcGluX2xv Y2soJmFkZXYtPnJpbmdfbHJ1X2xpc3RfbG9jayk7CiAJbGlzdF9mb3JfZWFjaF9lbnRyeShlbnRy eSwgJmFkZXYtPnJpbmdfbHJ1X2xpc3QsIGxydV9saXN0KSB7Ci0JCWlmIChlbnRyeS0+ZnVuY3Mt PnR5cGUgPT0gdHlwZSkgewotCQkJKnJpbmcgPSBlbnRyeTsKLQkJCWFtZGdwdV9yaW5nX2xydV90 b3VjaF9sb2NrZWQoYWRldiwgKnJpbmcpOwotCQkJYnJlYWs7Ci0JCX0KKwkJaWYgKGVudHJ5LT5m dW5jcy0+dHlwZSAhPSB0eXBlKQorCQkJY29udGludWU7CisKKwkJaWYgKGFtZGdwdV9yaW5nX2lz X2JsYWNrbGlzdGVkKGVudHJ5LCBibGFja2xpc3QsIG51bV9ibGFja2xpc3QpKQorCQkJY29udGlu dWU7CisKKwkJKnJpbmcgPSBlbnRyeTsKKwkJYW1kZ3B1X3JpbmdfbHJ1X3RvdWNoX2xvY2tlZChh ZGV2LCAqcmluZyk7CisJCWJyZWFrOwogCX0KIAlzcGluX3VubG9jaygmYWRldi0+cmluZ19scnVf bGlzdF9sb2NrKTsKIAogCWlmICghKnJpbmcpIHsKIAkJRFJNX0VSUk9SKCJSaW5nIExSVSBjb250 YWlucyBubyBlbnRyaWVzIGZvciByaW5nIHR5cGU6JWRcbiIsIHR5cGUpOwogCQlyZXR1cm4gLUVJ TlZBTDsKIAl9CiAKIAlyZXR1cm4gMDsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2FtZGdwdV9yaW5nLmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRn cHVfcmluZy5oCmluZGV4IDJjODAxYTUuLjgxMWQ3NmEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9yaW5nLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvYW1kZ3B1X3JpbmcuaApAQCAtMTk1LDE1ICsxOTUsMTUgQEAgdm9pZCBhbWRncHVfcmlu Z19nZW5lcmljX3BhZF9pYihzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcsIHN0cnVjdCBhbWRncHVf aWIgKmliKTsKIHZvaWQgYW1kZ3B1X3JpbmdfY29tbWl0KHN0cnVjdCBhbWRncHVfcmluZyAqcmlu Zyk7CiB2b2lkIGFtZGdwdV9yaW5nX3VuZG8oc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKTsKIGlu dCBhbWRncHVfcmluZ19wcmlvcml0eV9nZXQoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nLAogCQkJ ICAgICBlbnVtIGFtZF9zY2hlZF9wcmlvcml0eSBwcmlvcml0eSk7CiB2b2lkIGFtZGdwdV9yaW5n X3ByaW9yaXR5X3B1dChzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcsCiAJCQkgICAgICBlbnVtIGFt ZF9zY2hlZF9wcmlvcml0eSBwcmlvcml0eSk7CiBpbnQgYW1kZ3B1X3JpbmdfaW5pdChzdHJ1Y3Qg YW1kZ3B1X2RldmljZSAqYWRldiwgc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nLAogCQkgICAgIHVu c2lnbmVkIHJpbmdfc2l6ZSwgc3RydWN0IGFtZGdwdV9pcnFfc3JjICppcnFfc3JjLAogCQkgICAg IHVuc2lnbmVkIGlycV90eXBlKTsKIHZvaWQgYW1kZ3B1X3JpbmdfZmluaShzdHJ1Y3QgYW1kZ3B1 X3JpbmcgKnJpbmcpOwotaW50IGFtZGdwdV9yaW5nX2xydV9nZXQoc3RydWN0IGFtZGdwdV9kZXZp Y2UgKmFkZXYsIGludCBod19pcCwKLQkJCXN0cnVjdCBhbWRncHVfcmluZyAqKnJpbmcpOworaW50 IGFtZGdwdV9yaW5nX2xydV9nZXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIGludCB0eXBl LCBpbnQgKmJsYWNrbGlzdCwKKwkJCWludCBudW1fYmxhY2tsaXN0LCBzdHJ1Y3QgYW1kZ3B1X3Jp bmcgKipyaW5nKTsKIHZvaWQgYW1kZ3B1X3JpbmdfbHJ1X3RvdWNoKHN0cnVjdCBhbWRncHVfZGV2 aWNlICphZGV2LCBzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcpOwogCiAjZW5kaWYKLS0gCjIuOS4z CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4 IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK