From patchwork Thu Jan 19 18:13:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 45893 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp476913wrn; Thu, 19 Jan 2023 10:21:19 -0800 (PST) X-Google-Smtp-Source: AMrXdXvo4XCqxBgrBb0DP3yNlKB3kVO+Q5MbzZpyT9I/0+ACB6hrYp3raro/TL2srj26BAJngTfE X-Received: by 2002:a17:90a:4d8e:b0:223:fa53:b368 with SMTP id m14-20020a17090a4d8e00b00223fa53b368mr12649998pjh.34.1674152479462; Thu, 19 Jan 2023 10:21:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674152479; cv=none; d=google.com; s=arc-20160816; b=L/YJRaebp1ha6QUa1vvaMjCjdjYsJN+cZNQHZtdm0GKEZKAlLoDm0tSxEjnfd0PPF9 a1vFbNUM+qk7LjssjL4eDbW6ZoJudT2qZHtU810PAHlsan/k6OcImF+xto0hM9dCKeHG u6ZKGKuY30k3ysoP2D/IyvkiNg0yZIR1EzMhjF0/Vz5B7ddRO5/z+HLzLcR5qfjW6shk VkvWhG8xSj12EFbOPrdgkEK/p1/1Jb9aQfTeAwVzVLo9+vs/KgOGXioM/0/0ALhG4i0c 3zmYW8KfS0kByduk1uE59GR7wPOlskXeNkEIuMq56r+dF9/+/3bYyKlhpTrEaimEMLdl hDVw== 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=gzlco0z7kyARFne6aPjn97rwGjIZC5wmHdoy935q5v8=; b=LjM5WrJ7qf449CxLPQ4rBoOcGvpyzTNqWbptGL/zLmyVzYZkr934nhFMvqJVA8i9/T tD2bnwhJYm1u5DCwoV4Tre58Bzlm1jaFIadsdd3de2JzJyqY6npADQElrO+rc+jgxXBB B584GKQvQDYL6TcJ900HSpzDsCUTF+d8FszQBO/LjUyLGcl6menkQzmGbVPHTvoOQ3PG w/EEWEU5f4ovhyh8FkVs85MArs36H5BrVCnaxdq67dO7gLhRdeuhfcW758YacD+9oCnZ 7bDj6CyJcrWcCtN/bB36Y/MMoQ9y7EM8qjLWcoj85LeOStBn9Ewq0XayFbG637XdCgJd nekg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Em6XPAjN; 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 rj2-20020a17090b3e8200b00218b3d1c3afsi6297282pjb.74.2023.01.19.10.21.07; Thu, 19 Jan 2023 10:21:19 -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=Em6XPAjN; 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 S230324AbjASSNl (ORCPT + 99 others); Thu, 19 Jan 2023 13:13:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39922 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230108AbjASSNX (ORCPT ); Thu, 19 Jan 2023 13:13:23 -0500 Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F11A43921 for ; Thu, 19 Jan 2023 10:13:20 -0800 (PST) Received: by mail-pl1-x632.google.com with SMTP id p24so3035802plw.11 for ; Thu, 19 Jan 2023 10:13:20 -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=gzlco0z7kyARFne6aPjn97rwGjIZC5wmHdoy935q5v8=; b=Em6XPAjN56DTVWK7ltE7kWrUpgn4OjY5KNM0m0CZekF/Erh5W6I0BYol/sRWj7Iv8m 2y4DE4uEOTBLFrbViTWJwhiO698EWk1mFt4PHLKjI8nwgqj8QNmoz7AcfTIZuX2esnPc I59H7o/kCo0x2wW6+2EGEiGcxYk4sFsUcqrWlLYrsW+fYwBIBr7tCIojm1QCpQ1xeIRq DjYCudyK0HK4cdjR62ipxU1DiPs443dl3466m1BdtZ+9ah+h7R//mnLkKyihBgW9axoK DD75W548dMoOGRN18vbHqB8ZZqDVWsJ2VP9ttM+GhsThtHAhtnfypWOiTVjmSzx4s58s w9tA== 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=gzlco0z7kyARFne6aPjn97rwGjIZC5wmHdoy935q5v8=; b=zIkDkwAGheWMGVaW/xFWZ6LkEyeXyUTbTRmSJa3tv3h2nzZ9IgEadpeL0iy6gNbAlS lFNx6Ms+VR1aos839O/J+5/b05pDIEyHZHls85HbpncLs9rSv26RqZDsG0jqVT5GnmDA KaMY8oUGxgYbVO9de2NPhULXeT2mB48KOyxu+nJKhaHUMbEza+keoUErLoHMtGwNIEin 6rIoZEZKqxe4pA2gCU0/I4No41ztgboK6CBBFztFgFAAQoWgaPH9vuyUAT7YEUj2BByS XW8ifxz7H4fL43qaZar2LJ6sDMDJGIxHUNuMoGZd0BDNsgcPDugct9bVPPDfCbVe6eRL smKQ== X-Gm-Message-State: AFqh2kpWFB1ksCyVFeOozoXKv+BSQm5QAX7MXQFObVo5dDFbU1bXwUv4 f4w4HoFDDiT/EkbJy/5hrrc= X-Received: by 2002:a17:903:11c7:b0:194:a531:4b39 with SMTP id q7-20020a17090311c700b00194a5314b39mr15913608plh.67.1674151999425; Thu, 19 Jan 2023 10:13:19 -0800 (PST) Received: from localhost ([2a00:79e1:abd:4a00:2703:3c72:eb1a:cffd]) by smtp.gmail.com with ESMTPSA id y22-20020a17090264d600b001708c4ebbaesm12103841pli.309.2023.01.19.10.13.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jan 2023 10:13:19 -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] drm/shmem: Cleanup drm_gem_shmem_create_with_handle() Date: Thu, 19 Jan 2023 10:13:25 -0800 Message-Id: <20230119181325.2834875-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?1755476110248123729?= X-GMAIL-MSGID: =?utf-8?q?1755476110248123729?= 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 | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c index f21f47737817..19406f4907df 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) @@ -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);