From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754906AbcAOO4t (ORCPT ); Fri, 15 Jan 2016 09:56:49 -0500 Received: from mail-yk0-f176.google.com ([209.85.160.176]:32854 "EHLO mail-yk0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754798AbcAOO4q (ORCPT ); Fri, 15 Jan 2016 09:56:46 -0500 From: Gustavo Padovan To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, dri-devel@lists.freedesktop.org, daniels@collabora.com, =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Riley Andrews , Daniel Vetter , Rob Clark , Greg Hackmann , John Harrison , Maarten Lankhorst , Gustavo Padovan Subject: [RFC 16/29] dma-buf/fence: create fence_default_timeline_name() Date: Fri, 15 Jan 2016 12:55:26 -0200 Message-Id: <1452869739-3304-17-git-send-email-gustavo@padovan.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1452869739-3304-1-git-send-email-gustavo@padovan.org> References: <1452869739-3304-1-git-send-email-gustavo@padovan.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Gustavo Padovan The fence timeline struct already receives the name of the timeline so we can use a default function to return the timeline name. Signed-off-by: Gustavo Padovan --- drivers/dma-buf/fence.c | 14 ++++++++++++++ drivers/staging/android/sync.c | 9 +-------- include/linux/fence.h | 1 + 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/drivers/dma-buf/fence.c b/drivers/dma-buf/fence.c index 85b5074..f77d6a9 100644 --- a/drivers/dma-buf/fence.c +++ b/drivers/dma-buf/fence.c @@ -456,6 +456,20 @@ const char *fence_default_get_driver_name(struct fence *fence) EXPORT_SYMBOL(fence_default_get_driver_name); /** + * fence_default_get_timeline_name - default get_timeline_name op + * @fence: [in] the fence to retrieve timeline name + * + * This function returns the name of the timeline which the fence belongs to. + */ +const char *fence_default_get_timeline_name(struct fence *fence) +{ + struct fence_timeline *parent = fence_parent(fence); + + return parent->name; +} +EXPORT_SYMBOL(fence_default_get_timeline_name); + +/** * fence_default_enable_signaling - default op for .enable_signaling * @fence: [in] the fence to enable signaling * diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c index c3386a6..f8b3c6b 100644 --- a/drivers/staging/android/sync.c +++ b/drivers/staging/android/sync.c @@ -321,13 +321,6 @@ int sync_fence_wait(struct sync_fence *sync_fence, long timeout) } EXPORT_SYMBOL(sync_fence_wait); -static const char *sync_fence_get_timeline_name(struct fence *fence) -{ - struct fence_timeline *parent = fence_parent(fence); - - return parent->name; -} - static bool sync_fence_signaled(struct fence *fence) { struct fence_timeline *parent = fence_parent(fence); @@ -377,7 +370,7 @@ static void sync_fence_timeline_value_str(struct fence *fence, static const struct fence_ops sync_fence_ops = { .get_driver_name = fence_default_get_driver_name, - .get_timeline_name = sync_fence_get_timeline_name, + .get_timeline_name = fence_default_get_timeline_name, .enable_signaling = fence_default_enable_signaling, .signaled = sync_fence_signaled, .wait = fence_default_wait, diff --git a/include/linux/fence.h b/include/linux/fence.h index f355c28a..e8f9f12 100644 --- a/include/linux/fence.h +++ b/include/linux/fence.h @@ -295,6 +295,7 @@ static inline void fence_put(struct fence *fence) int fence_signal(struct fence *fence); int fence_signal_locked(struct fence *fence); const char *fence_default_get_driver_name(struct fence *fence); +const char *fence_default_get_timeline_name(struct fence *fence); bool fence_default_enable_signaling(struct fence *fence); signed long fence_default_wait(struct fence *fence, bool intr, signed long timeout); void fence_default_release(struct fence *fence); -- 2.5.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gustavo Padovan Subject: [RFC 16/29] dma-buf/fence: create fence_default_timeline_name() Date: Fri, 15 Jan 2016 12:55:26 -0200 Message-ID: <1452869739-3304-17-git-send-email-gustavo@padovan.org> References: <1452869739-3304-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-f169.google.com (mail-yk0-f169.google.com [209.85.160.169]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2FD547A0F5 for ; Fri, 15 Jan 2016 06:56:46 -0800 (PST) Received: by mail-yk0-f169.google.com with SMTP id v14so451543805ykd.3 for ; Fri, 15 Jan 2016 06:56:46 -0800 (PST) In-Reply-To: <1452869739-3304-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, daniels@collabora.com, Daniel Vetter , Riley Andrews , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Maarten Lankhorst , Gustavo Padovan , John Harrison List-Id: dri-devel@lists.freedesktop.org RnJvbTogR3VzdGF2byBQYWRvdmFuIDxndXN0YXZvLnBhZG92YW5AY29sbGFib3JhLmNvLnVrPgoK VGhlIGZlbmNlIHRpbWVsaW5lIHN0cnVjdCBhbHJlYWR5IHJlY2VpdmVzIHRoZSBuYW1lIG9mIHRo ZSB0aW1lbGluZSBzbwp3ZSBjYW4gdXNlIGEgZGVmYXVsdCBmdW5jdGlvbiB0byByZXR1cm4gdGhl IHRpbWVsaW5lIG5hbWUuCgpTaWduZWQtb2ZmLWJ5OiBHdXN0YXZvIFBhZG92YW4gPGd1c3Rhdm8u cGFkb3ZhbkBjb2xsYWJvcmEuY28udWs+Ci0tLQogZHJpdmVycy9kbWEtYnVmL2ZlbmNlLmMgICAg ICAgIHwgMTQgKysrKysrKysrKysrKysKIGRyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL3N5bmMuYyB8 ICA5ICstLS0tLS0tLQogaW5jbHVkZS9saW51eC9mZW5jZS5oICAgICAgICAgIHwgIDEgKwogMyBm aWxlcyBjaGFuZ2VkLCAxNiBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZG1hLWJ1Zi9mZW5jZS5jIGIvZHJpdmVycy9kbWEtYnVmL2ZlbmNlLmMKaW5k ZXggODViNTA3NC4uZjc3ZDZhOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9kbWEtYnVmL2ZlbmNlLmMK KysrIGIvZHJpdmVycy9kbWEtYnVmL2ZlbmNlLmMKQEAgLTQ1Niw2ICs0NTYsMjAgQEAgY29uc3Qg Y2hhciAqZmVuY2VfZGVmYXVsdF9nZXRfZHJpdmVyX25hbWUoc3RydWN0IGZlbmNlICpmZW5jZSkK IEVYUE9SVF9TWU1CT0woZmVuY2VfZGVmYXVsdF9nZXRfZHJpdmVyX25hbWUpOwogCiAvKioKKyAq IGZlbmNlX2RlZmF1bHRfZ2V0X3RpbWVsaW5lX25hbWUgLSBkZWZhdWx0IGdldF90aW1lbGluZV9u YW1lIG9wCisgKiBAZmVuY2U6CVtpbl0JdGhlIGZlbmNlIHRvIHJldHJpZXZlIHRpbWVsaW5lIG5h bWUKKyAqCisgKiBUaGlzIGZ1bmN0aW9uIHJldHVybnMgdGhlIG5hbWUgb2YgdGhlIHRpbWVsaW5l IHdoaWNoIHRoZSBmZW5jZSBiZWxvbmdzIHRvLgorICovCitjb25zdCBjaGFyICpmZW5jZV9kZWZh dWx0X2dldF90aW1lbGluZV9uYW1lKHN0cnVjdCBmZW5jZSAqZmVuY2UpCit7CisJc3RydWN0IGZl bmNlX3RpbWVsaW5lICpwYXJlbnQgPSBmZW5jZV9wYXJlbnQoZmVuY2UpOworCisJcmV0dXJuIHBh cmVudC0+bmFtZTsKK30KK0VYUE9SVF9TWU1CT0woZmVuY2VfZGVmYXVsdF9nZXRfdGltZWxpbmVf bmFtZSk7CisKKy8qKgogICogZmVuY2VfZGVmYXVsdF9lbmFibGVfc2lnbmFsaW5nIC0gZGVmYXVs dCBvcCBmb3IgLmVuYWJsZV9zaWduYWxpbmcKICAqIEBmZW5jZToJW2luXQl0aGUgZmVuY2UgdG8g ZW5hYmxlIHNpZ25hbGluZwogICoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lk L3N5bmMuYyBiL2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL3N5bmMuYwppbmRleCBjMzM4NmE2Li5m OGIzYzZiIDEwMDY0NAotLS0gYS9kcml2ZXJzL3N0YWdpbmcvYW5kcm9pZC9zeW5jLmMKKysrIGIv ZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvc3luYy5jCkBAIC0zMjEsMTMgKzMyMSw2IEBAIGludCBz eW5jX2ZlbmNlX3dhaXQoc3RydWN0IHN5bmNfZmVuY2UgKnN5bmNfZmVuY2UsIGxvbmcgdGltZW91 dCkKIH0KIEVYUE9SVF9TWU1CT0woc3luY19mZW5jZV93YWl0KTsKIAotc3RhdGljIGNvbnN0IGNo YXIgKnN5bmNfZmVuY2VfZ2V0X3RpbWVsaW5lX25hbWUoc3RydWN0IGZlbmNlICpmZW5jZSkKLXsK LQlzdHJ1Y3QgZmVuY2VfdGltZWxpbmUgKnBhcmVudCA9IGZlbmNlX3BhcmVudChmZW5jZSk7Ci0K LQlyZXR1cm4gcGFyZW50LT5uYW1lOwotfQotCiBzdGF0aWMgYm9vbCBzeW5jX2ZlbmNlX3NpZ25h bGVkKHN0cnVjdCBmZW5jZSAqZmVuY2UpCiB7CiAJc3RydWN0IGZlbmNlX3RpbWVsaW5lICpwYXJl bnQgPSBmZW5jZV9wYXJlbnQoZmVuY2UpOwpAQCAtMzc3LDcgKzM3MCw3IEBAIHN0YXRpYyB2b2lk IHN5bmNfZmVuY2VfdGltZWxpbmVfdmFsdWVfc3RyKHN0cnVjdCBmZW5jZSAqZmVuY2UsCiAKIHN0 YXRpYyBjb25zdCBzdHJ1Y3QgZmVuY2Vfb3BzIHN5bmNfZmVuY2Vfb3BzID0gewogCS5nZXRfZHJp dmVyX25hbWUgPSBmZW5jZV9kZWZhdWx0X2dldF9kcml2ZXJfbmFtZSwKLQkuZ2V0X3RpbWVsaW5l X25hbWUgPSBzeW5jX2ZlbmNlX2dldF90aW1lbGluZV9uYW1lLAorCS5nZXRfdGltZWxpbmVfbmFt ZSA9IGZlbmNlX2RlZmF1bHRfZ2V0X3RpbWVsaW5lX25hbWUsCiAJLmVuYWJsZV9zaWduYWxpbmcg PSBmZW5jZV9kZWZhdWx0X2VuYWJsZV9zaWduYWxpbmcsCiAJLnNpZ25hbGVkID0gc3luY19mZW5j ZV9zaWduYWxlZCwKIAkud2FpdCA9IGZlbmNlX2RlZmF1bHRfd2FpdCwKZGlmZiAtLWdpdCBhL2lu Y2x1ZGUvbGludXgvZmVuY2UuaCBiL2luY2x1ZGUvbGludXgvZmVuY2UuaAppbmRleCBmMzU1YzI4 YS4uZThmOWYxMiAxMDA2NDQKLS0tIGEvaW5jbHVkZS9saW51eC9mZW5jZS5oCisrKyBiL2luY2x1 ZGUvbGludXgvZmVuY2UuaApAQCAtMjk1LDYgKzI5NSw3IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBm ZW5jZV9wdXQoc3RydWN0IGZlbmNlICpmZW5jZSkKIGludCBmZW5jZV9zaWduYWwoc3RydWN0IGZl bmNlICpmZW5jZSk7CiBpbnQgZmVuY2Vfc2lnbmFsX2xvY2tlZChzdHJ1Y3QgZmVuY2UgKmZlbmNl KTsKIGNvbnN0IGNoYXIgKmZlbmNlX2RlZmF1bHRfZ2V0X2RyaXZlcl9uYW1lKHN0cnVjdCBmZW5j ZSAqZmVuY2UpOworY29uc3QgY2hhciAqZmVuY2VfZGVmYXVsdF9nZXRfdGltZWxpbmVfbmFtZShz dHJ1Y3QgZmVuY2UgKmZlbmNlKTsKIGJvb2wgZmVuY2VfZGVmYXVsdF9lbmFibGVfc2lnbmFsaW5n KHN0cnVjdCBmZW5jZSAqZmVuY2UpOwogc2lnbmVkIGxvbmcgZmVuY2VfZGVmYXVsdF93YWl0KHN0 cnVjdCBmZW5jZSAqZmVuY2UsIGJvb2wgaW50ciwgc2lnbmVkIGxvbmcgdGltZW91dCk7CiB2b2lk IGZlbmNlX2RlZmF1bHRfcmVsZWFzZShzdHJ1Y3QgZmVuY2UgKmZlbmNlKTsKLS0gCjIuNS4wCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwg bWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=