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: 5287821 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 32141C11AC for ; Wed, 12 Nov 2014 11:38:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 50A142013D for ; Wed, 12 Nov 2014 11:38:45 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 377F820166 for ; Wed, 12 Nov 2014 11:38:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 37F1D6E20A; Wed, 12 Nov 2014 03:38:43 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) by gabe.freedesktop.org (Postfix) with ESMTP id 01F746E20A for ; Wed, 12 Nov 2014 03:38:41 -0800 (PST) Received: by mail-wi0-f181.google.com with SMTP id n3so4546280wiv.8 for ; Wed, 12 Nov 2014 03:38:41 -0800 (PST) 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=T/8YMrSNcfWn7weWsUwgicjROdLntWIe9QWOSMnzy7M=; b=ZAf/nkoLFoh1asDMBV2aZFpNbSbYBHKrUHJmStRuP/0IfPa135hasz/+SwSP43oWrG ks5zCO+iRiMOcfaV9F20UgOeavtOsr1n2Zk4VQFPiO4/yua8bTgMsgdobBqK9Q6z3Mjx YNmOe+e7XtvbfQCMPsyraHmJaJ/ugpUccHGj8+RSU0AHWk8CNeVWzCZgACiObHtJRUXW 8b2IlRcsUqJAqNJxupHkDPfeB+mjldgX4AQZZAJxTuUXI2U41Q4kLglITiHDWfDe4dHX vf/bqdwDaynYXJNm8GIzPJQtr95qpyMpBxNxVUihqZdClagwmtzYbWOpa5O16HsWYJC7 ZxXQ== X-Gm-Message-State: ALoCoQleBgm07DYqwi86cKg0Ch+gVMg8UjjmvQnxhLXK0ySAYbP1LUdOWepMSMs9PQzcojcL6CCb 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 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> Cc: linaro-kernel@lists.linaro.org, patches@linaro.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Benjamin Gaignard 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=-2.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD,SUSPICIOUS_RECIPS,UNPARSEABLE_RELAY autolearn=ham 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 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