From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lucas Stach Subject: [PATCH RFC 039/111] staging: etnaviv: move msm_gem_import() etc to etnaviv_gem_prime.c Date: Thu, 2 Apr 2015 17:29:41 +0200 Message-ID: <1427988653-754-40-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 240996EA55 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 ZSBwcmltZSBpbXBvcnQgY29kZSBvdXQgaW50byBldG5hdml2X2dlbV9wcmltZS5jLCB3aGljaCBr ZWVwcwphbGwgdGhpcyBmdW5jdGlvbmFsaXR5IHRvZ2V0aGVyLgoKU2lnbmVkLW9mZi1ieTogUnVz c2VsbCBLaW5nIDxybWsra2VybmVsQGFybS5saW51eC5vcmcudWs+Ci0tLQogZHJpdmVycy9zdGFn aW5nL2V0bmF2aXYvZXRuYXZpdl9nZW0uYyAgICAgICB8IDU1IC0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tCiBkcml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2X2dlbV9wcmltZS5jIHwg NTUgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIDIgZmlsZXMgY2hhbmdlZCwgNTUgaW5z ZXJ0aW9ucygrKSwgNTUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9zdGFnaW5n L2V0bmF2aXYvZXRuYXZpdl9nZW0uYyBiL2RyaXZlcnMvc3RhZ2luZy9ldG5hdml2L2V0bmF2aXZf Z2VtLmMKaW5kZXggMTg1Y2QxNzAyYjJlLi4xY2Q1YzZiYzI1MzIgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvc3RhZ2luZy9ldG5hdml2L2V0bmF2aXZfZ2VtLmMKKysrIGIvZHJpdmVycy9zdGFnaW5nL2V0 bmF2aXYvZXRuYXZpdl9nZW0uYwpAQCAtMTcsNyArMTcsNiBAQAogCiAjaW5jbHVkZSA8bGludXgv c3BpbmxvY2suaD4KICNpbmNsdWRlIDxsaW51eC9zaG1lbV9mcy5oPgotI2luY2x1ZGUgPGxpbnV4 L2RtYS1idWYuaD4KIAogI2luY2x1ZGUgImV0bmF2aXZfZHJ2LmgiCiAjaW5jbHVkZSAiZXRuYXZp dl9nZW0uaCIKQEAgLTcwMiw1NyArNzAxLDMgQEAgaW50IGV0bmF2aXZfZ2VtX25ld19wcml2YXRl KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHNpemVfdCBzaXplLCB1aW50MzJfdCBmbGFncywKIAog CXJldHVybiAwOwogfQotCi1zdGF0aWMgdm9pZCBldG5hdml2X2dlbV9wcmltZV9yZWxlYXNlKHN0 cnVjdCBldG5hdml2X2dlbV9vYmplY3QgKmV0bmF2aXZfb2JqKQotewotCWlmIChldG5hdml2X29i ai0+dmFkZHIpCi0JCWRtYV9idWZfdnVubWFwKGV0bmF2aXZfb2JqLT5iYXNlLmltcG9ydF9hdHRh Y2gtPmRtYWJ1ZiwKLQkJCSAgICAgICBldG5hdml2X29iai0+dmFkZHIpOwotCi0JLyogRG9uJ3Qg ZHJvcCB0aGUgcGFnZXMgZm9yIGltcG9ydGVkIGRtYWJ1ZiwgYXMgdGhleSBhcmUgbm90Ci0JICog b3VycywganVzdCBmcmVlIHRoZSBhcnJheSB3ZSBhbGxvY2F0ZWQ6Ci0JICovCi0JaWYgKGV0bmF2 aXZfb2JqLT5wYWdlcykKLQkJZHJtX2ZyZWVfbGFyZ2UoZXRuYXZpdl9vYmotPnBhZ2VzKTsKLQot CWRybV9wcmltZV9nZW1fZGVzdHJveSgmZXRuYXZpdl9vYmotPmJhc2UsIGV0bmF2aXZfb2JqLT5z Z3QpOwotfQotCi1zdGF0aWMgY29uc3Qgc3RydWN0IGV0bmF2aXZfZ2VtX29wcyBldG5hdml2X2dl bV9wcmltZV9vcHMgPSB7Ci0JLnJlbGVhc2UgPSBldG5hdml2X2dlbV9wcmltZV9yZWxlYXNlLAot fTsKLQotc3RydWN0IGRybV9nZW1fb2JqZWN0ICptc21fZ2VtX2ltcG9ydChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LAotCQl1aW50MzJfdCBzaXplLCBzdHJ1Y3Qgc2dfdGFibGUgKnNndCkKLXsKLQlz dHJ1Y3QgZXRuYXZpdl9nZW1fb2JqZWN0ICpldG5hdml2X29iajsKLQlpbnQgcmV0LCBucGFnZXM7 Ci0KLQlzaXplID0gUEFHRV9BTElHTihzaXplKTsKLQotCXJldCA9IGV0bmF2aXZfZ2VtX25ld19w cml2YXRlKGRldiwgc2l6ZSwgRVROQV9CT19XQywgJmV0bmF2aXZfb2JqKTsKLQlpZiAocmV0IDwg MCkKLQkJcmV0dXJuIEVSUl9QVFIocmV0KTsKLQotCW5wYWdlcyA9IHNpemUgLyBQQUdFX1NJWkU7 Ci0KLQlldG5hdml2X29iai0+b3BzID0gJmV0bmF2aXZfZ2VtX3ByaW1lX29wczsKLQlldG5hdml2 X29iai0+c2d0ID0gc2d0OwotCWV0bmF2aXZfb2JqLT5wYWdlcyA9IGRybV9tYWxsb2NfYWIobnBh Z2VzLCBzaXplb2Yoc3RydWN0IHBhZ2UgKikpOwotCWlmICghZXRuYXZpdl9vYmotPnBhZ2VzKSB7 Ci0JCXJldCA9IC1FTk9NRU07Ci0JCWdvdG8gZmFpbDsKLQl9Ci0KLQlyZXQgPSBkcm1fcHJpbWVf c2dfdG9fcGFnZV9hZGRyX2FycmF5cyhzZ3QsIGV0bmF2aXZfb2JqLT5wYWdlcywKLQkJCQkJICAg ICAgIE5VTEwsIG5wYWdlcyk7Ci0JaWYgKHJldCkKLQkJZ290byBmYWlsOwotCi0JcmV0dXJuICZl dG5hdml2X29iai0+YmFzZTsKLQotZmFpbDoKLQlkcm1fZ2VtX29iamVjdF91bnJlZmVyZW5jZV91 bmxvY2tlZCgmZXRuYXZpdl9vYmotPmJhc2UpOwotCi0JcmV0dXJuIEVSUl9QVFIocmV0KTsKLX0K ZGlmZiAtLWdpdCBhL2RyaXZlcnMvc3RhZ2luZy9ldG5hdml2L2V0bmF2aXZfZ2VtX3ByaW1lLmMg Yi9kcml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2X2dlbV9wcmltZS5jCmluZGV4IDljMTUy YjU2NDBiYy4uNGNmOWUwNDNjNjA0IDEwMDY0NAotLS0gYS9kcml2ZXJzL3N0YWdpbmcvZXRuYXZp di9ldG5hdml2X2dlbV9wcmltZS5jCisrKyBiL2RyaXZlcnMvc3RhZ2luZy9ldG5hdml2L2V0bmF2 aXZfZ2VtX3ByaW1lLmMKQEAgLTE1LDYgKzE1LDcgQEAKICAqIHRoaXMgcHJvZ3JhbS4gIElmIG5v dCwgc2VlIDxodHRwOi8vd3d3LmdudS5vcmcvbGljZW5zZXMvPi4KICAqLwogCisjaW5jbHVkZSA8 bGludXgvZG1hLWJ1Zi5oPgogI2luY2x1ZGUgImV0bmF2aXZfZHJ2LmgiCiAjaW5jbHVkZSAiZXRu YXZpdl9nZW0uaCIKIApAQCAtNTYsMyArNTcsNTcgQEAgdm9pZCBtc21fZ2VtX3ByaW1lX3VucGlu KHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqKQogCWlmICghb2JqLT5pbXBvcnRfYXR0YWNoKQog CQltc21fZ2VtX3B1dF9wYWdlcyhvYmopOwogfQorCitzdGF0aWMgdm9pZCBldG5hdml2X2dlbV9w cmltZV9yZWxlYXNlKHN0cnVjdCBldG5hdml2X2dlbV9vYmplY3QgKmV0bmF2aXZfb2JqKQorewor CWlmIChldG5hdml2X29iai0+dmFkZHIpCisJCWRtYV9idWZfdnVubWFwKGV0bmF2aXZfb2JqLT5i YXNlLmltcG9ydF9hdHRhY2gtPmRtYWJ1ZiwKKwkJCSAgICAgICBldG5hdml2X29iai0+dmFkZHIp OworCisJLyogRG9uJ3QgZHJvcCB0aGUgcGFnZXMgZm9yIGltcG9ydGVkIGRtYWJ1ZiwgYXMgdGhl eSBhcmUgbm90CisJICogb3VycywganVzdCBmcmVlIHRoZSBhcnJheSB3ZSBhbGxvY2F0ZWQ6CisJ ICovCisJaWYgKGV0bmF2aXZfb2JqLT5wYWdlcykKKwkJZHJtX2ZyZWVfbGFyZ2UoZXRuYXZpdl9v YmotPnBhZ2VzKTsKKworCWRybV9wcmltZV9nZW1fZGVzdHJveSgmZXRuYXZpdl9vYmotPmJhc2Us IGV0bmF2aXZfb2JqLT5zZ3QpOworfQorCitzdGF0aWMgY29uc3Qgc3RydWN0IGV0bmF2aXZfZ2Vt X29wcyBldG5hdml2X2dlbV9wcmltZV9vcHMgPSB7CisJLnJlbGVhc2UgPSBldG5hdml2X2dlbV9w cmltZV9yZWxlYXNlLAorfTsKKworc3RydWN0IGRybV9nZW1fb2JqZWN0ICptc21fZ2VtX2ltcG9y dChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAorCQl1aW50MzJfdCBzaXplLCBzdHJ1Y3Qgc2dfdGFi bGUgKnNndCkKK3sKKwlzdHJ1Y3QgZXRuYXZpdl9nZW1fb2JqZWN0ICpldG5hdml2X29iajsKKwlp bnQgcmV0LCBucGFnZXM7CisKKwlzaXplID0gUEFHRV9BTElHTihzaXplKTsKKworCXJldCA9IGV0 bmF2aXZfZ2VtX25ld19wcml2YXRlKGRldiwgc2l6ZSwgRVROQV9CT19XQywgJmV0bmF2aXZfb2Jq KTsKKwlpZiAocmV0IDwgMCkKKwkJcmV0dXJuIEVSUl9QVFIocmV0KTsKKworCW5wYWdlcyA9IHNp emUgLyBQQUdFX1NJWkU7CisKKwlldG5hdml2X29iai0+b3BzID0gJmV0bmF2aXZfZ2VtX3ByaW1l X29wczsKKwlldG5hdml2X29iai0+c2d0ID0gc2d0OworCWV0bmF2aXZfb2JqLT5wYWdlcyA9IGRy bV9tYWxsb2NfYWIobnBhZ2VzLCBzaXplb2Yoc3RydWN0IHBhZ2UgKikpOworCWlmICghZXRuYXZp dl9vYmotPnBhZ2VzKSB7CisJCXJldCA9IC1FTk9NRU07CisJCWdvdG8gZmFpbDsKKwl9CisKKwly ZXQgPSBkcm1fcHJpbWVfc2dfdG9fcGFnZV9hZGRyX2FycmF5cyhzZ3QsIGV0bmF2aXZfb2JqLT5w YWdlcywKKwkJCQkJICAgICAgIE5VTEwsIG5wYWdlcyk7CisJaWYgKHJldCkKKwkJZ290byBmYWls OworCisJcmV0dXJuICZldG5hdml2X29iai0+YmFzZTsKKworZmFpbDoKKwlkcm1fZ2VtX29iamVj dF91bnJlZmVyZW5jZV91bmxvY2tlZCgmZXRuYXZpdl9vYmotPmJhc2UpOworCisJcmV0dXJuIEVS Ul9QVFIocmV0KTsKK30KLS0gCjIuMS40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2RyaS1kZXZlbAo=