From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Subject: [PATCH 3/3] drm/amdgpu: Try evicting from CPU visible to invisible VRAM first Date: Thu, 18 May 2017 18:08:09 +0900 Message-ID: <20170518090809.15916-4-michel@daenzer.net> References: <20170518090809.15916-1-michel@daenzer.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170518090809.15916-1-michel-otUistvHUpPR7s880joybQ@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 RnJvbTogTWljaGVsIETDpG56ZXIgPG1pY2hlbC5kYWVuemVyQGFtZC5jb20+CgpJbiBleGNoYW5n ZSwgbW92ZSBCT3Mgd2l0aCB0aGUgQU1ER1BVX0dFTV9DUkVBVEVfQ1BVX0FDQ0VTU19SRVFVSVJF RApmbGFnIHNldCB0byBDUFUgdmlzaWJsZSBWUkFNIHdpdGggbW9yZSBmb3JjZS4KCkZvciBvdGhl ciBCT3MsIHRoaXMgZ2l2ZXMgYW5vdGhlciBjaGFuY2UgdG8gc3RheSBpbiBWUkFNIGlmIHRoZXkK aGFwcGVuZWQgdG8gbGllIGluIHRoZSBDUFUgdmlzaWJsZSBwYXJ0IGFuZCBhbm90aGVyIEJPIG5l ZWRzIHRvIGdvCnRoZXJlLgoKVGhpcyBzaG91bGQgYWxsb3cgQk9zIHRvIHN0YXkgaW4gVlJBTSBs b25nZXIgaW4gc29tZSBjYXNlcy4KClNpZ25lZC1vZmYtYnk6IE1pY2hlbCBEw6RuemVyIDxtaWNo ZWwuZGFlbnplckBhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdw dV9vYmplY3QuYyB8IDE5ICsrKysrKysrKysrKysrLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2FtZGdwdV90dG0uYyAgICB8IDI3ICsrKysrKysrKysrKysrKysrKysrKysrKysrKwog MiBmaWxlcyBjaGFuZ2VkLCA0MSBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9vYmplY3QuYyBiL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9vYmplY3QuYwppbmRleCA0MWVlMzUzYjIyYzgu LmQ0NWMyMzI1YzYxYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1k Z3B1X29iamVjdC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9vYmpl Y3QuYwpAQCAtOTYzLDExICs5NjMsMjAgQEAgaW50IGFtZGdwdV9ib19mYXVsdF9yZXNlcnZlX25v dGlmeShzdHJ1Y3QgdHRtX2J1ZmZlcl9vYmplY3QgKmJvKQogCQkJCQkgQU1ER1BVX0dFTV9ET01B SU5fR1RUKTsKIAlhYm8tPnBsYWNlbWVudHNbMF0ubHBmbiA9IGFkZXYtPm1jLnZpc2libGVfdnJh bV9zaXplID4+IFBBR0VfU0hJRlQ7CiAKLQkvKiBPbmx5IHNldCBHVFQgYXMgYnVzeSBwbGFjZW1l bnQ7IGlmIHRoZXJlIGlzIG5vIHNwYWNlIGluIENQVSB2aXNpYmxlCi0JICogVlJBTSwgbW92ZSB0 aGlzIEJPIHRvIEdUVCBpbnN0ZWFkIG9mIGV2aWN0aW5nIG90aGVyIEJPcwotCSAqLwotCWFiby0+ cGxhY2VtZW50LmJ1c3lfcGxhY2VtZW50ID0gJmFiby0+cGxhY2VtZW50c1sxXTsKLQlhYm8tPnBs YWNlbWVudC5udW1fYnVzeV9wbGFjZW1lbnQgPSAxOworCWlmIChhYm8tPmZsYWdzICYgQU1ER1BV X0dFTV9DUkVBVEVfQ1BVX0FDQ0VTU19SRVFVSVJFRCkgeworCQkvKiBPbmx5IHNldCBWUkFNIGFz IG5vcm1hbCBwbGFjZW1lbnQ7IGlmIHRoZXJlIGlzIG5vIHNwYWNlIGluCisJCSAqIENQVSB2aXNp YmxlIFZSQU0sIGV2aWN0IG90aGVyIEJPcywgb25seSBmYWxsIGJhY2sgdG8gR1RUIGFzCisJCSAq IGxhc3QgcmVzb3J0CisJCSAqLworCQlhYm8tPnBsYWNlbWVudC5udW1fcGxhY2VtZW50ID0gMTsK Kwl9IGVsc2UgeworCQkvKiBPbmx5IHNldCBHVFQgYXMgYnVzeSBwbGFjZW1lbnQ7IGlmIHRoZXJl IGlzIG5vIHNwYWNlIGluIENQVQorCQkgKiB2aXNpYmxlIFZSQU0sIG1vdmUgdGhpcyBCTyB0byBH VFQgaW5zdGVhZCBvZiBldmljdGluZyBvdGhlcgorCQkgKiBCT3MKKwkJICovCisJCWFiby0+cGxh Y2VtZW50LmJ1c3lfcGxhY2VtZW50ID0gJmFiby0+cGxhY2VtZW50c1sxXTsKKwkJYWJvLT5wbGFj ZW1lbnQubnVtX2J1c3lfcGxhY2VtZW50ID0gMTsKKwl9CiAKIAlyZXR1cm4gdHRtX2JvX3ZhbGlk YXRlKGJvLCAmYWJvLT5wbGFjZW1lbnQsIGZhbHNlLCBmYWxzZSk7CiB9CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdHRtLmMgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9hbWRncHVfdHRtLmMKaW5kZXggNTc3ODliODYwNzY4Li5kNWVkODUwMjY1NDIg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV90dG0uYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdHRtLmMKQEAgLTIwNiw3ICsyMDYs MzQgQEAgc3RhdGljIHZvaWQgYW1kZ3B1X2V2aWN0X2ZsYWdzKHN0cnVjdCB0dG1fYnVmZmVyX29i amVjdCAqYm8sCiAJCSAgICBhZGV2LT5tbWFuLmJ1ZmZlcl9mdW5jc19yaW5nICYmCiAJCSAgICBh ZGV2LT5tbWFuLmJ1ZmZlcl9mdW5jc19yaW5nLT5yZWFkeSA9PSBmYWxzZSkgewogCQkJYW1kZ3B1 X3R0bV9wbGFjZW1lbnRfZnJvbV9kb21haW4oYWJvLCBBTURHUFVfR0VNX0RPTUFJTl9DUFUpOwor CQl9IGVsc2UgaWYgKGFkZXYtPm1jLnZpc2libGVfdnJhbV9zaXplIDwgYWRldi0+bWMucmVhbF92 cmFtX3NpemUpIHsKKwkJCXVuc2lnbmVkIGZwZm4gPSBhZGV2LT5tYy52aXNpYmxlX3ZyYW1fc2l6 ZSA+PiBQQUdFX1NISUZUOworCQkJc3RydWN0IGRybV9tbV9ub2RlICpub2RlID0gYm8tPm1lbS5t bV9ub2RlOworCQkJdW5zaWduZWQgbG9uZyBwYWdlc19sZWZ0OworCisJCQlmb3IgKHBhZ2VzX2xl ZnQgPSBiby0+bWVtLm51bV9wYWdlczsKKwkJCSAgICAgcGFnZXNfbGVmdDsKKwkJCSAgICAgcGFn ZXNfbGVmdCAtPSBub2RlLT5zaXplLCBub2RlKyspIHsKKwkJCQlpZiAobm9kZS0+c3RhcnQgPCBm cGZuKQorCQkJCQlicmVhazsKKwkJCX0KKworCQkJaWYgKCFwYWdlc19sZWZ0KQorCQkJCWdvdG8g Z3R0OworCisJCQkvKiBUcnkgZXZpY3RpbmcgdG8gdGhlIENQVSBpbmFjY2Vzc2libGUgcGFydCBv ZiBWUkFNCisJCQkgKiBmaXJzdCwgYnV0IG9ubHkgc2V0IEdUVCBhcyBidXN5IHBsYWNlbWVudCwg c28gdGhpcworCQkJICogQk8gd2lsbCBiZSBldmljdGVkIHRvIEdUVCByYXRoZXIgdGhhbiBjYXVz aW5nIG90aGVyCisJCQkgKiBCT3MgdG8gYmUgZXZpY3RlZCBmcm9tIFZSQU0KKwkJCSAqLworCQkJ YW1kZ3B1X3R0bV9wbGFjZW1lbnRfZnJvbV9kb21haW4oYWJvLCBBTURHUFVfR0VNX0RPTUFJTl9W UkFNIHwKKwkJCQkJCQkgQU1ER1BVX0dFTV9ET01BSU5fR1RUKTsKKwkJCWFiby0+cGxhY2VtZW50 c1swXS5mcGZuID0gZnBmbjsKKwkJCWFiby0+cGxhY2VtZW50c1swXS5scGZuID0gMDsKKwkJCWFi by0+cGxhY2VtZW50LmJ1c3lfcGxhY2VtZW50ID0gJmFiby0+cGxhY2VtZW50c1sxXTsKKwkJCWFi by0+cGxhY2VtZW50Lm51bV9idXN5X3BsYWNlbWVudCA9IDE7CiAJCX0gZWxzZSB7CitndHQ6CiAJ CQlhbWRncHVfdHRtX3BsYWNlbWVudF9mcm9tX2RvbWFpbihhYm8sIEFNREdQVV9HRU1fRE9NQUlO X0dUVCk7CiAJCQkvKiBTZXQgYW4gdXBwZXIgbGltaXQgdG8gZm9yY2UgZGlyZWN0bHkgYWxsb2Nh dGluZwogCQkJICogYWRkcmVzcyBzcGFjZSBmb3IgdGhlIEJPLgotLSAKMi4xMS4wCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcg bGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK