From patchwork Thu Sep 14 23:27:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 140015 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp758151vqi; Thu, 14 Sep 2023 19:31:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFwpLTeRxWGlMrofC9YQ90nzuWPrVOq95hzK2bnM6GtE9Y68RnQNXRP4054XNMs9YMNuvNT X-Received: by 2002:a05:6870:63a8:b0:1d5:a980:9caa with SMTP id t40-20020a05687063a800b001d5a9809caamr484678oap.29.1694745060893; Thu, 14 Sep 2023 19:31:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694745060; cv=none; d=google.com; s=arc-20160816; b=eJojSFrVo3SPU/m/PDF9FKY/agUDblM+bqvSN1xi/aoMk4Yxm7rliU8AKcyg/qP0U2 0x86DECUeJ76H1O6tMqXryyhqnApfo4VY72+WNLL8oTM7QuFJH+ZtwTXvIRJz4geNlsD 2NZWM5EnNGRLjyEeVq7N3prSQPX075Y7f9gw2KoUhPBgye0vW3mwWMM/cBAKd6PgN7HY rWCzXkTXxQ5Y7ki7CgDG1qdHBm+KrFvMyzqqE4zyZd7DTKrb5d+tQRNEnvoQWBDfZdqT Mvy+wqX0bVziwiltGQqVb/1L6slqXqC2jm+SuUzsGe7+oXkWRzL58cM55jrqO8jZbOL/ Vhbw== 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=d17CL19Dp1BocwgZYmwXxYbHn60AWaKuD2v7VavLfsY=; fh=5cel2jD5h+yPMXVwxbomyVhwojHUqATy6nFjd4aOh4o=; b=Xyxn/6zfIRqpW8fm++fysjivq8ci+c0aNYQtoAOuWlckBXDwvz7oaQMmQfP8S/rRDE 4rU9LAgZ9EryEx++FWoxYWXAynt3TnPninpE8Bc2FrIYJZwF78iaZzm3kClCXAfk7fRN T2/b0mGBK1CItRyUFJf3X+nCPDViu2zhJlKDNSo7AvQGRJrNGdSpobYKQJS+8qRf68m6 XRBCFFDrHsu5b1r+bDBOiIp7e1RRdMYTSMh2STmucWgg1zJptgr2RBMIGgRJ0XDOlT0F EW4WpSU2DFXGJELnEWhAU402yUI77yCH9PcnW9y5y/pEiZIRyRIaExmOq5rohradjRMz 0jnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=hKBd9V1x; 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 r65-20020a632b44000000b0056fed6fa634si2383994pgr.433.2023.09.14.19.31.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 19:31:00 -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=hKBd9V1x; 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 6D15D84555BC; Thu, 14 Sep 2023 16:30: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 S230446AbjINX3x (ORCPT + 33 others); Thu, 14 Sep 2023 19:29:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231201AbjINX3b (ORCPT ); Thu, 14 Sep 2023 19:29:31 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 070D730DB for ; Thu, 14 Sep 2023 16:29:20 -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 24B10660736E; Fri, 15 Sep 2023 00:29:17 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1694734158; bh=rdg2xxMt8DDggiprQZR1cJzPur25tDSV97uYhOP0FLw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hKBd9V1xQTZcxtivpaES3+GDu/DgglmGsGAuOGWZD+NxJo7NvU4vNYvKTBER0ZaVc zkA8waTUQ1cbT6k9xlQKnPPCUXsQwtg9F8kXNaetwiPe4nsDZTrUhkKLfb33j4lDI4 s/GiEiYiIr7TR71T4BDbcbLqI0BP/brdtBOyrXtj0YMwpeoBNljE6dA488HGthYmv7 Ya5Az8l5zfWRkNAM2QOLKfh+MwklSrfblZ5MxHObJiG7v9XEKOFKptOVKC2mgfiE2e kMw98zp/L0Zv1/o+gMO6qEGWd/atUZmfJ1Bg5m17ndbvH4LpqjsXONl8r5fNkbuT4h yUlXKFmK8Dchw== 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 v17 14/18] drm/shmem-helper: Export drm_gem_shmem_get_pages_sgt_locked() Date: Fri, 15 Sep 2023 02:27:17 +0300 Message-ID: <20230914232721.408581-15-dmitry.osipenko@collabora.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230914232721.408581-1-dmitry.osipenko@collabora.com> References: <20230914232721.408581-1-dmitry.osipenko@collabora.com> MIME-Version: 1.0 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]); Thu, 14 Sep 2023 16:30:01 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777068996638112831 X-GMAIL-MSGID: 1777068996638112831 Export drm_gem_shmem_get_pages_sgt_locked() that will be used by virtio-gpu shrinker during GEM swap-in operation done under the held reservation lock. Signed-off-by: Dmitry Osipenko Reviewed-by: Boris Brezillon --- drivers/gpu/drm/drm_gem_shmem_helper.c | 3 ++- include/drm/drm_gem_shmem_helper.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c index b1cd56e12f66..1ebdf6b53ce4 100644 --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c @@ -865,7 +865,7 @@ struct sg_table *drm_gem_shmem_get_sg_table(struct drm_gem_shmem_object *shmem) } EXPORT_SYMBOL_GPL(drm_gem_shmem_get_sg_table); -static struct sg_table *drm_gem_shmem_get_pages_sgt_locked(struct drm_gem_shmem_object *shmem) +struct sg_table *drm_gem_shmem_get_pages_sgt_locked(struct drm_gem_shmem_object *shmem) { struct drm_gem_object *obj = &shmem->base; int ret; @@ -903,6 +903,7 @@ static struct sg_table *drm_gem_shmem_get_pages_sgt_locked(struct drm_gem_shmem_ drm_gem_shmem_put_pages_locked(shmem); return ERR_PTR(ret); } +EXPORT_SYMBOL_GPL(drm_gem_shmem_get_pages_sgt_locked); /** * drm_gem_shmem_get_pages_sgt - Pin pages, dma map them, and return a diff --git a/include/drm/drm_gem_shmem_helper.h b/include/drm/drm_gem_shmem_helper.h index 0bc6e8797162..44c6e14d8e3d 100644 --- a/include/drm/drm_gem_shmem_helper.h +++ b/include/drm/drm_gem_shmem_helper.h @@ -147,6 +147,7 @@ void drm_gem_shmem_purge_locked(struct drm_gem_shmem_object *shmem); struct sg_table *drm_gem_shmem_get_sg_table(struct drm_gem_shmem_object *shmem); struct sg_table *drm_gem_shmem_get_pages_sgt(struct drm_gem_shmem_object *shmem); +struct sg_table *drm_gem_shmem_get_pages_sgt_locked(struct drm_gem_shmem_object *shmem); void drm_gem_shmem_print_info(const struct drm_gem_shmem_object *shmem, struct drm_printer *p, unsigned int indent);