From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 1B0D6C433EF for ; Mon, 11 Apr 2022 16:09:25 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 04B6D10E1AB; Mon, 11 Apr 2022 16:09:24 +0000 (UTC) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 691CC10E1AB; Mon, 11 Apr 2022 16:09:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1649693362; x=1681229362; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=y1V561DsC8ai3Gqb7cZYWzHmr8pZatljnnPprOuneD4=; b=icaBweDETmOCp4Bl1ai2FRrEsyygJyRUvbe4jI13EiqIgR2Y3xiapikR 9r2dAtZswyZchI23i86uWtg0xC4Hnnc3o0I9Kj8fc6g2TfufvXicZs+y5 H4JDS2zq3PgEv901fAY/krMSO2arNlksGNlspeQg2XUSkPZIHjoJcFi+m f49aKraYEpt69SOaSJBqHdbRjHtSMfl8wPsnWt3aFZ/myh+KK5yKzh6Bo h5I4UdJXosFTO1SGYsoCcZvidt93bMpSsxD8GIvRQXENAXzlTrmARjrds cKMT3l5VQMbUvpEm24MD7+8QLIothqCBdxOA9h7Lh2Aq+xThBvtiwQ72d Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10314"; a="261898049" X-IronPort-AV: E=Sophos;i="5.90,252,1643702400"; d="scan'208";a="261898049" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Apr 2022 09:09:19 -0700 X-IronPort-AV: E=Sophos;i="5.90,252,1643702400"; d="scan'208";a="572274334" Received: from lwit-desk1.ger.corp.intel.com (HELO localhost) ([10.249.143.43]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Apr 2022 09:09:15 -0700 From: Jani Nikula To: Christoph Hellwig , Joonas Lahtinen , Rodrigo Vivi , Zhenyu Wang , Zhi Wang Subject: Re: [PATCH 04/34] drm/i915/gvt: don't override the include path In-Reply-To: <20220411141403.86980-5-hch@lst.de> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20220411141403.86980-1-hch@lst.de> <20220411141403.86980-5-hch@lst.de> Date: Mon, 11 Apr 2022 19:09:12 +0300 Message-ID: <8735ijiouv.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain 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: , Cc: intel-gfx@lists.freedesktop.org, intel-gvt-dev@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Jason Gunthorpe , linux-kernel@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Mon, 11 Apr 2022, Christoph Hellwig wrote: > drivers/gpu/drm/i915/gvt/Makefile is included > from drivers/gpu/drm/i915/Makefile and thus inherits the normal include > path relative to drivers/gpu/drm/i915/. Fix up the gvt-specific trace > header and just do away with the include path manipulation. > > Signed-off-by: Christoph Hellwig > --- > drivers/gpu/drm/i915/gvt/Makefile | 1 - > drivers/gpu/drm/i915/gvt/trace.h | 2 +- > 2 files changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gvt/Makefile b/drivers/gpu/drm/i915/gvt/Makefile > index ea8324abc784a..4d70f4689479c 100644 > --- a/drivers/gpu/drm/i915/gvt/Makefile > +++ b/drivers/gpu/drm/i915/gvt/Makefile > @@ -5,5 +5,4 @@ GVT_SOURCE := gvt.o aperture_gm.o handlers.o vgpu.o trace_points.o firmware.o \ > execlist.o scheduler.o sched_policy.o mmio_context.o cmd_parser.o debugfs.o \ > fb_decoder.o dmabuf.o page_track.o > > -ccflags-y += -I $(srctree)/$(src) -I $(srctree)/$(src)/$(GVT_DIR)/ > i915-y += $(addprefix $(GVT_DIR)/, $(GVT_SOURCE)) > diff --git a/drivers/gpu/drm/i915/gvt/trace.h b/drivers/gpu/drm/i915/gvt/trace.h > index 6d787750d279f..348f57f8301db 100644 > --- a/drivers/gpu/drm/i915/gvt/trace.h > +++ b/drivers/gpu/drm/i915/gvt/trace.h > @@ -379,5 +379,5 @@ TRACE_EVENT(render_mmio, > #undef TRACE_INCLUDE_PATH > #define TRACE_INCLUDE_PATH . > #undef TRACE_INCLUDE_FILE > -#define TRACE_INCLUDE_FILE trace > +#define TRACE_INCLUDE_FILE gvt/trace This is not actually correct. Please see my gvt Makefile cleanup [1][2]. BR, Jani. [1] https://lore.kernel.org/all/20220331082127.432171-1-jani.nikula@intel.com/ [2] https://lore.kernel.org/all/20220331082127.432171-2-jani.nikula@intel.com/ > #include -- Jani Nikula, Intel Open Source Graphics Center From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 9F71FC433F5 for ; Mon, 11 Apr 2022 16:09:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5964E10E29D; Mon, 11 Apr 2022 16:09:24 +0000 (UTC) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 691CC10E1AB; Mon, 11 Apr 2022 16:09:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1649693362; x=1681229362; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=y1V561DsC8ai3Gqb7cZYWzHmr8pZatljnnPprOuneD4=; b=icaBweDETmOCp4Bl1ai2FRrEsyygJyRUvbe4jI13EiqIgR2Y3xiapikR 9r2dAtZswyZchI23i86uWtg0xC4Hnnc3o0I9Kj8fc6g2TfufvXicZs+y5 H4JDS2zq3PgEv901fAY/krMSO2arNlksGNlspeQg2XUSkPZIHjoJcFi+m f49aKraYEpt69SOaSJBqHdbRjHtSMfl8wPsnWt3aFZ/myh+KK5yKzh6Bo h5I4UdJXosFTO1SGYsoCcZvidt93bMpSsxD8GIvRQXENAXzlTrmARjrds cKMT3l5VQMbUvpEm24MD7+8QLIothqCBdxOA9h7Lh2Aq+xThBvtiwQ72d Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10314"; a="261898049" X-IronPort-AV: E=Sophos;i="5.90,252,1643702400"; d="scan'208";a="261898049" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Apr 2022 09:09:19 -0700 X-IronPort-AV: E=Sophos;i="5.90,252,1643702400"; d="scan'208";a="572274334" Received: from lwit-desk1.ger.corp.intel.com (HELO localhost) ([10.249.143.43]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Apr 2022 09:09:15 -0700 From: Jani Nikula To: Christoph Hellwig , Joonas Lahtinen , Rodrigo Vivi , Zhenyu Wang , Zhi Wang In-Reply-To: <20220411141403.86980-5-hch@lst.de> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20220411141403.86980-1-hch@lst.de> <20220411141403.86980-5-hch@lst.de> Date: Mon, 11 Apr 2022 19:09:12 +0300 Message-ID: <8735ijiouv.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Intel-gfx] [PATCH 04/34] drm/i915/gvt: don't override the include path X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx@lists.freedesktop.org, intel-gvt-dev@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Jason Gunthorpe , linux-kernel@vger.kernel.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Mon, 11 Apr 2022, Christoph Hellwig wrote: > drivers/gpu/drm/i915/gvt/Makefile is included > from drivers/gpu/drm/i915/Makefile and thus inherits the normal include > path relative to drivers/gpu/drm/i915/. Fix up the gvt-specific trace > header and just do away with the include path manipulation. > > Signed-off-by: Christoph Hellwig > --- > drivers/gpu/drm/i915/gvt/Makefile | 1 - > drivers/gpu/drm/i915/gvt/trace.h | 2 +- > 2 files changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gvt/Makefile b/drivers/gpu/drm/i915/gvt/Makefile > index ea8324abc784a..4d70f4689479c 100644 > --- a/drivers/gpu/drm/i915/gvt/Makefile > +++ b/drivers/gpu/drm/i915/gvt/Makefile > @@ -5,5 +5,4 @@ GVT_SOURCE := gvt.o aperture_gm.o handlers.o vgpu.o trace_points.o firmware.o \ > execlist.o scheduler.o sched_policy.o mmio_context.o cmd_parser.o debugfs.o \ > fb_decoder.o dmabuf.o page_track.o > > -ccflags-y += -I $(srctree)/$(src) -I $(srctree)/$(src)/$(GVT_DIR)/ > i915-y += $(addprefix $(GVT_DIR)/, $(GVT_SOURCE)) > diff --git a/drivers/gpu/drm/i915/gvt/trace.h b/drivers/gpu/drm/i915/gvt/trace.h > index 6d787750d279f..348f57f8301db 100644 > --- a/drivers/gpu/drm/i915/gvt/trace.h > +++ b/drivers/gpu/drm/i915/gvt/trace.h > @@ -379,5 +379,5 @@ TRACE_EVENT(render_mmio, > #undef TRACE_INCLUDE_PATH > #define TRACE_INCLUDE_PATH . > #undef TRACE_INCLUDE_FILE > -#define TRACE_INCLUDE_FILE trace > +#define TRACE_INCLUDE_FILE gvt/trace This is not actually correct. Please see my gvt Makefile cleanup [1][2]. BR, Jani. [1] https://lore.kernel.org/all/20220331082127.432171-1-jani.nikula@intel.com/ [2] https://lore.kernel.org/all/20220331082127.432171-2-jani.nikula@intel.com/ > #include -- Jani Nikula, Intel Open Source Graphics Center From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 035F5C433F5 for ; Mon, 11 Apr 2022 16:10:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240821AbiDKQNE (ORCPT ); Mon, 11 Apr 2022 12:13:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44168 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229773AbiDKQMw (ORCPT ); Mon, 11 Apr 2022 12:12:52 -0400 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0CF9C3C49C for ; Mon, 11 Apr 2022 09:09:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1649693361; x=1681229361; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=y1V561DsC8ai3Gqb7cZYWzHmr8pZatljnnPprOuneD4=; b=V80Gsx1AEANgsH35tEjhZ2QRDjrlTs1n7PBd5hu3We33pG6nZLj7diAK 8nprzLfJaClDgfNvRNNUWVWaXYJzFhyZj+e+I9aAIliMjO+uv4MJqExPu OLPsm19YKs8qhgfazZy1SwG8NNazKqJvIJVmYXvlTqhk5abgPpKG9kMg/ wT/U10+pgxsmpFJAIkwLaSKVzWEks1kw4Qp3l6hVidAN3IY0Fa3jWcMX+ DrIzwmV7MhU9r+BFyjcefJqn41Qy1NBT2G6GtDq8RtWQlRWsQBYthyFLJ 2hbPwd6g2LizjGLBP4fPQECMzdV8YDUXJnmSq1n90YpuY5GUEHmzQRXQ7 A==; X-IronPort-AV: E=McAfee;i="6400,9594,10314"; a="259748514" X-IronPort-AV: E=Sophos;i="5.90,252,1643702400"; d="scan'208";a="259748514" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Apr 2022 09:09:19 -0700 X-IronPort-AV: E=Sophos;i="5.90,252,1643702400"; d="scan'208";a="572274334" Received: from lwit-desk1.ger.corp.intel.com (HELO localhost) ([10.249.143.43]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Apr 2022 09:09:15 -0700 From: Jani Nikula To: Christoph Hellwig , Joonas Lahtinen , Rodrigo Vivi , Zhenyu Wang , Zhi Wang Cc: Jason Gunthorpe , intel-gfx@lists.freedesktop.org, intel-gvt-dev@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 04/34] drm/i915/gvt: don't override the include path In-Reply-To: <20220411141403.86980-5-hch@lst.de> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20220411141403.86980-1-hch@lst.de> <20220411141403.86980-5-hch@lst.de> Date: Mon, 11 Apr 2022 19:09:12 +0300 Message-ID: <8735ijiouv.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 11 Apr 2022, Christoph Hellwig wrote: > drivers/gpu/drm/i915/gvt/Makefile is included > from drivers/gpu/drm/i915/Makefile and thus inherits the normal include > path relative to drivers/gpu/drm/i915/. Fix up the gvt-specific trace > header and just do away with the include path manipulation. > > Signed-off-by: Christoph Hellwig > --- > drivers/gpu/drm/i915/gvt/Makefile | 1 - > drivers/gpu/drm/i915/gvt/trace.h | 2 +- > 2 files changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gvt/Makefile b/drivers/gpu/drm/i915/gvt/Makefile > index ea8324abc784a..4d70f4689479c 100644 > --- a/drivers/gpu/drm/i915/gvt/Makefile > +++ b/drivers/gpu/drm/i915/gvt/Makefile > @@ -5,5 +5,4 @@ GVT_SOURCE := gvt.o aperture_gm.o handlers.o vgpu.o trace_points.o firmware.o \ > execlist.o scheduler.o sched_policy.o mmio_context.o cmd_parser.o debugfs.o \ > fb_decoder.o dmabuf.o page_track.o > > -ccflags-y += -I $(srctree)/$(src) -I $(srctree)/$(src)/$(GVT_DIR)/ > i915-y += $(addprefix $(GVT_DIR)/, $(GVT_SOURCE)) > diff --git a/drivers/gpu/drm/i915/gvt/trace.h b/drivers/gpu/drm/i915/gvt/trace.h > index 6d787750d279f..348f57f8301db 100644 > --- a/drivers/gpu/drm/i915/gvt/trace.h > +++ b/drivers/gpu/drm/i915/gvt/trace.h > @@ -379,5 +379,5 @@ TRACE_EVENT(render_mmio, > #undef TRACE_INCLUDE_PATH > #define TRACE_INCLUDE_PATH . > #undef TRACE_INCLUDE_FILE > -#define TRACE_INCLUDE_FILE trace > +#define TRACE_INCLUDE_FILE gvt/trace This is not actually correct. Please see my gvt Makefile cleanup [1][2]. BR, Jani. [1] https://lore.kernel.org/all/20220331082127.432171-1-jani.nikula@intel.com/ [2] https://lore.kernel.org/all/20220331082127.432171-2-jani.nikula@intel.com/ > #include -- Jani Nikula, Intel Open Source Graphics Center