From patchwork Mon Sep 18 12:35:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "StDenis, Tom" X-Patchwork-Id: 9956617 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 2AF9760385 for ; Mon, 18 Sep 2017 12:35:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1987C28C6D for ; Mon, 18 Sep 2017 12:35:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0CD3C28CA8; Mon, 18 Sep 2017 12:35:51 +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 4F27528C6D for ; Mon, 18 Sep 2017 12:35:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C5FF26E374; Mon, 18 Sep 2017 12:35:44 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0075.outbound.protection.outlook.com [104.47.42.75]) by gabe.freedesktop.org (Postfix) with ESMTPS id 481206E366; Mon, 18 Sep 2017 12:35:39 +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=YnqOPSFMAOq/oExAzYT+rFQ7VdiSO2fd1AtfuhtnvEgjD65KXW0sETBzIXLPHtq2g8PXKSSF7TCEE0+bPPfx9ztEX61s2e4Axubj6j59coAL0ZnM1YRR9fwQI+PRnUzr0ikrBC5y1bFjUE+p4Ap44Lvje36w7S5k5TIWH7xgmn8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Tom.StDenis@amd.com; Received: from fx8.amd.com (165.204.55.251) by DM5PR1201MB0074.namprd12.prod.outlook.com (10.174.106.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.8; Mon, 18 Sep 2017 12:35:37 +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 08:35:28 -0400 Message-Id: <20170918123528.26629-5-tom.stdenis@amd.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170918123528.26629-1-tom.stdenis@amd.com> References: <20170918123528.26629-1-tom.stdenis@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.55.251] X-ClientProxiedBy: MWHPR1401CA0007.namprd14.prod.outlook.com (10.174.253.145) To DM5PR1201MB0074.namprd12.prod.outlook.com (10.174.106.16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e2146cf0-e9a6-4fc6-a056-08d4fe91c3fb 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:DM5PR1201MB0074; X-Microsoft-Exchange-Diagnostics: 1; DM5PR1201MB0074; 3:3I91I1Ih4zln8FZmkQO71pzCK+OV2K9kwOUWkRRZ5NazyrQT1TG5MZ6yoJmYicdmJDF7V3O1GCPPDL/H+B9o/YN+s2/R1pKxPlmcv+hpH8uXUqBSGYrxjib58aCs4KkyKdFt8xIQTSlcqlwOKjyz2wQV+3XM1OPYkezb3/Gf6SDtKmuzMozbx4ysrQ2FNxjn0w8Fpr9x2uVv+WIWde4jyJ1XVFMBG3MIjnzxqWLefXDjdHHxNERpo/3rVBtZbr9H; 25:QlesDpBCa61mlMuk3zQapcoF9w1aza5o9ktuGH5etL7JCIHnkFoxacczW1W9I2ZYCxtZRAMbd8X2iai1XzXTjb4WpXUAaNiFZkPBiJD9tFOWTMixrPHFZJdUERW4qgUVxMVkrAXkGZMvEhBlR1ADENqZFqyvpdO/nLn/dINsLtpRkVmIUdzuv7RaCLD2HijKvs1qOG12qcKYJ70Kdn6EhVBcJFXVmKwedWkp/3cJaG6IGB9xKxzrAlRvepSvS56fSqX1SmXBDu194ao8OypQuTJXZE+222cSP9jQemOUDtB/Qksy5IzmPN8pWjyn97L9yQ7PCmVggdAyNbTD/8ArVw==; 31:5GrfpHLg7pn0tUTy4q2DQkmoz2CwTHAugh8JWQNj3xCENPEMF0SmJmhzyqlBFhNWdo0FU9hGIs1KPLUwcPOoWw9Qy1mQMDSkzPBHnTmseTz2GJnNh0JPXlzsrpX8mYvBjx0xf+npc1TU56sMdiAhZ4u4RA90ut7Dw/TzAh2i1j/hiwZ0gM1kiRXbm5yWB2lvvEmwDZcgfC1HeJNK5NRH4sGO9YNU9zSI7tGIZb9XyBY= X-MS-TrafficTypeDiagnostic: DM5PR1201MB0074: X-Microsoft-Exchange-Diagnostics: 1; DM5PR1201MB0074; 20:Km8UANj3rFGeIGRT6yavHk56XDMGQiKc9ofDXyyEmrWWykq4Nk2WV7qRg1yaZSL7cYP+/vVor0Sf4JWWTwqYloNMTYQ3skYD4yiozdb7jdik1C3pBBBnz6tfudQXrOEJpVTe8dye5iS1MZUi3QuNRG+c3QL9GhLhwKUhgj502lML5b/6uZKrV458IysGOoGt903MNlH633u/Tld+FMR1ffUTmiLaK7olFlEmlcBS/593PHNmU5v7ry2wJ6t1aldk8EUpE5dXGAspmuimfvOR1S1F4R3otQQnQKgymPIV3I+sHgJais7L6dhW3MgXWcYYvJCzSy6AGWuOky38CUpvw/XrVpxjsVQ7NQCJGAv9aliyjdHNZ5AGFiMeoZUcZhg77zdY+xdyOFjzpSKj/539yQzaqZ1iRF3N/1Hg8yWYJow0knIQIK2zpHuG9dvgDx9wM6xYKjxFCyPPHDlWcgutwxGP7zgPDMTY97VSUUK2kGrLGsgXvqDy+0thFtJc6ykY; 4:60ys30lXmiaHuRlVB7Dnyjaz+YoMJwymnFEjnrwk/fkulhGE8fE/Gbq0VR+uVMLc2gXUZw9cyCoZ2inR7a5cx9u6Dkpqz6wGw+TZK4Ki7vbBS0ntTUS8EBzPat2EeE3PmdlshTnj+NTdN+6iO/MlJWVNxJm1leY9hvJEZ4qumnXPa9xCeie0xw1wPAsJ8V+MY/iOD/r0q5oHiM4TuBMp3wcMtjjE2HB71B7hNG7S1sGWU9MIM+u7URGyQsqMrHo+gaXo5bCmr+gg2ojnffHa87xUhXx9/+rHFT5VRPs9Z+E= 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)(100000703101)(100105400095)(3002001)(93006095)(93001095)(10201501046)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123562025)(20161123564025)(20161123558100)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM5PR1201MB0074; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM5PR1201MB0074; X-Forefront-PRVS: 04347F8039 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(346002)(39860400002)(376002)(199003)(189002)(101416001)(81156014)(2950100002)(53936002)(4326008)(16526017)(316002)(6486002)(6916009)(575784001)(86362001)(6666003)(8676002)(7736002)(2906002)(66066001)(189998001)(305945005)(81166006)(110136004)(16586007)(97736004)(5660300001)(36756003)(2351001)(76176999)(68736007)(72206003)(25786009)(450100002)(50466002)(50226002)(3846002)(6116002)(33646002)(48376002)(47776003)(5003940100001)(478600001)(50986999)(8936002)(106356001)(1076002)(105586002)(53416004)(2361001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR1201MB0074; H:fx8.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX: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; DM5PR1201MB0074; 23:bDbzfHCtx/EiC4gedQsdrZxKj4ApL3bAujBDeVw?= =?us-ascii?Q?1sTUct88CcaonV6IImIezGkvjJ0MvDgfzzZXWyddnUn5+cGKgiw/vEIGDL9R?= =?us-ascii?Q?6QJYh9R2zVt0IcMef7pOTJa3RrLWN09nKDatUT1BLtwyE1/tAdQ23fHH1+KN?= =?us-ascii?Q?WVBc2X1BlH/MF4qRkIkxQJhLVxPWCyEjybhPJl4o4jZ0BRmis5cjA+jtvhdG?= =?us-ascii?Q?o4ALOFyVoObO+hwoNv5+kDnBGFW1oP+tIFASUtQxGA2W26X71XufszRe6ZSB?= =?us-ascii?Q?iaAQW7OBmTfG8Yf7Htj/oZfK1ByniYllPEJmfcpH50JENaaHNlPiII172UKn?= =?us-ascii?Q?6g0IthORdOWhXEQOXmbwmnjKh+qhEA/1CtVfZAiMv6ZpMsMqQ/xwSR5YHodW?= =?us-ascii?Q?uA/0UX7hyjLWjl+lCM28srENunqVjDS9vr5fRSG8bOndXeQ5btxck+daAU3i?= =?us-ascii?Q?X7ImsyqAopIQPwxIHkmyoHuTDwbZcYYhJQZfhEAjzzhTCFV7t4zAtNJORQhU?= =?us-ascii?Q?x2KxOgc8cot8+KgaAAE5e0rlD44/LoW698FgLUmnw3sMx9XrN52dDsRE2gJ6?= =?us-ascii?Q?20BdXf6QeEKx2pyvl/t0ZZRgSsU3CKmQ4FXg12oXbv/pDbFmFStyYTQzcItU?= =?us-ascii?Q?MQNKRz++qxQIo+YTxLZpr/jveV2pCwT7r1h+LSqBpLWNK4mPhd9ZJhYj/jmX?= =?us-ascii?Q?Fhy48f0aM9wIVwEtAdyMDBtX3LIC43UpmPZGiHzEe8hMMOsgniul0xu/bHWl?= =?us-ascii?Q?/ehBQWyYy1iKgLGgr52vkp26i1Cx18Z4AqBQhVzOdFRWot5ectPYmbdRssmm?= =?us-ascii?Q?fFMPlCYieeYF3XCmrcHsyzBSdp75mYGdgI4aAJ+5r39NdjATfcxKz8vJjBzk?= =?us-ascii?Q?IApV84YS8hLJc3LJW9mf6OR7fqTmE8reIEZoyG64s6LnbCa+mlJQaMXq30rf?= =?us-ascii?Q?MawDov/Bc5XnfIRLFh38VDJuSbT3hwc867riWQMC7HYixMO3qa2BrMpv/Eqw?= =?us-ascii?Q?fN+OhdDaWxDrpvPJf7vH9xOqf7YqImOjh2b8Y6TBZQDhicWewYe1nmvTzMG4?= =?us-ascii?Q?vzApfWz1cMHUj+Sx5jKuygbYVf3a5Pajj77J+PjMZHrjqXDLn3NZmgL2wJz5?= =?us-ascii?Q?PDJngFYqpiV1aFwM97Bsy0M8UX7D8rOcX87sw30M9Lvmj+nKxwTly2faF0NF?= =?us-ascii?Q?RXLT05sODP1zPdzqM396JC4ayl4bpc+TLXmL9xNiUuSqzX4MkAnoqNZm2WA?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR1201MB0074; 6:NYpy7xl8ic7zmjuoR9qm3cFyDz1wVo3S7Tggy/5neJ/9wi1plTv5ER8Er0KN2m8cJG5ZEvVOADK10peOBM7p0P/49BTPMzf50KjQrReSZ6S0AuTXptdDA/fWeOKVQvK296XY261aIIhOlzU82sbxLgQwB9sqpQ9T2daw8j+1bwkC6oXo4PlyqpdfnuHU2qOGNnBVm7tAz1Jn4PazfJpMXu0x5EFJHCAOn9u4FFamba+zHMmHb4aOlxLkc6HIVWukGwjeu2lvnC9Nzj3V2OC4NRuJLbgEZis5uhM/O1Zra0CN0PBoXN53b0xRzkc1PtFsIE+d44s0ZbikRmxx26sKdg==; 5:Dm9Ifl4x9/mQ62UgvN/S+nY/AiLK+YHHxzEWgCSkLmCsDnH40qyYzdOdiB7cCdYXesV90I+1ZSVoUv7ASFeXbiZj5Ygfh8Ap8w75Eg5jW4Zek7Mm7YariGpuBONbBPISfPx77sYk1cBsEUp8mOqEHQ==; 24:bU3Q7BvdOS7WyBRkTOi7Lh4fmXIuQn6WgY8Xr0BGi0yrnY/2SfJWParE3x4VDo7P6CxD3xR5j4b/zRu+gELZrBZffuEwJviy3pyfE97vN64=; 7:mvfOrJkX5BykPDUlt0/GVJtj1q4r/Yb91EgUt7XWV0xaSAj5VCkE7YL5czdHm206XA6xCFFyGNzRhqVpB6uvPIYyhXq6lE/ardkBFpLZTDzmuTwbNJo7Rn4OYAixEiASNnyxL2ZnlLdUhFqjn5JmKNLjcE55YQxKNPFFmJTiwUspjsPThZGTtoq52L/KAFr+KEWo8fP2PKBEWX89FM3AJ9h+6MiH0ssCFA+96P4zcXg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR1201MB0074; 20:40QP/jFs5QUwi1FimDvYJR2uDCS/sjCWDKMLaRp3euK+/3FBE59718R3KSSrP10wldnl+5B2oUqbTMHeIjXodoBLRBFlj4rFh3zltYDWq+u0m3zp133Fub8UnryeGqPx8ns11RWbRqDii3wNEjfEW3SKnYJ3S6WeVZMJPKkJcDDNmHjflLyLdF945rTD5iMaaVKi373N8OdHhSz7BuNbbdePSHmN3ZQlvSoWBwj+LjOZInftB+4W6zJ/m+v+OXw2 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2017 12:35:37.1905 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR1201MB0074 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"