From patchwork Sun Oct 29 23:01:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 159449 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp1896198vqb; Sun, 29 Oct 2023 16:23:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG7qXdukUAeBbVaSOqkjAf1R/OuW0N9SLjUAgU34RvtP2uXCjieR68+qmr48vbEjhBXku7o X-Received: by 2002:a05:6a20:e11e:b0:12c:2dc7:74bc with SMTP id kr30-20020a056a20e11e00b0012c2dc774bcmr12823517pzb.46.1698621838488; Sun, 29 Oct 2023 16:23:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698621838; cv=none; d=google.com; s=arc-20160816; b=Rmm20R0PXTqQPeDnU3674e/O6FstSlw6TXNz95ZDomQEumWQRdnqtYblNpliSwK4ap Remqji2yByIc8Yq/FqYKbEKDW72ndqs2Kc4MZ4x9/Fz9YOR+uwdpaGJL/x6fc3vpvyhh 3k8cFuP0LHSdqQ0HL9peNwO14wFsx83TuDVkW/FtQmDY+cHsxxtgjP+NgEMTt4DpNuDF 4MIj4Xr5MsLfOaXrLcgnreOgPa9wDw+l4s5+BlkpmUDTaHS6TdOAQ8fTfEbd7dzhkgm3 PjNsSqJ/qfy1wn/BI6xogMogcBfAknNCn3Bd2d2HQf5kvmaZZBqByALMZzPlx2uCOQ41 EAiA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Tfo4M9T/sbRJeWWF1fQjM9AXkJQCNJFnO6StQC6Rw2k=; fh=5cel2jD5h+yPMXVwxbomyVhwojHUqATy6nFjd4aOh4o=; b=Xq1JL8qzg8INzc8sdThydCmypVRw2hjvU5C1LmYLlIaKZGDP4UzJ/QuHckSN+YR/sR kkezISo/eZfZahCkJ24ySN89EUiPUX8bPGZUopPQqTJxqIB+ywklZEKT9dsOG0OfWNeA JSWw9Tog3zPt6VDVxRzDV1sTnGtK0Q8J353uknodocxze3e+G3sHtj6KbsYT4tIvJJl9 gSD4At/XzMzLtssORaZWj8peNrhMEgG0JTenay7/xWozfdsCUPK7sxw7irbJOFHcYbvv qqGPtMnEgKrftnEA8F5+0Rl4rnIEmXZv6kGiz90DqI0Ni6xQ1MUTHXkaREXV2iTumtxG +8zw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=RdnV8+Jx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id z3-20020a633303000000b005b11ce9c97esi4034449pgz.353.2023.10.29.16.23.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 16:23:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=RdnV8+Jx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 68D70807D54C; Sun, 29 Oct 2023 16:23:01 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231361AbjJ2XWs (ORCPT + 31 others); Sun, 29 Oct 2023 19:22:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232185AbjJ2XWd (ORCPT ); Sun, 29 Oct 2023 19:22:33 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D0F0AD27 for ; Sun, 29 Oct 2023 16:03:32 -0700 (PDT) Received: from workpc.. (109-252-153-31.dynamic.spd-mgts.ru [109.252.153.31]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: dmitry.osipenko) by madras.collabora.co.uk (Postfix) with ESMTPSA id 2E19366072BB; Sun, 29 Oct 2023 23:02:28 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1698620549; bh=KY/ituSmjApTGQqTq0AtCm1dqXKqbUYecOQaKKnFD8s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RdnV8+JxJ7IDe7iu3uGPQ4wPKugU58yvcc5QiILNK7R3iFTwnsaTaEavspOLHIchQ s7r/XqeOfQFSuAI3qvUM8cfqkMjULJOc8OdZSZOKesj2buoLnjg80oQwbMd6XemfDK jiSR/Uhbew4G+eMNMQ4urou+7mh33a9bp4BY37+Pj3r+SoRCl1qRrq2R8wH6yqcgYu mRuIiomdnsFdppITadS3k/qJ6cPJEIAP+lJwvylf6vXCeGXIEfUD/TUPAjaCaFYPXo YjEZ2dkTd9cYcNngKIqLoM23jSho9YZimeUS6rqs+t0ZlX8YjdV+1XS4ChRPjQdL8D ikanOEQgUVRRQ== From: Dmitry Osipenko To: David Airlie , Gerd Hoffmann , Gurchetan Singh , Chia-I Wu , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , =?utf-8?q?Christian_K=C3=B6nig?= , Qiang Yu , Steven Price , Boris Brezillon , Emma Anholt , Melissa Wen Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, kernel@collabora.com, virtualization@lists.linux-foundation.org Subject: [PATCH v18 02/26] drm/gem: Add _locked postfix to functions that have unlocked counterpart Date: Mon, 30 Oct 2023 02:01:41 +0300 Message-ID: <20231029230205.93277-3-dmitry.osipenko@collabora.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231029230205.93277-1-dmitry.osipenko@collabora.com> References: <20231029230205.93277-1-dmitry.osipenko@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Sun, 29 Oct 2023 16:23:01 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781134093042869466 X-GMAIL-MSGID: 1781134093042869466 Add _locked postfix to drm_gem functions that have unlocked counterpart functions to make GEM functions naming more consistent and intuitive in regards to the locking requirements. Reviewed-by: Boris Brezillon Suggested-by: Boris Brezillon Signed-off-by: Dmitry Osipenko Acked-by: Maxime Ripard --- drivers/gpu/drm/drm_gem.c | 6 +++--- include/drm/drm_gem.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index 95327b003692..4523cd40fb2f 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -1490,10 +1490,10 @@ drm_gem_lru_scan(struct drm_gem_lru *lru, EXPORT_SYMBOL(drm_gem_lru_scan); /** - * drm_gem_evict - helper to evict backing pages for a GEM object + * drm_gem_evict_locked - helper to evict backing pages for a GEM object * @obj: obj in question */ -int drm_gem_evict(struct drm_gem_object *obj) +int drm_gem_evict_locked(struct drm_gem_object *obj) { dma_resv_assert_held(obj->resv); @@ -1505,4 +1505,4 @@ int drm_gem_evict(struct drm_gem_object *obj) return 0; } -EXPORT_SYMBOL(drm_gem_evict); +EXPORT_SYMBOL(drm_gem_evict_locked); diff --git a/include/drm/drm_gem.h b/include/drm/drm_gem.h index 3daa8db644c3..c55d8571dbb3 100644 --- a/include/drm/drm_gem.h +++ b/include/drm/drm_gem.h @@ -551,7 +551,7 @@ unsigned long drm_gem_lru_scan(struct drm_gem_lru *lru, unsigned long *remaining, bool (*shrink)(struct drm_gem_object *obj)); -int drm_gem_evict(struct drm_gem_object *obj); +int drm_gem_evict_locked(struct drm_gem_object *obj); #ifdef CONFIG_LOCKDEP /**