From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lucas Stach Subject: [PATCH v2 3/3] drm/etnaviv: call correct function when trying to vmap a DMABUF Date: Tue, 26 Jan 2016 18:48:22 +0100 Message-ID: <1453830502-5866-3-git-send-email-l.stach@pengutronix.de> References: <1453830502-5866-1-git-send-email-l.stach@pengutronix.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from metis.ext.4.pengutronix.de (metis.ext.4.pengutronix.de [92.198.50.35]) by gabe.freedesktop.org (Postfix) with ESMTPS id 423116E279 for ; Tue, 26 Jan 2016 09:48:25 -0800 (PST) In-Reply-To: <1453830502-5866-1-git-send-email-l.stach@pengutronix.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Russell King , Christian Gmeiner , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org V2hlbiB0cnlpbmcgdG8gZ2V0IHRoZSB2bWFwIGFkZHJlc3Mgb2YgYW4gaW1wb3J0ZWQgYnVmZmVy LCB3ZSBtdXN0CmNhbGwgaW50byB0aGUgYXBwcm9wcmlhdGUgaGVscGVyIGZ1bmN0aW9uLCB0byBh bGxvdyB0aGUgZXhwb3J0ZXIgdG8KZXN0YWJsaXNoIHRoZSB2bWFwLCBpbnN0ZWFkIG9mIHRyeWlu ZyB0byB2bWFwIHRoZSBidWZmZXIgb24gb3VyIG93bi4KCkFkZCBhbiBpbmRpcmVjdGlvbiB0aHJv dWdoIGV0bmF2aXZfZ2VtX29wcyB0byBhbGxvdyB0aGUgY29ycmVjdAppbXBsZW1lbnRhdGlvbiB0 byBiZSBjYWxsZWQuCgpTaWduZWQtb2ZmLWJ5OiBMdWNhcyBTdGFjaCA8bC5zdGFjaEBwZW5ndXRy b25peC5kZT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vZXRuYXZpdi9ldG5hdml2X2dlbS5jICAgICAg IHwgMzYgKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9ldG5h dml2L2V0bmF2aXZfZ2VtLmggICAgICAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vZXRuYXZpdi9l dG5hdml2X2dlbV9wcmltZS5jIHwgIDggKysrKysrKwogMyBmaWxlcyBjaGFuZ2VkLCAzNCBpbnNl cnRpb25zKCspLCAxMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v ZXRuYXZpdi9ldG5hdml2X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2V0bmF2aXYvZXRuYXZpdl9n ZW0uYwppbmRleCAxZGEzZDQ4MDU0YzIuLjRiNTE5ZTQzMDliMiAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2V0bmF2aXYvZXRuYXZpdl9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZXRu YXZpdi9ldG5hdml2X2dlbS5jCkBAIC0zNTcsMjMgKzM1NywzNSBAQCB2b2lkICpldG5hdml2X2dl bV92bWFwKHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqKQogewogCXN0cnVjdCBldG5hdml2X2dl bV9vYmplY3QgKmV0bmF2aXZfb2JqID0gdG9fZXRuYXZpdl9ibyhvYmopOwogCi0JbXV0ZXhfbG9j aygmZXRuYXZpdl9vYmotPmxvY2spOwotCWlmICghZXRuYXZpdl9vYmotPnZhZGRyKSB7Ci0JCXN0 cnVjdCBwYWdlICoqcGFnZXMgPSBldG5hdml2X2dlbV9nZXRfcGFnZXMoZXRuYXZpdl9vYmopOwot Ci0JCWlmIChJU19FUlIocGFnZXMpKSB7Ci0JCQltdXRleF91bmxvY2soJmV0bmF2aXZfb2JqLT5s b2NrKTsKLQkJCXJldHVybiBOVUxMOwotCQl9CisJaWYgKGV0bmF2aXZfb2JqLT52YWRkcikKKwkJ cmV0dXJuIGV0bmF2aXZfb2JqLT52YWRkcjsKIAotCQlldG5hdml2X29iai0+dmFkZHIgPSB2bWFw KHBhZ2VzLCBvYmotPnNpemUgPj4gUEFHRV9TSElGVCwKLQkJCQlWTV9NQVAsIHBncHJvdF93cml0 ZWNvbWJpbmUoUEFHRV9LRVJORUwpKTsKLQl9CisJbXV0ZXhfbG9jaygmZXRuYXZpdl9vYmotPmxv Y2spOworCS8qCisJICogTmVlZCB0byBjaGVjayBhZ2FpbiwgYXMgd2UgbWlnaHQgaGF2ZSByYWNl ZCB3aXRoIGFub3RoZXIgdGhyZWFkCisJICogd2hpbGUgd2FpdGluZyBmb3IgdGhlIG11dGV4Lgor CSAqLworCWlmICghZXRuYXZpdl9vYmotPnZhZGRyKQorCQlldG5hdml2X29iai0+dmFkZHIgPSBl dG5hdml2X29iai0+b3BzLT52bWFwKGV0bmF2aXZfb2JqKTsKIAltdXRleF91bmxvY2soJmV0bmF2 aXZfb2JqLT5sb2NrKTsKIAogCXJldHVybiBldG5hdml2X29iai0+dmFkZHI7CiB9CiAKK3N0YXRp YyB2b2lkICpldG5hdml2X2dlbV92bWFwX2ltcGwoc3RydWN0IGV0bmF2aXZfZ2VtX29iamVjdCAq b2JqKQoreworCXN0cnVjdCBwYWdlICoqcGFnZXM7CisKKwlsb2NrZGVwX2Fzc2VydF9oZWxkKCZv YmotPmxvY2spOworCisJcGFnZXMgPSBldG5hdml2X2dlbV9nZXRfcGFnZXMob2JqKTsKKwlpZiAo SVNfRVJSKHBhZ2VzKSkKKwkJcmV0dXJuIE5VTEw7CisKKwlyZXR1cm4gdm1hcChwYWdlcywgb2Jq LT5iYXNlLnNpemUgPj4gUEFHRV9TSElGVCwKKwkJCVZNX01BUCwgcGdwcm90X3dyaXRlY29tYmlu ZShQQUdFX0tFUk5FTCkpOworfQorCiBzdGF0aWMgaW5saW5lIGVudW0gZG1hX2RhdGFfZGlyZWN0 aW9uIGV0bmF2aXZfb3BfdG9fZG1hX2Rpcih1MzIgb3ApCiB7CiAJaWYgKG9wICYgRVROQV9QUkVQ X1JFQUQpCkBAIC01MjQsNiArNTM2LDcgQEAgc3RhdGljIHZvaWQgZXRuYXZpdl9nZW1fc2htZW1f cmVsZWFzZShzdHJ1Y3QgZXRuYXZpdl9nZW1fb2JqZWN0ICpldG5hdml2X29iaikKIHN0YXRpYyBj b25zdCBzdHJ1Y3QgZXRuYXZpdl9nZW1fb3BzIGV0bmF2aXZfZ2VtX3NobWVtX29wcyA9IHsKIAku Z2V0X3BhZ2VzID0gZXRuYXZpdl9nZW1fc2htZW1fZ2V0X3BhZ2VzLAogCS5yZWxlYXNlID0gZXRu YXZpdl9nZW1fc2htZW1fcmVsZWFzZSwKKwkudm1hcCA9IGV0bmF2aXZfZ2VtX3ZtYXBfaW1wbCwK IH07CiAKIHZvaWQgZXRuYXZpdl9nZW1fZnJlZV9vYmplY3Qoc3RydWN0IGRybV9nZW1fb2JqZWN0 ICpvYmopCkBAIC04NjgsNiArODgxLDcgQEAgc3RhdGljIHZvaWQgZXRuYXZpdl9nZW1fdXNlcnB0 cl9yZWxlYXNlKHN0cnVjdCBldG5hdml2X2dlbV9vYmplY3QgKmV0bmF2aXZfb2JqKQogc3RhdGlj IGNvbnN0IHN0cnVjdCBldG5hdml2X2dlbV9vcHMgZXRuYXZpdl9nZW1fdXNlcnB0cl9vcHMgPSB7 CiAJLmdldF9wYWdlcyA9IGV0bmF2aXZfZ2VtX3VzZXJwdHJfZ2V0X3BhZ2VzLAogCS5yZWxlYXNl ID0gZXRuYXZpdl9nZW1fdXNlcnB0cl9yZWxlYXNlLAorCS52bWFwID0gZXRuYXZpdl9nZW1fdm1h cF9pbXBsLAogfTsKIAogaW50IGV0bmF2aXZfZ2VtX25ld191c2VycHRyKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9ldG5hdml2L2V0bmF2aXZfZ2VtLmggYi9kcml2ZXJzL2dwdS9kcm0vZXRuYXZpdi9ldG5h dml2X2dlbS5oCmluZGV4IGEzMDBiNGIzZDU0NS4uYWI1ZGY4MTQ3YTVmIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vZXRuYXZpdi9ldG5hdml2X2dlbS5oCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9ldG5hdml2L2V0bmF2aXZfZ2VtLmgKQEAgLTc4LDYgKzc4LDcgQEAgc3RydWN0IGV0bmF2aXZf Z2VtX29iamVjdCAqdG9fZXRuYXZpdl9ibyhzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaikKIHN0 cnVjdCBldG5hdml2X2dlbV9vcHMgewogCWludCAoKmdldF9wYWdlcykoc3RydWN0IGV0bmF2aXZf Z2VtX29iamVjdCAqKTsKIAl2b2lkICgqcmVsZWFzZSkoc3RydWN0IGV0bmF2aXZfZ2VtX29iamVj dCAqKTsKKwl2b2lkICooKnZtYXApKHN0cnVjdCBldG5hdml2X2dlbV9vYmplY3QgKik7CiB9Owog CiBzdGF0aWMgaW5saW5lIGJvb2wgaXNfYWN0aXZlKHN0cnVjdCBldG5hdml2X2dlbV9vYmplY3Qg KmV0bmF2aXZfb2JqKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2V0bmF2aXYvZXRuYXZp dl9nZW1fcHJpbWUuYyBiL2RyaXZlcnMvZ3B1L2RybS9ldG5hdml2L2V0bmF2aXZfZ2VtX3ByaW1l LmMKaW5kZXggOWMwNTRiNmMyNGQ2Li40ZTY3Mzk1ZjVmYTEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9ldG5hdml2L2V0bmF2aXZfZ2VtX3ByaW1lLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2V0bmF2aXYvZXRuYXZpdl9nZW1fcHJpbWUuYwpAQCAtNzcsOSArNzcsMTcgQEAgc3RhdGljIHZv aWQgZXRuYXZpdl9nZW1fcHJpbWVfcmVsZWFzZShzdHJ1Y3QgZXRuYXZpdl9nZW1fb2JqZWN0ICpl dG5hdml2X29iaikKIAlkcm1fcHJpbWVfZ2VtX2Rlc3Ryb3koJmV0bmF2aXZfb2JqLT5iYXNlLCBl dG5hdml2X29iai0+c2d0KTsKIH0KIAorc3RhdGljIHZvaWQgKmV0bmF2aXZfZ2VtX3ByaW1lX3Zt YXBfaW1wbChzdHJ1Y3QgZXRuYXZpdl9nZW1fb2JqZWN0ICpldG5hdml2X29iaikKK3sKKwlsb2Nr ZGVwX2Fzc2VydF9oZWxkKCZldG5hdml2X29iai0+bG9jayk7CisKKwlyZXR1cm4gZG1hX2J1Zl92 bWFwKGV0bmF2aXZfb2JqLT5iYXNlLmltcG9ydF9hdHRhY2gtPmRtYWJ1Zik7Cit9CisKIHN0YXRp YyBjb25zdCBzdHJ1Y3QgZXRuYXZpdl9nZW1fb3BzIGV0bmF2aXZfZ2VtX3ByaW1lX29wcyA9IHsK IAkvKiAuZ2V0X3BhZ2VzIHNob3VsZCBuZXZlciBiZSBjYWxsZWQgKi8KIAkucmVsZWFzZSA9IGV0 bmF2aXZfZ2VtX3ByaW1lX3JlbGVhc2UsCisJLnZtYXAgPSBldG5hdml2X2dlbV9wcmltZV92bWFw X2ltcGwsCiB9OwogCiBzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKmV0bmF2aXZfZ2VtX3ByaW1lX2lt cG9ydF9zZ190YWJsZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAotLSAKMi43LjAucmMzCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFp bGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=