From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gustavo Padovan Subject: [PATCH v2 08/11] staging/android: rename android_fence to timeline_fence Date: Wed, 27 Jan 2016 11:30:36 -0200 Message-ID: <1453901439-19467-9-git-send-email-gustavo@padovan.org> References: <1453901439-19467-1-git-send-email-gustavo@padovan.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-yk0-f179.google.com (mail-yk0-f179.google.com [209.85.160.179]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2F259893ED for ; Wed, 27 Jan 2016 05:31:18 -0800 (PST) Received: by mail-yk0-f179.google.com with SMTP id v14so240018923ykd.3 for ; Wed, 27 Jan 2016 05:31:18 -0800 (PST) In-Reply-To: <1453901439-19467-1-git-send-email-gustavo@padovan.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Greg Kroah-Hartman Cc: devel@driverdev.osuosl.org, Daniel Stone , Daniel Vetter , Riley Andrews , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Gustavo Padovan , John Harrison List-Id: dri-devel@lists.freedesktop.org RnJvbTogR3VzdGF2byBQYWRvdmFuIDxndXN0YXZvLnBhZG92YW5AY29sbGFib3JhLmNvLnVrPgoK V2UgYXJlIG1vdmluZyBvdXQgb2Ygc3RhZ2luZy9hZHJvaWQgc28gcmVuYW1lIGl0IHRvIGEgbmFt ZSB0aGF0IGlzIG5vdApyZWxhdGVkIHRvIGFuZHJvaWQgYW55bW9yZS4KClNpZ25lZC1vZmYtYnk6 IEd1c3Rhdm8gUGFkb3ZhbiA8Z3VzdGF2by5wYWRvdmFuQGNvbGxhYm9yYS5jby51az4KLS0tCiBk cml2ZXJzL3N0YWdpbmcvYW5kcm9pZC9zeW5jLmMgfCA0MCArKysrKysrKysrKysrKysrKysrKy0t LS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjAgaW5zZXJ0aW9ucygrKSwgMjAg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvc3luYy5j IGIvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvc3luYy5jCmluZGV4IDA3ZmU5OTUuLmVhODE2ZGQg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL3N5bmMuYworKysgYi9kcml2ZXJz L3N0YWdpbmcvYW5kcm9pZC9zeW5jLmMKQEAgLTI4LDcgKzI4LDcgQEAKICNkZWZpbmUgQ1JFQVRF X1RSQUNFX1BPSU5UUwogI2luY2x1ZGUgInRyYWNlL3N5bmMuaCIKIAotc3RhdGljIGNvbnN0IHN0 cnVjdCBmZW5jZV9vcHMgYW5kcm9pZF9mZW5jZV9vcHM7CitzdGF0aWMgY29uc3Qgc3RydWN0IGZl bmNlX29wcyB0aW1lbGluZV9mZW5jZV9vcHM7CiAKIHN0cnVjdCBzeW5jX3RpbWVsaW5lICpzeW5j X3RpbWVsaW5lX2NyZWF0ZShpbnQgc2l6ZSwgY29uc3QgY2hhciAqZHJ2X25hbWUsCiAJCQkJCSAg IGNvbnN0IGNoYXIgKm5hbWUpCkBAIC0xMjYsNyArMTI2LDcgQEAgc3RydWN0IGZlbmNlICpzeW5j X3B0X2NyZWF0ZShzdHJ1Y3Qgc3luY190aW1lbGluZSAqb2JqLCBpbnQgc2l6ZSwKIAogCXNwaW5f bG9ja19pcnFzYXZlKCZvYmotPmNoaWxkX2xpc3RfbG9jaywgZmxhZ3MpOwogCXN5bmNfdGltZWxp bmVfZ2V0KG9iaik7Ci0JZmVuY2VfaW5pdChmZW5jZSwgJmFuZHJvaWRfZmVuY2Vfb3BzLCAmb2Jq LT5jaGlsZF9saXN0X2xvY2ssCisJZmVuY2VfaW5pdChmZW5jZSwgJnRpbWVsaW5lX2ZlbmNlX29w cywgJm9iai0+Y2hpbGRfbGlzdF9sb2NrLAogCQkgICBvYmotPmNvbnRleHQsIHZhbHVlKTsKIAls aXN0X2FkZF90YWlsKCZmZW5jZS0+Y2hpbGRfbGlzdCwgJm9iai0+Y2hpbGRfbGlzdF9oZWFkKTsK IAlJTklUX0xJU1RfSEVBRCgmZmVuY2UtPmFjdGl2ZV9saXN0KTsKQEAgLTEzNSwyMSArMTM1LDIx IEBAIHN0cnVjdCBmZW5jZSAqc3luY19wdF9jcmVhdGUoc3RydWN0IHN5bmNfdGltZWxpbmUgKm9i aiwgaW50IHNpemUsCiB9CiBFWFBPUlRfU1lNQk9MKHN5bmNfcHRfY3JlYXRlKTsKIAotc3RhdGlj IGNvbnN0IGNoYXIgKmFuZHJvaWRfZmVuY2VfZ2V0X2RyaXZlcl9uYW1lKHN0cnVjdCBmZW5jZSAq ZmVuY2UpCitzdGF0aWMgY29uc3QgY2hhciAqdGltZWxpbmVfZmVuY2VfZ2V0X2RyaXZlcl9uYW1l KHN0cnVjdCBmZW5jZSAqZmVuY2UpCiB7CiAJc3RydWN0IHN5bmNfdGltZWxpbmUgKnBhcmVudCA9 IGZlbmNlX3BhcmVudChmZW5jZSk7CiAKIAlyZXR1cm4gcGFyZW50LT5kcnZfbmFtZTsKIH0KIAot c3RhdGljIGNvbnN0IGNoYXIgKmFuZHJvaWRfZmVuY2VfZ2V0X3RpbWVsaW5lX25hbWUoc3RydWN0 IGZlbmNlICpmZW5jZSkKK3N0YXRpYyBjb25zdCBjaGFyICp0aW1lbGluZV9mZW5jZV9nZXRfdGlt ZWxpbmVfbmFtZShzdHJ1Y3QgZmVuY2UgKmZlbmNlKQogewogCXN0cnVjdCBzeW5jX3RpbWVsaW5l ICpwYXJlbnQgPSBmZW5jZV9wYXJlbnQoZmVuY2UpOwogCiAJcmV0dXJuIHBhcmVudC0+bmFtZTsK IH0KIAotc3RhdGljIHZvaWQgYW5kcm9pZF9mZW5jZV9yZWxlYXNlKHN0cnVjdCBmZW5jZSAqZmVu Y2UpCitzdGF0aWMgdm9pZCB0aW1lbGluZV9mZW5jZV9yZWxlYXNlKHN0cnVjdCBmZW5jZSAqZmVu Y2UpCiB7CiAJc3RydWN0IHN5bmNfdGltZWxpbmUgKnBhcmVudCA9IGZlbmNlX3BhcmVudChmZW5j ZSk7CiAJdW5zaWduZWQgbG9uZyBmbGFnczsKQEAgLTE2NCwyNSArMTY0LDI1IEBAIHN0YXRpYyB2 b2lkIGFuZHJvaWRfZmVuY2VfcmVsZWFzZShzdHJ1Y3QgZmVuY2UgKmZlbmNlKQogCWZlbmNlX2Zy ZWUoZmVuY2UpOwogfQogCi1zdGF0aWMgYm9vbCBhbmRyb2lkX2ZlbmNlX3NpZ25hbGVkKHN0cnVj dCBmZW5jZSAqZmVuY2UpCitzdGF0aWMgYm9vbCB0aW1lbGluZV9mZW5jZV9zaWduYWxlZChzdHJ1 Y3QgZmVuY2UgKmZlbmNlKQogewogCXN0cnVjdCBzeW5jX3RpbWVsaW5lICpwYXJlbnQgPSBmZW5j ZV9wYXJlbnQoZmVuY2UpOwogCiAJcmV0dXJuIChmZW5jZS0+c2Vxbm8gPiBwYXJlbnQtPnZhbHVl KSA/IGZhbHNlIDogdHJ1ZTsKIH0KIAotc3RhdGljIGJvb2wgYW5kcm9pZF9mZW5jZV9lbmFibGVf c2lnbmFsaW5nKHN0cnVjdCBmZW5jZSAqZmVuY2UpCitzdGF0aWMgYm9vbCB0aW1lbGluZV9mZW5j ZV9lbmFibGVfc2lnbmFsaW5nKHN0cnVjdCBmZW5jZSAqZmVuY2UpCiB7CiAJc3RydWN0IHN5bmNf dGltZWxpbmUgKnBhcmVudCA9IGZlbmNlX3BhcmVudChmZW5jZSk7CiAKLQlpZiAoYW5kcm9pZF9m ZW5jZV9zaWduYWxlZChmZW5jZSkpCisJaWYgKHRpbWVsaW5lX2ZlbmNlX3NpZ25hbGVkKGZlbmNl KSkKIAkJcmV0dXJuIGZhbHNlOwogCiAJbGlzdF9hZGRfdGFpbCgmZmVuY2UtPmFjdGl2ZV9saXN0 LCAmcGFyZW50LT5hY3RpdmVfbGlzdF9oZWFkKTsKIAlyZXR1cm4gdHJ1ZTsKIH0KIAotc3RhdGlj IGludCBhbmRyb2lkX2ZlbmNlX2ZpbGxfZHJpdmVyX2RhdGEoc3RydWN0IGZlbmNlICpmZW5jZSwK K3N0YXRpYyBpbnQgdGltZWxpbmVfZmVuY2VfZmlsbF9kcml2ZXJfZGF0YShzdHJ1Y3QgZmVuY2Ug KmZlbmNlLAogCQkJCQkgIHZvaWQgKmRhdGEsIGludCBzaXplKQogewogCWlmIChzaXplIDwgc2l6 ZW9mKGZlbmNlLT5zZXFubykpCkBAIC0xOTMsMTMgKzE5MywxMyBAQCBzdGF0aWMgaW50IGFuZHJv aWRfZmVuY2VfZmlsbF9kcml2ZXJfZGF0YShzdHJ1Y3QgZmVuY2UgKmZlbmNlLAogCXJldHVybiBz aXplb2YoZmVuY2UtPnNlcW5vKTsKIH0KIAotc3RhdGljIHZvaWQgYW5kcm9pZF9mZW5jZV92YWx1 ZV9zdHIoc3RydWN0IGZlbmNlICpmZW5jZSwKK3N0YXRpYyB2b2lkIHRpbWVsaW5lX2ZlbmNlX3Zh bHVlX3N0cihzdHJ1Y3QgZmVuY2UgKmZlbmNlLAogCQkJCSAgICBjaGFyICpzdHIsIGludCBzaXpl KQogewogCXNucHJpbnRmKHN0ciwgc2l6ZSwgIiVkIiwgZmVuY2UtPnNlcW5vKTsKIH0KIAotc3Rh dGljIHZvaWQgYW5kcm9pZF9mZW5jZV90aW1lbGluZV92YWx1ZV9zdHIoc3RydWN0IGZlbmNlICpm ZW5jZSwKK3N0YXRpYyB2b2lkIHRpbWVsaW5lX2ZlbmNlX3RpbWVsaW5lX3ZhbHVlX3N0cihzdHJ1 Y3QgZmVuY2UgKmZlbmNlLAogCQkJCQkgICAgIGNoYXIgKnN0ciwgaW50IHNpemUpCiB7CiAJc3Ry dWN0IHN5bmNfdGltZWxpbmUgKnBhcmVudCA9IGZlbmNlX3BhcmVudChmZW5jZSk7CkBAIC0yMDcs MTUgKzIwNywxNSBAQCBzdGF0aWMgdm9pZCBhbmRyb2lkX2ZlbmNlX3RpbWVsaW5lX3ZhbHVlX3N0 cihzdHJ1Y3QgZmVuY2UgKmZlbmNlLAogCXNucHJpbnRmKHN0ciwgc2l6ZSwgIiVkIiwgcGFyZW50 LT52YWx1ZSk7CiB9CiAKLXN0YXRpYyBjb25zdCBzdHJ1Y3QgZmVuY2Vfb3BzIGFuZHJvaWRfZmVu Y2Vfb3BzID0gewotCS5nZXRfZHJpdmVyX25hbWUgPSBhbmRyb2lkX2ZlbmNlX2dldF9kcml2ZXJf bmFtZSwKLQkuZ2V0X3RpbWVsaW5lX25hbWUgPSBhbmRyb2lkX2ZlbmNlX2dldF90aW1lbGluZV9u YW1lLAotCS5lbmFibGVfc2lnbmFsaW5nID0gYW5kcm9pZF9mZW5jZV9lbmFibGVfc2lnbmFsaW5n LAotCS5zaWduYWxlZCA9IGFuZHJvaWRfZmVuY2Vfc2lnbmFsZWQsCitzdGF0aWMgY29uc3Qgc3Ry dWN0IGZlbmNlX29wcyB0aW1lbGluZV9mZW5jZV9vcHMgPSB7CisJLmdldF9kcml2ZXJfbmFtZSA9 IHRpbWVsaW5lX2ZlbmNlX2dldF9kcml2ZXJfbmFtZSwKKwkuZ2V0X3RpbWVsaW5lX25hbWUgPSB0 aW1lbGluZV9mZW5jZV9nZXRfdGltZWxpbmVfbmFtZSwKKwkuZW5hYmxlX3NpZ25hbGluZyA9IHRp bWVsaW5lX2ZlbmNlX2VuYWJsZV9zaWduYWxpbmcsCisJLnNpZ25hbGVkID0gdGltZWxpbmVfZmVu Y2Vfc2lnbmFsZWQsCiAJLndhaXQgPSBmZW5jZV9kZWZhdWx0X3dhaXQsCi0JLnJlbGVhc2UgPSBh bmRyb2lkX2ZlbmNlX3JlbGVhc2UsCi0JLmZpbGxfZHJpdmVyX2RhdGEgPSBhbmRyb2lkX2ZlbmNl X2ZpbGxfZHJpdmVyX2RhdGEsCi0JLmZlbmNlX3ZhbHVlX3N0ciA9IGFuZHJvaWRfZmVuY2VfdmFs dWVfc3RyLAotCS50aW1lbGluZV92YWx1ZV9zdHIgPSBhbmRyb2lkX2ZlbmNlX3RpbWVsaW5lX3Zh bHVlX3N0ciwKKwkucmVsZWFzZSA9IHRpbWVsaW5lX2ZlbmNlX3JlbGVhc2UsCisJLmZpbGxfZHJp dmVyX2RhdGEgPSB0aW1lbGluZV9mZW5jZV9maWxsX2RyaXZlcl9kYXRhLAorCS5mZW5jZV92YWx1 ZV9zdHIgPSB0aW1lbGluZV9mZW5jZV92YWx1ZV9zdHIsCisJLnRpbWVsaW5lX3ZhbHVlX3N0ciA9 IHRpbWVsaW5lX2ZlbmNlX3RpbWVsaW5lX3ZhbHVlX3N0ciwKIH07CiAKLS0gCjIuNS4wCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFp bGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=