From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934658AbeE2OBC (ORCPT ); Tue, 29 May 2018 10:01:02 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:36598 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S934764AbeE2N7h (ORCPT ); Tue, 29 May 2018 09:59:37 -0400 From: Gerd Hoffmann To: dri-devel@lists.freedesktop.org Cc: Gerd Hoffmann , Daniel Vetter , Sumit Semwal , linux-media@vger.kernel.org (open list:DMA BUFFER SHARING FRAMEWORK), linaro-mm-sig@lists.linaro.org (moderated list:DMA BUFFER SHARING FRAMEWORK), linux-kernel@vger.kernel.org (open list) Subject: [PATCH] dma-buf: make map_atomic and map function pointers optional Date: Tue, 29 May 2018 15:59:18 +0200 Message-Id: <20180529135918.19729-1-kraxel@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org So drivers don't need dummy functions just returning NULL. Cc: Daniel Vetter Signed-off-by: Gerd Hoffmann --- include/linux/dma-buf.h | 4 ++-- drivers/dma-buf/dma-buf.c | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h index 085db2fee2..88917fa796 100644 --- a/include/linux/dma-buf.h +++ b/include/linux/dma-buf.h @@ -39,12 +39,12 @@ struct dma_buf_attachment; /** * struct dma_buf_ops - operations possible on struct dma_buf - * @map_atomic: maps a page from the buffer into kernel address + * @map_atomic: [optional] maps a page from the buffer into kernel address * space, users may not block until the subsequent unmap call. * This callback must not sleep. * @unmap_atomic: [optional] unmaps a atomically mapped page from the buffer. * This Callback must not sleep. - * @map: maps a page from the buffer into kernel address space. + * @map: [optional] maps a page from the buffer into kernel address space. * @unmap: [optional] unmaps a page from the buffer. * @vmap: [optional] creates a virtual mapping for the buffer into kernel * address space. Same restrictions as for vmap and friends apply. diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index d78d5fc173..4c45e31258 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -872,6 +872,8 @@ void *dma_buf_kmap_atomic(struct dma_buf *dmabuf, unsigned long page_num) { WARN_ON(!dmabuf); + if (!dmabuf->ops->map_atomic) + return NULL; return dmabuf->ops->map_atomic(dmabuf, page_num); } EXPORT_SYMBOL_GPL(dma_buf_kmap_atomic); @@ -907,6 +909,8 @@ void *dma_buf_kmap(struct dma_buf *dmabuf, unsigned long page_num) { WARN_ON(!dmabuf); + if (!dmabuf->ops->map) + return NULL; return dmabuf->ops->map(dmabuf, page_num); } EXPORT_SYMBOL_GPL(dma_buf_kmap); -- 2.9.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gerd Hoffmann Subject: [PATCH] dma-buf: make map_atomic and map function pointers optional Date: Tue, 29 May 2018 15:59:18 +0200 Message-ID: <20180529135918.19729-1-kraxel@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by gabe.freedesktop.org (Postfix) with ESMTPS id 392A56E25B for ; Tue, 29 May 2018 13:59:37 +0000 (UTC) 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 Cc: open list , "moderated list:DMA BUFFER SHARING FRAMEWORK" , Gerd Hoffmann , "open list:DMA BUFFER SHARING FRAMEWORK" List-Id: dri-devel@lists.freedesktop.org U28gZHJpdmVycyBkb24ndCBuZWVkIGR1bW15IGZ1bmN0aW9ucyBqdXN0IHJldHVybmluZyBOVUxM LgoKQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbEBmZndsbC5jaD4KU2lnbmVkLW9mZi1ieTogR2Vy ZCBIb2ZmbWFubiA8a3JheGVsQHJlZGhhdC5jb20+Ci0tLQogaW5jbHVkZS9saW51eC9kbWEtYnVm LmggICB8IDQgKystLQogZHJpdmVycy9kbWEtYnVmL2RtYS1idWYuYyB8IDQgKysrKwogMiBmaWxl cyBjaGFuZ2VkLCA2IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv aW5jbHVkZS9saW51eC9kbWEtYnVmLmggYi9pbmNsdWRlL2xpbnV4L2RtYS1idWYuaAppbmRleCAw ODVkYjJmZWUyLi44ODkxN2ZhNzk2IDEwMDY0NAotLS0gYS9pbmNsdWRlL2xpbnV4L2RtYS1idWYu aAorKysgYi9pbmNsdWRlL2xpbnV4L2RtYS1idWYuaApAQCAtMzksMTIgKzM5LDEyIEBAIHN0cnVj dCBkbWFfYnVmX2F0dGFjaG1lbnQ7CiAKIC8qKgogICogc3RydWN0IGRtYV9idWZfb3BzIC0gb3Bl cmF0aW9ucyBwb3NzaWJsZSBvbiBzdHJ1Y3QgZG1hX2J1ZgotICogQG1hcF9hdG9taWM6IG1hcHMg YSBwYWdlIGZyb20gdGhlIGJ1ZmZlciBpbnRvIGtlcm5lbCBhZGRyZXNzCisgKiBAbWFwX2F0b21p YzogW29wdGlvbmFsXSBtYXBzIGEgcGFnZSBmcm9tIHRoZSBidWZmZXIgaW50byBrZXJuZWwgYWRk cmVzcwogICoJCXNwYWNlLCB1c2VycyBtYXkgbm90IGJsb2NrIHVudGlsIHRoZSBzdWJzZXF1ZW50 IHVubWFwIGNhbGwuCiAgKgkJVGhpcyBjYWxsYmFjayBtdXN0IG5vdCBzbGVlcC4KICAqIEB1bm1h cF9hdG9taWM6IFtvcHRpb25hbF0gdW5tYXBzIGEgYXRvbWljYWxseSBtYXBwZWQgcGFnZSBmcm9t IHRoZSBidWZmZXIuCiAgKgkJICBUaGlzIENhbGxiYWNrIG11c3Qgbm90IHNsZWVwLgotICogQG1h cDogbWFwcyBhIHBhZ2UgZnJvbSB0aGUgYnVmZmVyIGludG8ga2VybmVsIGFkZHJlc3Mgc3BhY2Uu CisgKiBAbWFwOiBbb3B0aW9uYWxdIG1hcHMgYSBwYWdlIGZyb20gdGhlIGJ1ZmZlciBpbnRvIGtl cm5lbCBhZGRyZXNzIHNwYWNlLgogICogQHVubWFwOiBbb3B0aW9uYWxdIHVubWFwcyBhIHBhZ2Ug ZnJvbSB0aGUgYnVmZmVyLgogICogQHZtYXA6IFtvcHRpb25hbF0gY3JlYXRlcyBhIHZpcnR1YWwg bWFwcGluZyBmb3IgdGhlIGJ1ZmZlciBpbnRvIGtlcm5lbAogICoJICBhZGRyZXNzIHNwYWNlLiBT YW1lIHJlc3RyaWN0aW9ucyBhcyBmb3Igdm1hcCBhbmQgZnJpZW5kcyBhcHBseS4KZGlmZiAtLWdp dCBhL2RyaXZlcnMvZG1hLWJ1Zi9kbWEtYnVmLmMgYi9kcml2ZXJzL2RtYS1idWYvZG1hLWJ1Zi5j CmluZGV4IGQ3OGQ1ZmMxNzMuLjRjNDVlMzEyNTggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZG1hLWJ1 Zi9kbWEtYnVmLmMKKysrIGIvZHJpdmVycy9kbWEtYnVmL2RtYS1idWYuYwpAQCAtODcyLDYgKzg3 Miw4IEBAIHZvaWQgKmRtYV9idWZfa21hcF9hdG9taWMoc3RydWN0IGRtYV9idWYgKmRtYWJ1Ziwg dW5zaWduZWQgbG9uZyBwYWdlX251bSkKIHsKIAlXQVJOX09OKCFkbWFidWYpOwogCisJaWYgKCFk bWFidWYtPm9wcy0+bWFwX2F0b21pYykKKwkJcmV0dXJuIE5VTEw7CiAJcmV0dXJuIGRtYWJ1Zi0+ b3BzLT5tYXBfYXRvbWljKGRtYWJ1ZiwgcGFnZV9udW0pOwogfQogRVhQT1JUX1NZTUJPTF9HUEwo ZG1hX2J1Zl9rbWFwX2F0b21pYyk7CkBAIC05MDcsNiArOTA5LDggQEAgdm9pZCAqZG1hX2J1Zl9r bWFwKHN0cnVjdCBkbWFfYnVmICpkbWFidWYsIHVuc2lnbmVkIGxvbmcgcGFnZV9udW0pCiB7CiAJ V0FSTl9PTighZG1hYnVmKTsKIAorCWlmICghZG1hYnVmLT5vcHMtPm1hcCkKKwkJcmV0dXJuIE5V TEw7CiAJcmV0dXJuIGRtYWJ1Zi0+b3BzLT5tYXAoZG1hYnVmLCBwYWdlX251bSk7CiB9CiBFWFBP UlRfU1lNQk9MX0dQTChkbWFfYnVmX2ttYXApOwotLSAKMi45LjMKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJp LWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=