From patchwork Wed Feb 10 16:05:49 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: 12081105 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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,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 5A482C433DB for ; Wed, 10 Feb 2021 16:05:55 +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 E86FD64E0B for ; Wed, 10 Feb 2021 16:05:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E86FD64E0B 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 33F8D6E321; Wed, 10 Feb 2021 16:05:54 +0000 (UTC) Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) by gabe.freedesktop.org (Postfix) with ESMTPS id 96E636E321 for ; Wed, 10 Feb 2021 16:05:52 +0000 (UTC) Received: by mail-ed1-x52d.google.com with SMTP id q2so3649176edi.4 for ; Wed, 10 Feb 2021 08:05:52 -0800 (PST) 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=3/LJSMSnOUZXdAr1zayBL9FVpjNwWh6HQVcuhizDP7E=; b=j/iJlzE6SNUtbDlh2NOFxPsJxjtbqNa8V4eevPE6IW0WrIbCnxSH8GPBdEoYSWP3gn Pcc4qse/0n96/Mrct/TDGPTzQEDpeer0gBMVDsqHVQwzkTrjmKUWsyMxnqc2/tOvYevV FS9ayaAXscQnadw2+vwYBB9iwz96gJ/UHDKvTlg2UY3NBwB48b/jHPu/0RqZXH9CP5ku dL/R3yF1BAA5KjzF+p/iDrU4+G7UGNvSz8AY0KBIXf87T+3BUCF4c+hMQLnV/Mk2NJdE VsRu3EgyFzdjq42jdphDaiNy3GZpngAZrY49WigiOp4DTaiWWkKdg8x5U8nHR4VueZog l6Kg== 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=3/LJSMSnOUZXdAr1zayBL9FVpjNwWh6HQVcuhizDP7E=; b=O49rhe6yC5Zcxm1doMg3NPFkaWA4ovjmasowXT8hwSqLKGi1uYjDPOH68eRGZBg5Ax qLBAGFTdnwkCXPOhG7/6p+eLzXb6nKIgOTs021U6MaTbAg6vFmZVsOPo5KAKg8+FD+yi BJc3MVRDeGW3xz+PdieqEv0x0mbkb2T0ymimWiwV2CWEHRyt61c2NdUsDEPQXqarcUCl bhnD9YMev6dzJyYNgVbtbKs7Iml0TGJzc/agQA8bf6sOZSi5q52Qa+rNvphm3mX+Ab5h 7R5HYeL+zaPwcIsEDA5b/9vSaAddIHETpVEzpWisAAE82whf0IS1RpVcsn6gHpWchpAx iI2w== X-Gm-Message-State: AOAM533KCSaWb0DVbyCqZtbhNQ0bebLuAQotUe1NzXSnio99hDEf47Ve MHv2+UeWBLTR9E7jRs9DM9CUJDWVk45YJg== X-Google-Smtp-Source: ABdhPJyVS9rWi0i5yBAnXcuoxcw3nIgg1XugXMng7l1b3uFTijhmddhQCMtE8WjcCb9BFFEmjlpyjg== X-Received: by 2002:aa7:c0cd:: with SMTP id j13mr3762361edp.319.1612973151327; Wed, 10 Feb 2021 08:05:51 -0800 (PST) Received: from abel.fritz.box ([2a02:908:1252:fb60:f16b:8c3:1c30:3103]) by smtp.gmail.com with ESMTPSA id w18sm1410164edt.8.2021.02.10.08.05.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Feb 2021 08:05:50 -0800 (PST) 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, ray.huang@amd.com Subject: [PATCH] drm/ttm: make sure pool pages are cleared Date: Wed, 10 Feb 2021 17:05:49 +0100 Message-Id: <20210210160549.1462-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: , Cc: efault@gmx.de Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The old implementation wasn't consistend on this. But it looks like we depend on this so better bring it back. Signed-off-by: Christian König Reported-and-tested-by: Mike Galbraith Fixes: d099fc8f540a ("drm/ttm: new TT backend allocation pool v3") --- drivers/gpu/drm/ttm/ttm_pool.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/gpu/drm/ttm/ttm_pool.c b/drivers/gpu/drm/ttm/ttm_pool.c index 74bf1c84b637..6e27cb1bf48b 100644 --- a/drivers/gpu/drm/ttm/ttm_pool.c +++ b/drivers/gpu/drm/ttm/ttm_pool.c @@ -33,6 +33,7 @@ #include #include +#include #ifdef CONFIG_X86 #include @@ -218,6 +219,15 @@ static void ttm_pool_unmap(struct ttm_pool *pool, dma_addr_t dma_addr, /* Give pages into a specific pool_type */ static void ttm_pool_type_give(struct ttm_pool_type *pt, struct page *p) { + unsigned int i, num_pages = 1 << pt->order; + + for (i = 0; i < num_pages; ++i) { + if (PageHighMem(p)) + clear_highpage(p + i); + else + clear_page(page_address(p + i)); + } + spin_lock(&pt->lock); list_add(&p->lru, &pt->pages); spin_unlock(&pt->lock);