From patchwork Thu Jan 19 22:44:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 46049 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp586364wrn; Thu, 19 Jan 2023 15:00:56 -0800 (PST) X-Google-Smtp-Source: AMrXdXuSgFWgZOnWe++r6gRlD4vU3TEal2cjyV3DGmq2S1DOryCSmBMWYEkNtvmQC6qUvRbpge1J X-Received: by 2002:a17:907:a702:b0:877:95bf:cff3 with SMTP id vw2-20020a170907a70200b0087795bfcff3mr538716ejc.77.1674169256261; Thu, 19 Jan 2023 15:00:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674169256; cv=none; d=google.com; s=arc-20160816; b=Xv7JXHnu7zK18DbYSMXO99Gt1A32ulFvI7qkH+POOl+LxYDrDFfpFxGWxGv9airefH Zsz6DvYoNGNGW08q2+K5uHf7xx2wmH3P6rNfjkIpd+yAb/FdaZJoTgUKnNHn51HuSL4L YCaVlA3gTIiT9D6YY9mwReRi9VRqbSLrt7aklmNtHjIdnIs4ZIKKDRWDXVHv3X5AxqgU jFQLRtrTMw1T8ICI9y4DrH+dnwia4iaQLYItCYNSmxacl2xS+juZysNyF0wlcwE4llNY W+AtaqFJYUHaiC7YeUDUCFmNOJoftiG+46f1lf0YH/G3Tur1FE9VS1Ypc8IEH8pB/2si cEsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=vkhEkO/AZn+iGeeCv4z3XDvZENqvSyRmzPX1UAsRe3E=; b=cllDU77aVJ4f2VfV+kYNiSIY5WJoIgj747cBM42Z8jNoXZx1C2nrh0u+j1ofPRRcme x5UY8bnUCWhDgYACPPSUO9Uq2BIRAffc8DC9/tZthAgfJuxDJN3r9m/FJ1U8Xn+gqz99 /b1Ta3KtpS8N8wk4gRe2i5Iu1EmWhDgFe5Sd8xDNM1trEv7QW/27STMAdrytG/ZkqPWo HEre9TRiyypsg1CF4Q0LeCyLTJ+0kCa4WjCfyWYydORdFG9rPfJ8Dg2lgFXY3Dfdbk6Z vmQiWoY5tSi77MMYi771xFdxRuNUvn8XvPvbvM/074QDcL+tHuqJWWhW35Po+HAeKDWx T6+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Q1xuRnvO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gn14-20020a1709070d0e00b0086023e3d3dasi29707517ejc.81.2023.01.19.15.00.32; Thu, 19 Jan 2023 15:00:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Q1xuRnvO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230341AbjASW7T (ORCPT + 99 others); Thu, 19 Jan 2023 17:59:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230255AbjASW6g (ORCPT ); Thu, 19 Jan 2023 17:58:36 -0500 Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 646277EE3 for ; Thu, 19 Jan 2023 14:44:47 -0800 (PST) Received: by mail-pl1-x62e.google.com with SMTP id b17so3712262pld.7 for ; Thu, 19 Jan 2023 14:44:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=vkhEkO/AZn+iGeeCv4z3XDvZENqvSyRmzPX1UAsRe3E=; b=Q1xuRnvO5zB4dNHXmx9mPeSe2yQ9xR+RKfk8j4EtFNa17ivRYMfiW8h3oYZENvWGt4 XuS9dLUpHfW00h90VvgPG9BPMh439dJjAifwI822JeuZ2yJe95JOtnx/bekBzXKKD8T1 3qHSfKuub2eyqbsfzu+V/aAHdQlQJ14Q5QVuyBVRbkJm+pKOjswz4HtJeYh7tC2MloSC jiC9nweU9Ak1wWdtNB35TAFDKw6Kod+u2fx/qJGmlAqQVtMreAcuVnf5sVIfgDSJeNZx caXTst8FtDSBGZat1aMWEhhmg5UQVsQ7yNH0EGIXYC5pPTME0CkVzIwNBSH+hB/td1MO Nyfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=vkhEkO/AZn+iGeeCv4z3XDvZENqvSyRmzPX1UAsRe3E=; b=aLSimi1yYCL0GIvNu1nw87+VKoJcNIEMmjdXpRo53GgIcBR4Yay+M70yC6Xr/jGW05 gUkdLnaCKcNUwUtbMnHmnmYUrNCoAVMyK2opIRf8qXOMxSzR9dpnHVnSfKwf1v4PTUC1 Fxl15RVEslAl/AY35Reoz+DKPeFgWF4Sm5x6sSVBCMq1R4hKw2ERIK92diQr2OAhGz/a XzGlU+xz0fsesm33Eww96P+y43heWL1NUoTCwooUyiPptsRnNt+4t5nWGKf/XBcP0k5u Ql9K1CjCEFGXJAr9OYCwq6Ot9pOKUFHDv0/i+sYod8mfmmmBJ41bdRiVdGDBYlBhsPIg FujA== X-Gm-Message-State: AFqh2krhX9YqJnq8tsojyDZTOnpsipOi8RHIbWu2YCVi/uJUjlcXu0T1 wQTkVi69jq6HecBCjcUk2FA= X-Received: by 2002:a17:90a:ab15:b0:21a:1b9b:139e with SMTP id m21-20020a17090aab1500b0021a1b9b139emr13065198pjq.8.1674168286884; Thu, 19 Jan 2023 14:44:46 -0800 (PST) Received: from localhost ([2a00:79e1:abd:4a00:2703:3c72:eb1a:cffd]) by smtp.gmail.com with ESMTPSA id i2-20020a17090a3d8200b00228ea2e951fsm173081pjc.8.2023.01.19.14.44.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jan 2023 14:44:46 -0800 (PST) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: Rob Clark , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2] drm/shmem: Cleanup drm_gem_shmem_create_with_handle() Date: Thu, 19 Jan 2023 14:44:51 -0800 Message-Id: <20230119224452.2880652-1-robdclark@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755493701999873815?= X-GMAIL-MSGID: =?utf-8?q?1755493701999873815?= 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 --- drivers/gpu/drm/drm_gem_shmem_helper.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c index f21f47737817..fa6281e43954 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 @@ -533,9 +531,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);