From patchwork Fri Jun 19 13:52:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Thompson X-Patchwork-Id: 6645681 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3C952C0020 for ; Fri, 19 Jun 2015 15:14:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6215E20958 for ; Fri, 19 Jun 2015 15:14:07 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 86CA020957 for ; Fri, 19 Jun 2015 15:14:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A90EE6E192; Fri, 19 Jun 2015 08:14:04 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com [209.85.212.179]) by gabe.freedesktop.org (Postfix) with ESMTP id C149472045 for ; Fri, 19 Jun 2015 06:52:47 -0700 (PDT) Received: by wiga1 with SMTP id a1so19822284wig.0 for ; Fri, 19 Jun 2015 06:52:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6svAv/8n8mCgFK9T6ZC6ZJg2Z6Qh/a5L2TvBASTZvc4=; b=AgoZVj/riVf4dVkXGB7v4RTflCV2qACA8QzFlZvZcYhNO+7Z2S4tI8egm0pb5AvFEV TolndlAxSg97s98qxkzIGQieHp92IbffPJukxjYMcQwEsTTGVMbMef5PdMh4jOpW6cy0 dRw218wEAh6J27VERVwpG+zfMoX7FQbkDcaDWqryhBCFUT1FF0esWJE2xNCru1Xir8OZ XOtT/jw9bFNqwc+zWZVkzXZVf0Krxj7kViHYjMtxsvJbsbb1drLJb7b8clrpW+0RDgYQ LXwgBsizm3y0SLtgbb5wFippUJAggKYoD5XJByCrkNKOXJ0sfY4dcAX3GMepcJIRDMje GVWA== X-Gm-Message-State: ALoCoQlqTLCwBc1BLt6B8Vrk8KiGlnfPxkcxfMP6189xDlmMQToV9ieKbl1XkNoZ701yrsntH6rz X-Received: by 10.180.77.136 with SMTP id s8mr6856918wiw.7.1434721966810; Fri, 19 Jun 2015 06:52:46 -0700 (PDT) Received: from wychelm.lan (cpc4-aztw19-0-0-cust71.18-1.cable.virginm.net. [82.33.25.72]) by mx.google.com with ESMTPSA id z9sm3855387wiv.9.2015.06.19.06.52.45 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Jun 2015 06:52:46 -0700 (PDT) From: Daniel Thompson To: David Airlie Subject: [RESEND PATCH v2 v4.1-rc8 2/2] drm: prime: Document gem_prime_mmap Date: Fri, 19 Jun 2015 14:52:29 +0100 Message-Id: <1434721949-25732-3-git-send-email-daniel.thompson@linaro.org> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1434721949-25732-1-git-send-email-daniel.thompson@linaro.org> References: <1434721949-25732-1-git-send-email-daniel.thompson@linaro.org> X-Mailman-Approved-At: Fri, 19 Jun 2015 08:14:03 -0700 Cc: Daniel Thompson , linaro-kernel@lists.linaro.org, patches@linaro.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Benjamin Gaignard , Damien Hobson-Garcia X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP gem_prime_map is not currently described in the DRM manual, lets document it. Signed-off-by: Daniel Thompson --- 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 6d2cf4fb4038..3b40a415f45d 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