From: Bas Nieuwenhuizen Subject: [PATCH] drm/ttm: Merge hugepage attr changes in ttm_dma_page_put. Date: Wed, 25 Jul 2018 22:29:50 +0200 Message-ID: <20180725202950.51216-1-basni@chromium.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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 Cc: Bas Nieuwenhuizen RXZlcnkgc2V0X3BhZ2VzX2FycmF5X3diIGNhbGwgcmVzdWx0ZWQgaW4gY3Jvc3MtY29yZQppbnRl cnJ1cHRzIGFuZCBUTEIgZmx1c2hlcy4gTWVyZ2UgbW9yZSBvZiB0aGVtIGZvcgpsZXNzIG92ZXJo ZWFkLgoKVGhpcyByZWR1Y2VzIHRoZSB0aW1lIG5lZWRlZCB0byBmcmVlIGEgMS42IEdpQiBHVFQg V0MKYnVmZmVyIGFzIHBhcnQgb2YgVnVsa2FuIENUUyBmcm9tICB+MiBzZWMgdG8gPCAwLjI1IHNl Yy4KKEFsbG9jYXRpb24gc3RpbGwgdGFrZXMgbW9yZSB0aGFuIDIgc2VjIHRob3VnaCkKClNpZ25l ZC1vZmYtYnk6IEJhcyBOaWV1d2VuaHVpemVuIDxiYXNuaUBjaHJvbWl1bS5vcmc+Ci0tLQogZHJp dmVycy9ncHUvZHJtL3R0bS90dG1fcGFnZV9hbGxvY19kbWEuYyB8IDMxICsrKysrKysrKysrKysr KysrKy0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDI0IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3R0bS90dG1fcGFnZV9hbGxvY19kbWEu YyBiL2RyaXZlcnMvZ3B1L2RybS90dG0vdHRtX3BhZ2VfYWxsb2NfZG1hLmMKaW5kZXggNGM2NTk0 MDVhMDA4YS4uOTQ0MGJhMGE1NTExNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3R0bS90 dG1fcGFnZV9hbGxvY19kbWEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdHRtL3R0bV9wYWdlX2Fs bG9jX2RtYS5jCkBAIC0yOTksNiArMjk5LDI1IEBAIHN0YXRpYyBpbnQgc2V0X3BhZ2VzX2FycmF5 X3VjKHN0cnVjdCBwYWdlICoqcGFnZXMsIGludCBhZGRyaW5hcnJheSkKICNlbmRpZgogCXJldHVy biAwOwogfQorCitzdGF0aWMgaW50IHR0bV9zZXRfcGFnZV9yYW5nZV93YihzdHJ1Y3QgcGFnZSAq cCwgdW5zaWduZWQgbG9uZyBudW1wYWdlcykKK3sKKyNpZiBJU19FTkFCTEVEKENPTkZJR19BR1Ap CisgICAgICAgIHVuc2lnbmVkIGxvbmcgaTsKKworICAgICAgICBmb3IgKGkgPSAwOyBpIDwgbnVt cGFnZXM7IGkrKykKKyAgICAgICAgICAgICAgICB1bm1hcF9wYWdlX2Zyb21fYWdwKHAgKyBpKTsK KyNlbmRpZgorCXJldHVybiAwOworfQorCisjZWxzZSAvKiBmb3IgIUNPTkZJR19YODYgKi8KKwor c3RhdGljIGludCB0dG1fc2V0X3BhZ2VfcmFuZ2Vfd2Ioc3RydWN0IHBhZ2UgKnAsIHVuc2lnbmVk IGxvbmcgbnVtcGFnZXMpCit7CisJcmV0dXJuIHNldF9tZW1vcnlfd2IoKHVuc2lnbmVkIGxvbmcp cGFnZV9hZGRyZXNzKHApLCBudW1wYWdlcyk7Cit9CisKICNlbmRpZiAvKiBmb3IgIUNPTkZJR19Y ODYgKi8KIAogc3RhdGljIGludCB0dG1fc2V0X3BhZ2VzX2NhY2hpbmcoc3RydWN0IGRtYV9wb29s ICpwb29sLApAQCAtMzg3LDE4ICs0MDYsMTYgQEAgc3RhdGljIHZvaWQgdHRtX3Bvb2xfdXBkYXRl X2ZyZWVfbG9ja2VkKHN0cnVjdCBkbWFfcG9vbCAqcG9vbCwKIHN0YXRpYyB2b2lkIHR0bV9kbWFf cGFnZV9wdXQoc3RydWN0IGRtYV9wb29sICpwb29sLCBzdHJ1Y3QgZG1hX3BhZ2UgKmRfcGFnZSkK IHsKIAlzdHJ1Y3QgcGFnZSAqcGFnZSA9IGRfcGFnZS0+cDsKLQl1bnNpZ25lZCBpLCBudW1fcGFn ZXM7CisJdW5zaWduZWQgbnVtX3BhZ2VzOwogCWludCByZXQ7CiAKIAkvKiBEb24ndCBzZXQgV0Ig b24gV0IgcGFnZSBwb29sLiAqLwogCWlmICghKHBvb2wtPnR5cGUgJiBJU19DQUNIRUQpKSB7CiAJ CW51bV9wYWdlcyA9IHBvb2wtPnNpemUgLyBQQUdFX1NJWkU7Ci0JCWZvciAoaSA9IDA7IGkgPCBu dW1fcGFnZXM7ICsraSwgKytwYWdlKSB7Ci0JCQlyZXQgPSBzZXRfcGFnZXNfYXJyYXlfd2IoJnBh Z2UsIDEpOwotCQkJaWYgKHJldCkgewotCQkJCXByX2VycigiJXM6IEZhaWxlZCB0byBzZXQgJWQg cGFnZXMgdG8gd2IhXG4iLAotCQkJCSAgICAgICBwb29sLT5kZXZfbmFtZSwgMSk7Ci0JCQl9CisJ CXJldCA9IHR0bV9zZXRfcGFnZV9yYW5nZV93YihwYWdlLCBudW1fcGFnZXMpOworCQlpZiAocmV0 KSB7CisJCQlwcl9lcnIoIiVzOiBGYWlsZWQgdG8gc2V0ICVkIHBhZ2VzIHRvIHdiIVxuIiwKKwkJ CSAgICAgICBwb29sLT5kZXZfbmFtZSwgbnVtX3BhZ2VzKTsKIAkJfQogCX0KIAotLSAKMi4xOC4w LjIzMy5nOTg1Zjg4Y2Y3ZS1nb29nCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Ft ZC1nZngK