From: Russell King Subject: [PATCH 06/20] drm/armada: rename overlay identifiers Date: Tue, 29 Sep 2015 19:09:58 +0100 Message-ID: References: <20150929180843.GP21513@n2100.arm.linux.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from pandora.arm.linux.org.uk (pandora.arm.linux.org.uk [78.32.30.218]) by gabe.freedesktop.org (Postfix) with ESMTPS id C94576E623 for ; Tue, 29 Sep 2015 11:17:36 -0700 (PDT) Received: from e0022681537dd.dyn.arm.linux.org.uk ([2002:4e20:1eda:1:222:68ff:fe15:37dd]:44967 helo=rmk-PC.arm.linux.org.uk) by pandora.arm.linux.org.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1ZgzLj-0004Jd-LZ for dri-devel@lists.freedesktop.org; Tue, 29 Sep 2015 19:09:59 +0100 Received: from rmk by rmk-PC.arm.linux.org.uk with local (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1ZgzLi-0003ky-Jg for dri-devel@lists.freedesktop.org; Tue, 29 Sep 2015 19:09:58 +0100 In-Reply-To: <20150929180843.GP21513@n2100.arm.linux.org.uk> Content-Disposition: inline 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 List-Id: dri-devel@lists.freedesktop.org SW5jbHVkZSBhbiBfb3ZsIGluZml4IGludG8gdGhlIG92ZXJsYXkgaWRlbnRpZmllcnMgdG8gc2Vw YXJhdGUgdGhlbSBmcm9tCnRoZSBwcmltYXJ5IHBsYW5lLgoKU2lnbmVkLW9mZi1ieTogUnVzc2Vs bCBLaW5nIDxybWsra2VybmVsQGFybS5saW51eC5vcmcudWs+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2FybWFkYS9hcm1hZGFfb3ZlcmxheS5jIHwgNTUgKysrKysrKysrKysrKysrKysrLS0tLS0tLS0t LS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzAgaW5zZXJ0aW9ucygrKSwgMjUgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FybWFkYS9hcm1hZGFfb3ZlcmxheS5jIGIv ZHJpdmVycy9ncHUvZHJtL2FybWFkYS9hcm1hZGFfb3ZlcmxheS5jCmluZGV4IGU5MzlmYWJhN2Zj Yy4uOTM5M2ExNTE4M2UyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYXJtYWRhL2FybWFk YV9vdmVybGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FybWFkYS9hcm1hZGFfb3ZlcmxheS5j CkBAIC0xNiw3ICsxNiw3IEBACiAjaW5jbHVkZSA8ZHJtL2FybWFkYV9kcm0uaD4KICNpbmNsdWRl ICJhcm1hZGFfaW9jdGxQLmgiCiAKLXN0cnVjdCBhcm1hZGFfcGxhbmVfcHJvcGVydGllcyB7Citz dHJ1Y3QgYXJtYWRhX292bF9wbGFuZV9wcm9wZXJ0aWVzIHsKIAl1aW50MzJfdCBjb2xvcmtleV95 cjsKIAl1aW50MzJfdCBjb2xvcmtleV91ZzsKIAl1aW50MzJfdCBjb2xvcmtleV92YjsKQEAgLTI5 LDcgKzI5LDcgQEAgc3RydWN0IGFybWFkYV9wbGFuZV9wcm9wZXJ0aWVzIHsKIAl1aW50MzJfdCBj b2xvcmtleV9tb2RlOwogfTsKIAotc3RydWN0IGFybWFkYV9wbGFuZSB7CitzdHJ1Y3QgYXJtYWRh X292bF9wbGFuZSB7CiAJc3RydWN0IGRybV9wbGFuZSBiYXNlOwogCXNwaW5sb2NrX3QgbG9jazsK IAlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpvbGRfZmI7CkBAIC00MiwxMyArNDIsMTMgQEAgc3Ry dWN0IGFybWFkYV9wbGFuZSB7CiAJCXN0cnVjdCBhcm1hZGFfcmVncyByZWdzWzEzXTsKIAkJd2Fp dF9xdWV1ZV9oZWFkX3Qgd2FpdDsKIAl9IHZibDsKLQlzdHJ1Y3QgYXJtYWRhX3BsYW5lX3Byb3Bl cnRpZXMgcHJvcDsKKwlzdHJ1Y3QgYXJtYWRhX292bF9wbGFuZV9wcm9wZXJ0aWVzIHByb3A7CiB9 OwotI2RlZmluZSBkcm1fdG9fYXJtYWRhX3BsYW5lKHApIGNvbnRhaW5lcl9vZihwLCBzdHJ1Y3Qg YXJtYWRhX3BsYW5lLCBiYXNlKQorI2RlZmluZSBkcm1fdG9fYXJtYWRhX292bF9wbGFuZShwKSBj b250YWluZXJfb2YocCwgc3RydWN0IGFybWFkYV9vdmxfcGxhbmUsIGJhc2UpCiAKIAogc3RhdGlj IHZvaWQKLWFybWFkYV9vdmxfdXBkYXRlX2F0dHIoc3RydWN0IGFybWFkYV9wbGFuZV9wcm9wZXJ0 aWVzICpwcm9wLAorYXJtYWRhX292bF91cGRhdGVfYXR0cihzdHJ1Y3QgYXJtYWRhX292bF9wbGFu ZV9wcm9wZXJ0aWVzICpwcm9wLAogCXN0cnVjdCBhcm1hZGFfY3J0YyAqZGNydGMpCiB7CiAJd3Jp dGVsX3JlbGF4ZWQocHJvcC0+Y29sb3JrZXlfeXIsIGRjcnRjLT5iYXNlICsgTENEX1NQVV9DT0xP UktFWV9ZKTsKQEAgLTcyLDkgKzcyLDkgQEAgYXJtYWRhX292bF91cGRhdGVfYXR0cihzdHJ1Y3Qg YXJtYWRhX3BsYW5lX3Byb3BlcnRpZXMgKnByb3AsCiB9CiAKIC8qID09PSBQbGFuZSBzdXBwb3J0 ID09PSAqLwotc3RhdGljIHZvaWQgYXJtYWRhX3BsYW5lX3ZibChzdHJ1Y3QgYXJtYWRhX2NydGMg KmRjcnRjLCB2b2lkICpkYXRhKQorc3RhdGljIHZvaWQgYXJtYWRhX292bF9wbGFuZV92Ymwoc3Ry dWN0IGFybWFkYV9jcnRjICpkY3J0Yywgdm9pZCAqZGF0YSkKIHsKLQlzdHJ1Y3QgYXJtYWRhX3Bs YW5lICpkcGxhbmUgPSBkYXRhOworCXN0cnVjdCBhcm1hZGFfb3ZsX3BsYW5lICpkcGxhbmUgPSBk YXRhOwogCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiOwogCiAJYXJtYWRhX2RybV9jcnRjX3Vw ZGF0ZV9yZWdzKGRjcnRjLCBkcGxhbmUtPnZibC5yZWdzKTsKQEAgLTkxLDEyICs5MSwxMiBAQCBz dGF0aWMgdm9pZCBhcm1hZGFfcGxhbmVfdmJsKHN0cnVjdCBhcm1hZGFfY3J0YyAqZGNydGMsIHZv aWQgKmRhdGEpCiB9CiAKIHN0YXRpYyBpbnQKLWFybWFkYV9wbGFuZV91cGRhdGUoc3RydWN0IGRy bV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKK2FybWFkYV9vdmxfcGxhbmVf dXBkYXRlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJ c3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIsCiAJaW50IGNydGNfeCwgaW50IGNydGNfeSwgdW5z aWduZWQgY3J0Y193LCB1bnNpZ25lZCBjcnRjX2gsCiAJdWludDMyX3Qgc3JjX3gsIHVpbnQzMl90 IHNyY195LCB1aW50MzJfdCBzcmNfdywgdWludDMyX3Qgc3JjX2gpCiB7Ci0Jc3RydWN0IGFybWFk YV9wbGFuZSAqZHBsYW5lID0gZHJtX3RvX2FybWFkYV9wbGFuZShwbGFuZSk7CisJc3RydWN0IGFy bWFkYV9vdmxfcGxhbmUgKmRwbGFuZSA9IGRybV90b19hcm1hZGFfb3ZsX3BsYW5lKHBsYW5lKTsK IAlzdHJ1Y3QgYXJtYWRhX2NydGMgKmRjcnRjID0gZHJtX3RvX2FybWFkYV9jcnRjKGNydGMpOwog CXN0cnVjdCBkcm1fcmVjdCBzcmMgPSB7CiAJCS54MSA9IHNyY194LApAQCAtMjY3LDkgKzI2Nyw5 IEBAIGFybWFkYV9wbGFuZV91cGRhdGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBk cm1fY3J0YyAqY3J0YywKIAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIGludCBhcm1hZGFfcGxhbmVf ZGlzYWJsZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSkKK3N0YXRpYyBpbnQgYXJtYWRhX292bF9w bGFuZV9kaXNhYmxlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lKQogewotCXN0cnVjdCBhcm1hZGFf cGxhbmUgKmRwbGFuZSA9IGRybV90b19hcm1hZGFfcGxhbmUocGxhbmUpOworCXN0cnVjdCBhcm1h ZGFfb3ZsX3BsYW5lICpkcGxhbmUgPSBkcm1fdG9fYXJtYWRhX292bF9wbGFuZShwbGFuZSk7CiAJ c3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmI7CiAJc3RydWN0IGFybWFkYV9jcnRjICpkY3J0YzsK IApAQCAtMzAyLDIwICszMDIsMjAgQEAgc3RhdGljIGludCBhcm1hZGFfcGxhbmVfZGlzYWJsZShz dHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSkKIAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIHZvaWQgYXJt YWRhX3BsYW5lX2Rlc3Ryb3koc3RydWN0IGRybV9wbGFuZSAqcGxhbmUpCitzdGF0aWMgdm9pZCBh cm1hZGFfb3ZsX3BsYW5lX2Rlc3Ryb3koc3RydWN0IGRybV9wbGFuZSAqcGxhbmUpCiB7Ci0Jc3Ry dWN0IGFybWFkYV9wbGFuZSAqZHBsYW5lID0gZHJtX3RvX2FybWFkYV9wbGFuZShwbGFuZSk7CisJ c3RydWN0IGFybWFkYV9vdmxfcGxhbmUgKmRwbGFuZSA9IGRybV90b19hcm1hZGFfb3ZsX3BsYW5l KHBsYW5lKTsKIAogCWRybV9wbGFuZV9jbGVhbnVwKHBsYW5lKTsKIAogCWtmcmVlKGRwbGFuZSk7 CiB9CiAKLXN0YXRpYyBpbnQgYXJtYWRhX3BsYW5lX3NldF9wcm9wZXJ0eShzdHJ1Y3QgZHJtX3Bs YW5lICpwbGFuZSwKK3N0YXRpYyBpbnQgYXJtYWRhX292bF9wbGFuZV9zZXRfcHJvcGVydHkoc3Ry dWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJc3RydWN0IGRybV9wcm9wZXJ0eSAqcHJvcGVydHksIHVp bnQ2NF90IHZhbCkKIHsKIAlzdHJ1Y3QgYXJtYWRhX3ByaXZhdGUgKnByaXYgPSBwbGFuZS0+ZGV2 LT5kZXZfcHJpdmF0ZTsKLQlzdHJ1Y3QgYXJtYWRhX3BsYW5lICpkcGxhbmUgPSBkcm1fdG9fYXJt YWRhX3BsYW5lKHBsYW5lKTsKKwlzdHJ1Y3QgYXJtYWRhX292bF9wbGFuZSAqZHBsYW5lID0gZHJt X3RvX2FybWFkYV9vdmxfcGxhbmUocGxhbmUpOwogCWJvb2wgdXBkYXRlX2F0dHIgPSBmYWxzZTsK IAogCWlmIChwcm9wZXJ0eSA9PSBwcml2LT5jb2xvcmtleV9wcm9wKSB7CkBAIC0zNzksMTQgKzM3 OSwxNCBAQCBzdGF0aWMgaW50IGFybWFkYV9wbGFuZV9zZXRfcHJvcGVydHkoc3RydWN0IGRybV9w bGFuZSAqcGxhbmUsCiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX3Bs YW5lX2Z1bmNzIGFybWFkYV9wbGFuZV9mdW5jcyA9IHsKLQkudXBkYXRlX3BsYW5lCT0gYXJtYWRh X3BsYW5lX3VwZGF0ZSwKLQkuZGlzYWJsZV9wbGFuZQk9IGFybWFkYV9wbGFuZV9kaXNhYmxlLAot CS5kZXN0cm95CT0gYXJtYWRhX3BsYW5lX2Rlc3Ryb3ksCi0JLnNldF9wcm9wZXJ0eQk9IGFybWFk YV9wbGFuZV9zZXRfcHJvcGVydHksCitzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9wbGFuZV9mdW5j cyBhcm1hZGFfb3ZsX3BsYW5lX2Z1bmNzID0geworCS51cGRhdGVfcGxhbmUJPSBhcm1hZGFfb3Zs X3BsYW5lX3VwZGF0ZSwKKwkuZGlzYWJsZV9wbGFuZQk9IGFybWFkYV9vdmxfcGxhbmVfZGlzYWJs ZSwKKwkuZGVzdHJveQk9IGFybWFkYV9vdmxfcGxhbmVfZGVzdHJveSwKKwkuc2V0X3Byb3BlcnR5 CT0gYXJtYWRhX292bF9wbGFuZV9zZXRfcHJvcGVydHksCiB9OwogCi1zdGF0aWMgY29uc3QgdWlu dDMyX3QgYXJtYWRhX2Zvcm1hdHNbXSA9IHsKK3N0YXRpYyBjb25zdCB1aW50MzJfdCBhcm1hZGFf b3ZsX2Zvcm1hdHNbXSA9IHsKIAlEUk1fRk9STUFUX1VZVlksCiAJRFJNX0ZPUk1BVF9ZVVlWLAog CURSTV9GT1JNQVRfWVVWNDIwLApAQCAtNDU2LDcgKzQ1Niw3IEBAIGludCBhcm1hZGFfb3Zlcmxh eV9wbGFuZV9jcmVhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdW5zaWduZWQgbG9uZyBjcnRj cykKIHsKIAlzdHJ1Y3QgYXJtYWRhX3ByaXZhdGUgKnByaXYgPSBkZXYtPmRldl9wcml2YXRlOwog CXN0cnVjdCBkcm1fbW9kZV9vYmplY3QgKm1vYmo7Ci0Jc3RydWN0IGFybWFkYV9wbGFuZSAqZHBs YW5lOworCXN0cnVjdCBhcm1hZGFfb3ZsX3BsYW5lICpkcGxhbmU7CiAJaW50IHJldDsKIAogCXJl dCA9IGFybWFkYV9vdmVybGF5X2NyZWF0ZV9wcm9wZXJ0aWVzKGRldik7CkBAIC00NjksMTEgKzQ2 OSwxNiBAQCBpbnQgYXJtYWRhX292ZXJsYXlfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsIHVuc2lnbmVkIGxvbmcgY3J0Y3MpCiAKIAlzcGluX2xvY2tfaW5pdCgmZHBsYW5lLT5s b2NrKTsKIAlpbml0X3dhaXRxdWV1ZV9oZWFkKCZkcGxhbmUtPnZibC53YWl0KTsKLQlhcm1hZGFf ZHJtX3ZibF9ldmVudF9pbml0KCZkcGxhbmUtPnZibC51cGRhdGUsIGFybWFkYV9wbGFuZV92Ymws CisJYXJtYWRhX2RybV92YmxfZXZlbnRfaW5pdCgmZHBsYW5lLT52YmwudXBkYXRlLCBhcm1hZGFf b3ZsX3BsYW5lX3ZibCwKIAkJCQkgIGRwbGFuZSk7CiAKLQlkcm1fcGxhbmVfaW5pdChkZXYsICZk cGxhbmUtPmJhc2UsIGNydGNzLCAmYXJtYWRhX3BsYW5lX2Z1bmNzLAotCQkgICAgICAgYXJtYWRh X2Zvcm1hdHMsIEFSUkFZX1NJWkUoYXJtYWRhX2Zvcm1hdHMpLCBmYWxzZSk7CisJZHJtX3BsYW5l X2luaXQoZGV2LCAmZHBsYW5lLT5iYXNlLCBjcnRjcywgJmFybWFkYV9vdmxfcGxhbmVfZnVuY3Ms CisJCSAgICAgICBhcm1hZGFfb3ZsX2Zvcm1hdHMsIEFSUkFZX1NJWkUoYXJtYWRhX292bF9mb3Jt YXRzKSwKKwkJICAgICAgIGZhbHNlKTsKKwlpZiAocmV0KSB7CisJCWtmcmVlKGRwbGFuZSk7CisJ CXJldHVybiByZXQ7CisJfQogCiAJZHBsYW5lLT5wcm9wLmNvbG9ya2V5X3lyID0gMHhmZWZlZmUw MDsKIAlkcGxhbmUtPnByb3AuY29sb3JrZXlfdWcgPSAweDAxMDEwMTAwOwotLSAKMi4xLjAKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBt YWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==