From patchwork Thu Aug 12 20:34:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jason Ekstrand X-Patchwork-Id: 12434199 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=-16.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,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 D9CCDC4338F for ; Thu, 12 Aug 2021 20:34:51 +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 888EC6103E for ; Thu, 12 Aug 2021 20:34:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 888EC6103E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=jlekstrand.net 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 C8B3E6E47A; Thu, 12 Aug 2021 20:34:49 +0000 (UTC) Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1B01D6E47A for ; Thu, 12 Aug 2021 20:34:48 +0000 (UTC) Received: by mail-pj1-x102e.google.com with SMTP id oa17so11829530pjb.1 for ; Thu, 12 Aug 2021 13:34:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jlekstrand-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=VVVjPWX6jcSp1gRrqICXCN1mOR2j3DjUtUf/9alZY3Y=; b=NTqEWkzJUOw2ZlXrzJrnIL4WSEmuEgL12Njv6P7CcRtEgYmBlih9RSajBqOAsK3ZM9 V8PKTjIDKQL5gRifoAkZtS4W9g6QfcOZDuhy32XfekzezTvgaxz9ET1610rZWUUP2u2U CpWA9hnw6LmYuMtytVwNwMUMN1Hdq++j3+zwa2BoEKUlPkbsPEMqxUguO83zPZyK/RoC llVctLxu5z3Zs/gqEnHBUmKIvqBMampzJ4RBkPflBaMu5m9uN7KS9ywlVqCZEIFmIwsj yQAM51w3Ib4rKerBpFgY6GRmGXqs7RIhf3HvQuDqrh2MA1Q5r+7Z2DkB/6lKTf3wXwE7 mRkw== 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=VVVjPWX6jcSp1gRrqICXCN1mOR2j3DjUtUf/9alZY3Y=; b=AlVqmxjydkEOXaqt6l7nus/6K6NPVb664e6yEuRAaf2xl7waiN3irWOKp0DumWqOTa ByEhnrtmn8TCRR6ih9vwPFS0PXbvsU8/jaV8F0bdDAy3IYMQbf2M2IUgcxNCV29JeQYJ 7mj3nvR/v7DLGVO+vffxS+WOHLOZBV92oz7JD7ZW43g4LztMm1nZ6bDLBSgS/mP86/i2 gSOqpkdODPQJK0tBL9I8PhsqF/KP3A33yu0buksVdg0Zn/tgxWdcw2Ct+Hv3GceZpO38 ozsiMvz0WG/NrGDppGxtSjTZgFpmOxlPusVpjlv8qDiBvBrZ9YyWlau5dd97LhQZ0KXg S0jA== X-Gm-Message-State: AOAM531GjjNFbVucZN+Wbg39dDvuz+C6JPYWxTDRW1TO89ZaWZ+Fy8K9 bys2GMZXJpaTFJDEtOmqIhJIKemcs9B1xSa6 X-Google-Smtp-Source: ABdhPJxDromVb70j3SOsWGyuE45OdCGJRLAQxvA5DgMW3jezwPixi6sfC0TTSj4bEQmvD9f9JziRlQ== X-Received: by 2002:a63:ce54:: with SMTP id r20mr5534412pgi.164.1628800487085; Thu, 12 Aug 2021 13:34:47 -0700 (PDT) Received: from omlet.lan ([134.134.137.86]) by smtp.gmail.com with ESMTPSA id h5sm3404482pfv.131.2021.08.12.13.34.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Aug 2021 13:34:46 -0700 (PDT) From: Jason Ekstrand To: dri-devel@lists.freedesktop.org Cc: Jason Ekstrand , =?utf-8?q?Christian_K=C3=B6nig?= Subject: [PATCH 1/2] drm/ttm: ttm_bo_device is now ttm_device Date: Thu, 12 Aug 2021 15:34:42 -0500 Message-Id: <20210812203443.1725307-1-jason@jlekstrand.net> X-Mailer: git-send-email 2.31.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" These names were changed in commit 8af8a109b34fa88b8b91f25d11485b37d37549c3 Author: Christian König Date: Thu Oct 1 14:51:40 2020 +0200 drm/ttm: device naming cleanup But he missed a couple of them. Signed-off-by: Jason Ekstrand Cc: Christian König Fixes: 8af8a109b34f ("drm/ttm: device naming cleanup") --- Documentation/gpu/drm-mm.rst | 2 +- include/drm/ttm/ttm_tt.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/gpu/drm-mm.rst b/Documentation/gpu/drm-mm.rst index d5a73fa2c9ef..8126beadc7df 100644 --- a/Documentation/gpu/drm-mm.rst +++ b/Documentation/gpu/drm-mm.rst @@ -37,7 +37,7 @@ TTM initialization This section is outdated. Drivers wishing to support TTM must pass a filled :c:type:`ttm_bo_driver -` structure to ttm_bo_device_init, together with an +` structure to ttm_device_init, together with an initialized global reference to the memory manager. The ttm_bo_driver structure contains several fields with function pointers for initializing the TTM, allocating and freeing memory, waiting for command diff --git a/include/drm/ttm/ttm_tt.h b/include/drm/ttm/ttm_tt.h index 818680c6a8ed..0d97967bf955 100644 --- a/include/drm/ttm/ttm_tt.h +++ b/include/drm/ttm/ttm_tt.h @@ -31,7 +31,7 @@ #include #include -struct ttm_bo_device; +struct ttm_device; struct ttm_tt; struct ttm_resource; struct ttm_buffer_object; From patchwork Thu Aug 12 20:34:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jason Ekstrand X-Patchwork-Id: 12434201 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=-16.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,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 1C0F8C4338F for ; Thu, 12 Aug 2021 20:34: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 CA9686103E for ; Thu, 12 Aug 2021 20:34:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org CA9686103E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=jlekstrand.net 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 763D06E47B; Thu, 12 Aug 2021 20:34:51 +0000 (UTC) Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by gabe.freedesktop.org (Postfix) with ESMTPS id 67F1D6E47A for ; Thu, 12 Aug 2021 20:34:49 +0000 (UTC) Received: by mail-pj1-x1030.google.com with SMTP id oa17so11829641pjb.1 for ; Thu, 12 Aug 2021 13:34:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jlekstrand-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=otS/AA0BHrXG6Y0hs1egziVZdEyeOXzD64u+7F8XKYY=; b=y0gl9b3tIpV/Eu9/KZMedHII4fg1R7kiwLVGZkep8+RkYoNy0GGBaIsuZatbPQbf/G yH9fUOpddKafQBxCDT9TjUt6DmJIKZ5bMcsJKJspWpwHOG8FZucTcguZ1nTdgAPSu8M6 D0JAYZPW9AZmBbxQwWT/WNRAxNbFJKz7SJcxbYhg0QDmhmMX6E3NjBudIdmW3d9YliDK +fuBa+xrVqaAMP7S+RThAkpT+xcYhh/iOeDteO2WdlNpx3F7rCsGbBzLcNIte643whLA tqY4JulFN7pdszvcVw/n+rMZz+w6afMevvf/PA601zprSpnxQq0ALJygnx2SM4g/HrRX ka6g== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=otS/AA0BHrXG6Y0hs1egziVZdEyeOXzD64u+7F8XKYY=; b=OfkKTAZBvJzD4jxOpGYlzgunVCN5757vMWC0yEs8Pi/a3J1awqd/y9kmYcZGalo7Jx zeGZLDJAqqLNTBzBibJw62LMRNux+IrNznfxJMU0rUdVE16R7B5W7gBdTbOhA3YbvYPQ vPs4dY/Qku3kCcX55RSuORXjJ2LVhfPoppTdBTYdjj+ITXr/5Px38EsMwVoP9OI8xS7I mbaOsCugomHED6vts0D6G3KCML0R3Xl+Cyi5VX2U+/9EaZivzVIieqb6aneEyBvROwC3 1pbAcS8zoXcMOhmxJ7n2oRROfnTFNwEAd0yjjxvwi/+QsTdgltGhi3R0Dg5LuUXCCIXG PXqg== X-Gm-Message-State: AOAM5329OMgGm4+S5hy/mOH1yin7+0Y6SBKi9sTH3io6ehRXxLtiISJW FF3dXquQbexnAbcQEkC9aa1mD54WGn2aYyBM X-Google-Smtp-Source: ABdhPJziZyCl29IXBYV6dyM0FPW5HPzwPwTmtSimXfaqyRwzb7wvYGj7eZuEvQdSRiD0VUcv2YcwPg== X-Received: by 2002:a17:90b:380a:: with SMTP id mq10mr15958615pjb.207.1628800488664; Thu, 12 Aug 2021 13:34:48 -0700 (PDT) Received: from omlet.lan ([134.134.137.86]) by smtp.gmail.com with ESMTPSA id h5sm3404482pfv.131.2021.08.12.13.34.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Aug 2021 13:34:48 -0700 (PDT) From: Jason Ekstrand To: dri-devel@lists.freedesktop.org Cc: Jason Ekstrand , =?utf-8?q?Christian_K=C3=B6nig?= Subject: [PATCH 2/2] drm/ttm: Include pagemap.h from ttm_tt.h Date: Thu, 12 Aug 2021 15:34:43 -0500 Message-Id: <20210812203443.1725307-2-jason@jlekstrand.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210812203443.1725307-1-jason@jlekstrand.net> References: <20210812203443.1725307-1-jason@jlekstrand.net> 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's needed for pgprot_t which is used in the header. Signed-off-by: Jason Ekstrand Cc: Christian König --- drivers/gpu/drm/ttm/ttm_tt.c | 1 - include/drm/ttm/ttm_tt.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c index 24031a8acd2d..d5cd8b5dc0bf 100644 --- a/drivers/gpu/drm/ttm/ttm_tt.c +++ b/drivers/gpu/drm/ttm/ttm_tt.c @@ -32,7 +32,6 @@ #define pr_fmt(fmt) "[TTM] " fmt #include -#include #include #include #include diff --git a/include/drm/ttm/ttm_tt.h b/include/drm/ttm/ttm_tt.h index 0d97967bf955..b20e89d321b0 100644 --- a/include/drm/ttm/ttm_tt.h +++ b/include/drm/ttm/ttm_tt.h @@ -27,6 +27,7 @@ #ifndef _TTM_TT_H_ #define _TTM_TT_H_ +#include #include #include #include