From patchwork Mon Sep 18 17:33:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "StDenis, Tom" X-Patchwork-Id: 9957225 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8171B601E9 for ; Mon, 18 Sep 2017 17:34:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D23828D6F for ; Mon, 18 Sep 2017 17:34:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 61E0928D78; Mon, 18 Sep 2017 17:34:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_WEB, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B07BE28D6F for ; Mon, 18 Sep 2017 17:34:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 129E388C90; Mon, 18 Sep 2017 17:34:09 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0086.outbound.protection.outlook.com [104.47.33.86]) by gabe.freedesktop.org (Postfix) with ESMTPS id 22B6B6E3C9; Mon, 18 Sep 2017 17:34:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=jC7Jb23cE1l1FgcnS8dcgumNyhOnC+Q/NRtEQrLk3Gg=; b=dCCU4pc3QGAw02v5cI4ASbX1CvHhxWM9QTjiJQrjm20MMrBrV3kZkVZ6Inq8MTvUHwo0yyjD8SRLRwSWKMQBC5H9Ibg6tqZdSRAGVgNgFb7dUHOKFRJEGSGMcN/K2ACQIcyGWQAKWu6QFmSGwP1WEhh+H+2Hla77+/8R6WS8eD0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Tom.StDenis@amd.com; Received: from fx8.amd.com (165.204.55.251) by MWHPR1201MB0079.namprd12.prod.outlook.com (10.174.98.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.11; Mon, 18 Sep 2017 17:34:03 +0000 From: Tom St Denis To: amd-gfx@lists.freedesktop.org Subject: [PATCH 4/4] drm/ttm: Remove TTM dma tracepoint since it's not required anymore Date: Mon, 18 Sep 2017 13:33:50 -0400 Message-Id: <20170918173350.9543-5-tom.stdenis@amd.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170918173350.9543-1-tom.stdenis@amd.com> References: <20170918173350.9543-1-tom.stdenis@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.55.251] X-ClientProxiedBy: BN6PR06CA0031.namprd06.prod.outlook.com (10.174.93.20) To MWHPR1201MB0079.namprd12.prod.outlook.com (10.174.98.18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5a9924a9-9657-43dd-39c8-08d4febb74f0 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(48565401081)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:MWHPR1201MB0079; X-Microsoft-Exchange-Diagnostics: 1; MWHPR1201MB0079; 3:+Vm/4ic/daEuOUy+XjNVPLgYbL59mP2hA/fs8BKlZnfWBmlXRLvUbqhOWwhKU3zCq6YYSCx6DmhYPF4/f9ZyP+624IeOEJFHjxj5kTXkx1JYjOu/afLdMrw8QobddaU3MIynJbU3srLFJOAiZ7bOLexLAyBNIdJoFAcHl+UaIlmRPMhRJviRQsv5rKA0Cvgkmr/iBARdbed0khqQWiFW7hn3DEIyg3iO2s0cPKOyT1s8X657vRFFe0F7TDHQeg5N; 25:i5TvVepljyw6WYo92qS+YhWmT8sC3igtHA+57HfMzGCFkKES4o8RlIhT3CChD1gc6hi2MHx+cXCPjMQwUf7SVlXClbnqkCzJ/QHU0L/7vBRUUguK+H5/8K+jLE4qtdKnSBC7rWsiNASoVu4KRiVYwNuBWngjfg1EYBx+qGgr2graYMbaYSRh59vNp9su5AuxO86EOV13vo36az0AXgj/taKae/95BoH7Gy2M54mGw6pltGSgEc5na346GVunAZgqOy6ljME0U7S92QVtl5G6mEu/eXXXfrGdACtL709ATVk2v8wVyWrUYZg/2H5lMmFcX+wngeXizy0WGjNBmdHj0A==; 31:Ouv9bJWkOvfs9d5RrsjUr4Iu4N9mRPZQq82eK5WGmgbuwAN2vMiuyTji3GYwCzS+Rk3b/qoBHGe4k7Se2Tiq3Enl+r1ZWjwY/j847/UcxDopgPem3CljFc19jbXX1Ivep/WGAw5E7oe/WheAv4ZYQUVjS1BFbkWzd/zK8r7t0CbTNlpHECAEOioUM8TDR9eF9OFVqDuuv1zGHdUH/ALQD3VuNNtZRwJtHjj8N2FttFw= X-MS-TrafficTypeDiagnostic: MWHPR1201MB0079: X-Microsoft-Exchange-Diagnostics: 1; MWHPR1201MB0079; 20:ZyyNdgpz/XRCAQ8s3Dg1DBCWSdWn3mQz0g0Xj/3/ufOVxSwoXRRPkBO+2TJxQsJqXEY45AHAmqaZGklbYbrkWUE1IwNzwLVFjCY3BzQ6hUGvsv8tSJ0vvXKWjkf/7gEhNyXe9sQeEJdpSol8OvQJjVZcd75lYrVrOA8hyTUNq/NX/A9/a8jQ7OBHcWnP0q57OY27oWI0G7speKuIDYB4ZVuv/WpAFhzRivUej9aCDKp8IFlEO2B9muSYLxwcoVxelL47rLNqdjPsEjcN+VUkyP+TSd47V5C8rqtNwttmyQ0TUen0uvylqoiiIECbmNOu3t8U0JpQG9ecRcnT0ciM2KVN0i9q45tf5MMTMtMcDo49Sf9vPFGhVnCjVG3TraGCO9vq74aT1a65AwEm4BiIftWfd95rDNbquAHYLtNvix0qIm8TWAZr12z7hLAPn35xNJLbIbBXplfoVJKiRXSn0RwAjlMzL3RHhGxnXqxXhCFnFbQwBZhhmGkex/rj0p3X; 4:WrjHFSrFl1bNpmB3cQhODcMy3v2K+kdVJ+GeBi2W0a+0EQISDkrzcXAeOShwTi9XWF48k4FVIuMAMyQ6Q/N85ZzyoO76j2w+n0eQx2TpgNA5OGUANUcrJPZ3pRwRUqX6JVYW7svUBnJZwvPpEouWYmFgWpXzpBjTboAe8iRWZ+38Hd/6rjDaWnY2GXyZwqNKewVqsO3+u3rRUqU+b679blTpTrXUq+jqjGAzAxO3Dkx7rq0ztDeHyVoSIibwAd6eFj9VgfIISiuCv6e1sECrkbP9CuZPVISMdsc9VuGEpjw= X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(100000703101)(100105400095)(3002001)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123562025)(20161123564025)(20161123558100)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:MWHPR1201MB0079; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:MWHPR1201MB0079; X-Forefront-PRVS: 04347F8039 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(346002)(376002)(39860400002)(189002)(199003)(25786009)(105586002)(72206003)(68736007)(53936002)(2361001)(33646002)(76176999)(48376002)(50466002)(5660300001)(36756003)(6486002)(450100002)(110136004)(478600001)(6116002)(16526017)(66066001)(3846002)(1076002)(47776003)(16586007)(86362001)(2906002)(575784001)(6666003)(50986999)(5003940100001)(305945005)(8676002)(81166006)(81156014)(106356001)(7736002)(2950100002)(316002)(6916009)(2351001)(50226002)(97736004)(4326008)(101416001)(8936002)(189998001)(53416004); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR1201MB0079; H:fx8.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR1201MB0079; 23:WJbGfe6ErLycbA9QmxGy13w5TYJio5wUXsjIqEz?= =?us-ascii?Q?v7wK0ES1ycSt0yl0iTsIQtfcAnjC4uj2DgqVWuCaKFzY5sAMtJuIz+vMQNHX?= =?us-ascii?Q?G7cxilnRBbTuB86TB1d/LzgtEjbgXGLBG7rgm7dEJE+O4qqWzIrZRklD2ySm?= =?us-ascii?Q?4uPMWyuQ6L0J6TRFaU3I9Omab3eQtLlrnrXcFavw411/WSoEuMkn9KWTn2RG?= =?us-ascii?Q?esPsDS3OqWv81Ukj4Eb0zAJpORCwjLQdy20ux8+uK2T64m82S4D6ZgLJ97CB?= =?us-ascii?Q?y3coeM5P8L1qD7hXNkwrlrvg68PUkC9Hj3+c7wF/kJTUlPKu1cKzovfPcVUG?= =?us-ascii?Q?D4tI2mVhuUSH34Z4Gx7HDmB5F87QZDTFtZiRwxWAKTH1A17T2V1OXWksNlP+?= =?us-ascii?Q?cnZLvTavR6rICXxHo9hxa2YkCwiIOPG7kloQiU0xo9Y8BnRUd6mZzIiKNM/Z?= =?us-ascii?Q?010yu5B7yWjMDDM909k0dD5e4vMgYRVXioOqlZ5aEt6AwFJZlbZ2by9a9q27?= =?us-ascii?Q?6hV+P/693BQlE+sBlb67LU7girYyP4rsPlKUrhgpcQaYwIs7aaxw63L/XJW2?= =?us-ascii?Q?pN95cZSr9E2NutWNI3s6KVvkC3PyITUPH4cY1rwdCjy8/Xj1mYuuT3L6Pk+R?= =?us-ascii?Q?VIGyCfKj/YgDx2UfYdEwbJSFdaljIlbmvWAhH4D81E6/KU7QFeeyhZDl5zO8?= =?us-ascii?Q?3jM0Uh5BW2j+YI1rjFQQSSEBV7Owuaydc8TXZI7t68b0iSdgG2XkIHeP6UnR?= =?us-ascii?Q?dpCStQZ2sRIUXFkB2vr/cpD+XWeWdmU7o67djqWIGXIG8UOJdMM4wns00X8Y?= =?us-ascii?Q?b2qK14ZV6vLoDcrcj5cU4b+EvwDHkm1Nv46aqZb+8SOiseTPZeh3UJbgyed/?= =?us-ascii?Q?ih9BQIoQxOtu8AsmIBqTDJeDwcq/sNAJ7WaQjKnLmgPKq1aQ5Hw6mJ1pPWHW?= =?us-ascii?Q?B8zfxUJsMpkT1639ijurNx/XD4ragQgMaFvw2qVrH05o/MN6XoGYEGkqy/u6?= =?us-ascii?Q?kQrsh1z8tqrzpCLuDTri8JoPJ8iPrFQsmyXiXOA6c/Kb/dS0Mfj1E5J29Ggi?= =?us-ascii?Q?kHwET72DmF3uefobWQ1txOxDJaoXSm/a4Q3TodeB56q+YTCRjj+HSv69UBM+?= =?us-ascii?Q?+v0MuweLvLCHyrjmhxN7Dm4oXOY9/RC7sSlnuIaqKVMXvGVafKyYqBpYN64h?= =?us-ascii?Q?RlG5jM7wvojhDOqmHu6AIV85PnmkYL/0/kvabYrodaDylO0pWibQ87hs1UA?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR1201MB0079; 6:c/2dtp45FLNM9tMdR+P2EO3QkFNwCMdEGwzMwz/7XIW0AizONtIv4U1N2UCqwW7kW87rxIuQ8JGS+QzcBaL5stOJ7bWu74WuazxoWKEdyz3Egt8GWGUQoKL5u/Zpi62HFeGNnGQU7teR6UJ7kizy86YUfCQ9QJMRv3BBB9GGS+XsinDgMdJKjrPdyKfdM6L9cvxCidw29r/a+uA5O+W+gZRa/gyUepYqqy8l7Z6Lcs+K2wBQj29JQnPv2FHekVhLTbl2gH/Z/91BUxsgfHmlXSQ1sv4uv2QCpoG/zeWRErUBlKMNyj/8lkueT5rodJz/jwzw7yneq6jHuK6IlpMXRA==; 5:7fPAlc61+TxJaPf8V70IQbJ/MqOEKMEOrYBc6vToF+adof0Ghfk33OdH590PJSSEzigFgxYi2DeyjU/wtazrUdm2YEYBRp62I/xieA9vnUX+tErbKYOvI7D/QvwQ9JRLHlgE28U2lemQFVcmJ0jaHw==; 24:/04UgS3T95jRfOzQQqY1Rx0yZj0euaeD+nxv2EoCXSCQQTtPSglB7XVgHEfnA8tXfQHmfsx9udHUri4w6wr2fvZZJiAisv699i1J8jLPxRI=; 7:S5r3v/DNkZfP4jI1WTLlBRNoy2pTEonWJ2KOhlMPIyuvPGW3BbuOmyEMo6aBh7joxLfTsysnTvCuR2P4hhroM8I0SEAx7AuzufkgIi7tula1IbtGAfjaDStf+wl278HAdySY/7451nyOdXpJL6pLZy6iCoBdxECW15i3g+EUHHq3sliYoa+Xv+DXFS6lfobERu7kOS2kZb97Q8+KmVKGCxZcsG4WLh9G5dPBlsI8m4U= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR1201MB0079; 20:CVUhOur5+n9evMAkhzigshjstzsKE3eRkKlGOkq+mdFkZj2wEKpPPXm20t2L6QkGglzblM4kwnJJ1245jXUrGXXH/Tyn2DllakWk17ILln7vXhgOVAGQk7l56g7rTIV4FirkpXlb5SR7BKyb5exkJzoGmmDfdBmWKn6AM6NS6XGPZVpjfIxCcOmulYlguuUZU13qqU+s1dqw66BewCFbo3Zbp3aCB1fqwRSLK5bPJeGB0HrrpovZdSbYrDudbmIN X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2017 17:34:03.3603 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1201MB0079 Cc: Tom St Denis , dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 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" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Tom St Denis --- drivers/gpu/drm/ttm/Makefile | 2 +- drivers/gpu/drm/ttm/ttm_debug.c | 74 ----------------------------- drivers/gpu/drm/ttm/ttm_trace.h | 87 ----------------------------------- drivers/gpu/drm/ttm/ttm_tracepoints.c | 45 ------------------ 4 files changed, 1 insertion(+), 207 deletions(-) delete mode 100644 drivers/gpu/drm/ttm/ttm_debug.c delete mode 100644 drivers/gpu/drm/ttm/ttm_trace.h delete mode 100644 drivers/gpu/drm/ttm/ttm_tracepoints.c diff --git a/drivers/gpu/drm/ttm/Makefile b/drivers/gpu/drm/ttm/Makefile index ab2bef1219e5..4d0c938ff4b2 100644 --- a/drivers/gpu/drm/ttm/Makefile +++ b/drivers/gpu/drm/ttm/Makefile @@ -4,7 +4,7 @@ ttm-y := ttm_memory.o ttm_tt.o ttm_bo.o \ ttm_bo_util.o ttm_bo_vm.o ttm_module.o \ ttm_object.o ttm_lock.o ttm_execbuf_util.o ttm_page_alloc.o \ - ttm_bo_manager.o ttm_page_alloc_dma.o ttm_debug.o ttm_tracepoints.o + ttm_bo_manager.o ttm_page_alloc_dma.o ttm-$(CONFIG_AGP) += ttm_agp_backend.o obj-$(CONFIG_DRM_TTM) += ttm.o diff --git a/drivers/gpu/drm/ttm/ttm_debug.c b/drivers/gpu/drm/ttm/ttm_debug.c deleted file mode 100644 index ef5f0d090154..000000000000 --- a/drivers/gpu/drm/ttm/ttm_debug.c +++ /dev/null @@ -1,74 +0,0 @@ -/************************************************************************** - * - * Copyright (c) 2017 Advanced Micro Devices, Inc. - * All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sub license, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice (including the - * next paragraph) shall be included in all copies or substantial portions - * of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL - * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE - * USE OR OTHER DEALINGS IN THE SOFTWARE. - * - **************************************************************************/ -/* - * Authors: Tom St Denis - */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "ttm_trace.h" - -void ttm_trace_dma_map(struct device *dev, struct ttm_dma_tt *tt) -{ - unsigned i; - - if (unlikely(trace_ttm_dma_map_enabled())) { - for (i = 0; i < tt->ttm.num_pages; i++) { - trace_ttm_dma_map( - dev, - tt->ttm.pages[i], - tt->dma_address[i]); - } - } -} -EXPORT_SYMBOL(ttm_trace_dma_map); - -void ttm_trace_dma_unmap(struct device *dev, struct ttm_dma_tt *tt) -{ - unsigned i; - - if (unlikely(trace_ttm_dma_unmap_enabled())) { - for (i = 0; i < tt->ttm.num_pages; i++) { - trace_ttm_dma_unmap( - dev, - tt->ttm.pages[i], - tt->dma_address[i]); - } - } -} -EXPORT_SYMBOL(ttm_trace_dma_unmap); - diff --git a/drivers/gpu/drm/ttm/ttm_trace.h b/drivers/gpu/drm/ttm/ttm_trace.h deleted file mode 100644 index 715ce68b7b33..000000000000 --- a/drivers/gpu/drm/ttm/ttm_trace.h +++ /dev/null @@ -1,87 +0,0 @@ -/************************************************************************** - * - * Copyright (c) 2017 Advanced Micro Devices, Inc. - * All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sub license, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice (including the - * next paragraph) shall be included in all copies or substantial portions - * of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL - * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE - * USE OR OTHER DEALINGS IN THE SOFTWARE. - * - **************************************************************************/ -/* - * Authors: Tom St Denis - */ -#if !defined(_TTM_TRACE_H) || defined(TRACE_HEADER_MULTI_READ) -#define _TTM_TRACE_H_ - -#include -#include -#include - -#include - -#undef TRACE_SYSTEM -#define TRACE_SYSTEM ttm -#define TRACE_INCLUDE_FILE ttm_trace - -TRACE_EVENT(ttm_dma_map, - TP_PROTO(struct device *dev, struct page *page, dma_addr_t dma_address), - TP_ARGS(dev, page, dma_address), - TP_STRUCT__entry( - __string(device, dev_name(dev)) - __field(dma_addr_t, dma) - __field(phys_addr_t, phys) - ), - TP_fast_assign( - __assign_str(device, dev_name(dev)); - __entry->dma = dma_address; - __entry->phys = page_to_phys(page); - ), - TP_printk("%s: %pad => %pa", - __get_str(device), - &__entry->dma, - &__entry->phys) -); - -TRACE_EVENT(ttm_dma_unmap, - TP_PROTO(struct device *dev, struct page *page, dma_addr_t dma_address), - TP_ARGS(dev, page, dma_address), - TP_STRUCT__entry( - __string(device, dev_name(dev)) - __field(dma_addr_t, dma) - __field(phys_addr_t, phys) - ), - TP_fast_assign( - __assign_str(device, dev_name(dev)); - __entry->dma = dma_address; - __entry->phys = page_to_phys(page); - ), - TP_printk("%s: %pad => %pa", - __get_str(device), - &__entry->dma, - &__entry->phys) -); - -#endif - -/* This part must be outside protection */ -#undef TRACE_INCLUDE_PATH -#define TRACE_INCLUDE_PATH ../../drivers/gpu/drm/ttm/ -#include - diff --git a/drivers/gpu/drm/ttm/ttm_tracepoints.c b/drivers/gpu/drm/ttm/ttm_tracepoints.c deleted file mode 100644 index 861a6266822b..000000000000 --- a/drivers/gpu/drm/ttm/ttm_tracepoints.c +++ /dev/null @@ -1,45 +0,0 @@ -/************************************************************************** - * - * Copyright (c) 2017 Advanced Micro Devices, Inc. - * All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sub license, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice (including the - * next paragraph) shall be included in all copies or substantial portions - * of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL - * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE - * USE OR OTHER DEALINGS IN THE SOFTWARE. - * - **************************************************************************/ -/* - * Authors: Tom St Denis - */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define CREATE_TRACE_POINTS -#include "ttm_trace.h"