From patchwork Fri Sep 1 16:14:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "StDenis, Tom" X-Patchwork-Id: 9934785 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 4D07460216 for ; Fri, 1 Sep 2017 16:14:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 40DA72022B for ; Fri, 1 Sep 2017 16:14:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 35AC62041F; Fri, 1 Sep 2017 16:14:32 +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 C70042022B for ; Fri, 1 Sep 2017 16:14:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EE4506E88C; Fri, 1 Sep 2017 16:14:30 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on0052.outbound.protection.outlook.com [104.47.36.52]) by gabe.freedesktop.org (Postfix) with ESMTPS id EFD5E6E88A; Fri, 1 Sep 2017 16:14:29 +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=TtChdTIDX7o0ORwjF4pkWTM53uyXhRlV7gFOHLORWC8=; b=I+JarcXBEAmGwYmGJx7hIAY0GFzKxmFw88E7B6T8DE23glW/GELmM3ji0cDS4q0k68e4oTAULZigy5b26+/bwRVqVkHqiLLXGYGSiW4QkGF+CbUd8MNlcdF86TzI5tQ3NYoSLHU4/7esgNwgO41uAdYCCpyo4N/eepad1RBlVxA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Tom.StDenis@amd.com; Received: from fx8.amd.com (165.204.55.251) by BN6PR1201MB0065.namprd12.prod.outlook.com (10.174.114.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.13.10; Fri, 1 Sep 2017 16:14:27 +0000 From: Tom St Denis To: amd-gfx@lists.freedesktop.org Subject: [PATCH] drm/ttm: Fix trace include path (v2) Date: Fri, 1 Sep 2017 12:14:23 -0400 Message-Id: <20170901161423.6737-1-tom.stdenis@amd.com> X-Mailer: git-send-email 2.12.0 MIME-Version: 1.0 X-Originating-IP: [165.204.55.251] X-ClientProxiedBy: SN4PR0401CA0015.namprd04.prod.outlook.com (10.171.32.25) To BN6PR1201MB0065.namprd12.prod.outlook.com (10.174.114.15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 29a118f4-ac48-44e3-d095-08d4f1548555 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:BN6PR1201MB0065; X-Microsoft-Exchange-Diagnostics: 1; BN6PR1201MB0065; 3:bnEY8+i3bk8oc7DwqEQ41lxdpDzRVN9UlkTYmCEMCu5SFU5841Mpa6txcXMQN/my7vyM/PYAv36lofgEBxgjaFIEbR4Xtei/jNIxq6PlAr+/0bWKRBpafYjFSeDF+wI332z1xiWwFHsvcOr3ZYk0XwVBWYp/AL1XKu0XeuaDk4BrUKKGeahFMUrmQ8VmS0sR7QVOime0SlRD/4i6cLHkQsX5NUDw/1f+3o1aEW4irbeuW6g5rrde8Gl/U9THQSXb; 25:Nkl9Fc3eL+VIFD8CYCzttYG2j8qAWfkO/2ki58iHJSU8fxO46UHA0gmfSsOz8TD3701ix+F+okOX+gEFAJjvm/3VhoH1dvsTpG3q12XM8/zTAf2CJabZjaxDTM2ZAGK/ItFf4aQRquq/I3OP5vnOvBuJ3MNxU1OYsA5jprJGm+hy/KYdLZkcTe049fDJ+3fkQ5wFeWvpPu6I3Rts9Du5nNAqfnAm1W94RNAbg0d0fmtmbqlvUVMj4/jAGNolpNa7ZOCks8MdKoK+AhLj+L32xDUHh83xGYwU8qpxG6Ogs96bBtX3lqfJkXmnmNa2oHQATys2tqcdNPtOdrq9lhqzCw==; 31:5QrWKHaIzGjOoJcLgRpROx90XBaf3AzNYEzlHQh6M94r3sk4ORI2AQD0xui2ohOh4XfyrJH/EKeST1+kYmMEI5QVo04iNK7gP7bTrKQma669+oF8aQGlXtxkBtkJej/9yCAyOh5N8mvl9QI3YdoFbiKRCVeGF2KWLQIbNUmv0O8ILTRcj3EMTdGTsnkITTfeSptKwQ5yq9T0XkU9ldbrulgM5cspWnra4mDsdX+bl84= X-MS-TrafficTypeDiagnostic: BN6PR1201MB0065: X-Microsoft-Exchange-Diagnostics: 1; BN6PR1201MB0065; 20:0kHPAyMI3Tap4TmlVlVibqBIYqUBUmZSyoWdmdGWO875rOzEKdKny+ItFuqrkwmDf5sFKL9qAnXf09a7v/PUJ+c8mFG678tOaaX6jX35W/BMnz8wZ2u4elnEIlG+Qn9VB/Imojxunvzzn6NTcq0sgoAj2l34VQtYW3OxnUN2ISL+75noQeTQ5nKYvaC3IierHRjOr3wL7uHTHBPfV85rDAjiKh7Ttm7EVrOTP8DjEEH9qVYiBkMhlfmG498ykvBCOHasDoiR7FViGXCc9hFUnRLFXdXmmHyEE8c/iH67ClFMUTdHYDsmiwG3EswA9D1MIhu6bvVKZX740yWVEV9X7aR18kVP6z+0S/0Nv7lI1gxG3ybHg01K0lq+L9mHz7Mdog6Wnny6inynct1PCJXuFoORIqLshn7gXlRc3Yf+Cd2gR/STLrfSLUOYoLCl+eUqvkWP/FIevNjJTELvn9ym/0smLxrQ+c5/qt8UUO19EAvV7QqpvxDAzdDdAfVpVBoK; 4:qWWBBpcOmIvDSXwXxJswhPMhGoNQ9bJ1Z3a4NMJpZX6fVRL9plBYh1LxEhTEi1kLSTWBsfdQ7T3XWo3BKUb2TOym/4jxPz/9fFlTZcaAMKW5h3VX7+GSFV62vcVqWz+rr2jKUNBJ/oBDxxYrUl8FfuQh32NKvdZxjb2ntQWQQXsCGEREXDLHl230bkYptJ28tDEzjeWpmHtWk0HY7fE1KoGdTnq5Q6fyymu08JGba2MlamqhTUaC6bpegWSl1awXUiNZPBIrEBuanjGxtnH1/2SeCkfZgW+lulyufh4/0n4= 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)(601004)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(10201501046)(100000703101)(100105400095)(6055026)(6041248)(20161123560025)(20161123564025)(20161123562025)(20161123555025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN6PR1201MB0065; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN6PR1201MB0065; X-Forefront-PRVS: 0417A3FFD2 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(189002)(199003)(8676002)(81156014)(81166006)(8936002)(50226002)(305945005)(7736002)(66066001)(5660300001)(36756003)(2906002)(575784001)(86362001)(48376002)(4326008)(50466002)(47776003)(97736004)(53416004)(33646002)(5003940100001)(72206003)(3846002)(6116002)(42186005)(1076002)(6486002)(50986999)(6666003)(110136004)(478600001)(25786009)(2361001)(101416001)(6916009)(2351001)(68736007)(53936002)(189998001)(450100002)(105586002)(106356001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR1201MB0065; 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; BN6PR1201MB0065; 23:Jw1iFNvYoyzsxyLb8nPmUnBOf1X7+ZDyIIRzR6M?= =?us-ascii?Q?Qhh0ACXMRMEaZ6qS9QkCiYDuqHxdvAAm1lM2pL+dj0NNG/ai5i7ht+o7PAiT?= =?us-ascii?Q?W/BVgDYYBE49u4+oejJCD1ojU+KJ8nqDKZvmKXuvCly5HOG/QI/mz2cuuRPa?= =?us-ascii?Q?lQUhueJSwXNcuZ53K1tdgX976zfNkSI7JLG4JqK3IxWyle8IKnrVM1GZDUYW?= =?us-ascii?Q?DimIYJ+Uu7XL4e+sZgRQloBZHeu5p2FswbqE+TG4N9W47ByeU2hoXFkip89g?= =?us-ascii?Q?lc8tqn0rrM7ZSv+UsvFJKidRHw9F0UVsTNQh/4bmIzMOw4UpWWS4y/uxLhQK?= =?us-ascii?Q?mCKm1yX5Ivf9gc4AonFDIHyZUJXzxZpN1Rn6o6ixhN0q6HjVi8cq+efZMW1V?= =?us-ascii?Q?+9VswKNR/F7QxbqXl0zEr7CX+r0zmnNUaCWM1GZzhUeoOIoXwuKI8fMm156G?= =?us-ascii?Q?CIfgnyYey13mG9X/4hG8SY8eid93HHgnhxX4+yFbs4aQsicPd3CZxlmrBZqG?= =?us-ascii?Q?ezaaZ9d8kmOBp4k4rYpOpfRodPuGRxtMf1tRKH2Oy02TeETC6oXFGa8nDoh1?= =?us-ascii?Q?qEk0kQJ5LwglAQH6nhOF0CJnMiekyA0r3ShEZnM8fqAyi/lvT8Kbq1wYHw35?= =?us-ascii?Q?+TXhTMMdk53x0QWWJdcSnjYFDvzO3KI150bznuBiZF2JJZvJAV2K5Kt6WnGv?= =?us-ascii?Q?gYsHlBV+WcEiV9/gaLKKU2/oaZNTRu3fn+GONx8yI1vr7ozJhrOqYkhddTSf?= =?us-ascii?Q?MIWU3THQ31KW88UOGWUl2TSf8bJgNlFjWjRIKwBwcSmM0wBP1z+QlwB6GRIC?= =?us-ascii?Q?fcNC+pGHG8jxyxL4D3RwSWolYC5Pj9bA3qufcYxnA7R9M9r6j6dDRknISteW?= =?us-ascii?Q?xQKflh5f2ZlvVhKqH5OhnzLinhsvrxC/Qztnw5Xn3y6dM6GlTEmBoG24tseI?= =?us-ascii?Q?T7ddS9XWibXjL5ZFN+KUhAAtlFSAfzdHoD+fUWGi07Jf92O1lT9G9sBtWkxL?= =?us-ascii?Q?HiXpHb2lAdsc9Gdg4HZUIMvLCqxJMyihffBqiGnNW1gE4HzlJ4PWbPokxhMB?= =?us-ascii?Q?dkZxwxqV9+4xCrHSJumW3qarL1U7vTNrTeWNcKwLU448ZEizlhf7ttJgwTyd?= =?us-ascii?Q?pR8bDrUdDPro=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN6PR1201MB0065; 6:hzQWGCSaDH2z9NiJ6fNmqxZJr4hIaL7BgOjgcDHYXkY7c/DyZfPMp00YPBshlzzDDcWf/vqjqI9GaKgeJhchEgsWIiwPZz66Lcg/o+cCgl+nEv9BUtmvN7QIoNPCjBTkKeUr91Wm9vC2prlQYyGjhOSMJigG6kTTOLAdpmiog8hme4Twrfxa0IVb9piCbokd2h+I9xcqpHDp2crJd7xpELFyQbovui0/cLqJOCLJ6aONGP4gdIOZBQhbAife6zLc4+Wk8MDiMZHpd4dYxDexauS9hlFKjBnIjdXDu4ZXhT+tJJZULadbyh4AtEhOagMhr9Cs3oGYXnnsVdbmjwrgGQ==; 5:6HHUfVRZnmJ1hJKYa8qw2ErUa/s56UdRJ26OqXNhm4Pp/OSADWVOCfSERWWapkaa85Jh/2kVaMkb0C9+f2RxFLx2H8WnFzQSSDIDKAgTWK2B0rJIKG7zfTPm9OnpEAFps8CHMdn/azNgk0SEUU8pkw==; 24:93rQruo1Ix+wdJiteLFjRiBC8IiqbAsBDxjGvlkXG/JwNpWCNluGE9O1wYPYCgCOFs8DOS+53ajbcyXtTLCfVT2TqVgV+zHl+L1b6sl/0k0=; 7:nvvM26rpSzbAJMR+UO7W9uGURWnCqVmmXrUz6hg9LJ5/bSE8V20u9qq0/7RKAWFJYhNuiennZ1cwm3TRb9b5iPuVOc5A65/z6J0nr9IHZlxT0sYMA2CucwZUdz2Tndka/O3pS66FPJoFeoGOnQK5Lvh9EcNh4XT1UvtYrAcwhIV6Sv5QnNZDCP7GYpEy7KzW6BmkqXyjmhjpE3Jr2BxEDfv3dVilLkfmVgGUZ1RzJRw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR1201MB0065; 20:PUJwRLsRbplNB0Ox0j4JzuQv71Lg9T3c9XZvLkhxsa4gMALUM6pkOwXrY6RZzcRFmjxsa0WkY0Uz8W1sEcfdgmK+dXVepqmKh6XMnTbGDJhaQ6GVs+rSbKz/FARSmemFVbohvu8YXoXBnDqq0nakfkbF0G8F6CRneQh3UK0/Bmp6cNK8HBayFo2gpIBnJriG2neduF8yGS8Yw9hRZf3rAaLfeSZlR/zRacrkLd4gAnz95mKkYhDk/CVfvWIFHsMW X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Sep 2017 16:14:27.6998 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR1201MB0065 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 (v2): Drop Makefile change too. Reviewed-by: Alex Deucher Reviewed-by: Christian König Reviewed-by: Thierry Reding --- drivers/gpu/drm/ttm/Makefile | 2 +- drivers/gpu/drm/ttm/ttm_trace.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/ttm/Makefile b/drivers/gpu/drm/ttm/Makefile index fd3da00c0bf2..f0549eab73e6 100644 --- a/drivers/gpu/drm/ttm/Makefile +++ b/drivers/gpu/drm/ttm/Makefile @@ -1,7 +1,7 @@ # # Makefile for the drm device driver. This driver provides support for the -ccflags-y := -Iinclude/drm -I$(src)/. +ccflags-y := -Iinclude/drm 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 \ diff --git a/drivers/gpu/drm/ttm/ttm_trace.h b/drivers/gpu/drm/ttm/ttm_trace.h index 23279b9b8e64..715ce68b7b33 100644 --- a/drivers/gpu/drm/ttm/ttm_trace.h +++ b/drivers/gpu/drm/ttm/ttm_trace.h @@ -82,6 +82,6 @@ TRACE_EVENT(ttm_dma_unmap, /* This part must be outside protection */ #undef TRACE_INCLUDE_PATH -#define TRACE_INCLUDE_PATH . +#define TRACE_INCLUDE_PATH ../../drivers/gpu/drm/ttm/ #include