From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gustavo Padovan Subject: [PATCH 04/11] staging/android: remove .{fence, timeline}_value_str() from timeline_ops Date: Tue, 26 Jan 2016 16:30:19 -0200 Message-ID: <1453833026-24637-5-git-send-email-gustavo@padovan.org> References: <1453833026-24637-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-f196.google.com (mail-yk0-f196.google.com [209.85.160.196]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3CC906E28C for ; Tue, 26 Jan 2016 10:30:50 -0800 (PST) Received: by mail-yk0-f196.google.com with SMTP id k129so15377597yke.3 for ; Tue, 26 Jan 2016 10:30:50 -0800 (PST) In-Reply-To: <1453833026-24637-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 Tm93IHRoYXQgdGhlIHZhbHVlIG9mIGZlbmNlIGFuZCB0aGUgdGltZWxpbmUgYXJlIG5vdCBzdG9y ZWQgYnkgc3dfc3luYwphbnltb3JlIHdlIGNhbiByZW1vdmUgdGhpcyBleHRyYSBhYnN0cmFjdGlv biB0byByZXRyaWV2ZSB0aGlzIGRhdGEuCgpUaGlzIHBhdGNoIGNoYW5nZXMgYm90aCBmZW5jZV9v cHMgKC5mZW5jZV92YWx1ZV9zdHIgYW5kCi50aW1lbGluZV92YWx1ZV9zdHIpIHRvIHJldHVybiB0 aGUgc3RyIGRpcmVjdGx5LgoKSXQgYWxzbyBjbGVhbiB1cCBzdHJ1Y3Qgc3luY190aW1lbGluZV9v cHMgYnkgcmVtb3ZpbmcgYm90aCBvcHMgZnJvbSB0aGVyZS4KClNpZ25lZC1vZmYtYnk6IEd1c3Rh dm8gUGFkb3ZhbiA8Z3VzdGF2by5wYWRvdmFuQGNvbGxhYm9yYS5jby51az4KLS0tCiBkcml2ZXJz L3N0YWdpbmcvYW5kcm9pZC9zd19zeW5jLmMgICAgfCAxNyAtLS0tLS0tLS0tLS0tLS0tLQogZHJp dmVycy9zdGFnaW5nL2FuZHJvaWQvc3luYy5jICAgICAgIHwgMTYgKystLS0tLS0tLS0tLS0tLQog ZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvc3luYy5oICAgICAgIHwgIDkgLS0tLS0tLS0tCiBkcml2 ZXJzL3N0YWdpbmcvYW5kcm9pZC9zeW5jX2RlYnVnLmMgfCAxMiArKy0tLS0tLS0tLS0KIGRyaXZl cnMvc3RhZ2luZy9hbmRyb2lkL3RyYWNlL3N5bmMuaCB8IDEyICsrKy0tLS0tLS0tLQogNSBmaWxl cyBjaGFuZ2VkLCA3IGluc2VydGlvbnMoKyksIDU5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL3N3X3N5bmMuYyBiL2RyaXZlcnMvc3RhZ2luZy9hbmRy b2lkL3N3X3N5bmMuYwppbmRleCA0MjhlMjJjLi40MjAwYjEyIDEwMDY0NAotLS0gYS9kcml2ZXJz L3N0YWdpbmcvYW5kcm9pZC9zd19zeW5jLmMKKysrIGIvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQv c3dfc3luYy5jCkBAIC0zOCwyNSArMzgsOCBAQCBzdHJ1Y3QgZmVuY2UgKnN3X3N5bmNfcHRfY3Jl YXRlKHN0cnVjdCBzd19zeW5jX3RpbWVsaW5lICpvYmosIHUzMiB2YWx1ZSkKIH0KIEVYUE9SVF9T WU1CT0woc3dfc3luY19wdF9jcmVhdGUpOwogCi1zdGF0aWMgdm9pZCBzd19zeW5jX3RpbWVsaW5l X3ZhbHVlX3N0cihzdHJ1Y3Qgc3luY190aW1lbGluZSAqc3luY190aW1lbGluZSwKLQkJCQkgICAg ICAgY2hhciAqc3RyLCBpbnQgc2l6ZSkKLXsKLQlzdHJ1Y3Qgc3dfc3luY190aW1lbGluZSAqdGlt ZWxpbmUgPQotCQkoc3RydWN0IHN3X3N5bmNfdGltZWxpbmUgKilzeW5jX3RpbWVsaW5lOwotCXNu cHJpbnRmKHN0ciwgc2l6ZSwgIiVkIiwgdGltZWxpbmUtPnZhbHVlKTsKLX0KLQotc3RhdGljIHZv aWQgc3dfc3luY19mZW5jZV92YWx1ZV9zdHIoc3RydWN0IGZlbmNlICpmZW5jZSwgY2hhciAqc3Ry LCBpbnQgc2l6ZSkKLXsKLQlzdHJ1Y3Qgc3dfc3luY19wdCAqcHQgPSAoc3RydWN0IHN3X3N5bmNf cHQgKilmZW5jZTsKLQotCXNucHJpbnRmKHN0ciwgc2l6ZSwgIiVkIiwgcHQtPnZhbHVlKTsKLX0K LQogc3RhdGljIHN0cnVjdCBzeW5jX3RpbWVsaW5lX29wcyBzd19zeW5jX3RpbWVsaW5lX29wcyA9 IHsKIAkuZHJpdmVyX25hbWUgPSAic3dfc3luYyIsCi0JLnRpbWVsaW5lX3ZhbHVlX3N0ciA9IHN3 X3N5bmNfdGltZWxpbmVfdmFsdWVfc3RyLAotCS5mZW5jZV92YWx1ZV9zdHIgPSBzd19zeW5jX2Zl bmNlX3ZhbHVlX3N0ciwKIH07CiAKIHN0cnVjdCBzd19zeW5jX3RpbWVsaW5lICpzd19zeW5jX3Rp bWVsaW5lX2NyZWF0ZShjb25zdCBjaGFyICpuYW1lKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9zdGFn aW5nL2FuZHJvaWQvc3luYy5jIGIvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvc3luYy5jCmluZGV4 IDM5YWY1ZmIuLmYyZDI5OGMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL3N5 bmMuYworKysgYi9kcml2ZXJzL3N0YWdpbmcvYW5kcm9pZC9zeW5jLmMKQEAgLTE5NiwxNCArMTk2 LDcgQEAgc3RhdGljIGludCBhbmRyb2lkX2ZlbmNlX2ZpbGxfZHJpdmVyX2RhdGEoc3RydWN0IGZl bmNlICpmZW5jZSwKIHN0YXRpYyB2b2lkIGFuZHJvaWRfZmVuY2VfdmFsdWVfc3RyKHN0cnVjdCBm ZW5jZSAqZmVuY2UsCiAJCQkJICAgIGNoYXIgKnN0ciwgaW50IHNpemUpCiB7Ci0Jc3RydWN0IHN5 bmNfdGltZWxpbmUgKnBhcmVudCA9IGZlbmNlX3BhcmVudChmZW5jZSk7Ci0KLQlpZiAoIXBhcmVu dC0+b3BzLT5mZW5jZV92YWx1ZV9zdHIpIHsKLQkJaWYgKHNpemUpCi0JCQkqc3RyID0gMDsKLQkJ cmV0dXJuOwotCX0KLQlwYXJlbnQtPm9wcy0+ZmVuY2VfdmFsdWVfc3RyKGZlbmNlLCBzdHIsIHNp emUpOworCXNucHJpbnRmKHN0ciwgc2l6ZSwgIiVkIiwgZmVuY2UtPnNlcW5vKTsKIH0KIAogc3Rh dGljIHZvaWQgYW5kcm9pZF9mZW5jZV90aW1lbGluZV92YWx1ZV9zdHIoc3RydWN0IGZlbmNlICpm ZW5jZSwKQEAgLTIxMSwxMiArMjA0LDcgQEAgc3RhdGljIHZvaWQgYW5kcm9pZF9mZW5jZV90aW1l bGluZV92YWx1ZV9zdHIoc3RydWN0IGZlbmNlICpmZW5jZSwKIHsKIAlzdHJ1Y3Qgc3luY190aW1l bGluZSAqcGFyZW50ID0gZmVuY2VfcGFyZW50KGZlbmNlKTsKIAotCWlmICghcGFyZW50LT5vcHMt PnRpbWVsaW5lX3ZhbHVlX3N0cikgewotCQlpZiAoc2l6ZSkKLQkJCSpzdHIgPSAwOwotCQlyZXR1 cm47Ci0JfQotCXBhcmVudC0+b3BzLT50aW1lbGluZV92YWx1ZV9zdHIocGFyZW50LCBzdHIsIHNp emUpOworCXNucHJpbnRmKHN0ciwgc2l6ZSwgIiVkIiwgcGFyZW50LT52YWx1ZSk7CiB9CiAKIHN0 YXRpYyBjb25zdCBzdHJ1Y3QgZmVuY2Vfb3BzIGFuZHJvaWRfZmVuY2Vfb3BzID0gewpkaWZmIC0t Z2l0IGEvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvc3luYy5oIGIvZHJpdmVycy9zdGFnaW5nL2Fu ZHJvaWQvc3luYy5oCmluZGV4IDUwMDgzOGIuLmIxYTRiMDYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv c3RhZ2luZy9hbmRyb2lkL3N5bmMuaAorKysgYi9kcml2ZXJzL3N0YWdpbmcvYW5kcm9pZC9zeW5j LmgKQEAgLTI3LDE4ICsyNyw5IEBAIHN0cnVjdCBzeW5jX3RpbWVsaW5lOwogLyoqCiAgKiBzdHJ1 Y3Qgc3luY190aW1lbGluZV9vcHMgLSBzeW5jIG9iamVjdCBpbXBsZW1lbnRhdGlvbiBvcHMKICAq IEBkcml2ZXJfbmFtZToJbmFtZSBvZiB0aGUgaW1wbGVtZW50YXRpb24KLSAqIEB0aW1lbGluZV92 YWx1ZV9zdHI6IGZpbGwgc3RyIHdpdGggdGhlIHZhbHVlIG9mIHRoZSBzeW5jX3RpbWVsaW5lJ3Mg Y291bnRlcgotICogQGZlbmNlX3ZhbHVlX3N0cjoJZmlsbCBzdHIgd2l0aCB0aGUgdmFsdWUgb2Yg dGhlIGZlbmNlCiAgKi8KIHN0cnVjdCBzeW5jX3RpbWVsaW5lX29wcyB7CiAJY29uc3QgY2hhciAq ZHJpdmVyX25hbWU7Ci0KLQkvKiBvcHRpb25hbCAqLwotCXZvaWQgKCp0aW1lbGluZV92YWx1ZV9z dHIpKHN0cnVjdCBzeW5jX3RpbWVsaW5lICp0aW1lbGluZSwgY2hhciAqc3RyLAotCQkJCSAgIGlu dCBzaXplKTsKLQotCS8qIG9wdGlvbmFsICovCi0Jdm9pZCAoKmZlbmNlX3ZhbHVlX3N0cikoc3Ry dWN0IGZlbmNlICpmZW5jZSwgY2hhciAqc3RyLCBpbnQgc2l6ZSk7CiB9OwogCiAvKioKZGlmZiAt LWdpdCBhL2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL3N5bmNfZGVidWcuYyBiL2RyaXZlcnMvc3Rh Z2luZy9hbmRyb2lkL3N5bmNfZGVidWcuYwppbmRleCBiMzc0MTJkLi43NTE3ZmIzIDEwMDY0NAot LS0gYS9kcml2ZXJzL3N0YWdpbmcvYW5kcm9pZC9zeW5jX2RlYnVnLmMKKysrIGIvZHJpdmVycy9z dGFnaW5nL2FuZHJvaWQvc3luY19kZWJ1Zy5jCkBAIC0xMzQsMTYgKzEzNCw4IEBAIHN0YXRpYyB2 b2lkIHN5bmNfcHJpbnRfb2JqKHN0cnVjdCBzZXFfZmlsZSAqcywgc3RydWN0IHN5bmNfdGltZWxp bmUgKm9iaikKIAlzdHJ1Y3QgbGlzdF9oZWFkICpwb3M7CiAJdW5zaWduZWQgbG9uZyBmbGFnczsK IAotCXNlcV9wcmludGYocywgIiVzICVzIiwgb2JqLT5uYW1lLCBvYmotPm9wcy0+ZHJpdmVyX25h bWUpOwotCi0JaWYgKG9iai0+b3BzLT50aW1lbGluZV92YWx1ZV9zdHIpIHsKLQkJY2hhciB2YWx1 ZVs2NF07Ci0KLQkJb2JqLT5vcHMtPnRpbWVsaW5lX3ZhbHVlX3N0cihvYmosIHZhbHVlLCBzaXpl b2YodmFsdWUpKTsKLQkJc2VxX3ByaW50ZihzLCAiOiAlcyIsIHZhbHVlKTsKLQl9Ci0KLQlzZXFf cHV0cyhzLCAiXG4iKTsKKwlzZXFfcHJpbnRmKHMsICIlcyAlczogJWRcbiIsIG9iai0+bmFtZSwg b2JqLT5vcHMtPmRyaXZlcl9uYW1lLAorCQkgICBvYmotPnZhbHVlKTsKIAogCXNwaW5fbG9ja19p cnFzYXZlKCZvYmotPmNoaWxkX2xpc3RfbG9jaywgZmxhZ3MpOwogCWxpc3RfZm9yX2VhY2gocG9z LCAmb2JqLT5jaGlsZF9saXN0X2hlYWQpIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvc3RhZ2luZy9h bmRyb2lkL3RyYWNlL3N5bmMuaCBiL2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL3RyYWNlL3N5bmMu aAppbmRleCBhMGY4MGY0Li5kN2Y2NDU3ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9zdGFnaW5nL2Fu ZHJvaWQvdHJhY2Uvc3luYy5oCisrKyBiL2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL3RyYWNlL3N5 bmMuaApAQCAtMTUsMjEgKzE1LDE1IEBAIFRSQUNFX0VWRU5UKHN5bmNfdGltZWxpbmUsCiAKIAlU UF9TVFJVQ1RfX2VudHJ5KAogCQkJX19zdHJpbmcobmFtZSwgdGltZWxpbmUtPm5hbWUpCi0JCQlf X2FycmF5KGNoYXIsIHZhbHVlLCAzMikKKwkJCV9fZmllbGQodTMyLCB2YWx1ZSkKIAkpLAogCiAJ VFBfZmFzdF9hc3NpZ24oCiAJCQlfX2Fzc2lnbl9zdHIobmFtZSwgdGltZWxpbmUtPm5hbWUpOwot CQkJaWYgKHRpbWVsaW5lLT5vcHMtPnRpbWVsaW5lX3ZhbHVlX3N0cikgewotCQkJCXRpbWVsaW5l LT5vcHMtPnRpbWVsaW5lX3ZhbHVlX3N0cih0aW1lbGluZSwKLQkJCQkJCQlfX2VudHJ5LT52YWx1 ZSwKLQkJCQkJCQlzaXplb2YoX19lbnRyeS0+dmFsdWUpKTsKLQkJCX0gZWxzZSB7Ci0JCQkJX19l bnRyeS0+dmFsdWVbMF0gPSAnXDAnOwotCQkJfQorCQkJX19lbnRyeS0+dmFsdWUgPSB0aW1lbGlu ZS0+dmFsdWU7CiAJKSwKIAotCVRQX3ByaW50aygibmFtZT0lcyB2YWx1ZT0lcyIsIF9fZ2V0X3N0 cihuYW1lKSwgX19lbnRyeS0+dmFsdWUpCisJVFBfcHJpbnRrKCJuYW1lPSVzIHZhbHVlPSVkIiwg X19nZXRfc3RyKG5hbWUpLCBfX2VudHJ5LT52YWx1ZSkKICk7CiAKICNlbmRpZiAvKiBpZiAhZGVm aW5lZChfVFJBQ0VfU1lOQ19IKSB8fCBkZWZpbmVkKFRSQUNFX0hFQURFUl9NVUxUSV9SRUFEKSAq LwotLSAKMi41LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs Cg==