From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laurent Pinchart Subject: [PATCH 1/6] drm/omap: gem: Rename GEM function with omap_gem_* prefix Date: Mon, 2 Apr 2018 21:50:33 +0300 Message-ID: <20180402185038.18418-2-laurent.pinchart@ideasonboard.com> References: <20180402185038.18418-1-laurent.pinchart@ideasonboard.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from galahad.ideasonboard.com (galahad.ideasonboard.com [IPv6:2001:4b98:dc2:45:216:3eff:febb:480d]) by gabe.freedesktop.org (Postfix) with ESMTPS id 79BEB6E23F for ; Mon, 2 Apr 2018 18:50:34 +0000 (UTC) In-Reply-To: <20180402185038.18418-1-laurent.pinchart@ideasonboard.com> 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: Daniel Vetter , Tomi Valkeinen List-Id: dri-devel@lists.freedesktop.org Z2V0X3BhZ2VzKCkgYXMgYSBsb2NhbCBmdW5jdGlvbiBuYW1lIGlzIHRvbyBnZW5lcmljIGFuZCBl YXNpbHkgY29uZnVzZWQKZm9yIGEgZ2VuZXJpYyBNTSBrZXJuZWwgZnVuY3Rpb24uIFJlbmFtZSBp dCB0byBfX29tYXBfZ2VtX2dldF9wYWdlcygpLgoKUmVuYW1lIHRoZSBpc19jb250aWd1b3VzKCks IGlzX2NhY2hlX2NvaGVyZW50KCksIGV2aWN0KCksIGV2aWN0X2VudHJ5KCksCmZhdWx0XzFkKCkg YW5kIGZhdWx0XzJkKCkgZnVuY3Rpb25zIGZvciB0aGUgc2FtZSByZWFzb24uCgpTaWduZWQtb2Zm LWJ5OiBMYXVyZW50IFBpbmNoYXJ0IDxsYXVyZW50LnBpbmNoYXJ0QGlkZWFzb25ib2FyZC5jb20+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL29tYXBkcm0vb21hcF9nZW0uYyB8IDQ4ICsrKysrKysrKysr KysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjYgaW5zZXJ0aW9u cygrKSwgMjIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL29tYXBk cm0vb21hcF9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9vbWFwZHJtL29tYXBfZ2VtLmMKaW5kZXgg MGZhZjA0MmI4MmUxLi42Y2ZjZjYwY2ZmZTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9v bWFwZHJtL29tYXBfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL29tYXBkcm0vb21hcF9nZW0u YwpAQCAtMTU2LDcgKzE1Niw3IEBAIHN0YXRpYyB1NjQgbW1hcF9vZmZzZXQoc3RydWN0IGRybV9n ZW1fb2JqZWN0ICpvYmopCiAJcmV0dXJuIGRybV92bWFfbm9kZV9vZmZzZXRfYWRkcigmb2JqLT52 bWFfbm9kZSk7CiB9CiAKLXN0YXRpYyBib29sIGlzX2NvbnRpZ3VvdXMoc3RydWN0IG9tYXBfZ2Vt X29iamVjdCAqb21hcF9vYmopCitzdGF0aWMgYm9vbCBvbWFwX2dlbV9pc19jb250aWd1b3VzKHN0 cnVjdCBvbWFwX2dlbV9vYmplY3QgKm9tYXBfb2JqKQogewogCWlmIChvbWFwX29iai0+ZmxhZ3Mg JiBPTUFQX0JPX01FTV9ETUFfQVBJKQogCQlyZXR1cm4gdHJ1ZTsKQEAgLTE3MSw3ICsxNzEsNyBA QCBzdGF0aWMgYm9vbCBpc19jb250aWd1b3VzKHN0cnVjdCBvbWFwX2dlbV9vYmplY3QgKm9tYXBf b2JqKQogICogRXZpY3Rpb24KICAqLwogCi1zdGF0aWMgdm9pZCBldmljdF9lbnRyeShzdHJ1Y3Qg ZHJtX2dlbV9vYmplY3QgKm9iaiwKK3N0YXRpYyB2b2lkIG9tYXBfZ2VtX2V2aWN0X2VudHJ5KHN0 cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqLAogCQllbnVtIHRpbGVyX2ZtdCBmbXQsIHN0cnVjdCBv bWFwX2RybV91c2VyZ2FydF9lbnRyeSAqZW50cnkpCiB7CiAJc3RydWN0IG9tYXBfZ2VtX29iamVj dCAqb21hcF9vYmogPSB0b19vbWFwX2JvKG9iaik7CkBAIC0xOTksNyArMTk5LDcgQEAgc3RhdGlj IHZvaWQgZXZpY3RfZW50cnkoc3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmosCiB9CiAKIC8qIEV2 aWN0IGEgYnVmZmVyIGZyb20gdXNlcmdhcnQsIGlmIGl0IGlzIG1hcHBlZCB0aGVyZSAqLwotc3Rh dGljIHZvaWQgZXZpY3Qoc3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmopCitzdGF0aWMgdm9pZCBv bWFwX2dlbV9ldmljdChzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaikKIHsKIAlzdHJ1Y3Qgb21h cF9nZW1fb2JqZWN0ICpvbWFwX29iaiA9IHRvX29tYXBfYm8ob2JqKTsKIAlzdHJ1Y3Qgb21hcF9k cm1fcHJpdmF0ZSAqcHJpdiA9IG9iai0+ZGV2LT5kZXZfcHJpdmF0ZTsKQEAgLTIxMyw3ICsyMTMs NyBAQCBzdGF0aWMgdm9pZCBldmljdChzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaikKIAkJCQkm cHJpdi0+dXNlcmdhcnRbZm10XS5lbnRyeVtpXTsKIAogCQkJaWYgKGVudHJ5LT5vYmogPT0gb2Jq KQotCQkJCWV2aWN0X2VudHJ5KG9iaiwgZm10LCBlbnRyeSk7CisJCQkJb21hcF9nZW1fZXZpY3Rf ZW50cnkob2JqLCBmbXQsIGVudHJ5KTsKIAkJfQogCX0KIH0KQEAgLTI5MSw3ICsyOTEsOCBAQCBz dGF0aWMgaW50IG9tYXBfZ2VtX2F0dGFjaF9wYWdlcyhzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9i aikKIC8qIGFjcXVpcmUgcGFnZXMgd2hlbiBuZWVkZWQgKGZvciBleGFtcGxlLCBmb3IgRE1BIHdo ZXJlIHBoeXNpY2FsbHkKICAqIGNvbnRpZ3VvdXMgYnVmZmVyIGlzIG5vdCByZXF1aXJlZAogICov Ci1zdGF0aWMgaW50IGdldF9wYWdlcyhzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaiwgc3RydWN0 IHBhZ2UgKioqcGFnZXMpCitzdGF0aWMgaW50IF9fb21hcF9nZW1fZ2V0X3BhZ2VzKHN0cnVjdCBk cm1fZ2VtX29iamVjdCAqb2JqLAorCQkJCXN0cnVjdCBwYWdlICoqKnBhZ2VzKQogewogCXN0cnVj dCBvbWFwX2dlbV9vYmplY3QgKm9tYXBfb2JqID0gdG9fb21hcF9ibyhvYmopOwogCWludCByZXQg PSAwOwpAQCAtMzcxLDcgKzM3Miw3IEBAIHNpemVfdCBvbWFwX2dlbV9tbWFwX3NpemUoc3RydWN0 IGRybV9nZW1fb2JqZWN0ICpvYmopCiAgKi8KIAogLyogTm9ybWFsIGhhbmRsaW5nIGZvciB0aGUg Y2FzZSBvZiBmYXVsdGluZyBpbiBub24tdGlsZWQgYnVmZmVycyAqLwotc3RhdGljIGludCBmYXVs dF8xZChzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaiwKK3N0YXRpYyBpbnQgb21hcF9nZW1fZmF1 bHRfMWQoc3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmosCiAJCXN0cnVjdCB2bV9hcmVhX3N0cnVj dCAqdm1hLCBzdHJ1Y3Qgdm1fZmF1bHQgKnZtZikKIHsKIAlzdHJ1Y3Qgb21hcF9nZW1fb2JqZWN0 ICpvbWFwX29iaiA9IHRvX29tYXBfYm8ob2JqKTsKQEAgLTM4NSw3ICszODYsNyBAQCBzdGF0aWMg aW50IGZhdWx0XzFkKHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqLAogCQlvbWFwX2dlbV9jcHVf c3luY19wYWdlKG9iaiwgcGdvZmYpOwogCQlwZm4gPSBwYWdlX3RvX3BmbihvbWFwX29iai0+cGFn ZXNbcGdvZmZdKTsKIAl9IGVsc2UgewotCQlCVUdfT04oIWlzX2NvbnRpZ3VvdXMob21hcF9vYmop KTsKKwkJQlVHX09OKCFvbWFwX2dlbV9pc19jb250aWd1b3VzKG9tYXBfb2JqKSk7CiAJCXBmbiA9 IChvbWFwX29iai0+ZG1hX2FkZHIgPj4gUEFHRV9TSElGVCkgKyBwZ29mZjsKIAl9CiAKQEAgLTM5 Niw3ICszOTcsNyBAQCBzdGF0aWMgaW50IGZhdWx0XzFkKHN0cnVjdCBkcm1fZ2VtX29iamVjdCAq b2JqLAogfQogCiAvKiBTcGVjaWFsIGhhbmRsaW5nIGZvciB0aGUgY2FzZSBvZiBmYXVsdGluZyBp biAyZCB0aWxlZCBidWZmZXJzICovCi1zdGF0aWMgaW50IGZhdWx0XzJkKHN0cnVjdCBkcm1fZ2Vt X29iamVjdCAqb2JqLAorc3RhdGljIGludCBvbWFwX2dlbV9mYXVsdF8yZChzdHJ1Y3QgZHJtX2dl bV9vYmplY3QgKm9iaiwKIAkJc3RydWN0IHZtX2FyZWFfc3RydWN0ICp2bWEsIHN0cnVjdCB2bV9m YXVsdCAqdm1mKQogewogCXN0cnVjdCBvbWFwX2dlbV9vYmplY3QgKm9tYXBfb2JqID0gdG9fb21h cF9ibyhvYmopOwpAQCAtNDQzLDcgKzQ0NCw3IEBAIHN0YXRpYyBpbnQgZmF1bHRfMmQoc3RydWN0 IGRybV9nZW1fb2JqZWN0ICpvYmosCiAKIAkvKiBldmljdCBwcmV2aW91cyBidWZmZXIgdXNpbmcg dGhpcyB1c2VyZ2FydCBlbnRyeSwgaWYgYW55OiAqLwogCWlmIChlbnRyeS0+b2JqKQotCQlldmlj dF9lbnRyeShlbnRyeS0+b2JqLCBmbXQsIGVudHJ5KTsKKwkJb21hcF9nZW1fZXZpY3RfZW50cnko ZW50cnktPm9iaiwgZm10LCBlbnRyeSk7CiAKIAllbnRyeS0+b2JqID0gb2JqOwogCWVudHJ5LT5v YmpfcGdvZmYgPSBiYXNlX3Bnb2ZmOwpAQCAtNTI0LDcgKzUyNSw3IEBAIGludCBvbWFwX2dlbV9m YXVsdChzdHJ1Y3Qgdm1fZmF1bHQgKnZtZikKIAltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRl eCk7CiAKIAkvKiBpZiBhIHNobWVtIGJhY2tlZCBvYmplY3QsIG1ha2Ugc3VyZSB3ZSBoYXZlIHBh Z2VzIGF0dGFjaGVkIG5vdyAqLwotCXJldCA9IGdldF9wYWdlcyhvYmosICZwYWdlcyk7CisJcmV0 ID0gX19vbWFwX2dlbV9nZXRfcGFnZXMob2JqLCAmcGFnZXMpOwogCWlmIChyZXQpCiAJCWdvdG8g ZmFpbDsKIApAQCAtNTM1LDkgKzUzNiw5IEBAIGludCBvbWFwX2dlbV9mYXVsdChzdHJ1Y3Qgdm1f ZmF1bHQgKnZtZikKIAkgKi8KIAogCWlmIChvbWFwX29iai0+ZmxhZ3MgJiBPTUFQX0JPX1RJTEVE KQotCQlyZXQgPSBmYXVsdF8yZChvYmosIHZtYSwgdm1mKTsKKwkJcmV0ID0gb21hcF9nZW1fZmF1 bHRfMmQob2JqLCB2bWEsIHZtZik7CiAJZWxzZQotCQlyZXQgPSBmYXVsdF8xZChvYmosIHZtYSwg dm1mKTsKKwkJcmV0ID0gb21hcF9nZW1fZmF1bHRfMWQob2JqLCB2bWEsIHZtZik7CiAKIAogZmFp bDoKQEAgLTY5NCw3ICs2OTUsOCBAQCBpbnQgb21hcF9nZW1fcm9sbChzdHJ1Y3QgZHJtX2dlbV9v YmplY3QgKm9iaiwgdTMyIHJvbGwpCiAJLyogaWYgd2UgYXJlbid0IG1hcHBlZCB5ZXQsIHdlIGRv bid0IG5lZWQgdG8gZG8gYW55dGhpbmcgKi8KIAlpZiAob21hcF9vYmotPmJsb2NrKSB7CiAJCXN0 cnVjdCBwYWdlICoqcGFnZXM7Ci0JCXJldCA9IGdldF9wYWdlcyhvYmosICZwYWdlcyk7CisKKwkJ cmV0ID0gX19vbWFwX2dlbV9nZXRfcGFnZXMob2JqLCAmcGFnZXMpOwogCQlpZiAocmV0KQogCQkJ Z290byBmYWlsOwogCQlyZXQgPSB0aWxlcl9waW4ob21hcF9vYmotPmJsb2NrLCBwYWdlcywgbnBh Z2VzLCByb2xsLCB0cnVlKTsKQEAgLTcyMiw3ICs3MjQsNyBAQCBpbnQgb21hcF9nZW1fcm9sbChz dHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaiwgdTMyIHJvbGwpCiAgKiB0aGUgb21hcF9vYmotPmRt YV9hZGRyc1tpXSBpcyBzZXQgdG8gdGhlIERNQSBhZGRyZXNzLCBhbmQgdGhlIHBhZ2UgaXMKICAq IHVubWFwcGVkIGZyb20gdGhlIENQVS4KICAqLwotc3RhdGljIGlubGluZSBib29sIGlzX2NhY2hl ZF9jb2hlcmVudChzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaikKK3N0YXRpYyBpbmxpbmUgYm9v bCBvbWFwX2dlbV9pc19jYWNoZWRfY29oZXJlbnQoc3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmop CiB7CiAJc3RydWN0IG9tYXBfZ2VtX29iamVjdCAqb21hcF9vYmogPSB0b19vbWFwX2JvKG9iaik7 CiAKQEAgLTczOCw3ICs3NDAsNyBAQCB2b2lkIG9tYXBfZ2VtX2NwdV9zeW5jX3BhZ2Uoc3RydWN0 IGRybV9nZW1fb2JqZWN0ICpvYmosIGludCBwZ29mZikKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 ID0gb2JqLT5kZXY7CiAJc3RydWN0IG9tYXBfZ2VtX29iamVjdCAqb21hcF9vYmogPSB0b19vbWFw X2JvKG9iaik7CiAKLQlpZiAoaXNfY2FjaGVkX2NvaGVyZW50KG9iaikpCisJaWYgKG9tYXBfZ2Vt X2lzX2NhY2hlZF9jb2hlcmVudChvYmopKQogCQlyZXR1cm47CiAKIAlpZiAob21hcF9vYmotPmRt YV9hZGRyc1twZ29mZl0pIHsKQEAgLTc1OCw3ICs3NjAsNyBAQCB2b2lkIG9tYXBfZ2VtX2RtYV9z eW5jX2J1ZmZlcihzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaiwKIAlzdHJ1Y3QgcGFnZSAqKnBh Z2VzID0gb21hcF9vYmotPnBhZ2VzOwogCWJvb2wgZGlydHkgPSBmYWxzZTsKIAotCWlmIChpc19j YWNoZWRfY29oZXJlbnQob2JqKSkKKwlpZiAob21hcF9nZW1faXNfY2FjaGVkX2NvaGVyZW50KG9i aikpCiAJCXJldHVybjsKIAogCWZvciAoaSA9IDA7IGkgPCBucGFnZXM7IGkrKykgewpAQCAtODA2 LDcgKzgwOCw3IEBAIGludCBvbWFwX2dlbV9waW4oc3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmos IGRtYV9hZGRyX3QgKmRtYV9hZGRyKQogCiAJbXV0ZXhfbG9jaygmb2JqLT5kZXYtPnN0cnVjdF9t dXRleCk7CiAKLQlpZiAoIWlzX2NvbnRpZ3VvdXMob21hcF9vYmopICYmIHByaXYtPmhhc19kbW0p IHsKKwlpZiAoIW9tYXBfZ2VtX2lzX2NvbnRpZ3VvdXMob21hcF9vYmopICYmIHByaXYtPmhhc19k bW0pIHsKIAkJaWYgKG9tYXBfb2JqLT5kbWFfYWRkcl9jbnQgPT0gMCkgewogCQkJc3RydWN0IHBh Z2UgKipwYWdlczsKIAkJCXUzMiBucGFnZXMgPSBvYmotPnNpemUgPj4gUEFHRV9TSElGVDsKQEAg LTgxNSw3ICs4MTcsNyBAQCBpbnQgb21hcF9nZW1fcGluKHN0cnVjdCBkcm1fZ2VtX29iamVjdCAq b2JqLCBkbWFfYWRkcl90ICpkbWFfYWRkcikKIAogCQkJQlVHX09OKG9tYXBfb2JqLT5ibG9jayk7 CiAKLQkJCXJldCA9IGdldF9wYWdlcyhvYmosICZwYWdlcyk7CisJCQlyZXQgPSBfX29tYXBfZ2Vt X2dldF9wYWdlcyhvYmosICZwYWdlcyk7CiAJCQlpZiAocmV0KQogCQkJCWdvdG8gZmFpbDsKIApA QCAtODUzLDcgKzg1NSw3IEBAIGludCBvbWFwX2dlbV9waW4oc3RydWN0IGRybV9nZW1fb2JqZWN0 ICpvYmosIGRtYV9hZGRyX3QgKmRtYV9hZGRyKQogCQlvbWFwX29iai0+ZG1hX2FkZHJfY250Kys7 CiAKIAkJKmRtYV9hZGRyID0gb21hcF9vYmotPmRtYV9hZGRyOwotCX0gZWxzZSBpZiAoaXNfY29u dGlndW91cyhvbWFwX29iaikpIHsKKwl9IGVsc2UgaWYgKG9tYXBfZ2VtX2lzX2NvbnRpZ3VvdXMo b21hcF9vYmopKSB7CiAJCSpkbWFfYWRkciA9IG9tYXBfb2JqLT5kbWFfYWRkcjsKIAl9IGVsc2Ug ewogCQlyZXQgPSAtRUlOVkFMOwpAQCAtOTUzLDcgKzk1NSw3IEBAIGludCBvbWFwX2dlbV9nZXRf cGFnZXMoc3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmosIHN0cnVjdCBwYWdlICoqKnBhZ2VzLAog CQlyZXR1cm4gMDsKIAl9CiAJbXV0ZXhfbG9jaygmb2JqLT5kZXYtPnN0cnVjdF9tdXRleCk7Ci0J cmV0ID0gZ2V0X3BhZ2VzKG9iaiwgcGFnZXMpOworCXJldCA9IF9fb21hcF9nZW1fZ2V0X3BhZ2Vz KG9iaiwgcGFnZXMpOwogCW11dGV4X3VubG9jaygmb2JqLT5kZXYtPnN0cnVjdF9tdXRleCk7CiAJ cmV0dXJuIHJldDsKIH0KQEAgLTk3OSw3ICs5ODEsOSBAQCB2b2lkICpvbWFwX2dlbV92YWRkcihz dHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaikKIAlXQVJOX09OKCFtdXRleF9pc19sb2NrZWQoJm9i ai0+ZGV2LT5zdHJ1Y3RfbXV0ZXgpKTsKIAlpZiAoIW9tYXBfb2JqLT52YWRkcikgewogCQlzdHJ1 Y3QgcGFnZSAqKnBhZ2VzOwotCQlpbnQgcmV0ID0gZ2V0X3BhZ2VzKG9iaiwgJnBhZ2VzKTsKKwkJ aW50IHJldDsKKworCQlyZXQgPSBfX29tYXBfZ2VtX2dldF9wYWdlcyhvYmosICZwYWdlcyk7CiAJ CWlmIChyZXQpCiAJCQlyZXR1cm4gRVJSX1BUUihyZXQpOwogCQlvbWFwX29iai0+dmFkZHIgPSB2 bWFwKHBhZ2VzLCBvYmotPnNpemUgPj4gUEFHRV9TSElGVCwKQEAgLTEwODEsNyArMTA4NSw3IEBA IHZvaWQgb21hcF9nZW1fZnJlZV9vYmplY3Qoc3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmopCiAJ c3RydWN0IG9tYXBfZHJtX3ByaXZhdGUgKnByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVj dCBvbWFwX2dlbV9vYmplY3QgKm9tYXBfb2JqID0gdG9fb21hcF9ibyhvYmopOwogCi0JZXZpY3Qo b2JqKTsKKwlvbWFwX2dlbV9ldmljdChvYmopOwogCiAJV0FSTl9PTighbXV0ZXhfaXNfbG9ja2Vk KCZkZXYtPnN0cnVjdF9tdXRleCkpOwogCi0tIApSZWdhcmRzLAoKTGF1cmVudCBQaW5jaGFydAoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==