From patchwork Fri Sep 1 14:49:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 9934409 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 D01516016C for ; Fri, 1 Sep 2017 14:50:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C354720410 for ; Fri, 1 Sep 2017 14:50:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B7C65201CB; Fri, 1 Sep 2017 14:50:08 +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=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=unavailable 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 7D1DD20265 for ; Fri, 1 Sep 2017 14:50:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 74ECE6E871; Fri, 1 Sep 2017 14:50:05 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id A50AB6E86B; Fri, 1 Sep 2017 14:50:03 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id x189so401402wmg.4; Fri, 01 Sep 2017 07:50:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4btmMvNLk4g22VhzLvaGNKux8/pctqqC0iZ9I3I0Mcw=; b=ItxvsND/4f9nlh819lbv1rs8EmflEdFIl9KZ6NqLh62unnKIBNHoenb3F6BMl3+Rd/ 7QRJZ+I0Xv9STGWZVysCWGgbhSaVMJ9k8bDxor6pNfi7yihMl4QLRrbJutkp0ELTq+03 zzFnz+FJqUnxLGYLeAIT9/lqQmylSqYx0UIbN7FSnb5imgfTJxv9sNA4kxo34Cm49UBw jCsQaqGgME2CGWE2YnfOgI4AEf/KR/pQMIFRnb0uUfOfQGTKqoWF4npNYzUaSkXvbPl4 qOaflHGQRz9flCsYIzJ8rJMVFinTgrLVZ5SSg5+ky3Enaq4+C/O2RGVrvZG8c6zEE6IV K9mw== 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; bh=4btmMvNLk4g22VhzLvaGNKux8/pctqqC0iZ9I3I0Mcw=; b=N/ts3ufGLx3DjNrAbz9BvMxnFwtcawc1qM0TSjMUv96Oo8v/SMMyDhBqtci/mATD6y b/n+wxWRxWzwv13B8UMegHgxZtdQ1gKom1c3SDTVbT0UrBJ+9rFk8oBmP0ivzby/1D+8 FAawOslPAOkNR/Dzc3kGgpwRX6a7PCw42Ur7ljkFS13GkZRpWF/AfR2N5lnFTuqiJLjY YqxLWu9SBKu4Y/avdJISW8ZvD/9QOGNlpVvZVyQSkPd5W5caHsQQiRKVQEfne5KVLxdQ mjkhxERQWqEBxRB7X4yZSP26Im1kNW6fHjsih/IzWTED8hPwlavpK9K6+jXbvSTzc2Ge IANA== X-Gm-Message-State: AHPjjUi+N7WdhuqNp7IJFa/ZGwvhDGhBJx+wcAjvSLNL7c7zd2j9bdic K2T2UbVvNhdDLahK X-Google-Smtp-Source: ADKCNb4dXluSTZEeyiXFXxU7+tAeIRTXH9XEghmo5ajxAMW7qVBEhSPFA5e/ZQnn3sa8Eq34a50bMg== X-Received: by 10.28.7.18 with SMTP id 18mr632130wmh.189.1504277401974; Fri, 01 Sep 2017 07:50:01 -0700 (PDT) Received: from localhost (p200300E41BD6D60076D02BFFFE273F51.dip0.t-ipconnect.de. [2003:e4:1bd6:d600:76d0:2bff:fe27:3f51]) by smtp.gmail.com with ESMTPSA id k10sm343154wre.38.2017.09.01.07.50.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Sep 2017 07:50:01 -0700 (PDT) From: Thierry Reding To: dri-devel@lists.freedesktop.org Date: Fri, 1 Sep 2017 16:49:52 +0200 Message-Id: <20170901144954.19620-4-thierry.reding@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170901144954.19620-1-thierry.reding@gmail.com> References: <20170901144954.19620-1-thierry.reding@gmail.com> Cc: intel-gfx@lists.freedesktop.org, Rodrigo Vivi Subject: [Intel-gfx] [PATCH 4/6] drm/i915: Use correct path to trace include X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Thierry Reding The header comment in include/trace/define_trace.h specifies that the TRACE_INCLUDE_PATH needs to be relative to the define_trace.h header rather than the trace file including it. Most instances get that wrong and work around it by adding the $(src) directory to the include path. While this works, it is preferable to refer to the correct path to the trace file in the first place and avoid any workaround. Signed-off-by: Thierry Reding --- drivers/gpu/drm/i915/Makefile | 2 -- drivers/gpu/drm/i915/i915_trace.h | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile index 892f52b53060..1cb8059a3a16 100644 --- a/drivers/gpu/drm/i915/Makefile +++ b/drivers/gpu/drm/i915/Makefile @@ -150,5 +150,3 @@ endif i915-y += intel_lpe_audio.o obj-$(CONFIG_DRM_I915) += i915.o - -CFLAGS_i915_trace_points.o := -I$(src) diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h index b24a83d43559..8794c198f877 100644 --- a/drivers/gpu/drm/i915/i915_trace.h +++ b/drivers/gpu/drm/i915/i915_trace.h @@ -1031,5 +1031,5 @@ TRACE_EVENT(switch_mm, /* This part must be outside protection */ #undef TRACE_INCLUDE_PATH -#define TRACE_INCLUDE_PATH . +#define TRACE_INCLUDE_PATH ../../drivers/gpu/drm/i915 #include