From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tomi Valkeinen Subject: [PATCH 11/36] drm: omapdrm: Prefix all plane functions with omap_plane_ Date: Tue, 24 Mar 2015 14:15:28 +0200 Message-ID: <1427199353-4412-12-git-send-email-tomi.valkeinen@ti.com> References: <1427199353-4412-1-git-send-email-tomi.valkeinen@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from comal.ext.ti.com (comal.ext.ti.com [198.47.26.152]) by gabe.freedesktop.org (Postfix) with ESMTP id 2A0766E6CB for ; Tue, 24 Mar 2015 05:16:29 -0700 (PDT) In-Reply-To: <1427199353-4412-1-git-send-email-tomi.valkeinen@ti.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: Laurent Pinchart List-Id: dri-devel@lists.freedesktop.org RnJvbTogTGF1cmVudCBQaW5jaGFydCA8bGF1cmVudC5waW5jaGFydEBpZGVhc29uYm9hcmQuY29t PgoKVGhpcyBtYXRjaGVzIHRoZSByZXN0IG9mIHRoZSBmaWxlIGFuZCBjbGFyaWZpZXMgdGhlIGZ1 bmN0aW9ucycgcHVycG9zZS4KClNpZ25lZC1vZmYtYnk6IExhdXJlbnQgUGluY2hhcnQgPGxhdXJl bnQucGluY2hhcnRAaWRlYXNvbmJvYXJkLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vb21hcGRy bS9vbWFwX3BsYW5lLmMgfCAxOSArKysrKysrKysrLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwg MTAgaW5zZXJ0aW9ucygrKSwgOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vb21hcGRybS9vbWFwX3BsYW5lLmMgYi9kcml2ZXJzL2dwdS9kcm0vb21hcGRybS9vbWFw X3BsYW5lLmMKaW5kZXggMjExMWQ0MTVkYTk2Li4zMDlhMjI0NmI2ZTAgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9vbWFwZHJtL29tYXBfcGxhbmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v b21hcGRybS9vbWFwX3BsYW5lLmMKQEAgLTY1LDcgKzY1LDcgQEAgc3RydWN0IG9tYXBfcGxhbmUg ewogCXN0cnVjdCBjYWxsYmFjayBhcHBseV9kb25lX2NiOwogfTsKIAotc3RhdGljIHZvaWQgdW5w aW5fd29ya2VyKHN0cnVjdCBkcm1fZmxpcF93b3JrICp3b3JrLCB2b2lkICp2YWwpCitzdGF0aWMg dm9pZCBvbWFwX3BsYW5lX3VucGluX3dvcmtlcihzdHJ1Y3QgZHJtX2ZsaXBfd29yayAqd29yaywg dm9pZCAqdmFsKQogewogCXN0cnVjdCBvbWFwX3BsYW5lICpvbWFwX3BsYW5lID0KIAkJCWNvbnRh aW5lcl9vZih3b3JrLCBzdHJ1Y3Qgb21hcF9wbGFuZSwgdW5waW5fd29yayk7CkBAIC03OCw3ICs3 OCw4IEBAIHN0YXRpYyB2b2lkIHVucGluX3dvcmtlcihzdHJ1Y3QgZHJtX2ZsaXBfd29yayAqd29y aywgdm9pZCAqdmFsKQogfQogCiAvKiB1cGRhdGUgd2hpY2ggZmIgKGlmIGFueSkgaXMgcGlubmVk IGZvciBzY2Fub3V0ICovCi1zdGF0aWMgaW50IHVwZGF0ZV9waW4oc3RydWN0IGRybV9wbGFuZSAq cGxhbmUsIHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiKQorc3RhdGljIGludCBvbWFwX3BsYW5l X3VwZGF0ZV9waW4oc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCisJCQkJIHN0cnVjdCBkcm1fZnJh bWVidWZmZXIgKmZiKQogewogCXN0cnVjdCBvbWFwX3BsYW5lICpvbWFwX3BsYW5lID0gdG9fb21h cF9wbGFuZShwbGFuZSk7CiAJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqcGlubmVkX2ZiID0gb21h cF9wbGFuZS0+cGlubmVkX2ZiOwpAQCAtMTI2LDcgKzEyNyw3IEBAIHN0YXRpYyB2b2lkIG9tYXBf cGxhbmVfcHJlX2FwcGx5KHN0cnVjdCBvbWFwX2RybV9hcHBseSAqYXBwbHkpCiAJREJHKCIlcywg ZW5hYmxlZD0lZCIsIG9tYXBfcGxhbmUtPm5hbWUsIGVuYWJsZWQpOwogCiAJLyogaWYgZmIgaGFz IGNoYW5nZWQsIHBpbiBuZXcgZmI6ICovCi0JdXBkYXRlX3BpbihwbGFuZSwgZW5hYmxlZCA/IHBs YW5lLT5mYiA6IE5VTEwpOworCW9tYXBfcGxhbmVfdXBkYXRlX3BpbihwbGFuZSwgZW5hYmxlZCA/ IHBsYW5lLT5mYiA6IE5VTEwpOwogCiAJaWYgKCFlbmFibGVkKSB7CiAJCWRpc3BjX292bF9lbmFi bGUob21hcF9wbGFuZS0+aWQsIGZhbHNlKTsKQEAgLTE3Myw3ICsxNzQsNyBAQCBzdGF0aWMgdm9p ZCBvbWFwX3BsYW5lX3Bvc3RfYXBwbHkoc3RydWN0IG9tYXBfZHJtX2FwcGx5ICphcHBseSkKIAkJ Y2IuZnhuKGNiLmFyZyk7CiB9CiAKLXN0YXRpYyBpbnQgYXBwbHkoc3RydWN0IGRybV9wbGFuZSAq cGxhbmUpCitzdGF0aWMgaW50IG9tYXBfcGxhbmVfYXBwbHkoc3RydWN0IGRybV9wbGFuZSAqcGxh bmUpCiB7CiAJaWYgKHBsYW5lLT5jcnRjKSB7CiAJCXN0cnVjdCBvbWFwX3BsYW5lICpvbWFwX3Bs YW5lID0gdG9fb21hcF9wbGFuZShwbGFuZSk7CkBAIC0yMTQsNyArMjE1LDcgQEAgaW50IG9tYXBf cGxhbmVfbW9kZV9zZXQoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJCW9tYXBfcGxhbmUtPmFw cGx5X2RvbmVfY2IuYXJnID0gYXJnOwogCX0KIAotCXJldHVybiBhcHBseShwbGFuZSk7CisJcmV0 dXJuIG9tYXBfcGxhbmVfYXBwbHkocGxhbmUpOwogfQogCiBzdGF0aWMgaW50IG9tYXBfcGxhbmVf dXBkYXRlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLApAQCAtMjgzLDcgKzI4NCw3IEBAIGludCBv bWFwX3BsYW5lX3NldF9lbmFibGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIGJvb2wgZW5hYmxl KQogCQlyZXR1cm4gMDsKIAogCW9tYXBfcGxhbmUtPmVuYWJsZWQgPSBlbmFibGU7Ci0JcmV0dXJu IGFwcGx5KHBsYW5lKTsKKwlyZXR1cm4gb21hcF9wbGFuZV9hcHBseShwbGFuZSk7CiB9CiAKIC8q IGhlbHBlciB0byBpbnN0YWxsIHByb3BlcnRpZXMgd2hpY2ggYXJlIGNvbW1vbiB0byBwbGFuZXMg YW5kIGNydGNzICovCkBAIC0zMzEsMTEgKzMzMiwxMSBAQCBpbnQgb21hcF9wbGFuZV9zZXRfcHJv cGVydHkoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJaWYgKHByb3BlcnR5ID09IHByaXYtPnJv dGF0aW9uX3Byb3ApIHsKIAkJREJHKCIlczogcm90YXRpb246ICUwMngiLCBvbWFwX3BsYW5lLT5u YW1lLCAodWludDMyX3QpdmFsKTsKIAkJb21hcF9wbGFuZS0+d2luLnJvdGF0aW9uID0gdmFsOwot CQlyZXQgPSBhcHBseShwbGFuZSk7CisJCXJldCA9IG9tYXBfcGxhbmVfYXBwbHkocGxhbmUpOwog CX0gZWxzZSBpZiAocHJvcGVydHkgPT0gcHJpdi0+em9yZGVyX3Byb3ApIHsKIAkJREJHKCIlczog em9yZGVyOiAlMDJ4Iiwgb21hcF9wbGFuZS0+bmFtZSwgKHVpbnQzMl90KXZhbCk7CiAJCW9tYXBf cGxhbmUtPmluZm8uem9yZGVyID0gdmFsOwotCQlyZXQgPSBhcHBseShwbGFuZSk7CisJCXJldCA9 IG9tYXBfcGxhbmVfYXBwbHkocGxhbmUpOwogCX0KIAogCXJldHVybiByZXQ7CkBAIC0zODYsNyAr Mzg3LDcgQEAgc3RydWN0IGRybV9wbGFuZSAqb21hcF9wbGFuZV9pbml0KHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsCiAJCXJldHVybiBFUlJfUFRSKC1FTk9NRU0pOwogCiAJZHJtX2ZsaXBfd29ya19p bml0KCZvbWFwX3BsYW5lLT51bnBpbl93b3JrLAotCQkJInVucGluIiwgdW5waW5fd29ya2VyKTsK KwkJCSJ1bnBpbiIsIG9tYXBfcGxhbmVfdW5waW5fd29ya2VyKTsKIAogCW9tYXBfcGxhbmUtPm5m b3JtYXRzID0gb21hcF9mcmFtZWJ1ZmZlcl9nZXRfZm9ybWF0cygKIAkJCW9tYXBfcGxhbmUtPmZv cm1hdHMsIEFSUkFZX1NJWkUob21hcF9wbGFuZS0+Zm9ybWF0cyksCi0tIAoyLjMuMwoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxp bmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK