From: "=?UTF-8?q?Christian=20K=C3=B6nig?=" Subject: [PATCH 4/6] drm/ttm: move more logic into ttm_page_pool_get_pages Date: Thu, 5 Oct 2017 15:07:52 +0200 Message-ID: <1507208874-3448-4-git-send-email-deathsimple@vodafone.de> References: <1507208874-3448-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: <1507208874-3448-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 IEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS90 dG0vdHRtX3BhZ2VfYWxsb2MuYyB8IDk4ICsrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0t LS0tLQogMSBmaWxlIGNoYW5nZWQsIDUyIGluc2VydGlvbnMoKyksIDQ2IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS90dG0vdHRtX3BhZ2VfYWxsb2MuYyBiL2RyaXZl cnMvZ3B1L2RybS90dG0vdHRtX3BhZ2VfYWxsb2MuYwppbmRleCBlOGQ0MmQ0Li5hODAwMzg3IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdHRtL3R0bV9wYWdlX2FsbG9jLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL3R0bS90dG1fcGFnZV9hbGxvYy5jCkBAIC02MjcsMTkgKzYyNywyMCBAQCBz dGF0aWMgdm9pZCB0dG1fcGFnZV9wb29sX2ZpbGxfbG9ja2VkKHN0cnVjdCB0dG1fcGFnZV9wb29s ICpwb29sLAogfQogCiAvKioKLSAqIEN1dCAnY291bnQnIG51bWJlciBvZiBwYWdlcyBmcm9tIHRo ZSBwb29sIGFuZCBwdXQgdGhlbSBvbiB0aGUgcmV0dXJuIGxpc3QuCisgKiBBbGxvY2F0ZSBwYWdl cyBmcm9tIHRoZSBwb29sIGFuZCBwdXQgdGhlbSBvbiB0aGUgcmV0dXJuIGxpc3QuCiAgKgotICog QHJldHVybiBjb3VudCBvZiBwYWdlcyBzdGlsbCByZXF1aXJlZCB0byBmdWxmaWxsIHRoZSByZXF1 ZXN0LgorICogQHJldHVybiB6ZXJvIGZvciBzdWNjZXNzIG9yIG5lZ2F0aXZlIGVycm9yIGNvZGUu CiAgKi8KLXN0YXRpYyB1bnNpZ25lZCB0dG1fcGFnZV9wb29sX2dldF9wYWdlcyhzdHJ1Y3QgdHRt X3BhZ2VfcG9vbCAqcG9vbCwKLQkJCQkJc3RydWN0IGxpc3RfaGVhZCAqcGFnZXMsCi0JCQkJCWlu dCB0dG1fZmxhZ3MsCi0JCQkJCWVudW0gdHRtX2NhY2hpbmdfc3RhdGUgY3N0YXRlLAotCQkJCQl1 bnNpZ25lZCBjb3VudCkKK3N0YXRpYyBpbnQgdHRtX3BhZ2VfcG9vbF9nZXRfcGFnZXMoc3RydWN0 IHR0bV9wYWdlX3Bvb2wgKnBvb2wsCisJCQkJICAgc3RydWN0IGxpc3RfaGVhZCAqcGFnZXMsCisJ CQkJICAgaW50IHR0bV9mbGFncywKKwkJCQkgICBlbnVtIHR0bV9jYWNoaW5nX3N0YXRlIGNzdGF0 ZSwKKwkJCQkgICB1bnNpZ25lZCBjb3VudCkKIHsKIAl1bnNpZ25lZCBsb25nIGlycV9mbGFnczsK IAlzdHJ1Y3QgbGlzdF9oZWFkICpwOwogCXVuc2lnbmVkIGk7CisJaW50IHIgPSAwOwogCiAJc3Bp bl9sb2NrX2lycXNhdmUoJnBvb2wtPmxvY2ssIGlycV9mbGFncyk7CiAJdHRtX3BhZ2VfcG9vbF9m aWxsX2xvY2tlZChwb29sLCB0dG1fZmxhZ3MsIGNzdGF0ZSwgY291bnQsICZpcnFfZmxhZ3MpOwpA QCAtNjcyLDcgKzY3MywzNSBAQCBzdGF0aWMgdW5zaWduZWQgdHRtX3BhZ2VfcG9vbF9nZXRfcGFn ZXMoc3RydWN0IHR0bV9wYWdlX3Bvb2wgKnBvb2wsCiAJY291bnQgPSAwOwogb3V0OgogCXNwaW5f dW5sb2NrX2lycXJlc3RvcmUoJnBvb2wtPmxvY2ssIGlycV9mbGFncyk7Ci0JcmV0dXJuIGNvdW50 OworCisJLyogY2xlYXIgdGhlIHBhZ2VzIGNvbWluZyBmcm9tIHRoZSBwb29sIGlmIHJlcXVlc3Rl ZCAqLworCWlmICh0dG1fZmxhZ3MgJiBUVE1fUEFHRV9GTEFHX1pFUk9fQUxMT0MpIHsKKwkJc3Ry dWN0IHBhZ2UgKnBhZ2U7CisKKwkJbGlzdF9mb3JfZWFjaF9lbnRyeShwYWdlLCBwYWdlcywgbHJ1 KSB7CisJCQlpZiAoUGFnZUhpZ2hNZW0ocGFnZSkpCisJCQkJY2xlYXJfaGlnaHBhZ2UocGFnZSk7 CisJCQllbHNlCisJCQkJY2xlYXJfcGFnZShwYWdlX2FkZHJlc3MocGFnZSkpOworCQl9CisJfQor CisJLyogSWYgcG9vbCBkaWRuJ3QgaGF2ZSBlbm91Z2ggcGFnZXMgYWxsb2NhdGUgbmV3IG9uZS4g Ki8KKwlpZiAoY291bnQpIHsKKwkJZ2ZwX3QgZ2ZwX2ZsYWdzID0gcG9vbC0+Z2ZwX2ZsYWdzOwor CisJCS8qIHNldCB6ZXJvIGZsYWcgZm9yIHBhZ2UgYWxsb2NhdGlvbiBpZiByZXF1aXJlZCAqLwor CQlpZiAodHRtX2ZsYWdzICYgVFRNX1BBR0VfRkxBR19aRVJPX0FMTE9DKQorCQkJZ2ZwX2ZsYWdz IHw9IF9fR0ZQX1pFUk87CisKKwkJLyogdHRtX2FsbG9jX25ld19wYWdlcyBkb2Vzbid0IHJlZmVy ZW5jZSBwb29sIHNvIHdlIGNhbiBydW4KKwkJICogbXVsdGlwbGUgcmVxdWVzdHMgaW4gcGFyYWxs ZWwuCisJCSAqKi8KKwkJciA9IHR0bV9hbGxvY19uZXdfcGFnZXMocGFnZXMsIGdmcF9mbGFncywg dHRtX2ZsYWdzLCBjc3RhdGUsCisJCQkJCWNvdW50KTsKKwl9CisKKwlyZXR1cm4gcjsKIH0KIAog LyogUHV0IGFsbCBwYWdlcyBpbiBwYWdlcyBsaXN0IHRvIGNvcnJlY3QgcG9vbCB0byB3YWl0IGZv ciByZXVzZSAqLwpAQCAtNzQyLDE4ICs3NzEsMTggQEAgc3RhdGljIGludCB0dG1fZ2V0X3BhZ2Vz KHN0cnVjdCBwYWdlICoqcGFnZXMsIHVuc2lnbmVkIG5wYWdlcywgaW50IGZsYWdzLAogCXN0cnVj dCB0dG1fcGFnZV9wb29sICpwb29sID0gdHRtX2dldF9wb29sKGZsYWdzLCBjc3RhdGUpOwogCXN0 cnVjdCBsaXN0X2hlYWQgcGxpc3Q7CiAJc3RydWN0IHBhZ2UgKnAgPSBOVUxMOwotCWdmcF90IGdm cF9mbGFncyA9IEdGUF9VU0VSOwogCXVuc2lnbmVkIGNvdW50OwogCWludCByOwogCi0JLyogc2V0 IHplcm8gZmxhZyBmb3IgcGFnZSBhbGxvY2F0aW9uIGlmIHJlcXVpcmVkICovCi0JaWYgKGZsYWdz ICYgVFRNX1BBR0VfRkxBR19aRVJPX0FMTE9DKQotCQlnZnBfZmxhZ3MgfD0gX19HRlBfWkVSTzsK LQogCS8qIE5vIHBvb2wgZm9yIGNhY2hlZCBwYWdlcyAqLwogCWlmIChwb29sID09IE5VTEwpIHsK KwkJZ2ZwX3QgZ2ZwX2ZsYWdzID0gR0ZQX1VTRVI7CiAJCXVuc2lnbmVkIGksIGo7CiAKKwkJLyog c2V0IHplcm8gZmxhZyBmb3IgcGFnZSBhbGxvY2F0aW9uIGlmIHJlcXVpcmVkICovCisJCWlmIChm bGFncyAmIFRUTV9QQUdFX0ZMQUdfWkVST19BTExPQykKKwkJCWdmcF9mbGFncyB8PSBfX0dGUF9a RVJPOworCiAJCWlmIChmbGFncyAmIFRUTV9QQUdFX0ZMQUdfRE1BMzIpCiAJCQlnZnBfZmxhZ3Mg fD0gR0ZQX0RNQTMyOwogCQllbHNlCkBAIC03OTEsNDQgKzgyMCwyMSBAQCBzdGF0aWMgaW50IHR0 bV9nZXRfcGFnZXMoc3RydWN0IHBhZ2UgKipwYWdlcywgdW5zaWduZWQgbnBhZ2VzLCBpbnQgZmxh Z3MsCiAJCXJldHVybiAwOwogCX0KIAotCS8qIGNvbWJpbmUgemVybyBmbGFnIHRvIHBvb2wgZmxh Z3MgKi8KLQlnZnBfZmxhZ3MgfD0gcG9vbC0+Z2ZwX2ZsYWdzOwotCiAJLyogRmlyc3Qgd2UgdGFr ZSBwYWdlcyBmcm9tIHRoZSBwb29sICovCiAJSU5JVF9MSVNUX0hFQUQoJnBsaXN0KTsKLQlucGFn ZXMgPSB0dG1fcGFnZV9wb29sX2dldF9wYWdlcyhwb29sLCAmcGxpc3QsIGZsYWdzLCBjc3RhdGUs IG5wYWdlcyk7CisJciA9IHR0bV9wYWdlX3Bvb2xfZ2V0X3BhZ2VzKHBvb2wsICZwbGlzdCwgZmxh Z3MsIGNzdGF0ZSwgbnBhZ2VzKTsKKwogCWNvdW50ID0gMDsKLQlsaXN0X2Zvcl9lYWNoX2VudHJ5 KHAsICZwbGlzdCwgbHJ1KSB7CisJbGlzdF9mb3JfZWFjaF9lbnRyeShwLCAmcGxpc3QsIGxydSkK IAkJcGFnZXNbY291bnQrK10gPSBwOwotCX0KLQotCS8qIGNsZWFyIHRoZSBwYWdlcyBjb21pbmcg ZnJvbSB0aGUgcG9vbCBpZiByZXF1ZXN0ZWQgKi8KLQlpZiAoZmxhZ3MgJiBUVE1fUEFHRV9GTEFH X1pFUk9fQUxMT0MpIHsKLQkJbGlzdF9mb3JfZWFjaF9lbnRyeShwLCAmcGxpc3QsIGxydSkgewot CQkJaWYgKFBhZ2VIaWdoTWVtKHApKQotCQkJCWNsZWFyX2hpZ2hwYWdlKHApOwotCQkJZWxzZQot CQkJCWNsZWFyX3BhZ2UocGFnZV9hZGRyZXNzKHApKTsKLQkJfQotCX0KIAotCS8qIElmIHBvb2wg ZGlkbid0IGhhdmUgZW5vdWdoIHBhZ2VzIGFsbG9jYXRlIG5ldyBvbmUuICovCi0JaWYgKG5wYWdl cyA+IDApIHsKLQkJLyogdHRtX2FsbG9jX25ld19wYWdlcyBkb2Vzbid0IHJlZmVyZW5jZSBwb29s IHNvIHdlIGNhbiBydW4KLQkJICogbXVsdGlwbGUgcmVxdWVzdHMgaW4gcGFyYWxsZWwuCi0JCSAq Ki8KLQkJSU5JVF9MSVNUX0hFQUQoJnBsaXN0KTsKLQkJciA9IHR0bV9hbGxvY19uZXdfcGFnZXMo JnBsaXN0LCBnZnBfZmxhZ3MsIGZsYWdzLCBjc3RhdGUsIG5wYWdlcyk7Ci0JCWxpc3RfZm9yX2Vh Y2hfZW50cnkocCwgJnBsaXN0LCBscnUpIHsKLQkJCXBhZ2VzW2NvdW50KytdID0gcDsKLQkJfQot CQlpZiAocikgewotCQkJLyogSWYgdGhlcmUgaXMgYW55IHBhZ2VzIGluIHRoZSBsaXN0IHB1dCB0 aGVtIGJhY2sgdG8KLQkJCSAqIHRoZSBwb29sLiAqLwotCQkJcHJfZXJyKCJGYWlsZWQgdG8gYWxs b2NhdGUgZXh0cmEgcGFnZXMgZm9yIGxhcmdlIHJlcXVlc3RcbiIpOwotCQkJdHRtX3B1dF9wYWdl cyhwYWdlcywgY291bnQsIGZsYWdzLCBjc3RhdGUpOwotCQkJcmV0dXJuIHI7Ci0JCX0KKwlpZiAo cikgeworCQkvKiBJZiB0aGVyZSBpcyBhbnkgcGFnZXMgaW4gdGhlIGxpc3QgcHV0IHRoZW0gYmFj ayB0bworCQkgKiB0aGUgcG9vbC4KKwkJICovCisJCXByX2VycigiRmFpbGVkIHRvIGFsbG9jYXRl IGV4dHJhIHBhZ2VzIGZvciBsYXJnZSByZXF1ZXN0XG4iKTsKKwkJdHRtX3B1dF9wYWdlcyhwYWdl cywgY291bnQsIGZsYWdzLCBjc3RhdGUpOworCQlyZXR1cm4gcjsKIAl9CiAKIAlyZXR1cm4gMDsK LS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK