From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ard Biesheuvel Subject: [PATCH v4 2/3] drm/nouveau/fb/gf100: defer DMA mapping of scratch page to init() hook Date: Mon, 26 Sep 2016 05:32:39 -0700 Message-ID: <1474893160-12321-3-git-send-email-ard.biesheuvel@linaro.org> References: <1474893160-12321-1-git-send-email-ard.biesheuvel@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1474893160-12321-1-git-send-email-ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, bskeggs-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, airlied-cv59FeDIM0c@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Ard Biesheuvel List-Id: dri-devel@lists.freedesktop.org VGhlIDEwMGMxMCBzY3JhdGNoIHBhZ2UgaXMgbWFwcGVkIHVzaW5nIGRtYV9tYXBfcGFnZSgpIGJl Zm9yZSB0aGUgVFRNCmxheWVyIGhhcyBoYWQgYSBjaGFuY2UgdG8gc2V0IHRoZSBETUEgbWFzay4g VGhpcyBtZWFucyB3ZSBhcmUgc3RpbGwKcnVubmluZyB3aXRoIHRoZSBkZWZhdWx0IG9mIDMyIHdo ZW4gdGhpcyBjb2RlIGV4ZWN1dGVzLCBhbmQgdGhpcyBjYXVzZXMKcHJvYmxlbXMgZm9yIHBsYXRm b3JtcyB3aXRoIG5vIG1lbW9yeSBiZWxvdyA0IEdCIChzdWNoIGFzIEFNRCBTZWF0dGxlKQoKU28g bW92ZSB0aGUgZG1hX21hcF9wYWdlKCkgdG8gdGhlIC5pbml0IGhvb2ssIHdoaWNoIGV4ZWN1dGVz IGFmdGVyIHRoZQpETUEgbWFzayBoYXMgYmVlbiBzZXQuCgpTaWduZWQtb2ZmLWJ5OiBBcmQgQmll c2hldXZlbCA8YXJkLmJpZXNoZXV2ZWxAbGluYXJvLm9yZz4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v bm91dmVhdS9udmttL3N1YmRldi9mYi9nZjEwMC5jIHwgMjYgKysrKysrKysrKysrKystLS0tLS0K IDEgZmlsZSBjaGFuZ2VkLCAxOCBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L252a20vc3ViZGV2L2ZiL2dmMTAwLmMgYi9k cml2ZXJzL2dwdS9kcm0vbm91dmVhdS9udmttL3N1YmRldi9mYi9nZjEwMC5jCmluZGV4IDc2NDMz Y2M2NmZmZi4uNWM4MTMyODczZTYwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbm91dmVh dS9udmttL3N1YmRldi9mYi9nZjEwMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L252 a20vc3ViZGV2L2ZiL2dmMTAwLmMKQEAgLTkzLDcgKzkzLDE4IEBAIGdmMTAwX2ZiX2luaXQoc3Ry dWN0IG52a21fZmIgKmJhc2UpCiAJc3RydWN0IGdmMTAwX2ZiICpmYiA9IGdmMTAwX2ZiKGJhc2Up OwogCXN0cnVjdCBudmttX2RldmljZSAqZGV2aWNlID0gZmItPmJhc2Uuc3ViZGV2LmRldmljZTsK IAotCWlmIChmYi0+cjEwMGMxMF9wYWdlKQorCWlmICghZmItPnIxMDBjMTApIHsKKwkJZG1hX2Fk ZHJfdCBhZGRyID0gZG1hX21hcF9wYWdlKGRldmljZS0+ZGV2LCBmYi0+cjEwMGMxMF9wYWdlLCAw LAorCQkJCQkgICAgICAgUEFHRV9TSVpFLCBETUFfQklESVJFQ1RJT05BTCk7CisJCWlmICghZG1h X21hcHBpbmdfZXJyb3IoZGV2aWNlLT5kZXYsIGFkZHIpKSB7CisJCQlmYi0+cjEwMGMxMCA9IGFk ZHI7CisJCX0gZWxzZSB7CisJCQludmttX3dhcm4oJmZiLT5iYXNlLnN1YmRldiwKKwkJCQkgImRt YV9tYXBfcGFnZSgpIGZhaWxlZCBvbiAxMDBjMTAgcGFnZVxuIik7CisJCX0KKwl9CisKKwlpZiAo ZmItPnIxMDBjMTApCiAJCW52a21fd3IzMihkZXZpY2UsIDB4MTAwYzEwLCBmYi0+cjEwMGMxMCA+ PiA4KTsKIH0KIApAQCAtMTAzLDEyICsxMTQsMTMgQEAgZ2YxMDBfZmJfZHRvcihzdHJ1Y3QgbnZr bV9mYiAqYmFzZSkKIAlzdHJ1Y3QgZ2YxMDBfZmIgKmZiID0gZ2YxMDBfZmIoYmFzZSk7CiAJc3Ry dWN0IG52a21fZGV2aWNlICpkZXZpY2UgPSBmYi0+YmFzZS5zdWJkZXYuZGV2aWNlOwogCi0JaWYg KGZiLT5yMTAwYzEwX3BhZ2UpIHsKKwlpZiAoZmItPnIxMDBjMTApIHsKIAkJZG1hX3VubWFwX3Bh Z2UoZGV2aWNlLT5kZXYsIGZiLT5yMTAwYzEwLCBQQUdFX1NJWkUsCiAJCQkgICAgICAgRE1BX0JJ RElSRUNUSU9OQUwpOwotCQlfX2ZyZWVfcGFnZShmYi0+cjEwMGMxMF9wYWdlKTsKIAl9CiAKKwlf X2ZyZWVfcGFnZShmYi0+cjEwMGMxMF9wYWdlKTsKKwogCXJldHVybiBmYjsKIH0KIApAQCAtMTI0 LDExICsxMzYsOSBAQCBnZjEwMF9mYl9uZXdfKGNvbnN0IHN0cnVjdCBudmttX2ZiX2Z1bmMgKmZ1 bmMsIHN0cnVjdCBudmttX2RldmljZSAqZGV2aWNlLAogCSpwZmIgPSAmZmItPmJhc2U7CiAKIAlm Yi0+cjEwMGMxMF9wYWdlID0gYWxsb2NfcGFnZShHRlBfS0VSTkVMIHwgX19HRlBfWkVSTyk7Ci0J aWYgKGZiLT5yMTAwYzEwX3BhZ2UpIHsKLQkJZmItPnIxMDBjMTAgPSBkbWFfbWFwX3BhZ2UoZGV2 aWNlLT5kZXYsIGZiLT5yMTAwYzEwX3BhZ2UsIDAsCi0JCQkJCSAgIFBBR0VfU0laRSwgRE1BX0JJ RElSRUNUSU9OQUwpOwotCQlpZiAoZG1hX21hcHBpbmdfZXJyb3IoZGV2aWNlLT5kZXYsIGZiLT5y MTAwYzEwKSkKLQkJCXJldHVybiAtRUZBVUxUOworCWlmICghZmItPnIxMDBjMTBfcGFnZSkgewor CQludmttX2Vycm9yKCZmYi0+YmFzZS5zdWJkZXYsICJmYWlsZWQgMTAwYzEwIHBhZ2UgYWxsb2Nc biIpOworCQlyZXR1cm4gLUVOT01FTTsKIAl9CiAKIAlyZXR1cm4gMDsKLS0gCjIuNy40CgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpOb3V2ZWF1IG1haWxp bmcgbGlzdApOb3V2ZWF1QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL25vdXZlYXUK