From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lucas Stach Subject: [PATCH RFC 069/111] staging: etnaviv: move scatterlist map/unmap Date: Thu, 2 Apr 2015 17:30:11 +0200 Message-ID: <1427988653-754-70-git-send-email-l.stach@pengutronix.de> References: <1427988653-754-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.pengutronix.de (metis.ext.pengutronix.de [92.198.50.35]) by gabe.freedesktop.org (Postfix) with ESMTP id 177136EA60 for ; Thu, 2 Apr 2015 08:31:00 -0700 (PDT) In-Reply-To: <1427988653-754-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: dri-devel@lists.freedesktop.org Cc: Russell King , kernel@pengutronix.de List-Id: dri-devel@lists.freedesktop.org RnJvbTogUnVzc2VsbCBLaW5nIDxybWsra2VybmVsQGFybS5saW51eC5vcmcudWs+CgpTaWduZWQt b2ZmLWJ5OiBSdXNzZWxsIEtpbmcgPHJtaytrZXJuZWxAYXJtLmxpbnV4Lm9yZy51az4KLS0tCiBk cml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2X2dlbS5jIHwgODkgKysrKysrKysrKysrKysr KysrKystLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA1MiBpbnNlcnRpb25zKCspLCAz NyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5h dml2X2dlbS5jIGIvZHJpdmVycy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZpdl9nZW0uYwppbmRleCAy ZjJiZjU2MTlmZmQuLjhlZWFmY2FmYjRlOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9zdGFnaW5nL2V0 bmF2aXYvZXRuYXZpdl9nZW0uYworKysgYi9kcml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2 X2dlbS5jCkBAIC0yMyw2ICsyMyw1NSBAQAogI2luY2x1ZGUgImV0bmF2aXZfZ3B1LmgiCiAjaW5j bHVkZSAiZXRuYXZpdl9tbXUuaCIKIAorc3RhdGljIHZvaWQgZXRuYXZpdl9nZW1fc2NhdHRlcl9t YXAoc3RydWN0IGV0bmF2aXZfZ2VtX29iamVjdCAqZXRuYXZpdl9vYmopCit7CisJc3RydWN0IGRy bV9kZXZpY2UgKmRldiA9IGV0bmF2aXZfb2JqLT5iYXNlLmRldjsKKworCS8qCisJICogRm9yIG5v bi1jYWNoZWQgYnVmZmVycywgZW5zdXJlIHRoZSBuZXcgcGFnZXMgYXJlIGNsZWFuCisJICogYmVj YXVzZSBkaXNwbGF5IGNvbnRyb2xsZXIsIEdQVSwgZXRjLiBhcmUgbm90IGNvaGVyZW50LgorCSAq LworCWlmIChldG5hdml2X29iai0+ZmxhZ3MgJiAoRVROQV9CT19XQ3xFVE5BX0JPX0NBQ0hFRCkp IHsKKwkJZG1hX21hcF9zZyhkZXYtPmRldiwgZXRuYXZpdl9vYmotPnNndC0+c2dsLAorCQkJICAg ZXRuYXZpdl9vYmotPnNndC0+bmVudHMsIERNQV9CSURJUkVDVElPTkFMKTsKKwl9IGVsc2Ugewor CQlzdHJ1Y3Qgc2NhdHRlcmxpc3QgKnNnOworCQl1bnNpZ25lZCBpbnQgaTsKKworCQlmb3JfZWFj aF9zZyhzZ3QtPnNnbCwgc2csIHNndC0+bmVudHMsIGkpIHsKKwkJCXNnX2RtYV9hZGRyZXNzKHNn KSA9IHNnX3BoeXMoc2cpOworI2lmZGVmIENPTkZJR19ORUVEX1NHX0RNQV9MRU5HVEgKKwkJCXNn X2RtYV9sZW4oc2cpID0gc2ctPmxlbmd0aDsKKyNlbmRpZgorCQl9CisJfQorfQorCitzdGF0aWMg dm9pZCBldG5hdml2X2dlbV9zY2F0dGVybGlzdF91bm1hcChzdHJ1Y3QgZXRuYXZpdl9nZW1fb2Jq ZWN0ICpldG5hdml2X29iaikKK3sKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZXRuYXZpdl9v YmotPmJhc2UuZGV2OworCisJLyoKKwkgKiBGb3Igbm9uLWNhY2hlZCBidWZmZXJzLCBlbnN1cmUg dGhlIG5ldyBwYWdlcyBhcmUgY2xlYW4KKwkgKiBiZWNhdXNlIGRpc3BsYXkgY29udHJvbGxlciwg R1BVLCBldGMuIGFyZSBub3QgY29oZXJlbnQ6CisJICoKKwkgKiBXQVJOSU5HOiBUaGUgRE1BIEFQ SSBkb2VzIG5vdCBzdXBwb3J0IGNvbmN1cnJlbnQgQ1BVCisJICogYW5kIGRldmljZSBhY2Nlc3Mg dG8gdGhlIG1lbW9yeSBhcmVhLiAgV2l0aCBCSURJUkVDVElPTkFMLAorCSAqIHdlIHdpbGwgY2xl YW4gdGhlIGNhY2hlIGxpbmVzIHdoaWNoIG92ZXJsYXAgdGhlIHJlZ2lvbiwKKwkgKiBhbmQgaW52 YWxpZGF0ZSBhbGwgY2FjaGUgbGluZXMgKHBhcnRpYWxseSkgY29udGFpbmVkIGluCisJICogdGhl IHJlZ2lvbi4KKwkgKgorCSAqIElmIHlvdSBoYXZlIGRpcnR5IGRhdGEgaW4gdGhlIG92ZXJsYXBw aW5nIGNhY2hlIGxpbmVzLAorCSAqIHRoYXQgd2lsbCBjb3JydXB0IHRoZSBHUFUtd3JpdHRlbiBk YXRhLiAgSWYgeW91IGhhdmUKKwkgKiB3cml0dGVuIGludG8gdGhlIHJlbWFpbmRlciBvZiB0aGUg cmVnaW9uLCB0aGlzIGNhbgorCSAqIGRpc2NhcmQgdGhvc2Ugd3JpdGVzLgorCSAqLworCWlmIChl dG5hdml2X29iai0+ZmxhZ3MgJiAoRVROQV9CT19XQ3xFVE5BX0JPX0NBQ0hFRCkpCisJCWRtYV91 bm1hcF9zZyhkZXYtPmRldiwgZXRuYXZpdl9vYmotPnNndC0+c2dsLAorCQkJICAgICBldG5hdml2 X29iai0+c2d0LT5uZW50cywKKwkJCSAgICAgRE1BX0JJRElSRUNUSU9OQUwpOworfQorCiAvKiBj YWxsZWQgd2l0aCBkZXYtPnN0cnVjdF9tdXRleCBoZWxkICovCiBzdGF0aWMgaW50IGV0bmF2aXZf Z2VtX3NobWVtX2dldF9wYWdlcyhzdHJ1Y3QgZXRuYXZpdl9nZW1fb2JqZWN0ICpldG5hdml2X29i aikKIHsKQEAgLTQyLDI3ICs5MSw3IEBAIHN0YXRpYyBpbnQgZXRuYXZpdl9nZW1fc2htZW1fZ2V0 X3BhZ2VzKHN0cnVjdCBldG5hdml2X2dlbV9vYmplY3QgKmV0bmF2aXZfb2JqKQogc3RhdGljIHZv aWQgcHV0X3BhZ2VzKHN0cnVjdCBldG5hdml2X2dlbV9vYmplY3QgKmV0bmF2aXZfb2JqKQogewog CWlmIChldG5hdml2X29iai0+c2d0KSB7Ci0JCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBldG5h dml2X29iai0+YmFzZS5kZXY7Ci0KLQkJLyoKLQkJICogRm9yIG5vbi1jYWNoZWQgYnVmZmVycywg ZW5zdXJlIHRoZSBuZXcgcGFnZXMgYXJlIGNsZWFuCi0JCSAqIGJlY2F1c2UgZGlzcGxheSBjb250 cm9sbGVyLCBHUFUsIGV0Yy4gYXJlIG5vdCBjb2hlcmVudDoKLQkJICoKLQkJICogV0FSTklORzog VGhlIERNQSBBUEkgZG9lcyBub3Qgc3VwcG9ydCBjb25jdXJyZW50IENQVQotCQkgKiBhbmQgZGV2 aWNlIGFjY2VzcyB0byB0aGUgbWVtb3J5IGFyZWEuICBXaXRoIEJJRElSRUNUSU9OQUwsCi0JCSAq IHdlIHdpbGwgY2xlYW4gdGhlIGNhY2hlIGxpbmVzIHdoaWNoIG92ZXJsYXAgdGhlIHJlZ2lvbiwK LQkJICogYW5kIGludmFsaWRhdGUgYWxsIGNhY2hlIGxpbmVzIChwYXJ0aWFsbHkpIGNvbnRhaW5l ZCBpbgotCQkgKiB0aGUgcmVnaW9uLgotCQkgKgotCQkgKiBJZiB5b3UgaGF2ZSBkaXJ0eSBkYXRh IGluIHRoZSBvdmVybGFwcGluZyBjYWNoZSBsaW5lcywKLQkJICogdGhhdCB3aWxsIGNvcnJ1cHQg dGhlIEdQVS13cml0dGVuIGRhdGEuICBJZiB5b3UgaGF2ZQotCQkgKiB3cml0dGVuIGludG8gdGhl IHJlbWFpbmRlciBvZiB0aGUgcmVnaW9uLCB0aGlzIGNhbgotCQkgKiBkaXNjYXJkIHRob3NlIHdy aXRlcy4KLQkJICovCi0JCWlmIChldG5hdml2X29iai0+ZmxhZ3MgJiAoRVROQV9CT19XQ3xFVE5B X0JPX0NBQ0hFRCkpCi0JCQlkbWFfdW5tYXBfc2coZGV2LT5kZXYsIGV0bmF2aXZfb2JqLT5zZ3Qt PnNnbCwKLQkJCQkgICAgIGV0bmF2aXZfb2JqLT5zZ3QtPm5lbnRzLAotCQkJCSAgICAgRE1BX0JJ RElSRUNUSU9OQUwpOworCQlldG5hdml2X2dlbV9zY2F0dGVybGlzdF91bm1hcChldG5hdml2X29i aik7CiAJCXNnX2ZyZWVfdGFibGUoZXRuYXZpdl9vYmotPnNndCk7CiAJCWtmcmVlKGV0bmF2aXZf b2JqLT5zZ3QpOwogCQlldG5hdml2X29iai0+c2d0ID0gTlVMTDsKQEAgLTk5LDEzICsxMjgsNyBA QCBzdHJ1Y3QgcGFnZSAqKmV0bmF2aXZfZ2VtX2dldF9wYWdlcyhzdHJ1Y3QgZXRuYXZpdl9nZW1f b2JqZWN0ICpldG5hdml2X29iaikKIAogCQlldG5hdml2X29iai0+c2d0ID0gc2d0OwogCi0JCS8q Ci0JCSAqIEZvciBub24tY2FjaGVkIGJ1ZmZlcnMsIGVuc3VyZSB0aGUgbmV3IHBhZ2VzIGFyZSBj bGVhbgotCQkgKiBiZWNhdXNlIGRpc3BsYXkgY29udHJvbGxlciwgR1BVLCBldGMuIGFyZSBub3Qg Y29oZXJlbnQuCi0JCSAqLwotCQlpZiAoZXRuYXZpdl9vYmotPmZsYWdzICYgKEVUTkFfQk9fV0N8 RVROQV9CT19DQUNIRUQpKQotCQkJZG1hX21hcF9zZyhkZXYtPmRldiwgZXRuYXZpdl9vYmotPnNn dC0+c2dsLAotCQkJCSAgIGV0bmF2aXZfb2JqLT5zZ3QtPm5lbnRzLCBETUFfQklESVJFQ1RJT05B TCk7CisJCWV0bmF2aXZfZ2VtX3NjYXR0ZXJfbWFwKGV0bmF2aXZfb2JqKTsKIAl9CiAKIAlyZXR1 cm4gZXRuYXZpdl9vYmotPnBhZ2VzOwpAQCAtODM2LDE1ICs4NTksNyBAQCBzdGF0aWMgaW50IGV0 bmF2aXZfZ2VtX3VzZXJwdHJfZ2V0X3BhZ2VzKHN0cnVjdCBldG5hdml2X2dlbV9vYmplY3QgKmV0 bmF2aXZfb2JqKQogc3RhdGljIHZvaWQgZXRuYXZpdl9nZW1fdXNlcnB0cl9yZWxlYXNlKHN0cnVj dCBldG5hdml2X2dlbV9vYmplY3QgKmV0bmF2aXZfb2JqKQogewogCWlmIChldG5hdml2X29iai0+ c2d0KSB7Ci0JCS8qCi0JCSAqIEZvciBub24tY2FjaGVkIGJ1ZmZlcnMsIGVuc3VyZSB0aGUgbmV3 IHBhZ2VzIGFyZSBjbGVhbgotCQkgKiBiZWNhdXNlIGRpc3BsYXkgY29udHJvbGxlciwgR1BVLCBl dGMuIGFyZSBub3QgY29oZXJlbnQ6Ci0JCSAqLwotCQlpZiAoZXRuYXZpdl9vYmotPmZsYWdzICYg KEVUTkFfQk9fV0N8RVROQV9CT19DQUNIRUQpKQotCQkJZG1hX3VubWFwX3NnKGV0bmF2aXZfb2Jq LT5iYXNlLmRldi0+ZGV2LAotCQkJCSAgICAgZXRuYXZpdl9vYmotPnNndC0+c2dsLAotCQkJCSAg ICAgZXRuYXZpdl9vYmotPnNndC0+bmVudHMsCi0JCQkJICAgICBETUFfQklESVJFQ1RJT05BTCk7 CisJCWV0bmF2aXZfZ2VtX3NjYXR0ZXJsaXN0X3VubWFwKGV0bmF2aXZfb2JqKTsKIAkJc2dfZnJl ZV90YWJsZShldG5hdml2X29iai0+c2d0KTsKIAkJa2ZyZWUoZXRuYXZpdl9vYmotPnNndCk7CiAJ fQotLSAKMi4xLjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs Cg==