Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933450AbbLOJXv (ORCPT ); Tue, 15 Dec 2015 04:23:51 -0500 Received: from mail-wm0-f45.google.com ([74.125.82.45]:33148 "EHLO mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933186AbbLOJWe (ORCPT ); Tue, 15 Dec 2015 04:22:34 -0500 Date: Tue, 15 Dec 2015 10:22:31 +0100 From: Daniel Vetter To: Eric Anholt Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] drm: Use the driver's gem_object_free function from CMA helpers. Message-ID: <20151215092231.GH3189@phenom.ffwll.local> Mail-Followup-To: Eric Anholt , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org References: <1450139186-21537-1-git-send-email-eric@anholt.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1450139186-21537-1-git-send-email-eric@anholt.net> X-Operating-System: Linux phenom 4.2.0-1-amd64 User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2749 Lines: 81 On Mon, Dec 14, 2015 at 04:26:26PM -0800, Eric Anholt wrote: > VC4 wraps the CMA objects in its own structures, so it needs to do its > own teardown (waiting for GPU to finish, updating bo_stats tracking). > The other CMA drivers are using drm_gem_cma_free_object as their > gem_free_object, so this should be a no-op for them. > > Signed-off-by: Eric Anholt Reviewed-by: Daniel Vetter Since vc4 landed already I'll pull this into drm-misc. -Daniel > --- > drivers/gpu/drm/drm_fb_cma_helper.c | 6 +++--- > drivers/gpu/drm/drm_gem_cma_helper.c | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_fb_cma_helper.c > index 5c1aca4..99b5673 100644 > --- a/drivers/gpu/drm/drm_fb_cma_helper.c > +++ b/drivers/gpu/drm/drm_fb_cma_helper.c > @@ -279,7 +279,7 @@ static int drm_fbdev_cma_create(struct drm_fb_helper *helper, > if (!fbi) { > dev_err(dev->dev, "Failed to allocate framebuffer info.\n"); > ret = -ENOMEM; > - goto err_drm_gem_cma_free_object; > + goto err_gem_free_object; > } > > fbdev_cma->fb = drm_fb_cma_alloc(dev, &mode_cmd, &obj, 1); > @@ -322,8 +322,8 @@ err_drm_fb_cma_destroy: > drm_fb_cma_destroy(fb); > err_framebuffer_release: > framebuffer_release(fbi); > -err_drm_gem_cma_free_object: > - drm_gem_cma_free_object(&obj->base); > +err_gem_free_object: > + dev->driver->gem_free_object(&obj->base); > return ret; > } > > diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c > index 7dcb43f..b409123 100644 > --- a/drivers/gpu/drm/drm_gem_cma_helper.c > +++ b/drivers/gpu/drm/drm_gem_cma_helper.c > @@ -121,7 +121,7 @@ struct drm_gem_cma_object *drm_gem_cma_create(struct drm_device *drm, > return cma_obj; > > error: > - drm_gem_cma_free_object(&cma_obj->base); > + drm->driver->gem_free_object(&cma_obj->base); > return ERR_PTR(ret); > } > EXPORT_SYMBOL_GPL(drm_gem_cma_create); > @@ -171,7 +171,7 @@ drm_gem_cma_create_with_handle(struct drm_file *file_priv, > return cma_obj; > > err_handle_create: > - drm_gem_cma_free_object(gem_obj); > + drm->driver->gem_free_object(gem_obj); > > return ERR_PTR(ret); > } > -- > 2.6.2 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/