From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755148AbcAOO5K (ORCPT ); Fri, 15 Jan 2016 09:57:10 -0500 Received: from mail-yk0-f180.google.com ([209.85.160.180]:34489 "EHLO mail-yk0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755000AbcAOO47 (ORCPT ); Fri, 15 Jan 2016 09:56:59 -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 19/29] dma-buf/fence: create fence_default_fill_driver_data() Date: Fri, 15 Jan 2016 12:55:29 -0200 Message-Id: <1452869739-3304-20-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 value needed by sw_sync is now inside struct fence so we create a default ops to reply that value for us. --- drivers/dma-buf/fence.c | 21 +++++++++++++++++++++ drivers/staging/android/sync.c | 12 +----------- include/linux/fence.h | 1 + 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/drivers/dma-buf/fence.c b/drivers/dma-buf/fence.c index 9fdeae8..d9089a0 100644 --- a/drivers/dma-buf/fence.c +++ b/drivers/dma-buf/fence.c @@ -621,6 +621,27 @@ void fence_default_release(struct fence *fence) EXPORT_SYMBOL(fence_default_release); /** + * fence_default_fill_driver_data - fence default .fill_driver_data ops + * @fence: [in] the fence to get the data from + * @data: [out] the data pointer to write the data + * @size: [in] the size of the allocated data + * + * This function return a driver data. In the case the fence seqno value. + * It is used at least by the sw_sync to send fence information to the + * userspace. + */ +int fence_default_fill_driver_data(struct fence *fence, void *data, int size) +{ + if (size < sizeof(fence->seqno)) + return -ENOMEM; + + memcpy(data, &fence->seqno, sizeof(fence->seqno)); + + return sizeof(fence->seqno); +} +EXPORT_SYMBOL(fence_default_fill_driver_data); + +/** * fence_default_value_str - default .fence_value_str fence ops * @fence: [in] the fence to get the value from * @str: [out] the string pointer to write the value diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c index 147a494..a275108 100644 --- a/drivers/staging/android/sync.c +++ b/drivers/staging/android/sync.c @@ -321,16 +321,6 @@ int sync_fence_wait(struct sync_fence *sync_fence, long timeout) } EXPORT_SYMBOL(sync_fence_wait); -static int sync_fence_fill_driver_data(struct fence *fence, - void *data, int size) -{ - struct fence_timeline *parent = fence_parent(fence); - - if (!parent->ops->fill_driver_data) - return 0; - return parent->ops->fill_driver_data(fence, data, size); -} - static const struct fence_ops sync_fence_ops = { .get_driver_name = fence_default_get_driver_name, .get_timeline_name = fence_default_get_timeline_name, @@ -338,7 +328,7 @@ static const struct fence_ops sync_fence_ops = { .signaled = fence_default_signaled, .wait = fence_default_wait, .release = fence_default_release, - .fill_driver_data = sync_fence_fill_driver_data, + .fill_driver_data = fence_default_fill_driver_data, .fence_value_str = fence_default_value_str, .timeline_value_str = fence_default_timeline_value_str, }; diff --git a/include/linux/fence.h b/include/linux/fence.h index 5371beb..04438c3 100644 --- a/include/linux/fence.h +++ b/include/linux/fence.h @@ -285,6 +285,7 @@ bool fence_default_signaled(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); +int fence_default_fill_driver_data(struct fence *fence, void *data, int size); void fence_default_value_str(struct fence *fence, char *str, int size); void fence_default_timeline_value_str(struct fence *fence, char *str, int size); int fence_add_callback(struct fence *fence, struct fence_cb *cb, -- 2.5.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gustavo Padovan Subject: [RFC 19/29] dma-buf/fence: create fence_default_fill_driver_data() Date: Fri, 15 Jan 2016 12:55:29 -0200 Message-ID: <1452869739-3304-20-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-f171.google.com (mail-yk0-f171.google.com [209.85.160.171]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5D3F77A0E7 for ; Fri, 15 Jan 2016 06:56:59 -0800 (PST) Received: by mail-yk0-f171.google.com with SMTP id k129so522529674yke.0 for ; Fri, 15 Jan 2016 06:56:59 -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 VGhlIHZhbHVlIG5lZWRlZCBieSBzd19zeW5jIGlzIG5vdyBpbnNpZGUgc3RydWN0IGZlbmNlIHNv IHdlIGNyZWF0ZSBhCmRlZmF1bHQgb3BzIHRvIHJlcGx5IHRoYXQgdmFsdWUgZm9yIHVzLgotLS0K IGRyaXZlcnMvZG1hLWJ1Zi9mZW5jZS5jICAgICAgICB8IDIxICsrKysrKysrKysrKysrKysrKysr KwogZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvc3luYy5jIHwgMTIgKy0tLS0tLS0tLS0tCiBpbmNs dWRlL2xpbnV4L2ZlbmNlLmggICAgICAgICAgfCAgMSArCiAzIGZpbGVzIGNoYW5nZWQsIDIzIGlu c2VydGlvbnMoKyksIDExIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZG1hLWJ1 Zi9mZW5jZS5jIGIvZHJpdmVycy9kbWEtYnVmL2ZlbmNlLmMKaW5kZXggOWZkZWFlOC4uZDkwODlh MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9kbWEtYnVmL2ZlbmNlLmMKKysrIGIvZHJpdmVycy9kbWEt YnVmL2ZlbmNlLmMKQEAgLTYyMSw2ICs2MjEsMjcgQEAgdm9pZCBmZW5jZV9kZWZhdWx0X3JlbGVh c2Uoc3RydWN0IGZlbmNlICpmZW5jZSkKIEVYUE9SVF9TWU1CT0woZmVuY2VfZGVmYXVsdF9yZWxl YXNlKTsKIAogLyoqCisgKiBmZW5jZV9kZWZhdWx0X2ZpbGxfZHJpdmVyX2RhdGEgLSBmZW5jZSBk ZWZhdWx0IC5maWxsX2RyaXZlcl9kYXRhIG9wcworICogQGZlbmNlOglbaW5dCXRoZSBmZW5jZSB0 byBnZXQgdGhlIGRhdGEgZnJvbQorICogQGRhdGE6CVtvdXRdCXRoZSBkYXRhIHBvaW50ZXIgdG8g d3JpdGUgdGhlIGRhdGEKKyAqIEBzaXplOglbaW5dCXRoZSBzaXplIG9mIHRoZSBhbGxvY2F0ZWQg ZGF0YQorICoKKyAqIFRoaXMgZnVuY3Rpb24gcmV0dXJuIGEgZHJpdmVyIGRhdGEuIEluIHRoZSBj YXNlIHRoZSBmZW5jZSBzZXFubyB2YWx1ZS4KKyAqIEl0IGlzIHVzZWQgYXQgbGVhc3QgYnkgdGhl IHN3X3N5bmMgdG8gc2VuZCBmZW5jZSBpbmZvcm1hdGlvbiB0byB0aGUKKyAqIHVzZXJzcGFjZS4K KyAqLworaW50IGZlbmNlX2RlZmF1bHRfZmlsbF9kcml2ZXJfZGF0YShzdHJ1Y3QgZmVuY2UgKmZl bmNlLCB2b2lkICpkYXRhLCBpbnQgc2l6ZSkKK3sKKwlpZiAoc2l6ZSA8IHNpemVvZihmZW5jZS0+ c2Vxbm8pKQorCQlyZXR1cm4gLUVOT01FTTsKKworCW1lbWNweShkYXRhLCAmZmVuY2UtPnNlcW5v LCBzaXplb2YoZmVuY2UtPnNlcW5vKSk7CisKKwlyZXR1cm4gc2l6ZW9mKGZlbmNlLT5zZXFubyk7 Cit9CitFWFBPUlRfU1lNQk9MKGZlbmNlX2RlZmF1bHRfZmlsbF9kcml2ZXJfZGF0YSk7CisKKy8q KgogICogZmVuY2VfZGVmYXVsdF92YWx1ZV9zdHIgLSBkZWZhdWx0IC5mZW5jZV92YWx1ZV9zdHIg ZmVuY2Ugb3BzCiAgKiBAZmVuY2U6CVtpbl0JdGhlIGZlbmNlIHRvIGdldCB0aGUgdmFsdWUgZnJv bQogICogQHN0cjoJW291dF0JdGhlIHN0cmluZyBwb2ludGVyIHRvIHdyaXRlIHRoZSB2YWx1ZQpk aWZmIC0tZ2l0IGEvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvc3luYy5jIGIvZHJpdmVycy9zdGFn aW5nL2FuZHJvaWQvc3luYy5jCmluZGV4IDE0N2E0OTQuLmEyNzUxMDggMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvc3RhZ2luZy9hbmRyb2lkL3N5bmMuYworKysgYi9kcml2ZXJzL3N0YWdpbmcvYW5kcm9p ZC9zeW5jLmMKQEAgLTMyMSwxNiArMzIxLDYgQEAgaW50IHN5bmNfZmVuY2Vfd2FpdChzdHJ1Y3Qg c3luY19mZW5jZSAqc3luY19mZW5jZSwgbG9uZyB0aW1lb3V0KQogfQogRVhQT1JUX1NZTUJPTChz eW5jX2ZlbmNlX3dhaXQpOwogCi1zdGF0aWMgaW50IHN5bmNfZmVuY2VfZmlsbF9kcml2ZXJfZGF0 YShzdHJ1Y3QgZmVuY2UgKmZlbmNlLAotCQkJCQkgIHZvaWQgKmRhdGEsIGludCBzaXplKQotewot CXN0cnVjdCBmZW5jZV90aW1lbGluZSAqcGFyZW50ID0gZmVuY2VfcGFyZW50KGZlbmNlKTsKLQot CWlmICghcGFyZW50LT5vcHMtPmZpbGxfZHJpdmVyX2RhdGEpCi0JCXJldHVybiAwOwotCXJldHVy biBwYXJlbnQtPm9wcy0+ZmlsbF9kcml2ZXJfZGF0YShmZW5jZSwgZGF0YSwgc2l6ZSk7Ci19Ci0K IHN0YXRpYyBjb25zdCBzdHJ1Y3QgZmVuY2Vfb3BzIHN5bmNfZmVuY2Vfb3BzID0gewogCS5nZXRf ZHJpdmVyX25hbWUgPSBmZW5jZV9kZWZhdWx0X2dldF9kcml2ZXJfbmFtZSwKIAkuZ2V0X3RpbWVs aW5lX25hbWUgPSBmZW5jZV9kZWZhdWx0X2dldF90aW1lbGluZV9uYW1lLApAQCAtMzM4LDcgKzMy OCw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZmVuY2Vfb3BzIHN5bmNfZmVuY2Vfb3BzID0gewog CS5zaWduYWxlZCA9IGZlbmNlX2RlZmF1bHRfc2lnbmFsZWQsCiAJLndhaXQgPSBmZW5jZV9kZWZh dWx0X3dhaXQsCiAJLnJlbGVhc2UgPSBmZW5jZV9kZWZhdWx0X3JlbGVhc2UsCi0JLmZpbGxfZHJp dmVyX2RhdGEgPSBzeW5jX2ZlbmNlX2ZpbGxfZHJpdmVyX2RhdGEsCisJLmZpbGxfZHJpdmVyX2Rh dGEgPSBmZW5jZV9kZWZhdWx0X2ZpbGxfZHJpdmVyX2RhdGEsCiAJLmZlbmNlX3ZhbHVlX3N0ciA9 IGZlbmNlX2RlZmF1bHRfdmFsdWVfc3RyLAogCS50aW1lbGluZV92YWx1ZV9zdHIgPSBmZW5jZV9k ZWZhdWx0X3RpbWVsaW5lX3ZhbHVlX3N0ciwKIH07CmRpZmYgLS1naXQgYS9pbmNsdWRlL2xpbnV4 L2ZlbmNlLmggYi9pbmNsdWRlL2xpbnV4L2ZlbmNlLmgKaW5kZXggNTM3MWJlYi4uMDQ0MzhjMyAx MDA2NDQKLS0tIGEvaW5jbHVkZS9saW51eC9mZW5jZS5oCisrKyBiL2luY2x1ZGUvbGludXgvZmVu Y2UuaApAQCAtMjg1LDYgKzI4NSw3IEBAIGJvb2wgZmVuY2VfZGVmYXVsdF9zaWduYWxlZChzdHJ1 Y3QgZmVuY2UgKmZlbmNlKTsKIGJvb2wgZmVuY2VfZGVmYXVsdF9lbmFibGVfc2lnbmFsaW5nKHN0 cnVjdCBmZW5jZSAqZmVuY2UpOwogc2lnbmVkIGxvbmcgZmVuY2VfZGVmYXVsdF93YWl0KHN0cnVj dCBmZW5jZSAqZmVuY2UsIGJvb2wgaW50ciwgc2lnbmVkIGxvbmcgdGltZW91dCk7CiB2b2lkIGZl bmNlX2RlZmF1bHRfcmVsZWFzZShzdHJ1Y3QgZmVuY2UgKmZlbmNlKTsKK2ludCBmZW5jZV9kZWZh dWx0X2ZpbGxfZHJpdmVyX2RhdGEoc3RydWN0IGZlbmNlICpmZW5jZSwgdm9pZCAqZGF0YSwgaW50 IHNpemUpOwogdm9pZCBmZW5jZV9kZWZhdWx0X3ZhbHVlX3N0cihzdHJ1Y3QgZmVuY2UgKmZlbmNl LCBjaGFyICpzdHIsIGludCBzaXplKTsKIHZvaWQgZmVuY2VfZGVmYXVsdF90aW1lbGluZV92YWx1 ZV9zdHIoc3RydWN0IGZlbmNlICpmZW5jZSwgY2hhciAqc3RyLCBpbnQgc2l6ZSk7CiBpbnQgZmVu Y2VfYWRkX2NhbGxiYWNrKHN0cnVjdCBmZW5jZSAqZmVuY2UsIHN0cnVjdCBmZW5jZV9jYiAqY2Is Ci0tIAoyLjUuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK