From: "=?UTF-8?q?Christian=20K=C3=B6nig?=" Subject: [PATCH 3/4] drm/ttm: move more logic into ttm_page_pool_get_pages Date: Tue, 10 Oct 2017 10:53:44 +0200 Message-ID: <1507625625-8665-3-git-send-email-deathsimple@vodafone.de> References: <1507625625-8665-1-git-send-email-deathsimple@vodafone.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1507625625-8665-1-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@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, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgoKTWFrZSBp dCBlYXNpZXIgdG8gYWRkIGh1Z2UgcGFnZSBwb29sLgoKU2lnbmVkLW9mZi1ieTogQ2hyaXN0aWFu IEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgpBY2tlZC1ieTogQWxleCBEZXVjaGVy IDxhbGV4YW5kZXIuZGV1Y2hlckBhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS90dG0vdHRt X3BhZ2VfYWxsb2MuYyB8IDk4ICsrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLQog MSBmaWxlIGNoYW5nZWQsIDUyIGluc2VydGlvbnMoKyksIDQ2IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS90dG0vdHRtX3BhZ2VfYWxsb2MuYyBiL2RyaXZlcnMvZ3B1 L2RybS90dG0vdHRtX3BhZ2VfYWxsb2MuYwppbmRleCAxYmM2MDUzLi4zOTc0NzMyIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vdHRtL3R0bV9wYWdlX2FsbG9jLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL3R0bS90dG1fcGFnZV9hbGxvYy5jCkBAIC02MjcsMTkgKzYyNywyMCBAQCBzdGF0aWMg dm9pZCB0dG1fcGFnZV9wb29sX2ZpbGxfbG9ja2VkKHN0cnVjdCB0dG1fcGFnZV9wb29sICpwb29s LAogfQogCiAvKioKLSAqIEN1dCAnY291bnQnIG51bWJlciBvZiBwYWdlcyBmcm9tIHRoZSBwb29s IGFuZCBwdXQgdGhlbSBvbiB0aGUgcmV0dXJuIGxpc3QuCisgKiBBbGxvY2F0ZSBwYWdlcyBmcm9t IHRoZSBwb29sIGFuZCBwdXQgdGhlbSBvbiB0aGUgcmV0dXJuIGxpc3QuCiAgKgotICogQHJldHVy biBjb3VudCBvZiBwYWdlcyBzdGlsbCByZXF1aXJlZCB0byBmdWxmaWxsIHRoZSByZXF1ZXN0Lgor ICogQHJldHVybiB6ZXJvIGZvciBzdWNjZXNzIG9yIG5lZ2F0aXZlIGVycm9yIGNvZGUuCiAgKi8K LXN0YXRpYyB1bnNpZ25lZCB0dG1fcGFnZV9wb29sX2dldF9wYWdlcyhzdHJ1Y3QgdHRtX3BhZ2Vf cG9vbCAqcG9vbCwKLQkJCQkJc3RydWN0IGxpc3RfaGVhZCAqcGFnZXMsCi0JCQkJCWludCB0dG1f ZmxhZ3MsCi0JCQkJCWVudW0gdHRtX2NhY2hpbmdfc3RhdGUgY3N0YXRlLAotCQkJCQl1bnNpZ25l ZCBjb3VudCkKK3N0YXRpYyBpbnQgdHRtX3BhZ2VfcG9vbF9nZXRfcGFnZXMoc3RydWN0IHR0bV9w YWdlX3Bvb2wgKnBvb2wsCisJCQkJICAgc3RydWN0IGxpc3RfaGVhZCAqcGFnZXMsCisJCQkJICAg aW50IHR0bV9mbGFncywKKwkJCQkgICBlbnVtIHR0bV9jYWNoaW5nX3N0YXRlIGNzdGF0ZSwKKwkJ CQkgICB1bnNpZ25lZCBjb3VudCkKIHsKIAl1bnNpZ25lZCBsb25nIGlycV9mbGFnczsKIAlzdHJ1 Y3QgbGlzdF9oZWFkICpwOwogCXVuc2lnbmVkIGk7CisJaW50IHIgPSAwOwogCiAJc3Bpbl9sb2Nr X2lycXNhdmUoJnBvb2wtPmxvY2ssIGlycV9mbGFncyk7CiAJdHRtX3BhZ2VfcG9vbF9maWxsX2xv Y2tlZChwb29sLCB0dG1fZmxhZ3MsIGNzdGF0ZSwgY291bnQsICZpcnFfZmxhZ3MpOwpAQCAtNjcy LDcgKzY3MywzNSBAQCBzdGF0aWMgdW5zaWduZWQgdHRtX3BhZ2VfcG9vbF9nZXRfcGFnZXMoc3Ry dWN0IHR0bV9wYWdlX3Bvb2wgKnBvb2wsCiAJY291bnQgPSAwOwogb3V0OgogCXNwaW5fdW5sb2Nr X2lycXJlc3RvcmUoJnBvb2wtPmxvY2ssIGlycV9mbGFncyk7Ci0JcmV0dXJuIGNvdW50OworCisJ LyogY2xlYXIgdGhlIHBhZ2VzIGNvbWluZyBmcm9tIHRoZSBwb29sIGlmIHJlcXVlc3RlZCAqLwor CWlmICh0dG1fZmxhZ3MgJiBUVE1fUEFHRV9GTEFHX1pFUk9fQUxMT0MpIHsKKwkJc3RydWN0IHBh Z2UgKnBhZ2U7CisKKwkJbGlzdF9mb3JfZWFjaF9lbnRyeShwYWdlLCBwYWdlcywgbHJ1KSB7CisJ CQlpZiAoUGFnZUhpZ2hNZW0ocGFnZSkpCisJCQkJY2xlYXJfaGlnaHBhZ2UocGFnZSk7CisJCQll bHNlCisJCQkJY2xlYXJfcGFnZShwYWdlX2FkZHJlc3MocGFnZSkpOworCQl9CisJfQorCisJLyog SWYgcG9vbCBkaWRuJ3QgaGF2ZSBlbm91Z2ggcGFnZXMgYWxsb2NhdGUgbmV3IG9uZS4gKi8KKwlp ZiAoY291bnQpIHsKKwkJZ2ZwX3QgZ2ZwX2ZsYWdzID0gcG9vbC0+Z2ZwX2ZsYWdzOworCisJCS8q IHNldCB6ZXJvIGZsYWcgZm9yIHBhZ2UgYWxsb2NhdGlvbiBpZiByZXF1aXJlZCAqLworCQlpZiAo dHRtX2ZsYWdzICYgVFRNX1BBR0VfRkxBR19aRVJPX0FMTE9DKQorCQkJZ2ZwX2ZsYWdzIHw9IF9f R0ZQX1pFUk87CisKKwkJLyogdHRtX2FsbG9jX25ld19wYWdlcyBkb2Vzbid0IHJlZmVyZW5jZSBw b29sIHNvIHdlIGNhbiBydW4KKwkJICogbXVsdGlwbGUgcmVxdWVzdHMgaW4gcGFyYWxsZWwuCisJ CSAqKi8KKwkJciA9IHR0bV9hbGxvY19uZXdfcGFnZXMocGFnZXMsIGdmcF9mbGFncywgdHRtX2Zs YWdzLCBjc3RhdGUsCisJCQkJCWNvdW50KTsKKwl9CisKKwlyZXR1cm4gcjsKIH0KIAogLyogUHV0 IGFsbCBwYWdlcyBpbiBwYWdlcyBsaXN0IHRvIGNvcnJlY3QgcG9vbCB0byB3YWl0IGZvciByZXVz ZSAqLwpAQCAtNzQyLDE4ICs3NzEsMTggQEAgc3RhdGljIGludCB0dG1fZ2V0X3BhZ2VzKHN0cnVj dCBwYWdlICoqcGFnZXMsIHVuc2lnbmVkIG5wYWdlcywgaW50IGZsYWdzLAogCXN0cnVjdCB0dG1f cGFnZV9wb29sICpwb29sID0gdHRtX2dldF9wb29sKGZsYWdzLCBjc3RhdGUpOwogCXN0cnVjdCBs aXN0X2hlYWQgcGxpc3Q7CiAJc3RydWN0IHBhZ2UgKnAgPSBOVUxMOwotCWdmcF90IGdmcF9mbGFn cyA9IEdGUF9VU0VSOwogCXVuc2lnbmVkIGNvdW50OwogCWludCByOwogCi0JLyogc2V0IHplcm8g ZmxhZyBmb3IgcGFnZSBhbGxvY2F0aW9uIGlmIHJlcXVpcmVkICovCi0JaWYgKGZsYWdzICYgVFRN X1BBR0VfRkxBR19aRVJPX0FMTE9DKQotCQlnZnBfZmxhZ3MgfD0gX19HRlBfWkVSTzsKLQogCS8q IE5vIHBvb2wgZm9yIGNhY2hlZCBwYWdlcyAqLwogCWlmIChwb29sID09IE5VTEwpIHsKKwkJZ2Zw X3QgZ2ZwX2ZsYWdzID0gR0ZQX1VTRVI7CiAJCXVuc2lnbmVkIGksIGo7CiAKKwkJLyogc2V0IHpl cm8gZmxhZyBmb3IgcGFnZSBhbGxvY2F0aW9uIGlmIHJlcXVpcmVkICovCisJCWlmIChmbGFncyAm IFRUTV9QQUdFX0ZMQUdfWkVST19BTExPQykKKwkJCWdmcF9mbGFncyB8PSBfX0dGUF9aRVJPOwor CiAJCWlmIChmbGFncyAmIFRUTV9QQUdFX0ZMQUdfRE1BMzIpCiAJCQlnZnBfZmxhZ3MgfD0gR0ZQ X0RNQTMyOwogCQllbHNlCkBAIC03OTIsNDQgKzgyMSwyMSBAQCBzdGF0aWMgaW50IHR0bV9nZXRf cGFnZXMoc3RydWN0IHBhZ2UgKipwYWdlcywgdW5zaWduZWQgbnBhZ2VzLCBpbnQgZmxhZ3MsCiAJ CXJldHVybiAwOwogCX0KIAotCS8qIGNvbWJpbmUgemVybyBmbGFnIHRvIHBvb2wgZmxhZ3MgKi8K LQlnZnBfZmxhZ3MgfD0gcG9vbC0+Z2ZwX2ZsYWdzOwotCiAJLyogRmlyc3Qgd2UgdGFrZSBwYWdl cyBmcm9tIHRoZSBwb29sICovCiAJSU5JVF9MSVNUX0hFQUQoJnBsaXN0KTsKLQlucGFnZXMgPSB0 dG1fcGFnZV9wb29sX2dldF9wYWdlcyhwb29sLCAmcGxpc3QsIGZsYWdzLCBjc3RhdGUsIG5wYWdl cyk7CisJciA9IHR0bV9wYWdlX3Bvb2xfZ2V0X3BhZ2VzKHBvb2wsICZwbGlzdCwgZmxhZ3MsIGNz dGF0ZSwgbnBhZ2VzKTsKKwogCWNvdW50ID0gMDsKLQlsaXN0X2Zvcl9lYWNoX2VudHJ5KHAsICZw bGlzdCwgbHJ1KSB7CisJbGlzdF9mb3JfZWFjaF9lbnRyeShwLCAmcGxpc3QsIGxydSkKIAkJcGFn ZXNbY291bnQrK10gPSBwOwotCX0KLQotCS8qIGNsZWFyIHRoZSBwYWdlcyBjb21pbmcgZnJvbSB0 aGUgcG9vbCBpZiByZXF1ZXN0ZWQgKi8KLQlpZiAoZmxhZ3MgJiBUVE1fUEFHRV9GTEFHX1pFUk9f QUxMT0MpIHsKLQkJbGlzdF9mb3JfZWFjaF9lbnRyeShwLCAmcGxpc3QsIGxydSkgewotCQkJaWYg KFBhZ2VIaWdoTWVtKHApKQotCQkJCWNsZWFyX2hpZ2hwYWdlKHApOwotCQkJZWxzZQotCQkJCWNs ZWFyX3BhZ2UocGFnZV9hZGRyZXNzKHApKTsKLQkJfQotCX0KIAotCS8qIElmIHBvb2wgZGlkbid0 IGhhdmUgZW5vdWdoIHBhZ2VzIGFsbG9jYXRlIG5ldyBvbmUuICovCi0JaWYgKG5wYWdlcyA+IDAp IHsKLQkJLyogdHRtX2FsbG9jX25ld19wYWdlcyBkb2Vzbid0IHJlZmVyZW5jZSBwb29sIHNvIHdl IGNhbiBydW4KLQkJICogbXVsdGlwbGUgcmVxdWVzdHMgaW4gcGFyYWxsZWwuCi0JCSAqKi8KLQkJ SU5JVF9MSVNUX0hFQUQoJnBsaXN0KTsKLQkJciA9IHR0bV9hbGxvY19uZXdfcGFnZXMoJnBsaXN0 LCBnZnBfZmxhZ3MsIGZsYWdzLCBjc3RhdGUsIG5wYWdlcyk7Ci0JCWxpc3RfZm9yX2VhY2hfZW50 cnkocCwgJnBsaXN0LCBscnUpIHsKLQkJCXBhZ2VzW2NvdW50KytdID0gcDsKLQkJfQotCQlpZiAo cikgewotCQkJLyogSWYgdGhlcmUgaXMgYW55IHBhZ2VzIGluIHRoZSBsaXN0IHB1dCB0aGVtIGJh Y2sgdG8KLQkJCSAqIHRoZSBwb29sLiAqLwotCQkJcHJfZXJyKCJGYWlsZWQgdG8gYWxsb2NhdGUg ZXh0cmEgcGFnZXMgZm9yIGxhcmdlIHJlcXVlc3RcbiIpOwotCQkJdHRtX3B1dF9wYWdlcyhwYWdl cywgY291bnQsIGZsYWdzLCBjc3RhdGUpOwotCQkJcmV0dXJuIHI7Ci0JCX0KKwlpZiAocikgewor CQkvKiBJZiB0aGVyZSBpcyBhbnkgcGFnZXMgaW4gdGhlIGxpc3QgcHV0IHRoZW0gYmFjayB0bwor CQkgKiB0aGUgcG9vbC4KKwkJICovCisJCXByX2VycigiRmFpbGVkIHRvIGFsbG9jYXRlIGV4dHJh IHBhZ2VzIGZvciBsYXJnZSByZXF1ZXN0XG4iKTsKKwkJdHRtX3B1dF9wYWdlcyhwYWdlcywgY291 bnQsIGZsYWdzLCBjc3RhdGUpOworCQlyZXR1cm4gcjsKIAl9CiAKIAlyZXR1cm4gMDsKLS0gCjIu Ny40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQt Z2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK