From mboxrd@z Thu Jan 1 00:00:00 1970 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 3017FC4338F for ; Wed, 28 Jul 2021 13:05:57 +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 F208160F02 for ; Wed, 28 Jul 2021 13:05:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org F208160F02 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5CBE56E1BB; Wed, 28 Jul 2021 13:05:56 +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 1D3456EA9C for ; Wed, 28 Jul 2021 13:05:55 +0000 (UTC) Received: by mail-wr1-x42b.google.com with SMTP id r2so2483423wrl.1 for ; Wed, 28 Jul 2021 06:05:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bQ87wOwH9xOd6jFHhuQOQ/bBNNUz8U9SO0pUyg9uERw=; b=HycY6YxL7pJbO4B32kkg0MzBpOkzrIOW7tbPHNC5G3auVNWVa5rrvq26syPqFgi6lK btdgpkHoDGxFe8ayZy2fMnIJCRTxH5B0FzYOmnu1VG4T888iJzxQzr7HBZqDB4kV1ArM OFoZ0zgRzlJn4xPdPp4S+jcmR+3npE7B+XKc/LWgq9Ug8/bPLcI8wREkvueOV4Soo/ey RdPr5a98udfh5RC6LKVi4CfP1uf28/KedHpl88bSAYEujy8ttUbC+d1Bdr7UdtZntaHi 9jr6PfbO6X9hO+k0wwGmBYmPkCa0CWI1QVqXfDYeTSPCbIdwdh5YX4EHP38wF/yJ6PYX EOpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bQ87wOwH9xOd6jFHhuQOQ/bBNNUz8U9SO0pUyg9uERw=; b=IKRg6W6edBcSKLkKtvwPrsSK+KyC8lcZjJsk2Ka/Apd6ZQUjNl0br8LL9lGP+0p0Ji 341euMSjGE/fdEC0dEPQHOcp0Puql0rbgCQVKsgbxDt9ljQNax+9TesuKkK8S34swDg7 VQgjCvglb5VNxFJiWWzux8QTWw8nO7JLNGgnCwPsJkls79ZFpoqMnneMEzVBEO9mH+L9 ZHOAWcijntgmL8t45yDGE6t7If8ZBLBE37FAFGp6LGmmFuxYClz4ReA+P7d0CMwbjpL7 s9r9ZM+9kA1tpPYB/XBr2ewR5MUQBCsJNRiatKRxlQj5nZetQPk2mSCjNp07AVOHMHvd LWew== X-Gm-Message-State: AOAM532xH00AIcbhiMTXLwYWDy3xeJPECA+iqFVM1zkm0kAGo/rqTc5N rM8LUOviMTQYp8+2uDmOMXA= X-Google-Smtp-Source: ABdhPJy7O3O8jpBtZUn0T3+7TbLUAXd/Q1DGYj3KXBh1JfaJn3jdsb4+KJGQlZM0kP2pxyZ1yFdfhQ== X-Received: by 2002:a5d:4312:: with SMTP id h18mr30715894wrq.170.1627477553636; Wed, 28 Jul 2021 06:05:53 -0700 (PDT) Received: from abel.fritz.box ([2a02:908:1252:fb60:6a03:ba57:3127:59bd]) by smtp.gmail.com with ESMTPSA id o17sm5867374wmp.31.2021.07.28.06.05.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jul 2021 06:05:53 -0700 (PDT) From: "=?UTF-8?q?Christian=20K=C3=B6nig?=" X-Google-Original-From: =?UTF-8?q?Christian=20K=C3=B6nig?= To: daniel.vetter@ffwll.ch, airlied@gmail.com Subject: [PATCH 1/5] drm/vmwgfx: unbind in vmw_ttm_unpopulate Date: Wed, 28 Jul 2021 15:05:48 +0200 Message-Id: <20210728130552.2074-1-christian.koenig@amd.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: , Cc: dri-devel@lists.freedesktop.org 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; -- 2.25.1