From patchwork Thu Jul 22 12:41:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_K=C3=B6nig?= X-Patchwork-Id: 12394007 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C8EB7C6377D for ; Thu, 22 Jul 2021 12:41:32 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6AB9361248 for ; Thu, 22 Jul 2021 12:41:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6AB9361248 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D16766EB1F; Thu, 22 Jul 2021 12:41:31 +0000 (UTC) Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5B7DC6EB1F for ; Thu, 22 Jul 2021 12:41:30 +0000 (UTC) Received: by mail-wm1-x334.google.com with SMTP id a23-20020a05600c2257b0290236ec98bebaso2884106wmm.1 for ; Thu, 22 Jul 2021 05:41:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=bQ87wOwH9xOd6jFHhuQOQ/bBNNUz8U9SO0pUyg9uERw=; b=kvaN9Vix7vlJStvH0NKIF+CaxL99XOM1hrpRf+Vor3wL2hi9O5iEyxoEGIPSQSYaOR B4ew8jvf1jcGtgr3zeWkb9R87/jfU211JXNJ7JX4GzCoiYTNgu0R0M6aESZxpPVRSkEl D0vwRL9GqV52mibZfkpiJd49iwf5zIgxiQIfHu/gAAUH5ohrjFcimiQLLVwKXxc6k+eK IZIoMskwNa4QuOETYfda9vVMuCcdjFdmy+sWTuy1LUCfblmn9oiz40ExiD8LIHnuBLzD CWa49ZQ+7Q4DQpIDsGx4jG1ycKR2Ua9VeCckv7YWDwpnW1NAgDY8M4B6mre+1nKQQx71 0dEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=bQ87wOwH9xOd6jFHhuQOQ/bBNNUz8U9SO0pUyg9uERw=; b=Y8pok5UbUsS4fvkUFTqLcxPAjgOcbyZoKWRdWoB0Neum2P5KZj2K9Pm6waerXRv4wH wfodFbg9bnE3C+IJ9H2jHMmbzfOq34z1u4kTG78RCmEIfJyhVVv+frG6Bfd0uO6WJP1Z EnmpWDUKDHhcL07ZEV6KS/EbgzkEWORvoTncyN2UI06rwG7o1dugD0ecVV4e5oi4CSPZ S/UAMsWvf+X2Xh5I319cCYOh2OmKmrgxc8qYiRhOQGqjCSZRNsFfJYW/UnXFw4pQ1fda D2/dJqQOFkjJa5RnYb6QpbLA01URnWeA/5UQ6dO25LsNSS7tbW2l9UbtSyMKlaDZZAvy A/Yg== X-Gm-Message-State: AOAM530P8nFBPDNcNmxYvlwDIv+Gukh2DljVxURPSRIki45X3p2Yu8iA 8qH0rS1PduOgUlt/9bk4HIJE1ayorFE= X-Google-Smtp-Source: ABdhPJymRsQalmmJP+os+oR4BmTS0SBWxSrtkVZksHPgOEMe2uOBLvII7x+EkvvEBKjLetU/t1d/1A== X-Received: by 2002:a1c:35c2:: with SMTP id c185mr8882192wma.73.1626957689119; Thu, 22 Jul 2021 05:41:29 -0700 (PDT) Received: from abel.fritz.box ([2a02:908:1252:fb60:6c5:784c:9ce7:760b]) by smtp.gmail.com with ESMTPSA id w8sm18545133wrk.10.2021.07.22.05.41.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 05:41:28 -0700 (PDT) From: " =?utf-8?q?Christian_K=C3=B6nig?= " X-Google-Original-From: =?utf-8?q?Christian_K=C3=B6nig?= To: dri-devel@lists.freedesktop.org, airlied@redhat.com, daniel@ffwll.ch Subject: [PATCH 1/5] drm/vmwgfx: unbind in vmw_ttm_unpopulate Date: Thu, 22 Jul 2021 14:41:23 +0200 Message-Id: <20210722124127.17901-1-christian.koenig@amd.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Doing this in vmw_ttm_destroy() is to late. It turned out that this is not a good idea at all because it leaves pointers to freed up system memory pages in the GART tables of the drivers. Signed-off-by: Christian König --- drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c index b0973c27e774..904031d03dbe 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c @@ -526,14 +526,9 @@ static void vmw_ttm_destroy(struct ttm_device *bdev, struct ttm_tt *ttm) struct vmw_ttm_tt *vmw_be = container_of(ttm, struct vmw_ttm_tt, dma_ttm); - vmw_ttm_unbind(bdev, ttm); ttm_tt_destroy_common(bdev, ttm); vmw_ttm_unmap_dma(vmw_be); - if (vmw_be->dev_priv->map_mode == vmw_dma_alloc_coherent) - ttm_tt_fini(&vmw_be->dma_ttm); - else - ttm_tt_fini(ttm); - + ttm_tt_fini(ttm); if (vmw_be->mob) vmw_mob_destroy(vmw_be->mob); @@ -578,6 +573,8 @@ static void vmw_ttm_unpopulate(struct ttm_device *bdev, dma_ttm); unsigned int i; + vmw_ttm_unbind(bdev, ttm); + if (vmw_tt->mob) { vmw_mob_destroy(vmw_tt->mob); vmw_tt->mob = NULL; From patchwork Thu Jul 22 12:41:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_K=C3=B6nig?= X-Patchwork-Id: 12394013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C87B0C63793 for ; Thu, 22 Jul 2021 12:41:39 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8BEE161248 for ; Thu, 22 Jul 2021 12:41:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8BEE161248 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 223096EC0D; Thu, 22 Jul 2021 12:41:35 +0000 (UTC) Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0E7D06EB1F for ; Thu, 22 Jul 2021 12:41:31 +0000 (UTC) Received: by mail-wm1-x331.google.com with SMTP id k14-20020a05600c1c8eb02901f13dd1672aso2454686wms.0 for ; Thu, 22 Jul 2021 05:41:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=1KnUzpgyyCCIJdQ8OciWIgIUJg25NpalllOKaMEJXyA=; b=UD+b5ZSQ9Y1pqKq+synXnXjSXoioZRFY6MT3BpPYDLmuag7H7xonwNPG1eeIm3QNtj qI6Z4/7cDIzWwab9HKvNcEw/tcARSKpOTWdlhuPZ1/rjUzpRK395vUzyXUUDwCGurlwh q04dFgtvMjA0GBf4hDdE+KEymnnCCykHiJOszpSDEGUgEmQewpc8W8dpvgTLDzlZVt74 7xkJloJcfqxYTCDOiAaIlp4XRe1OFQO/k5l/PoBU+vW36qf3f7K8cNBxljMS0G2u9T80 ogkZ8LcoLC7kja5qMmiSEdDYRH7ja9prh4t0T6tfHsmoPtcCYvLFwr//rxI7VZPz7zf8 xISA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1KnUzpgyyCCIJdQ8OciWIgIUJg25NpalllOKaMEJXyA=; b=WmeO/bMeEXFmDpih8ky3GvGC5oCVVeUL9GkAqtZquJnIGLjn/kjpXYnZ9sAPFxesCc K57zv4kM4nZAqOgL0ZdE+WsJGOzm5KAaHDDO4mfjUbG0OIUV8FOl3jGqm/8q1RiBOjj0 CCMqK8j4G17VVQFb8TGWbCi8x4st/1qFbRpyN8zUYVrz2keSmOCzXsGXLv/RWATtxJUb gnq6+rB2aerKJLnCk15OXMq6J99PltbjeCAd9SFz04r8oBi6w/UKr1et4v4Ec0U01+Kc ovFEYP7S69CzuYnc7EiaCQTwRcrnZLhBfbslKjHjSvw9GWeA/FdJTuH7mgPvu2XqHZv1 TdWg== X-Gm-Message-State: AOAM532UU+lV4xg4JidLJG4Wp6kUBlW3MeRwyeOFr9OAvx3OiiwWezdf oGKFcFrYf4hVyjoD/HWxAHdIyg/FjTQ= X-Google-Smtp-Source: ABdhPJw2liPPKoQFQLfyFbayiiNxnP940Q0MiZpqLuG1z4gBuIlW/p6/34UzRm7AIuERePyx141gpw== X-Received: by 2002:a1c:7dcf:: with SMTP id y198mr34646395wmc.140.1626957689738; Thu, 22 Jul 2021 05:41:29 -0700 (PDT) Received: from abel.fritz.box ([2a02:908:1252:fb60:6c5:784c:9ce7:760b]) by smtp.gmail.com with ESMTPSA id w8sm18545133wrk.10.2021.07.22.05.41.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 05:41:29 -0700 (PDT) From: " =?utf-8?q?Christian_K=C3=B6nig?= " X-Google-Original-From: =?utf-8?q?Christian_K=C3=B6nig?= To: dri-devel@lists.freedesktop.org, airlied@redhat.com, daniel@ffwll.ch Subject: [PATCH 2/5] drm/amdgpu: unbind in amdgpu_ttm_tt_unpopulate Date: Thu, 22 Jul 2021 14:41:24 +0200 Message-Id: <20210722124127.17901-2-christian.koenig@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210722124127.17901-1-christian.koenig@amd.com> References: <20210722124127.17901-1-christian.koenig@amd.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Doing this in amdgpu_ttm_backend_destroy() is to late. It turned out that this is not a good idea at all because it leaves pointers to freed up system memory pages in the GART tables of the drivers. Signed-off-by: Christian König --- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index b46726e47bce..42b5162814b1 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -1070,7 +1070,6 @@ static void amdgpu_ttm_backend_destroy(struct ttm_device *bdev, { struct amdgpu_ttm_tt *gtt = (void *)ttm; - amdgpu_ttm_backend_unbind(bdev, ttm); ttm_tt_destroy_common(bdev, ttm); if (gtt->usertask) put_task_struct(gtt->usertask); @@ -1154,6 +1153,8 @@ static void amdgpu_ttm_tt_unpopulate(struct ttm_device *bdev, struct amdgpu_ttm_tt *gtt = (void *)ttm; struct amdgpu_device *adev; + amdgpu_ttm_backend_unbind(bdev, ttm); + if (gtt && gtt->userptr) { amdgpu_ttm_tt_set_user_pages(ttm, NULL); kfree(ttm->sg); From patchwork Thu Jul 22 12:41:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_K=C3=B6nig?= X-Patchwork-Id: 12394009 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BECAAC63793 for ; Thu, 22 Jul 2021 12:41:35 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 818EC6128A for ; Thu, 22 Jul 2021 12:41:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 818EC6128A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D72166EBA6; Thu, 22 Jul 2021 12:41:34 +0000 (UTC) Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9548E6EB1F for ; Thu, 22 Jul 2021 12:41:31 +0000 (UTC) Received: by mail-wm1-x32a.google.com with SMTP id a23-20020a05600c2257b0290236ec98bebaso2884152wmm.1 for ; Thu, 22 Jul 2021 05:41:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=XYV11JNFtJ0LNfxBmV5PWTKY/7bs5I54vT7aSueO5Gk=; b=XdUmVEHNMFKle3u2/C8o0Cc5iLY6L+F1tUbbuCvV1LKW/R1lScWpMyXP4FHXnX1TeK YjwvOIn4z7/U25JOotUR6n4Cn+P/10Lz8BibZIZdAf88ib5JHN3Y2GuJ2UJ17bFS+Qha 588giRgcnQ5AsYpuYexKoroktXPgQnSnot+wiGvWPdoYPjed9UBfx1ymfNTNiFwO0YMM yPoRtCXiJIXeBI01lwDC73/O0ESHCiVOe7txB2WL4+hkJRGsYIIt18TcwyCc8tJPSrjd cHw4Ltm+DmbqXpmZ9IE8BSbc9dBJzxgVZzGaHUJ8JK6giLwJZp1MlVwZDkv/XPyY5szR tZKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XYV11JNFtJ0LNfxBmV5PWTKY/7bs5I54vT7aSueO5Gk=; b=HFy7B3MY4ypUq7Kwq1LvC2gAAyD3jNkM8Dp99mmI16+5aor2QiRXiZrE9SWcPONeZE 7VfmFCK/TuhYb6Em2Gu0gqiDtvu3HZVV0/n3wu69sLiC6gP09FBr3bZ9jmCkSAXv+Lpw ahwaBRU3JgBsZQWj5ETFHXJu0D813zD4RYw7R8FSc79dxCyXUGMyrdJ5EJAtdS2y0PSk tVWIRShsSr9u7zXhSm07MkDf34cY47sHUImRNF1F2K5ChRnO4PIk5INPuAkOcFGpZKeb y5EOKv7Jte6jVWO4z1uU8pbxZiQHib2f/keM4owm/fxurE7mmTuMFUDP7njDMdXVkROs c94Q== X-Gm-Message-State: AOAM5308AOn9bxikny9nmG/vyBU6i/jW7dpB5cqt1uzF/6XMloEDBaGB h6HMJVgsE3vd1m6bzpRvs8l0S++YwUM= X-Google-Smtp-Source: ABdhPJzsJKvY/0g/MV5B2d1OgQJ+eNwoi70/R6XyL5EUmT22+OmfMUTtElvQm5dkfigPT+HDcmpwjg== X-Received: by 2002:a7b:cc8d:: with SMTP id p13mr8708953wma.145.1626957690335; Thu, 22 Jul 2021 05:41:30 -0700 (PDT) Received: from abel.fritz.box ([2a02:908:1252:fb60:6c5:784c:9ce7:760b]) by smtp.gmail.com with ESMTPSA id w8sm18545133wrk.10.2021.07.22.05.41.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 05:41:30 -0700 (PDT) From: " =?utf-8?q?Christian_K=C3=B6nig?= " X-Google-Original-From: =?utf-8?q?Christian_K=C3=B6nig?= To: dri-devel@lists.freedesktop.org, airlied@redhat.com, daniel@ffwll.ch Subject: [PATCH 3/5] drm/nouveau: unbind in nouveau_ttm_tt_unpopulate Date: Thu, 22 Jul 2021 14:41:25 +0200 Message-Id: <20210722124127.17901-3-christian.koenig@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210722124127.17901-1-christian.koenig@amd.com> References: <20210722124127.17901-1-christian.koenig@amd.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Doing this in nouveau_ttm_tt_destroy()/nouveau_sgdma_destroy() is to late. It turned out that this is not a good idea at all because it leaves pointers to freed up system memory pages in the GART tables of the drivers. Signed-off-by: Christian König --- drivers/gpu/drm/nouveau/nouveau_bo.c | 3 ++- drivers/gpu/drm/nouveau/nouveau_sgdma.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index 085023624fb0..5f309a4ec211 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -1276,6 +1276,8 @@ nouveau_ttm_tt_unpopulate(struct ttm_device *bdev, if (slave) return; + nouveau_ttm_tt_unbind(bdev, ttm); + drm = nouveau_bdev(bdev); dev = drm->dev->dev; @@ -1289,7 +1291,6 @@ nouveau_ttm_tt_destroy(struct ttm_device *bdev, #if IS_ENABLED(CONFIG_AGP) struct nouveau_drm *drm = nouveau_bdev(bdev); if (drm->agp.bridge) { - ttm_agp_unbind(ttm); ttm_tt_destroy_common(bdev, ttm); ttm_agp_destroy(ttm); return; diff --git a/drivers/gpu/drm/nouveau/nouveau_sgdma.c b/drivers/gpu/drm/nouveau/nouveau_sgdma.c index 256ec5b35473..bde92a9dae7a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_sgdma.c +++ b/drivers/gpu/drm/nouveau/nouveau_sgdma.c @@ -21,7 +21,6 @@ nouveau_sgdma_destroy(struct ttm_device *bdev, struct ttm_tt *ttm) struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)ttm; if (ttm) { - nouveau_sgdma_unbind(bdev, ttm); ttm_tt_destroy_common(bdev, ttm); ttm_tt_fini(&nvbe->ttm); kfree(nvbe); From patchwork Thu Jul 22 12:41:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_K=C3=B6nig?= X-Patchwork-Id: 12394011 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C5F53C6377D for ; Thu, 22 Jul 2021 12:41:37 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 91A6061248 for ; Thu, 22 Jul 2021 12:41:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 91A6061248 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0DF176EC04; Thu, 22 Jul 2021 12:41:35 +0000 (UTC) Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6131C6EC04 for ; Thu, 22 Jul 2021 12:41:32 +0000 (UTC) Received: by mail-wm1-x333.google.com with SMTP id x14-20020a7bc20e0000b0290249f2904453so2445362wmi.1 for ; Thu, 22 Jul 2021 05:41:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=nQjh8xW0eM60mkaCg8rr3F97N02/jcov+zo3FgQKaMo=; b=I+cFaqhx4B0Cc0gHyJ7m/nObCtgyfaf2YcrSQxP5IUbfvcSMIL/u0Hlq3byu8val4n HJ+VbdcYC5FGPGxDdldHIqbfEnfCY28lt0a4Cn6iWeM45BMYG3XEnO0O5Yeg3V0um48Y xNFZ0WyZP8Pg2QP6Brc5nxEhZZuL59NXPuYnILxJYNBHCGioCZ2GTbrwsZC96WsrLzSW dUq98h1+onHyuNKz7MURy4BlBPFbH8LJsgj2Qwek1ZS54WW40i02IP2QiXflFUNYnV2O UmxT2ADe5P1KAEYHmBNO74FR6nXEi9ZnFTzfx9gDn8FuTqmbwKCuUAexX6sBd/Vwjv7L Ez5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nQjh8xW0eM60mkaCg8rr3F97N02/jcov+zo3FgQKaMo=; b=ETUCxKQW3neVUthi9fajPxFdjOrOLUUcQYMNlD57yPj+WFSNLSwORECYZ7EinGXbHg v+MymlMpsyNXIyfLHNHHXf4EupKjuQYNFwAkz4/MXHKctYQApJQmGtQxgcrcWK4RW76O 4ILpEZjcg2ahOKci80+qPr9kR0bB7GRqbL9IO+hafMe5r24QuDPRPKYHsIs0XiO4LjXG 3q8nEA1HFYZj2/2kt3iQf9Ujxpnl8wSCaFCcyqJh4rfZ6MwK+QuYZ53gy6vorkIfA94n jj+AsFo8P8kzS/Yy20JQT+4/B2GlWKbB1BU7VPc3ezJ0ZYgzqbm/7tOfoDf1/Sjl4Elg +Ikg== X-Gm-Message-State: AOAM533FxFPaggguf21mhnBacAjDAFi31LhCdPzt37Wyv3ZXTb1KO4Ie WS+WAIIYmaHX0aKUbUD8dvlR7XMmAoo= X-Google-Smtp-Source: ABdhPJwkUeEcY1rT49CNYrSi9hw4Cs1o3Uqc9U0tZMlfT8SwWLzkszONK/RNcMRURVS9w78/5hyrDA== X-Received: by 2002:a7b:c108:: with SMTP id w8mr42718138wmi.99.1626957691121; Thu, 22 Jul 2021 05:41:31 -0700 (PDT) Received: from abel.fritz.box ([2a02:908:1252:fb60:6c5:784c:9ce7:760b]) by smtp.gmail.com with ESMTPSA id w8sm18545133wrk.10.2021.07.22.05.41.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 05:41:30 -0700 (PDT) From: " =?utf-8?q?Christian_K=C3=B6nig?= " X-Google-Original-From: =?utf-8?q?Christian_K=C3=B6nig?= To: dri-devel@lists.freedesktop.org, airlied@redhat.com, daniel@ffwll.ch Subject: [PATCH 4/5] drm/radeon: unbind in radeon_ttm_tt_unpopulate() Date: Thu, 22 Jul 2021 14:41:26 +0200 Message-Id: <20210722124127.17901-4-christian.koenig@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210722124127.17901-1-christian.koenig@amd.com> References: <20210722124127.17901-1-christian.koenig@amd.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Doing this in radeon_ttm_tt_destroy() is to late. It turned out that this is not a good idea at all because it leaves pointers to freed up system memory pages in the GART tables of the drivers. Signed-off-by: Christian König --- drivers/gpu/drm/radeon/radeon_ttm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index a06d4cc2fb1c..ee343b76db54 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c @@ -488,9 +488,7 @@ static void radeon_ttm_backend_destroy(struct ttm_device *bdev, struct ttm_tt *t { struct radeon_ttm_tt *gtt = (void *)ttm; - radeon_ttm_backend_unbind(bdev, ttm); ttm_tt_destroy_common(bdev, ttm); - ttm_tt_fini(>t->ttm); kfree(gtt); } @@ -574,6 +572,8 @@ static void radeon_ttm_tt_unpopulate(struct ttm_device *bdev, struct ttm_tt *ttm struct radeon_ttm_tt *gtt = radeon_ttm_tt_to_gtt(rdev, ttm); bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG); + radeon_ttm_tt_unbind(bdev, ttm); + if (gtt && gtt->userptr) { kfree(ttm->sg); ttm->page_flags &= ~TTM_PAGE_FLAG_SG; @@ -651,7 +651,6 @@ static void radeon_ttm_tt_destroy(struct ttm_device *bdev, struct radeon_device *rdev = radeon_get_rdev(bdev); if (rdev->flags & RADEON_IS_AGP) { - ttm_agp_unbind(ttm); ttm_tt_destroy_common(bdev, ttm); ttm_agp_destroy(ttm); return; From patchwork Thu Jul 22 12:41:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_K=C3=B6nig?= X-Patchwork-Id: 12394015 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37790C63793 for ; Thu, 22 Jul 2021 12:41:43 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0301D61248 for ; Thu, 22 Jul 2021 12:41:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0301D61248 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6E7A66EC15; Thu, 22 Jul 2021 12:41:42 +0000 (UTC) Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by gabe.freedesktop.org (Postfix) with ESMTPS id 253AC6EBA6 for ; Thu, 22 Jul 2021 12:41:33 +0000 (UTC) Received: by mail-wr1-x42b.google.com with SMTP id n1so5766664wri.10 for ; Thu, 22 Jul 2021 05:41:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=rbhWlOsRYjtf/L4HdnCRmDzC2QwfIEQShNHakcq6e0g=; b=IUw5io0rG9xjNvR51ghbPngLFL6D+uza1hxyrTcWekIfcs6CuIt3GLkZhBrwuW5T7U arauzS2NhTjimdLVjlrb7AZK5yxnea/zatBasA6NwtG16LVr43z8becFrOjRQlQeXHED aqLr+4/ead0PYahVND03WOgijtxNiOF8XhCwiQBrmMvjx2dLpAgQDzNKcIEQS3d8XOVw rJj3sVJ03DLYka314l9Ry2zDu9WAeq6frHKIU5HmUBc+q2DZTlATG3f82DDn4XdenxXT a4p8Bu4vSyaYWhvOhdwvLa2GKr0dZt4lMnBbcnebmaLST7rdSjCndGVb5ZyvEnFU5TnW ReOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rbhWlOsRYjtf/L4HdnCRmDzC2QwfIEQShNHakcq6e0g=; b=dKOO9r9beFz4UiFEqPTzVDkO7BdruuwF3Yohz9KI0lqY07E8QQ/HYeObS7ujFaW+Og yuBmMa0ndT82Ecj1Tw2Gav43QPl4G0J82Al45dLAIo0FUBZJjG6PxKgQ0gM03DLwjcm6 EEMy2h2DIeU65iU3cse9hZD2rz9wonGwH7T7t4VprWrc+n+KHa0UNKG1a5DRxsvCbf4k Kze5x67nO45lgYmVfE+d3ywg59DDAbisZy/LdLCDOq8AkTGN2dzySwOVK5IKlvauzB1x eiBHFToiPb0sNM8dkq9PzeluAQetIDR1sVVAuzOAfqIpSBTV0B0hpSkHuAUCu6Ty8AGQ W/pw== X-Gm-Message-State: AOAM531FslGFRAxdHtAC9D+xPGSuquH52i3sxcqz6JYTHZZ5TXnaMtFo YvveU8csSV1rL4BAdTlCgQ6l5Y7qPhU= X-Google-Smtp-Source: ABdhPJzZjoLoF4ARdOW5j0bUcAUPHxfv6jaLigZp7eqKNTdLYCL9hXRahJbbuNfaHfvXozVlik/FuA== X-Received: by 2002:a05:6000:1001:: with SMTP id a1mr48823879wrx.121.1626957691803; Thu, 22 Jul 2021 05:41:31 -0700 (PDT) Received: from abel.fritz.box ([2a02:908:1252:fb60:6c5:784c:9ce7:760b]) by smtp.gmail.com with ESMTPSA id w8sm18545133wrk.10.2021.07.22.05.41.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 05:41:31 -0700 (PDT) From: " =?utf-8?q?Christian_K=C3=B6nig?= " X-Google-Original-From: =?utf-8?q?Christian_K=C3=B6nig?= To: dri-devel@lists.freedesktop.org, airlied@redhat.com, daniel@ffwll.ch Subject: [PATCH 5/5] drm/ttm: revert "flip tt destroy ordering." Date: Thu, 22 Jul 2021 14:41:27 +0200 Message-Id: <20210722124127.17901-5-christian.koenig@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210722124127.17901-1-christian.koenig@amd.com> References: <20210722124127.17901-1-christian.koenig@amd.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" It turned out that this is not a good idea at all because it leaves pointers to freed up system memory pages in the GART tables of the drivers. Instead change the drivers to unbind their page tables during unpopulate and merge those things back into ttm_tt_destroy() again. This reverts commit 7626168fd132009c79a0457bccc58014abc738f5. Signed-off-by: Christian König --- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 1 - drivers/gpu/drm/drm_gem_vram_helper.c | 1 - drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 1 - drivers/gpu/drm/nouveau/nouveau_bo.c | 1 - drivers/gpu/drm/nouveau/nouveau_sgdma.c | 1 - drivers/gpu/drm/qxl/qxl_ttm.c | 1 - drivers/gpu/drm/radeon/radeon_ttm.c | 2 -- drivers/gpu/drm/ttm/ttm_tt.c | 7 +------ drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 1 - include/drm/ttm/ttm_tt.h | 7 ------- 10 files changed, 1 insertion(+), 22 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index 42b5162814b1..6a6e04b64a80 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -1070,7 +1070,6 @@ static void amdgpu_ttm_backend_destroy(struct ttm_device *bdev, { struct amdgpu_ttm_tt *gtt = (void *)ttm; - ttm_tt_destroy_common(bdev, ttm); if (gtt->usertask) put_task_struct(gtt->usertask); diff --git a/drivers/gpu/drm/drm_gem_vram_helper.c b/drivers/gpu/drm/drm_gem_vram_helper.c index 1e9b82e51a07..cc81fbac1a13 100644 --- a/drivers/gpu/drm/drm_gem_vram_helper.c +++ b/drivers/gpu/drm/drm_gem_vram_helper.c @@ -846,7 +846,6 @@ static const struct drm_gem_object_funcs drm_gem_vram_object_funcs = { static void bo_driver_ttm_tt_destroy(struct ttm_device *bdev, struct ttm_tt *tt) { - ttm_tt_destroy_common(bdev, tt); ttm_tt_fini(tt); kfree(tt); } diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c index bf33724bed5c..e646aac9d7a4 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c @@ -118,7 +118,6 @@ static void i915_ttm_tt_destroy(struct ttm_device *bdev, struct ttm_tt *ttm) { struct i915_ttm_tt *i915_tt = container_of(ttm, typeof(*i915_tt), ttm); - ttm_tt_destroy_common(bdev, ttm); kfree(i915_tt); } diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index 5f309a4ec211..3177f89cf000 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -1291,7 +1291,6 @@ nouveau_ttm_tt_destroy(struct ttm_device *bdev, #if IS_ENABLED(CONFIG_AGP) struct nouveau_drm *drm = nouveau_bdev(bdev); if (drm->agp.bridge) { - ttm_tt_destroy_common(bdev, ttm); ttm_agp_destroy(ttm); return; } diff --git a/drivers/gpu/drm/nouveau/nouveau_sgdma.c b/drivers/gpu/drm/nouveau/nouveau_sgdma.c index bde92a9dae7a..85c03c83259b 100644 --- a/drivers/gpu/drm/nouveau/nouveau_sgdma.c +++ b/drivers/gpu/drm/nouveau/nouveau_sgdma.c @@ -21,7 +21,6 @@ nouveau_sgdma_destroy(struct ttm_device *bdev, struct ttm_tt *ttm) struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)ttm; if (ttm) { - ttm_tt_destroy_common(bdev, ttm); ttm_tt_fini(&nvbe->ttm); kfree(nvbe); } diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c index 19fd39d9a00c..e91d8154143e 100644 --- a/drivers/gpu/drm/qxl/qxl_ttm.c +++ b/drivers/gpu/drm/qxl/qxl_ttm.c @@ -101,7 +101,6 @@ int qxl_ttm_io_mem_reserve(struct ttm_device *bdev, */ static void qxl_ttm_backend_destroy(struct ttm_device *bdev, struct ttm_tt *ttm) { - ttm_tt_destroy_common(bdev, ttm); ttm_tt_fini(ttm); kfree(ttm); } diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index ee343b76db54..7793249bc549 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c @@ -488,7 +488,6 @@ static void radeon_ttm_backend_destroy(struct ttm_device *bdev, struct ttm_tt *t { struct radeon_ttm_tt *gtt = (void *)ttm; - ttm_tt_destroy_common(bdev, ttm); ttm_tt_fini(>t->ttm); kfree(gtt); } @@ -651,7 +650,6 @@ static void radeon_ttm_tt_destroy(struct ttm_device *bdev, struct radeon_device *rdev = radeon_get_rdev(bdev); if (rdev->flags & RADEON_IS_AGP) { - ttm_tt_destroy_common(bdev, ttm); ttm_agp_destroy(ttm); return; } diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c index 24031a8acd2d..41f38d9c3e1c 100644 --- a/drivers/gpu/drm/ttm/ttm_tt.c +++ b/drivers/gpu/drm/ttm/ttm_tt.c @@ -123,7 +123,7 @@ static int ttm_sg_tt_alloc_page_directory(struct ttm_tt *ttm) return 0; } -void ttm_tt_destroy_common(struct ttm_device *bdev, struct ttm_tt *ttm) +void ttm_tt_destroy(struct ttm_device *bdev, struct ttm_tt *ttm) { ttm_tt_unpopulate(bdev, ttm); @@ -131,11 +131,6 @@ void ttm_tt_destroy_common(struct ttm_device *bdev, struct ttm_tt *ttm) fput(ttm->swap_storage); ttm->swap_storage = NULL; -} -EXPORT_SYMBOL(ttm_tt_destroy_common); - -void ttm_tt_destroy(struct ttm_device *bdev, struct ttm_tt *ttm) -{ bdev->funcs->ttm_tt_destroy(bdev, ttm); } diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c index 904031d03dbe..f35bdc1cb197 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c @@ -526,7 +526,6 @@ static void vmw_ttm_destroy(struct ttm_device *bdev, struct ttm_tt *ttm) struct vmw_ttm_tt *vmw_be = container_of(ttm, struct vmw_ttm_tt, dma_ttm); - ttm_tt_destroy_common(bdev, ttm); vmw_ttm_unmap_dma(vmw_be); ttm_tt_fini(ttm); if (vmw_be->mob) diff --git a/include/drm/ttm/ttm_tt.h b/include/drm/ttm/ttm_tt.h index 818680c6a8ed..e402dab1d0f6 100644 --- a/include/drm/ttm/ttm_tt.h +++ b/include/drm/ttm/ttm_tt.h @@ -134,13 +134,6 @@ void ttm_tt_fini(struct ttm_tt *ttm); */ void ttm_tt_destroy(struct ttm_device *bdev, struct ttm_tt *ttm); -/** - * ttm_tt_destroy_common: - * - * Called from driver to destroy common path. - */ -void ttm_tt_destroy_common(struct ttm_device *bdev, struct ttm_tt *ttm); - /** * ttm_tt_swapin: *