From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lucas Stach Subject: [PATCH RFC 042/111] staging: etnaviv: clean up etnaviv_gem_{get, put}_pages() Date: Thu, 2 Apr 2015 17:29:44 +0200 Message-ID: <1427988653-754-43-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 598556EA44 for ; Thu, 2 Apr 2015 08:30:58 -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+CgpNb3ZlIHRo ZSBsb2NraW5nIGludG8gZXRuYXZpdl9nZW1fcHJpbWUuYyBhbmQgcGFzcyBhbiBldG5hdml2X2dl bV9vYmplY3QKcmF0aGVyIHRoYW4gZHJtX2dlbV9vYmplY3QuICBBcyB0aGlzIGJlY29tZXMgYW4g aW50ZXJuYWwgZ2VtIGZ1bmN0aW9uLAptb3ZlIHRoZSBwcm90b3R5cGUgaW50byBldG5hdml2X2dl bS5oLgoKU2lnbmVkLW9mZi1ieTogUnVzc2VsbCBLaW5nIDxybWsra2VybmVsQGFybS5saW51eC5v cmcudWs+Ci0tLQogZHJpdmVycy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZpdl9kcnYuaCAgICAgICB8 ICAyIC0tCiBkcml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2X2dlbS5jICAgICAgIHwgMTMg KysrLS0tLS0tLS0tLQogZHJpdmVycy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZpdl9nZW0uaCAgICAg ICB8ICAyICsrCiBkcml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2X2dlbV9wcmltZS5jIHwg MTggKysrKysrKysrKysrKystLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDE5IGluc2VydGlvbnMoKyks IDE2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvc3RhZ2luZy9ldG5hdml2L2V0 bmF2aXZfZHJ2LmggYi9kcml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2X2Rydi5oCmluZGV4 IGJkZjY2ODVlZjZjYy4uNzlmMjJkMTVmYzYzIDEwMDY0NAotLS0gYS9kcml2ZXJzL3N0YWdpbmcv ZXRuYXZpdi9ldG5hdml2X2Rydi5oCisrKyBiL2RyaXZlcnMvc3RhZ2luZy9ldG5hdml2L2V0bmF2 aXZfZHJ2LmgKQEAgLTgxLDggKzgxLDYgQEAgaW50IGV0bmF2aXZfZ2VtX2dldF9pb3ZhX2xvY2tl ZChzdHJ1Y3QgZXRuYXZpdl9ncHUgKmdwdSwKIAlzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaiwg dWludDMyX3QgKmlvdmEpOwogaW50IGV0bmF2aXZfZ2VtX2dldF9pb3ZhKHN0cnVjdCBldG5hdml2 X2dwdSAqZ3B1LCBzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaiwKIAlpbnQgaWQsIHVpbnQzMl90 ICppb3ZhKTsKLXN0cnVjdCBwYWdlICoqZXRuYXZpdl9nZW1fZ2V0X3BhZ2VzKHN0cnVjdCBkcm1f Z2VtX29iamVjdCAqb2JqKTsKLXZvaWQgbXNtX2dlbV9wdXRfcGFnZXMoc3RydWN0IGRybV9nZW1f b2JqZWN0ICpvYmopOwogdm9pZCBldG5hdml2X2dlbV9wdXRfaW92YShzdHJ1Y3QgZHJtX2dlbV9v YmplY3QgKm9iaik7CiBpbnQgbXNtX2dlbV9kdW1iX2NyZWF0ZShzdHJ1Y3QgZHJtX2ZpbGUgKmZp bGUsIHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCXN0cnVjdCBkcm1fbW9kZV9jcmVhdGVfZHVt YiAqYXJncyk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2X2dl bS5jIGIvZHJpdmVycy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZpdl9nZW0uYwppbmRleCA0OTNmZmMw MjU1NjkuLjIxMjBjZDM3OGQ4NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9zdGFnaW5nL2V0bmF2aXYv ZXRuYXZpdl9nZW0uYworKysgYi9kcml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2X2dlbS5j CkBAIC04MSwxOSArODEsMTIgQEAgc3RhdGljIHZvaWQgcHV0X3BhZ2VzKHN0cnVjdCBldG5hdml2 X2dlbV9vYmplY3QgKmV0bmF2aXZfb2JqKQogCX0KIH0KIAotc3RydWN0IHBhZ2UgKipldG5hdml2 X2dlbV9nZXRfcGFnZXMoc3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmopCitzdHJ1Y3QgcGFnZSAq KmV0bmF2aXZfZ2VtX2dldF9wYWdlcyhzdHJ1Y3QgZXRuYXZpdl9nZW1fb2JqZWN0ICpldG5hdml2 X29iaikKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gb2JqLT5kZXY7Ci0Jc3RydWN0IHBh Z2UgKipwOwotCi0JbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCXAgPSBnZXRfcGFn ZXModG9fZXRuYXZpdl9ibyhvYmopKTsKLQltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4 KTsKLQotCXJldHVybiBwOworCXJldHVybiBnZXRfcGFnZXMoZXRuYXZpdl9vYmopOwogfQogCi12 b2lkIG1zbV9nZW1fcHV0X3BhZ2VzKHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqKQordm9pZCBl dG5hdml2X2dlbV9wdXRfcGFnZXMoc3RydWN0IGV0bmF2aXZfZ2VtX29iamVjdCAqZXRuYXZpdl9v YmopCiB7CiAJLyogd2hlbiB3ZSBzdGFydCB0cmFja2luZyB0aGUgcGluIGNvdW50LCB0aGVuIGRv IHNvbWV0aGluZyBoZXJlICovCiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL3N0YWdpbmcvZXRuYXZp di9ldG5hdml2X2dlbS5oIGIvZHJpdmVycy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZpdl9nZW0uaApp bmRleCA2NWM5NzQwNTQyZGEuLjU2OWE0MDdjYmQzNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9zdGFn aW5nL2V0bmF2aXYvZXRuYXZpdl9nZW0uaAorKysgYi9kcml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9l dG5hdml2X2dlbS5oCkBAIC0xMDcsNSArMTA3LDcgQEAgc3RydWN0IGV0bmF2aXZfZ2VtX3N1Ym1p dCB7CiAKIGludCBldG5hdml2X2dlbV9uZXdfcHJpdmF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LCBzaXplX3Qgc2l6ZSwgdWludDMyX3QgZmxhZ3MsCiAJc3RydWN0IGV0bmF2aXZfZ2VtX29iamVj dCAqKnJlcyk7CitzdHJ1Y3QgcGFnZSAqKmV0bmF2aXZfZ2VtX2dldF9wYWdlcyhzdHJ1Y3QgZXRu YXZpdl9nZW1fb2JqZWN0ICpvYmopOwordm9pZCBldG5hdml2X2dlbV9wdXRfcGFnZXMoc3RydWN0 IGV0bmF2aXZfZ2VtX29iamVjdCAqb2JqKTsKIAogI2VuZGlmIC8qIF9fRVROQVZJVl9HRU1fSF9f ICovCmRpZmYgLS1naXQgYS9kcml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2X2dlbV9wcmlt ZS5jIGIvZHJpdmVycy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZpdl9nZW1fcHJpbWUuYwppbmRleCBk OTc0MmFlMWZhZDEuLjNhOTg2YWU5YjAwYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9zdGFnaW5nL2V0 bmF2aXYvZXRuYXZpdl9nZW1fcHJpbWUuYworKysgYi9kcml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9l dG5hdml2X2dlbV9wcmltZS5jCkBAIC00MSwxNSArNDEsMjUgQEAgdm9pZCBtc21fZ2VtX3ByaW1l X3Z1bm1hcChzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaiwgdm9pZCAqdmFkZHIpCiAKIGludCBt c21fZ2VtX3ByaW1lX3BpbihzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaikKIHsKLQlpZiAoIW9i ai0+aW1wb3J0X2F0dGFjaCkKLQkJZXRuYXZpdl9nZW1fZ2V0X3BhZ2VzKG9iaik7CisJaWYgKCFv YmotPmltcG9ydF9hdHRhY2gpIHsKKwkJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IG9iai0+ZGV2 OworCisJCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKKwkJZXRuYXZpdl9nZW1fZ2V0 X3BhZ2VzKHRvX2V0bmF2aXZfYm8ob2JqKSk7CisJCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3Rf bXV0ZXgpOworCX0KIAlyZXR1cm4gMDsKIH0KIAogdm9pZCBtc21fZ2VtX3ByaW1lX3VucGluKHN0 cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqKQogewotCWlmICghb2JqLT5pbXBvcnRfYXR0YWNoKQot CQltc21fZ2VtX3B1dF9wYWdlcyhvYmopOworCWlmICghb2JqLT5pbXBvcnRfYXR0YWNoKSB7CisJ CXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBvYmotPmRldjsKKworCQltdXRleF9sb2NrKCZkZXYt PnN0cnVjdF9tdXRleCk7CisJCWV0bmF2aXZfZ2VtX3B1dF9wYWdlcyh0b19ldG5hdml2X2JvKG9i aikpOworCQltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKKwl9CiB9CiAKIHN0YXRp YyB2b2lkIGV0bmF2aXZfZ2VtX3ByaW1lX3JlbGVhc2Uoc3RydWN0IGV0bmF2aXZfZ2VtX29iamVj dCAqZXRuYXZpdl9vYmopCi0tIAoyLjEuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9kcmktZGV2ZWwK