From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lucas Stach Subject: [PATCH RFC 040/111] staging: etnaviv: clean up prime import Date: Thu, 2 Apr 2015 17:29:42 +0200 Message-ID: <1427988653-754-41-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 3A2116EA45 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+CgpDbGVhbiB1 cCB0aGUgZXRuYXZpdiBwcmltZSBpbXBvcnQgaGFuZGxpbmcgYnkgY29tYmluaW5nIG1zbV9nZW1f aW1wb3J0KCkKYW5kIG1zbV9nZW1fcHJpbWVfaW1wb3J0X3NnX3RhYmxlKCksIGFuZCB0aGVuIGdp dmluZyBpdCBhbiBldG5hdml2XwpwcmVmaXguCgpTaWduZWQtb2ZmLWJ5OiBSdXNzZWxsIEtpbmcg PHJtaytrZXJuZWxAYXJtLmxpbnV4Lm9yZy51az4KLS0tCiBkcml2ZXJzL3N0YWdpbmcvZXRuYXZp di9ldG5hdml2X2Rydi5jICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvc3RhZ2luZy9ldG5hdml2L2V0 bmF2aXZfZHJ2LmggICAgICAgfCAgNiArKy0tLS0KIGRyaXZlcnMvc3RhZ2luZy9ldG5hdml2L2V0 bmF2aXZfZ2VtX3ByaW1lLmMgfCAxMyArKystLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDYg aW5zZXJ0aW9ucygrKSwgMTUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9zdGFn aW5nL2V0bmF2aXYvZXRuYXZpdl9kcnYuYyBiL2RyaXZlcnMvc3RhZ2luZy9ldG5hdml2L2V0bmF2 aXZfZHJ2LmMKaW5kZXggMmQ0NGZjZDcyOTllLi4yYjY4MDBhNzgyYmIgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvc3RhZ2luZy9ldG5hdml2L2V0bmF2aXZfZHJ2LmMKKysrIGIvZHJpdmVycy9zdGFnaW5n L2V0bmF2aXYvZXRuYXZpdl9kcnYuYwpAQCAtNTA4LDcgKzUwOCw3IEBAIHN0YXRpYyBzdHJ1Y3Qg ZHJtX2RyaXZlciBldG5hdml2X2RybV9kcml2ZXIgPSB7CiAJLmdlbV9wcmltZV9waW4gICAgICA9 IG1zbV9nZW1fcHJpbWVfcGluLAogCS5nZW1fcHJpbWVfdW5waW4gICAgPSBtc21fZ2VtX3ByaW1l X3VucGluLAogCS5nZW1fcHJpbWVfZ2V0X3NnX3RhYmxlID0gbXNtX2dlbV9wcmltZV9nZXRfc2df dGFibGUsCi0JLmdlbV9wcmltZV9pbXBvcnRfc2dfdGFibGUgPSBtc21fZ2VtX3ByaW1lX2ltcG9y dF9zZ190YWJsZSwKKwkuZ2VtX3ByaW1lX2ltcG9ydF9zZ190YWJsZSA9IGV0bmF2aXZfZ2VtX3By aW1lX2ltcG9ydF9zZ190YWJsZSwKIAkuZ2VtX3ByaW1lX3ZtYXAgICAgID0gbXNtX2dlbV9wcmlt ZV92bWFwLAogCS5nZW1fcHJpbWVfdnVubWFwICAgPSBtc21fZ2VtX3ByaW1lX3Z1bm1hcCwKICNp ZmRlZiBDT05GSUdfREVCVUdfRlMKZGlmZiAtLWdpdCBhL2RyaXZlcnMvc3RhZ2luZy9ldG5hdml2 L2V0bmF2aXZfZHJ2LmggYi9kcml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2X2Rydi5oCmlu ZGV4IGExNTQzNzM0YmMyZi4uYmRmNjY4NWVmNmNjIDEwMDY0NAotLS0gYS9kcml2ZXJzL3N0YWdp bmcvZXRuYXZpdi9ldG5hdml2X2Rydi5oCisrKyBiL2RyaXZlcnMvc3RhZ2luZy9ldG5hdml2L2V0 bmF2aXZfZHJ2LmgKQEAgLTkxLDggKzkxLDggQEAgaW50IG1zbV9nZW1fZHVtYl9tYXBfb2Zmc2V0 KHN0cnVjdCBkcm1fZmlsZSAqZmlsZSwgc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIHN0cnVjdCBz Z190YWJsZSAqbXNtX2dlbV9wcmltZV9nZXRfc2dfdGFibGUoc3RydWN0IGRybV9nZW1fb2JqZWN0 ICpvYmopOwogdm9pZCAqbXNtX2dlbV9wcmltZV92bWFwKHN0cnVjdCBkcm1fZ2VtX29iamVjdCAq b2JqKTsKIHZvaWQgbXNtX2dlbV9wcmltZV92dW5tYXAoc3RydWN0IGRybV9nZW1fb2JqZWN0ICpv YmosIHZvaWQgKnZhZGRyKTsKLXN0cnVjdCBkcm1fZ2VtX29iamVjdCAqbXNtX2dlbV9wcmltZV9p bXBvcnRfc2dfdGFibGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKLQkJc2l6ZV90IHNpemUsIHN0 cnVjdCBzZ190YWJsZSAqc2cpOworc3RydWN0IGRybV9nZW1fb2JqZWN0ICpldG5hdml2X2dlbV9w cmltZV9pbXBvcnRfc2dfdGFibGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKKwkJc3RydWN0IGRt YV9idWZfYXR0YWNobWVudCAqYXR0YWNoLCBzdHJ1Y3Qgc2dfdGFibGUgKnNnKTsKIGludCBtc21f Z2VtX3ByaW1lX3BpbihzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaik7CiB2b2lkIG1zbV9nZW1f cHJpbWVfdW5waW4oc3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmopOwogdm9pZCAqZXRuYXZpdl9n ZW1fdmFkZHJfbG9ja2VkKHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqKTsKQEAgLTEwOSw4ICsx MDksNiBAQCBpbnQgZXRuYXZpdl9nZW1fbmV3X2hhbmRsZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUsCiAJCXVpbnQzMl90IHNpemUsIHVpbnQzMl90IGZsYWdz LCB1aW50MzJfdCAqaGFuZGxlKTsKIHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqZXRuYXZpdl9nZW1f bmV3KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCXVpbnQzMl90IHNpemUsIHVpbnQzMl90IGZs YWdzKTsKLXN0cnVjdCBkcm1fZ2VtX29iamVjdCAqbXNtX2dlbV9pbXBvcnQoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwKLQkJdWludDMyX3Qgc2l6ZSwgc3RydWN0IHNnX3RhYmxlICpzZ3QpOwogdTMy IGV0bmF2aXZfYnVmZmVyX2luaXQoc3RydWN0IGV0bmF2aXZfZ3B1ICpncHUpOwogdm9pZCBldG5h dml2X2J1ZmZlcl9xdWV1ZShzdHJ1Y3QgZXRuYXZpdl9ncHUgKmdwdSwgdW5zaWduZWQgaW50IGV2 ZW50LAogCXN0cnVjdCBldG5hdml2X2dlbV9zdWJtaXQgKnN1Ym1pdCk7CmRpZmYgLS1naXQgYS9k cml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2X2dlbV9wcmltZS5jIGIvZHJpdmVycy9zdGFn aW5nL2V0bmF2aXYvZXRuYXZpdl9nZW1fcHJpbWUuYwppbmRleCA0Y2Y5ZTA0M2M2MDQuLmQ5NzQy YWUxZmFkMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZpdl9nZW1f cHJpbWUuYworKysgYi9kcml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2X2dlbV9wcmltZS5j CkBAIC0zOSwxMiArMzksNiBAQCB2b2lkIG1zbV9nZW1fcHJpbWVfdnVubWFwKHN0cnVjdCBkcm1f Z2VtX29iamVjdCAqb2JqLCB2b2lkICp2YWRkcikKIAkvKiBUT0RPIG1zbV9nZW1fdnVubWFwKCkg Ki8KIH0KIAotc3RydWN0IGRybV9nZW1fb2JqZWN0ICptc21fZ2VtX3ByaW1lX2ltcG9ydF9zZ190 YWJsZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAotCQlzaXplX3Qgc2l6ZSwgc3RydWN0IHNnX3Rh YmxlICpzZykKLXsKLQlyZXR1cm4gbXNtX2dlbV9pbXBvcnQoZGV2LCBzaXplLCBzZyk7Ci19Ci0K IGludCBtc21fZ2VtX3ByaW1lX3BpbihzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaikKIHsKIAlp ZiAoIW9iai0+aW1wb3J0X2F0dGFjaCkKQEAgLTc3LDE0ICs3MSwxMyBAQCBzdGF0aWMgY29uc3Qg c3RydWN0IGV0bmF2aXZfZ2VtX29wcyBldG5hdml2X2dlbV9wcmltZV9vcHMgPSB7CiAJLnJlbGVh c2UgPSBldG5hdml2X2dlbV9wcmltZV9yZWxlYXNlLAogfTsKIAotc3RydWN0IGRybV9nZW1fb2Jq ZWN0ICptc21fZ2VtX2ltcG9ydChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAotCQl1aW50MzJfdCBz aXplLCBzdHJ1Y3Qgc2dfdGFibGUgKnNndCkKK3N0cnVjdCBkcm1fZ2VtX29iamVjdCAqZXRuYXZp dl9nZW1fcHJpbWVfaW1wb3J0X3NnX3RhYmxlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCisJc3Ry dWN0IGRtYV9idWZfYXR0YWNobWVudCAqYXR0YWNoLCBzdHJ1Y3Qgc2dfdGFibGUgKnNndCkKIHsK IAlzdHJ1Y3QgZXRuYXZpdl9nZW1fb2JqZWN0ICpldG5hdml2X29iajsKKwlzaXplX3Qgc2l6ZSA9 IFBBR0VfQUxJR04oYXR0YWNoLT5kbWFidWYtPnNpemUpOwogCWludCByZXQsIG5wYWdlczsKIAot CXNpemUgPSBQQUdFX0FMSUdOKHNpemUpOwotCiAJcmV0ID0gZXRuYXZpdl9nZW1fbmV3X3ByaXZh dGUoZGV2LCBzaXplLCBFVE5BX0JPX1dDLCAmZXRuYXZpdl9vYmopOwogCWlmIChyZXQgPCAwKQog CQlyZXR1cm4gRVJSX1BUUihyZXQpOwotLSAKMi4xLjQKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVs QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vZHJpLWRldmVsCg==