From patchwork Fri Dec 13 22:23:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 22373 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f199.google.com (mail-ve0-f199.google.com [209.85.128.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B01AD23FBA for ; Fri, 13 Dec 2013 22:26:20 +0000 (UTC) Received: by mail-ve0-f199.google.com with SMTP id c14sf4844024vea.6 for ; Fri, 13 Dec 2013 14:26:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=DWih60lwEm6/0htKiRpLDWlWQoqywnj1eGdVAoOD7Ds=; b=i4V6l/BK8GJaL53ES8WPSCD0PRfFQG3REdgdoeDaRk7Ys19kVDP+s3NdvdjOPmbIl2 2Y0ZABwa2D6pUWWp1OvkHeOBrEsOSgZk3+f23uiATRyiVMnT1MPWnkQMvt+AHLtDJk0O x06VwuO79Rll4Fvqbj/yWa9o78O+VreiJPzagnq5ejtRuFL5eOXUcgxFaujFjlKsiTen K3oRdbJqgP2SPrXOVdx1KBI/xrLvtJLnWxBi7JN+RMyKdmwsnRXN9yuiuTaKmaq0BweG zEgtDgm8a6QfzhezZqBKGRZMM0SPwu7yRUeLG6stE4SCjXP8Io5GCfeuRj1MnlOznPdp AowA== X-Gm-Message-State: ALoCoQn27+JrfZmoI6kO714mOZTQeM8/YVct6whSs1wXFzZ4zhIswGmf/jD5AkU9rNtpOmhPnZBJ X-Received: by 10.58.187.197 with SMTP id fu5mr1993947vec.34.1386973580541; Fri, 13 Dec 2013 14:26:20 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.128.41 with SMTP id nl9ls1250507qeb.56.gmail; Fri, 13 Dec 2013 14:26:20 -0800 (PST) X-Received: by 10.52.249.3 with SMTP id yq3mr1832029vdc.55.1386973580370; Fri, 13 Dec 2013 14:26:20 -0800 (PST) Received: from mail-vb0-f53.google.com (mail-vb0-f53.google.com [209.85.212.53]) by mx.google.com with ESMTPS id lw10si1194964vec.81.2013.12.13.14.26.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 14:26:20 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.53 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.53; Received: by mail-vb0-f53.google.com with SMTP id o19so1737793vbm.12 for ; Fri, 13 Dec 2013 14:26:20 -0800 (PST) X-Received: by 10.58.210.39 with SMTP id mr7mr2217366vec.18.1386973580287; Fri, 13 Dec 2013 14:26:20 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp73451vcz; Fri, 13 Dec 2013 14:26:19 -0800 (PST) X-Received: by 10.68.197.234 with SMTP id ix10mr6052673pbc.80.1386973579377; Fri, 13 Dec 2013 14:26:19 -0800 (PST) Received: from mail-pb0-f41.google.com (mail-pb0-f41.google.com [209.85.160.41]) by mx.google.com with ESMTPS id qu5si2484596pbc.300.2013.12.13.14.26.19 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 14:26:19 -0800 (PST) Received-SPF: neutral (google.com: 209.85.160.41 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) client-ip=209.85.160.41; Received: by mail-pb0-f41.google.com with SMTP id jt11so3152525pbb.28 for ; Fri, 13 Dec 2013 14:26:19 -0800 (PST) X-Received: by 10.68.138.226 with SMTP id qt2mr5950576pbb.65.1386973578929; Fri, 13 Dec 2013 14:26:18 -0800 (PST) Received: from localhost.localdomain (c-67-170-153-23.hsd1.or.comcast.net. [67.170.153.23]) by mx.google.com with ESMTPSA id qz9sm7457908pbc.3.2013.12.13.14.26.14 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 14:26:17 -0800 (PST) From: John Stultz To: LKML Cc: Greg KH , Android Kernel Team , Sumit Semwal , Jesse Barker , Colin Cross , Rebecca Schultz Zavin , John Stultz Subject: [PATCH 008/115] gpu: ion: support begin/end and kmap/kunmap dma_buf ops Date: Fri, 13 Dec 2013 14:23:42 -0800 Message-Id: <1386973529-4884-9-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1386973529-4884-1-git-send-email-john.stultz@linaro.org> References: <1386973529-4884-1-git-send-email-john.stultz@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: john.stultz@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.53 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Rebecca Schultz Zavin These ops were added in the 3.4 kernel. This patch adds support for them to ion. Previous ion_map/unmap_kernel api is also retained in addition to this new api. Signed-off-by: Rebecca Schultz Zavin [jstultz: modified patch to apply to staging directory] Signed-off-by: John Stultz --- drivers/staging/android/ion/ion.c | 88 +++++++++++++++++++++++++++------------ 1 file changed, 62 insertions(+), 26 deletions(-) diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c index 75bf8f2..8937618 100644 --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/ion/ion.c @@ -391,6 +391,22 @@ int ion_phys(struct ion_client *client, struct ion_handle *handle, return ret; } +static void *ion_buffer_kmap_get(struct ion_buffer *buffer) +{ + void *vaddr; + + if (buffer->kmap_cnt) { + buffer->kmap_cnt++; + return buffer->vaddr; + } + vaddr = buffer->heap->ops->map_kernel(buffer->heap, buffer); + if (IS_ERR_OR_NULL(vaddr)) + return vaddr; + buffer->vaddr = vaddr; + buffer->kmap_cnt++; + return vaddr; +} + static void *ion_handle_kmap_get(struct ion_handle *handle) { struct ion_buffer *buffer = handle->buffer; @@ -399,34 +415,30 @@ static void *ion_handle_kmap_get(struct ion_handle *handle) if (handle->kmap_cnt) { handle->kmap_cnt++; return buffer->vaddr; - } else if (buffer->kmap_cnt) { - handle->kmap_cnt++; - buffer->kmap_cnt++; - return buffer->vaddr; } - - vaddr = buffer->heap->ops->map_kernel(buffer->heap, buffer); - buffer->vaddr = vaddr; - if (IS_ERR_OR_NULL(vaddr)) { - buffer->vaddr = NULL; + vaddr = ion_buffer_kmap_get(buffer); + if (IS_ERR_OR_NULL(vaddr)) return vaddr; - } handle->kmap_cnt++; - buffer->kmap_cnt++; return vaddr; } +static void ion_buffer_kmap_put(struct ion_buffer *buffer) +{ + buffer->kmap_cnt--; + if (!buffer->kmap_cnt) { + buffer->heap->ops->unmap_kernel(buffer->heap, buffer); + buffer->vaddr = NULL; + } +} + static void ion_handle_kmap_put(struct ion_handle *handle) { struct ion_buffer *buffer = handle->buffer; handle->kmap_cnt--; if (!handle->kmap_cnt) - buffer->kmap_cnt--; - if (!buffer->kmap_cnt) { - buffer->heap->ops->unmap_kernel(buffer->heap, buffer); - buffer->vaddr = NULL; - } + ion_buffer_kmap_put(buffer); } void *ion_map_kernel(struct ion_client *client, struct ion_handle *handle) @@ -675,7 +687,8 @@ static void ion_dma_buf_release(struct dma_buf *dmabuf) static void *ion_dma_buf_kmap(struct dma_buf *dmabuf, unsigned long offset) { - return NULL; + struct ion_buffer *buffer = dmabuf->priv; + return buffer->vaddr + offset; } static void ion_dma_buf_kunmap(struct dma_buf *dmabuf, unsigned long offset, @@ -684,26 +697,49 @@ static void ion_dma_buf_kunmap(struct dma_buf *dmabuf, unsigned long offset, return; } -static void *ion_dma_buf_kmap_atomic(struct dma_buf *dmabuf, - unsigned long offset) +static int ion_dma_buf_begin_cpu_access(struct dma_buf *dmabuf, size_t start, + size_t len, + enum dma_data_direction direction) { - return NULL; + struct ion_buffer *buffer = dmabuf->priv; + void *vaddr; + + if (!buffer->heap->ops->map_kernel) { + pr_err("%s: map kernel is not implemented by this heap.\n", + __func__); + return -ENODEV; + } + + mutex_lock(&buffer->lock); + vaddr = ion_buffer_kmap_get(buffer); + mutex_unlock(&buffer->lock); + if (IS_ERR(vaddr)) + return PTR_ERR(vaddr); + if (!vaddr) + return -ENOMEM; + return 0; } -static void ion_dma_buf_kunmap_atomic(struct dma_buf *dmabuf, - unsigned long offset, void *ptr) +static void ion_dma_buf_end_cpu_access(struct dma_buf *dmabuf, size_t start, + size_t len, + enum dma_data_direction direction) { - return; -} + struct ion_buffer *buffer = dmabuf->priv; + mutex_lock(&buffer->lock); + ion_buffer_kmap_put(buffer); + mutex_unlock(&buffer->lock); +} struct dma_buf_ops dma_buf_ops = { .map_dma_buf = ion_map_dma_buf, .unmap_dma_buf = ion_unmap_dma_buf, .mmap = ion_mmap, .release = ion_dma_buf_release, - .kmap_atomic = ion_dma_buf_kmap_atomic, - .kunmap_atomic = ion_dma_buf_kunmap_atomic, + .begin_cpu_access = ion_dma_buf_begin_cpu_access, + .end_cpu_access = ion_dma_buf_end_cpu_access, + .kmap_atomic = ion_dma_buf_kmap, + .kunmap_atomic = ion_dma_buf_kunmap, .kmap = ion_dma_buf_kmap, .kunmap = ion_dma_buf_kunmap, };