From mboxrd@z Thu Jan  1 00:00:00 1970
From: Lucas Stach <l.stach@pengutronix.de>
Subject: [PATCH RFC 041/111] staging: etnaviv: convert get_pages()/put_pages()
 to take etnaviv_obj
Date: Thu,  2 Apr 2015 17:29:43 +0200
Message-ID: <1427988653-754-42-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: <dri-devel-bounces@lists.freedesktop.org>
Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de
 [92.198.50.35])
 by gabe.freedesktop.org (Postfix) with ESMTP id 476756EA4C
 for <dri-devel@lists.freedesktop.org>; Thu,  2 Apr 2015 08:30:58 -0700 (PDT)
In-Reply-To: <1427988653-754-1-git-send-email-l.stach@pengutronix.de>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/dri-devel>
List-Post: <mailto:dri-devel@lists.freedesktop.org>
List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe>
Errors-To: dri-devel-bounces@lists.freedesktop.org
Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org>
To: dri-devel@lists.freedesktop.org
Cc: Russell King <linux@arm.linux.org.uk>, kernel@pengutronix.de
List-Id: dri-devel@lists.freedesktop.org

RnJvbTogUnVzc2VsbCBLaW5nIDxybWsra2VybmVsQGFybS5saW51eC5vcmcudWs+CgpDb252ZXJ0
IHRoZSBpbnRlcm5hbCBnZXRfcGFnZXMoKS9wdXRfcGFnZXMoKSBmdW5jdGlvbnMgdG8gdGFrZSBh
bgpldG5hdml2X29iaiByYXRoZXIgdGhhIGNvbnZlcnRpbmcgYmV0d2VlbiBkcm1fZ2VtX29iamVj
dCBhbmQgb3VyCnByaXZhdGUgb25lLgoKU2lnbmVkLW9mZi1ieTogUnVzc2VsbCBLaW5nIDxybWsr
a2VybmVsQGFybS5saW51eC5vcmcudWs+Ci0tLQogZHJpdmVycy9zdGFnaW5nL2V0bmF2aXYvZXRu
YXZpdl9nZW0uYyB8IDMzICsrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxl
IGNoYW5nZWQsIDE2IGluc2VydGlvbnMoKyksIDE3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh
L2RyaXZlcnMvc3RhZ2luZy9ldG5hdml2L2V0bmF2aXZfZ2VtLmMgYi9kcml2ZXJzL3N0YWdpbmcv
ZXRuYXZpdi9ldG5hdml2X2dlbS5jCmluZGV4IDFjZDVjNmJjMjUzMi4uNDkzZmZjMDI1NTY5IDEw
MDY0NAotLS0gYS9kcml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2X2dlbS5jCisrKyBiL2Ry
aXZlcnMvc3RhZ2luZy9ldG5hdml2L2V0bmF2aXZfZ2VtLmMKQEAgLTI0LDE2ICsyNCwxNCBAQAog
I2luY2x1ZGUgImV0bmF2aXZfbW11LmgiCiAKIC8qIGNhbGxlZCB3aXRoIGRldi0+c3RydWN0X211
dGV4IGhlbGQgKi8KLXN0YXRpYyBzdHJ1Y3QgcGFnZSAqKmdldF9wYWdlcyhzdHJ1Y3QgZHJtX2dl
bV9vYmplY3QgKm9iaikKK3N0YXRpYyBzdHJ1Y3QgcGFnZSAqKmdldF9wYWdlcyhzdHJ1Y3QgZXRu
YXZpdl9nZW1fb2JqZWN0ICpldG5hdml2X29iaikKIHsKLQlzdHJ1Y3QgZXRuYXZpdl9nZW1fb2Jq
ZWN0ICpldG5hdml2X29iaiA9IHRvX2V0bmF2aXZfYm8ob2JqKTsKLQogCWlmICghZXRuYXZpdl9v
YmotPnBhZ2VzKSB7Ci0JCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBvYmotPmRldjsKKwkJc3Ry
dWN0IGRybV9kZXZpY2UgKmRldiA9IGV0bmF2aXZfb2JqLT5iYXNlLmRldjsKIAkJc3RydWN0IHBh
Z2UgKipwOwotCQlpbnQgbnBhZ2VzID0gb2JqLT5zaXplID4+IFBBR0VfU0hJRlQ7CisJCWludCBu
cGFnZXMgPSBldG5hdml2X29iai0+YmFzZS5zaXplID4+IFBBR0VfU0hJRlQ7CiAKLQkJcCA9IGRy
bV9nZW1fZ2V0X3BhZ2VzKG9iaik7CisJCXAgPSBkcm1fZ2VtX2dldF9wYWdlcygmZXRuYXZpdl9v
YmotPmJhc2UpOwogCiAJCWlmIChJU19FUlIocCkpIHsKIAkJCWRldl9lcnIoZGV2LT5kZXYsICJj
b3VsZCBub3QgZ2V0IHBhZ2VzOiAlbGRcbiIsCkBAIC00NCw3ICs0Miw3IEBAIHN0YXRpYyBzdHJ1
Y3QgcGFnZSAqKmdldF9wYWdlcyhzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaikKIAkJZXRuYXZp
dl9vYmotPnNndCA9IGRybV9wcmltZV9wYWdlc190b19zZyhwLCBucGFnZXMpOwogCQlpZiAoSVNf
RVJSKGV0bmF2aXZfb2JqLT5zZ3QpKSB7CiAJCQlkZXZfZXJyKGRldi0+ZGV2LCAiZmFpbGVkIHRv
IGFsbG9jYXRlIHNndFxuIik7Ci0JCQlkcm1fZ2VtX3B1dF9wYWdlcyhvYmosIHAsIGZhbHNlLCBm
YWxzZSk7CisJCQlkcm1fZ2VtX3B1dF9wYWdlcygmZXRuYXZpdl9vYmotPmJhc2UsIHAsIGZhbHNl
LCBmYWxzZSk7CiAJCQlyZXR1cm4gRVJSX0NBU1QoZXRuYXZpdl9vYmotPnNndCk7CiAJCX0KIApA
QCAtNjEsMjIgKzU5LDIzIEBAIHN0YXRpYyBzdHJ1Y3QgcGFnZSAqKmdldF9wYWdlcyhzdHJ1Y3Qg
ZHJtX2dlbV9vYmplY3QgKm9iaikKIAlyZXR1cm4gZXRuYXZpdl9vYmotPnBhZ2VzOwogfQogCi1z
dGF0aWMgdm9pZCBwdXRfcGFnZXMoc3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmopCitzdGF0aWMg
dm9pZCBwdXRfcGFnZXMoc3RydWN0IGV0bmF2aXZfZ2VtX29iamVjdCAqZXRuYXZpdl9vYmopCiB7
Ci0Jc3RydWN0IGV0bmF2aXZfZ2VtX29iamVjdCAqZXRuYXZpdl9vYmogPSB0b19ldG5hdml2X2Jv
KG9iaik7Ci0KIAlpZiAoZXRuYXZpdl9vYmotPnBhZ2VzKSB7CisJCXN0cnVjdCBkcm1fZGV2aWNl
ICpkZXYgPSBldG5hdml2X29iai0+YmFzZS5kZXY7CisKIAkJLyogRm9yIG5vbi1jYWNoZWQgYnVm
ZmVycywgZW5zdXJlIHRoZSBuZXcgcGFnZXMgYXJlIGNsZWFuCiAJCSAqIGJlY2F1c2UgZGlzcGxh
eSBjb250cm9sbGVyLCBHUFUsIGV0Yy4gYXJlIG5vdCBjb2hlcmVudDoKIAkJICovCiAJCWlmIChl
dG5hdml2X29iai0+ZmxhZ3MgJiAoRVROQV9CT19XQ3xFVE5BX0JPX1VOQ0FDSEVEKSkKLQkJCWRt
YV91bm1hcF9zZyhvYmotPmRldi0+ZGV2LCBldG5hdml2X29iai0+c2d0LT5zZ2wsCisJCQlkbWFf
dW5tYXBfc2coZGV2LT5kZXYsIGV0bmF2aXZfb2JqLT5zZ3QtPnNnbCwKIAkJCQkgICAgIGV0bmF2
aXZfb2JqLT5zZ3QtPm5lbnRzLAogCQkJCSAgICAgRE1BX0JJRElSRUNUSU9OQUwpOwogCQlzZ19m
cmVlX3RhYmxlKGV0bmF2aXZfb2JqLT5zZ3QpOwogCQlrZnJlZShldG5hdml2X29iai0+c2d0KTsK
IAotCQlkcm1fZ2VtX3B1dF9wYWdlcyhvYmosIGV0bmF2aXZfb2JqLT5wYWdlcywgdHJ1ZSwgZmFs
c2UpOworCQlkcm1fZ2VtX3B1dF9wYWdlcygmZXRuYXZpdl9vYmotPmJhc2UsIGV0bmF2aXZfb2Jq
LT5wYWdlcywKKwkJCQkgIHRydWUsIGZhbHNlKTsKIAogCQlldG5hdml2X29iai0+cGFnZXMgPSBO
VUxMOwogCX0KQEAgLTg4LDcgKzg3LDcgQEAgc3RydWN0IHBhZ2UgKipldG5hdml2X2dlbV9nZXRf
cGFnZXMoc3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmopCiAJc3RydWN0IHBhZ2UgKipwOwogCiAJ
bXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCXAgPSBnZXRfcGFnZXMob2JqKTsKKwlw
ID0gZ2V0X3BhZ2VzKHRvX2V0bmF2aXZfYm8ob2JqKSk7CiAJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0
cnVjdF9tdXRleCk7CiAKIAlyZXR1cm4gcDsKQEAgLTE4OSw3ICsxODgsNyBAQCBpbnQgZXRuYXZp
dl9nZW1fZmF1bHQoc3RydWN0IHZtX2FyZWFfc3RydWN0ICp2bWEsIHN0cnVjdCB2bV9mYXVsdCAq
dm1mKQogCQlnb3RvIG91dDsKIAogCS8qIG1ha2Ugc3VyZSB3ZSBoYXZlIHBhZ2VzIGF0dGFjaGVk
IG5vdyAqLwotCXBhZ2VzID0gZ2V0X3BhZ2VzKG9iaik7CisJcGFnZXMgPSBnZXRfcGFnZXModG9f
ZXRuYXZpdl9ibyhvYmopKTsKIAlpZiAoSVNfRVJSKHBhZ2VzKSkgewogCQlyZXQgPSBQVFJfRVJS
KHBhZ2VzKTsKIAkJZ290byBvdXRfdW5sb2NrOwpAQCAtMjczLDcgKzI3Miw3IEBAIGludCBldG5h
dml2X2dlbV9nZXRfaW92YV9sb2NrZWQoc3RydWN0IGV0bmF2aXZfZ3B1ICpncHUsCiAJaWYgKCFl
dG5hdml2X29iai0+aW92YSAgJiYgIShldG5hdml2X29iai0+ZmxhZ3MgJiBFVE5BX0JPX0NNRFNU
UkVBTSkpIHsKIAkJc3RydWN0IGV0bmF2aXZfZHJtX3ByaXZhdGUgKnByaXYgPSBvYmotPmRldi0+
ZGV2X3ByaXZhdGU7CiAJCXN0cnVjdCBldG5hdml2X2lvbW11ICptbXUgPSBwcml2LT5tbXU7Ci0J
CXN0cnVjdCBwYWdlICoqcGFnZXMgPSBnZXRfcGFnZXMob2JqKTsKKwkJc3RydWN0IHBhZ2UgKipw
YWdlcyA9IGdldF9wYWdlcyhldG5hdml2X29iaik7CiAJCXVpbnQzMl90IG9mZnNldDsKIAkJc3Ry
dWN0IGRybV9tbV9ub2RlICpub2RlID0gTlVMTDsKIApAQCAtMzc1LDcgKzM3NCw3IEBAIHZvaWQg
KmV0bmF2aXZfZ2VtX3ZhZGRyX2xvY2tlZChzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaikKIAlX
QVJOX09OKCFtdXRleF9pc19sb2NrZWQoJm9iai0+ZGV2LT5zdHJ1Y3RfbXV0ZXgpKTsKIAogCWlm
ICghZXRuYXZpdl9vYmotPnZhZGRyKSB7Ci0JCXN0cnVjdCBwYWdlICoqcGFnZXMgPSBnZXRfcGFn
ZXMob2JqKTsKKwkJc3RydWN0IHBhZ2UgKipwYWdlcyA9IGdldF9wYWdlcyhldG5hdml2X29iaik7
CiAKIAkJaWYgKElTX0VSUihwYWdlcykpCiAJCQlyZXR1cm4gRVJSX0NBU1QocGFnZXMpOwpAQCAt
NTM2LDcgKzUzNSw3IEBAIHN0YXRpYyB2b2lkIGV0bmF2aXZfZ2VtX3NobWVtX3JlbGVhc2Uoc3Ry
dWN0IGV0bmF2aXZfZ2VtX29iamVjdCAqZXRuYXZpdl9vYmopCiB7CiAJaWYgKGV0bmF2aXZfb2Jq
LT52YWRkcikKIAkJdnVubWFwKGV0bmF2aXZfb2JqLT52YWRkcik7Ci0JcHV0X3BhZ2VzKCZldG5h
dml2X29iai0+YmFzZSk7CisJcHV0X3BhZ2VzKGV0bmF2aXZfb2JqKTsKIH0KIAogc3RhdGljIGNv
bnN0IHN0cnVjdCBldG5hdml2X2dlbV9vcHMgZXRuYXZpdl9nZW1fc2htZW1fb3BzID0gewotLSAK
Mi4xLjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRy
aS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw
Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==