From patchwork Thu Apr 2 15:29:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Stach X-Patchwork-Id: 6149881 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 75CFC9F440 for ; Thu, 2 Apr 2015 15:32:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A9C65203AA for ; Thu, 2 Apr 2015 15:32:22 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id D015B203AE for ; Thu, 2 Apr 2015 15:32:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 159CF6EA70; Thu, 2 Apr 2015 08:31:07 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [92.198.50.35]) by gabe.freedesktop.org (Postfix) with ESMTP id 1C2DE6EA53 for ; Thu, 2 Apr 2015 08:30:58 -0700 (PDT) Received: from dude.hi.4.pengutronix.de ([10.1.0.7] helo=dude.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1Ydh57-0005OD-Cm; Thu, 02 Apr 2015 17:30:57 +0200 From: Lucas Stach To: dri-devel@lists.freedesktop.org Subject: [PATCH RFC 038/111] staging: etnaviv: provide etnaviv_gem_new_private() Date: Thu, 2 Apr 2015 17:29:40 +0200 Message-Id: <1427988653-754-39-git-send-email-l.stach@pengutronix.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1427988653-754-1-git-send-email-l.stach@pengutronix.de> References: <1427988653-754-1-git-send-email-l.stach@pengutronix.de> X-SA-Exim-Connect-IP: 10.1.0.7 X-SA-Exim-Mail-From: l.stach@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: dri-devel@lists.freedesktop.org Cc: Russell King , kernel@pengutronix.de 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.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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 From: Russell King etnaviv_gem_new_private() creates a private non-shmem gem object which can be used to create these kinds of objects. Fix up msm_gem_import() to use it. Signed-off-by: Russell King --- drivers/staging/etnaviv/etnaviv_gem.c | 32 ++++++++++++++++++++++---------- drivers/staging/etnaviv/etnaviv_gem.h | 3 +++ 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/drivers/staging/etnaviv/etnaviv_gem.c b/drivers/staging/etnaviv/etnaviv_gem.c index 0a0cf92ff13f..185cd1702b2e 100644 --- a/drivers/staging/etnaviv/etnaviv_gem.c +++ b/drivers/staging/etnaviv/etnaviv_gem.c @@ -686,6 +686,23 @@ fail: return ERR_PTR(ret); } +int etnaviv_gem_new_private(struct drm_device *dev, size_t size, uint32_t flags, + struct etnaviv_gem_object **res) +{ + struct drm_gem_object *obj; + int ret; + + ret = etnaviv_gem_new_impl(dev, size, flags, &obj); + if (ret) + return ret; + + drm_gem_private_object_init(dev, obj, size); + + *res = to_etnaviv_bo(obj); + + return 0; +} + static void etnaviv_gem_prime_release(struct etnaviv_gem_object *etnaviv_obj) { if (etnaviv_obj->vaddr) @@ -709,20 +726,16 @@ struct drm_gem_object *msm_gem_import(struct drm_device *dev, uint32_t size, struct sg_table *sgt) { struct etnaviv_gem_object *etnaviv_obj; - struct drm_gem_object *obj; int ret, npages; size = PAGE_ALIGN(size); - ret = etnaviv_gem_new_impl(dev, size, ETNA_BO_WC, &obj); - if (ret) - goto fail; - - drm_gem_private_object_init(dev, obj, size); + ret = etnaviv_gem_new_private(dev, size, ETNA_BO_WC, &etnaviv_obj); + if (ret < 0) + return ERR_PTR(ret); npages = size / PAGE_SIZE; - etnaviv_obj = to_etnaviv_bo(obj); etnaviv_obj->ops = &etnaviv_gem_prime_ops; etnaviv_obj->sgt = sgt; etnaviv_obj->pages = drm_malloc_ab(npages, sizeof(struct page *)); @@ -736,11 +749,10 @@ struct drm_gem_object *msm_gem_import(struct drm_device *dev, if (ret) goto fail; - return obj; + return &etnaviv_obj->base; fail: - if (obj) - drm_gem_object_unreference_unlocked(obj); + drm_gem_object_unreference_unlocked(&etnaviv_obj->base); return ERR_PTR(ret); } diff --git a/drivers/staging/etnaviv/etnaviv_gem.h b/drivers/staging/etnaviv/etnaviv_gem.h index 676cbd46c600..65c9740542da 100644 --- a/drivers/staging/etnaviv/etnaviv_gem.h +++ b/drivers/staging/etnaviv/etnaviv_gem.h @@ -105,4 +105,7 @@ struct etnaviv_gem_submit { } bos[0]; }; +int etnaviv_gem_new_private(struct drm_device *dev, size_t size, uint32_t flags, + struct etnaviv_gem_object **res); + #endif /* __ETNAVIV_GEM_H__ */