From patchwork Wed Nov 12 11:38:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Thompson X-Patchwork-Id: 40646 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f70.google.com (mail-wg0-f70.google.com [74.125.82.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6E7B4244AB for ; Wed, 12 Nov 2014 11:38:43 +0000 (UTC) Received: by mail-wg0-f70.google.com with SMTP id x13sf6476766wgg.5 for ; Wed, 12 Nov 2014 03:38:42 -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=T/8YMrSNcfWn7weWsUwgicjROdLntWIe9QWOSMnzy7M=; b=jCIlIZnfhtf3YRmC6DslngtU3WCNgHK3Qd1IvmBZOpOonJFdseyFIA5WHPgpIIdtqF JUh0226scJY+FW3i7G4b3/HPH+ZxMo35dq7XJDB2B2QRpoSnSeIPQWV6UTb9hi42LE/L 3qRPPrwZ64JRzb1E133IvnFdWcwznyaeN+wWbtqStpd4Vtw12iC9CTQVFbtYcpydnXPe 817t0R9vvm0niDMD7I1lA0guIe2il+wL132y8J70lDfEF+T2ReY7Vs2TwWp0WmvmFH7P CQ/UYw83APCCRQ5LcM2gHg6jTEsMKbA3s3v0+CGijSR/cM+HlaHqy9AEXjm2DtMb7TSV nocg== X-Gm-Message-State: ALoCoQlpAvlg7b5hbh87OoWnAOJY40wxlAGmLlNTlUar0xuhdAH/8iMISOwno4w6/9y8lJowvndn X-Received: by 10.194.239.200 with SMTP id vu8mr2017963wjc.3.1415792322719; Wed, 12 Nov 2014 03:38:42 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.43.51 with SMTP id t19ls317580lal.16.gmail; Wed, 12 Nov 2014 03:38:42 -0800 (PST) X-Received: by 10.112.140.135 with SMTP id rg7mr1436678lbb.100.1415792322471; Wed, 12 Nov 2014 03:38:42 -0800 (PST) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id oz1si28599330lbb.88.2014.11.12.03.38.42 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 12 Nov 2014 03:38:42 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by mail-la0-f44.google.com with SMTP id hz20so1084830lab.3 for ; Wed, 12 Nov 2014 03:38:42 -0800 (PST) X-Received: by 10.112.12.35 with SMTP id v3mr1977929lbb.80.1415792322378; Wed, 12 Nov 2014 03:38:42 -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.112.184.201 with SMTP id ew9csp407750lbc; Wed, 12 Nov 2014 03:38:41 -0800 (PST) X-Received: by 10.180.104.2 with SMTP id ga2mr49455190wib.64.1415792321700; Wed, 12 Nov 2014 03:38:41 -0800 (PST) Received: from mail-wi0-f180.google.com (mail-wi0-f180.google.com. [209.85.212.180]) by mx.google.com with ESMTPS id n3si39755757wjz.21.2014.11.12.03.38.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 12 Nov 2014 03:38:41 -0800 (PST) Received-SPF: pass (google.com: domain of daniel.thompson@linaro.org designates 209.85.212.180 as permitted sender) client-ip=209.85.212.180; Received: by mail-wi0-f180.google.com with SMTP id hi2so4528655wib.13 for ; Wed, 12 Nov 2014 03:38:41 -0800 (PST) X-Received: by 10.180.90.241 with SMTP id bz17mr28232007wib.41.1415792321366; Wed, 12 Nov 2014 03:38:41 -0800 (PST) Received: from sundance.lan (cpc4-aztw19-0-0-cust157.18-1.cable.virginm.net. [82.33.25.158]) by mx.google.com with ESMTPSA id ji10sm21304728wid.7.2014.11.12.03.38.40 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Nov 2014 03:38:40 -0800 (PST) From: Daniel Thompson To: David Airlie Cc: Daniel Thompson , dri-devel@lists.freedesktop.org, Rob Clark , Benjamin Gaignard , linux-kernel@vger.kernel.org, patches@linaro.org, linaro-kernel@lists.linaro.org, John Stultz , Sumit Semwal Subject: [PATCH v2 v3.18-rc4 2/4] drm: prime: Document gem_prime_mmap Date: Wed, 12 Nov 2014 11:38:13 +0000 Message-Id: <1415792295-2466-3-git-send-email-daniel.thompson@linaro.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1415792295-2466-1-git-send-email-daniel.thompson@linaro.org> References: <1415639805-17477-1-git-send-email-daniel.thompson@linaro.org> <1415792295-2466-1-git-send-email-daniel.thompson@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: daniel.thompson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) 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: , gem_prime_map is not currently described in the DRM manual, lets document it. Signed-off-by: Daniel Thompson Reviewed-by: Rob Clark --- drivers/gpu/drm/drm_prime.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c index 8467b17c8053..5d00c8726133 100644 --- a/drivers/gpu/drm/drm_prime.c +++ b/drivers/gpu/drm/drm_prime.c @@ -309,7 +309,7 @@ static const struct dma_buf_ops drm_gem_prime_dmabuf_ops = { * Drivers can implement @gem_prime_export and @gem_prime_import in terms of * simpler APIs by using the helper functions @drm_gem_prime_export and * @drm_gem_prime_import. These functions implement dma-buf support in terms of - * five lower-level driver callbacks: + * six lower-level driver callbacks: * * Export callbacks: * @@ -321,6 +321,8 @@ static const struct dma_buf_ops drm_gem_prime_dmabuf_ops = { * * - @gem_prime_vunmap: vunmap a buffer exported by your driver * + * - @gem_prime_mmap (optional): mmap a buffer exported by your driver + * * Import callback: * * - @gem_prime_import_sg_table (import): produce a GEM object from another