From patchwork Tue May 2 17:02:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laura Abbott X-Patchwork-Id: 9708391 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3C22C60349 for ; Tue, 2 May 2017 17:02:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B18828346 for ; Tue, 2 May 2017 17:02:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1F994284DA; Tue, 2 May 2017 17:02:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.7 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9E22F28346 for ; Tue, 2 May 2017 17:02:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 11FC66E202; Tue, 2 May 2017 17:02:35 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qt0-f178.google.com (mail-qt0-f178.google.com [209.85.216.178]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3E0386E213 for ; Tue, 2 May 2017 17:02:34 +0000 (UTC) Received: by mail-qt0-f178.google.com with SMTP id n4so19099925qte.2 for ; Tue, 02 May 2017 10:02:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RBpbq1mFpK93nwo6dcOus9kJJ09Wb7HgUglALsIBgJA=; b=YbCYxB7q2dZ4mg8r94bKTVjJDWj3BQEpfnACqcO55/qe4WWQ4DzUKpPq5JEKDNn/P8 smiXt6bJqsp+fBKgHD43bsu7MJYEMnZpsgzwuHU1dCLP148mfv4cYmkUW/xHw42hKxMP ls+k2uqkkWnl5g3liJxNSZJTH1fImhCsywvu7TjrQ64D1dndNHhzZJoccfNM24Oiv1r1 wn4pUCNRaTRqJdgmrr2PUM0fW9Boinm755QvF9r/ZJIt5Vf9bSQat62kNi7pl4wNKIRm Yk/koQVFFfUzJZAiPT/tH43Azwkx84PE2brokwnGU8f5K/dP/7LSS//wOWStkR0Q0OM1 VecA== X-Gm-Message-State: AN3rC/69GVjBMpZ8vxWsm04Ki7FJq8gN/NX+IZ2SZG6bNFE1Y6IBZkFD C0tvhHYhmJhBZnEx X-Received: by 10.237.52.5 with SMTP id w5mr27371650qtd.22.1493744553196; Tue, 02 May 2017 10:02:33 -0700 (PDT) Received: from labbott-redhat-machine.redhat.com ([2601:602:9802:a8dc::7f81]) by smtp.gmail.com with ESMTPSA id i16sm14182600qta.61.2017.05.02.10.02.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 May 2017 10:02:32 -0700 (PDT) From: Laura Abbott To: Daniel Vetter , Chris Wilson , Sean Paul Subject: [PATCHv3 2/3] drm/prime: Introduce drm_gem_prime_import_platform Date: Tue, 2 May 2017 10:02:07 -0700 Message-Id: <1493744528-25768-3-git-send-email-labbott@redhat.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1493744528-25768-1-git-send-email-labbott@redhat.com> References: <1493744528-25768-1-git-send-email-labbott@redhat.com> Cc: intel-gfx@lists.freedesktop.org, Joonas Lahtinen , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org 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-Virus-Scanned: ClamAV using ClamSMTP The existing drm_gem_prime_import function uses the underlying struct device of a drm_device for attaching to a dma_buf. Some drivers (notably vgem) may not have an underlying device structure. Offer an alternate function to attach using a platform device associated with drm_device. Cc: intel-gfx@lists.freedesktop.org Reviewed-by: Chris Wilson Signed-off-by: Laura Abbott --- v3: Rebase to drm-misc-next. Prototype moved to a new header file. Comments added for new function. Brought back drm_device->platformdev as it had been removed in 76adb460fd93 ("drm: Remove the struct drm_device platformdev field"). I'm not entirely thrilled about this since the platformdev removal was good cleanup and this feels like a small step backwards. I don't know of a better approach though. --- drivers/gpu/drm/drm_prime.c | 49 +++++++++++++++++++++++++++++++++++---------- include/drm/drmP.h | 2 ++ include/drm/drm_prime.h | 4 ++++ 3 files changed, 44 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c index 9fb65b7..a557a4b 100644 --- a/drivers/gpu/drm/drm_prime.c +++ b/drivers/gpu/drm/drm_prime.c @@ -594,16 +594,9 @@ int drm_gem_prime_handle_to_fd(struct drm_device *dev, } EXPORT_SYMBOL(drm_gem_prime_handle_to_fd); -/** - * drm_gem_prime_import - helper library implementation of the import callback - * @dev: drm_device to import into - * @dma_buf: dma-buf object to import - * - * This is the implementation of the gem_prime_import functions for GEM drivers - * using the PRIME helpers. - */ -struct drm_gem_object *drm_gem_prime_import(struct drm_device *dev, - struct dma_buf *dma_buf) +static struct drm_gem_object *__drm_gem_prime_import(struct drm_device *dev, + struct dma_buf *dma_buf, + struct device *attach_dev) { struct dma_buf_attachment *attach; struct sg_table *sgt; @@ -625,7 +618,7 @@ struct drm_gem_object *drm_gem_prime_import(struct drm_device *dev, if (!dev->driver->gem_prime_import_sg_table) return ERR_PTR(-EINVAL); - attach = dma_buf_attach(dma_buf, dev->dev); + attach = dma_buf_attach(dma_buf, attach_dev); if (IS_ERR(attach)) return ERR_CAST(attach); @@ -655,9 +648,43 @@ struct drm_gem_object *drm_gem_prime_import(struct drm_device *dev, return ERR_PTR(ret); } + +/** + * drm_gem_prime_import - helper library implementation of the import callback + * @dev: drm_device to import into + * @dma_buf: dma-buf object to import + * + * This is the implementation of the gem_prime_import functions for GEM drivers + * using the PRIME helpers. + */ +struct drm_gem_object *drm_gem_prime_import(struct drm_device *dev, + struct dma_buf *dma_buf) +{ + return __drm_gem_prime_import(dev, dma_buf, dev->dev); +} EXPORT_SYMBOL(drm_gem_prime_import); /** + * drm_gem_prime_import_platform - alternate implementation of the import callback + * @dev: drm_device to import into + * @dma_buf: dma-buf object to import + * + * This is identical to drm_gem_prime_import except the device used for dma_buf + * attachment is an internal platform device instead of the standard device + * structure. The use of this function should be limited to drivers that do not + * set up an underlying device structure. + */ +struct drm_gem_object *drm_gem_prime_import_platform(struct drm_device *dev, + struct dma_buf *dma_buf) +{ + if (WARN_ON_ONCE(!dev->platformdev)) + return NULL; + + return __drm_gem_prime_import(dev, dma_buf, &dev->platformdev->dev); +} +EXPORT_SYMBOL(drm_gem_prime_import_platform); + +/** * drm_gem_prime_fd_to_handle - PRIME import function for GEM drivers * @dev: dev to export the buffer from * @file_priv: drm file-private structure diff --git a/include/drm/drmP.h b/include/drm/drmP.h index e1daa4f..086daee 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -439,6 +439,8 @@ struct drm_device { struct pci_controller *hose; #endif + /**< Platform device for drivers that do not use the standard device */ + struct platform_device *platformdev; struct virtio_device *virtdev; struct drm_sg_mem *sg; /**< Scatter gather memory */ diff --git a/include/drm/drm_prime.h b/include/drm/drm_prime.h index 0b2a235..9fe39f8 100644 --- a/include/drm/drm_prime.h +++ b/include/drm/drm_prime.h @@ -65,6 +65,10 @@ int drm_gem_prime_handle_to_fd(struct drm_device *dev, int *prime_fd); struct drm_gem_object *drm_gem_prime_import(struct drm_device *dev, struct dma_buf *dma_buf); + +struct drm_gem_object *drm_gem_prime_import_platform(struct drm_device *dev, + struct dma_buf *dma_buf); + int drm_gem_prime_fd_to_handle(struct drm_device *dev, struct drm_file *file_priv, int prime_fd, uint32_t *handle); struct dma_buf *drm_gem_dmabuf_export(struct drm_device *dev,