From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CADC7C05027 for ; Mon, 23 Jan 2023 16:11:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231910AbjAWQLu (ORCPT ); Mon, 23 Jan 2023 11:11:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232821AbjAWQLr (ORCPT ); Mon, 23 Jan 2023 11:11:47 -0500 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 2A8D723DB4 for ; Mon, 23 Jan 2023 08:11:35 -0800 (PST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 97814143D; Mon, 23 Jan 2023 08:12:16 -0800 (PST) Received: from [10.57.89.57] (unknown [10.57.89.57]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id D97593F5A1; Mon, 23 Jan 2023 08:11:32 -0800 (PST) Message-ID: <5777868b-522e-dd72-a5bb-effc9bf629f0@arm.com> Date: Mon, 23 Jan 2023 16:11:29 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Subject: Re: [PATCH v3] drm/shmem: Cleanup drm_gem_shmem_create_with_handle() Content-Language: en-GB To: Rob Clark , dri-devel@lists.freedesktop.org Cc: Rob Clark , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , open list References: <20230123154831.3191821-1-robdclark@gmail.com> From: Steven Price In-Reply-To: <20230123154831.3191821-1-robdclark@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 23/01/2023 15:48, Rob Clark wrote: > From: Rob Clark > > Once we create the handle, the handle owns the reference. Currently > nothing was doing anything with the shmem ptr after the handle was > created, but let's change drm_gem_shmem_create_with_handle() to not > return the pointer, so-as to not encourage problematic use of this > function in the future. As a bonus, it makes the code a bit cleaner. > > Signed-off-by: Rob Clark Reviewed-by: Steven Price > --- > drivers/gpu/drm/drm_gem_shmem_helper.c | 13 ++++--------- > 1 file changed, 4 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c > index f21f47737817..42c496c5f92c 100644 > --- a/drivers/gpu/drm/drm_gem_shmem_helper.c > +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c > @@ -415,7 +415,7 @@ void drm_gem_shmem_vunmap(struct drm_gem_shmem_object *shmem, > } > EXPORT_SYMBOL(drm_gem_shmem_vunmap); > > -static struct drm_gem_shmem_object * > +static int > drm_gem_shmem_create_with_handle(struct drm_file *file_priv, > struct drm_device *dev, size_t size, > uint32_t *handle) > @@ -425,7 +425,7 @@ drm_gem_shmem_create_with_handle(struct drm_file *file_priv, > > shmem = drm_gem_shmem_create(dev, size); > if (IS_ERR(shmem)) > - return shmem; > + return PTR_ERR(shmem); > > /* > * Allocate an id of idr table where the obj is registered > @@ -434,10 +434,8 @@ drm_gem_shmem_create_with_handle(struct drm_file *file_priv, > ret = drm_gem_handle_create(file_priv, &shmem->base, handle); > /* drop reference from allocate - handle holds it now. */ > drm_gem_object_put(&shmem->base); > - if (ret) > - return ERR_PTR(ret); > > - return shmem; > + return ret; > } > > /* Update madvise status, returns true if not purged, else > @@ -520,7 +518,6 @@ int drm_gem_shmem_dumb_create(struct drm_file *file, struct drm_device *dev, > struct drm_mode_create_dumb *args) > { > u32 min_pitch = DIV_ROUND_UP(args->width * args->bpp, 8); > - struct drm_gem_shmem_object *shmem; > > if (!args->pitch || !args->size) { > args->pitch = min_pitch; > @@ -533,9 +530,7 @@ int drm_gem_shmem_dumb_create(struct drm_file *file, struct drm_device *dev, > args->size = PAGE_ALIGN(args->pitch * args->height); > } > > - shmem = drm_gem_shmem_create_with_handle(file, dev, args->size, &args->handle); > - > - return PTR_ERR_OR_ZERO(shmem); > + return drm_gem_shmem_create_with_handle(file, dev, args->size, &args->handle); > } > EXPORT_SYMBOL_GPL(drm_gem_shmem_dumb_create); >