From patchwork Fri Mar 29 11:32:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 161422 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp1916023jan; Fri, 29 Mar 2019 04:35:22 -0700 (PDT) X-Google-Smtp-Source: APXvYqy2q5VZmq3DHb5k+8zrFFmU1UaPJvSY/GGySOL2jvTDFGDyAdXNecIdX+GiO7K0D7fD6su+ X-Received: by 2002:a63:4e10:: with SMTP id c16mr46152714pgb.302.1553859322520; Fri, 29 Mar 2019 04:35:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553859322; cv=none; d=google.com; s=arc-20160816; b=no3A5L6dRK0JJAQndl+jgRU+9eMKpwqGFsir61KQXLL+Dz8c3KGb7SVcTmAwqgMSd5 4IVfM+eifdDc5r17Z4RX1EBHZwEhyeIF7qlaZe3G2c3faUzTfnMNDbQwZJ/U6FK9o2x4 KjfpIKIIYKo1uDvbR6hWMJ8QmiDmHkh7dkXdZEbLr8nvcmmLU/kPSGviUBFobndcg8Rh ieCKmp5o3dyzuI//CRGTwXJ8cmjmlVHioAiiDkBdCbFbtH3wGmAUaS5d9whfheABqc9X bT/KpFut2PBueme7alyKxoXJi7x/Y+oCJgDmAIm1gCKyz9CVJtCjYStGUQqHGUs0dS4s 43RQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=tEJutIG3Lh/EZkRCNYRIQ9ceoZoPdFp7/y8BL0YMjyY=; b=HH7bG9n6x7tgb+Bg7vtSYZgpeXTapt7+YQwJJ95IPQyu9/iJCJxtqw3AOa4vVW22hE 1JuUEUGRxP24QS/FOe6TMqb5Etnz1RRyXnasLIRjGs9nhX4m+TUdm/njE88jXDXJ852T JRVh9RRe7cST3u4A1umQnxj0wcptO2Dqc/NT8Io+ZK1f+1CgsQ+e/qLk4abDtEG9Nhix OEyF3MQqlMiJ98vRvXYlNIaFqWzkFYBMTP0rSseFEVzujQR5HbFcjoQmSEaLFPq8dAKP yHydASIsJoO2jaa50rCbnM6BN5ptd/qQ1OOoOYlAkL41CJHbITo1BBs6y142gS/OpvEm cw2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=AX+5tIq8; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f1si1807924pld.32.2019.03.29.04.35.22; Fri, 29 Mar 2019 04:35:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=AX+5tIq8; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729420AbfC2LfU (ORCPT + 31 others); Fri, 29 Mar 2019 07:35:20 -0400 Received: from conuserg-11.nifty.com ([210.131.2.78]:57920 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727675AbfC2LfU (ORCPT ); Fri, 29 Mar 2019 07:35:20 -0400 Received: from grover.tkatk1.zaq.ne.jp (zaqdadce369.zaq.ne.jp [218.220.227.105]) (authenticated) by conuserg-11.nifty.com with ESMTP id x2TBWphT012559; Fri, 29 Mar 2019 20:32:52 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com x2TBWphT012559 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1553859173; bh=tEJutIG3Lh/EZkRCNYRIQ9ceoZoPdFp7/y8BL0YMjyY=; h=From:To:Cc:Subject:Date:From; b=AX+5tIq8j4ohThNs6xJDKIPJdON3aYv91vuxqpuqEiHXTPA3BK75CKGm+CP1msmDw yC1URWCQwcJoXdoSwfXeK4TqIRypGy4uAP5KixRISBC9qlicfRLXmAzlV6TGLKWNxH TYRemkI9COgy8w0X5+z30SWyOy6SZDfnvkESm1UrBSntV8ML5EzFfQrVc7ZRNdIwct HuyrHaW96dtuVANjcsF+Hn/JfsMnSm9XHwUiRZc4fLehrYOror9sGuJkD/S3snRYmH Zbz8XwQc+/+IuCr9zY7zSgxtzJUtXrOukqKR72Wd1cUh9ApYEVyAOEXTZci4R/F8GZ Aoo2kb2QMwYqA== X-Nifty-SrcIP: [218.220.227.105] From: Masahiro Yamada To: David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org Cc: Sam Ravnborg , Masahiro Yamada , Sean Paul , Zhenyu Wang , nouveau@lists.freedesktop.org, Jani Nikula , "James (Qian) Wang" , Alex Deucher , "David (ChunMing) Zhou" , amd-gfx@lists.freedesktop.org, Rob Clark , =?utf-8?q?Christian_K=C3=B6nig?= , Zhi Wang , Rodrigo Vivi , linux-arm-msm@vger.kernel.org, intel-gfx@lists.freedesktop.org, Ben Skeggs , Brian Starkey , intel-gvt-dev@lists.freedesktop.org, Liviu Dudau , linux-kernel@vger.kernel.org, Joonas Lahtinen , freedreno@lists.freedesktop.org Subject: [PATCH v2] drm: prefix header search paths with $(srctree)/ Date: Fri, 29 Mar 2019 20:32:41 +0900 Message-Id: <1553859161-2628-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently, the Kbuild core manipulates header search paths in a crazy way [1]. To fix this mess, I want all Makefiles to add explicit $(srctree)/ to the search paths in the srctree. Some Makefiles are already written in that way, but not all. The goal of this work is to make the notation consistent, and finally get rid of the gross hacks. Having whitespaces after -I does not matter since commit 48f6e3cf5bc6 ("kbuild: do not drop -I without parameter"). [1]: https://patchwork.kernel.org/patch/9632347/ Signed-off-by: Masahiro Yamada Reviewed-by: Sam Ravnborg --- I put all gpu/drm changes into a single patch because they are trivial conversion. If you are interested in the big picture of this work, the full patch set is available at the following URL. git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git build-test Changes in v2: - fix up the new driver komeda - Add Sam's Reviewed-by drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- drivers/gpu/drm/amd/lib/Makefile | 2 +- drivers/gpu/drm/arm/display/komeda/Makefile | 4 ++-- drivers/gpu/drm/i915/gvt/Makefile | 2 +- drivers/gpu/drm/msm/Makefile | 6 +++--- drivers/gpu/drm/nouveau/Kbuild | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) -- 2.7.4 diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile b/drivers/gpu/drm/amd/amdgpu/Makefile index 466da59..62bf9da 100644 --- a/drivers/gpu/drm/amd/amdgpu/Makefile +++ b/drivers/gpu/drm/amd/amdgpu/Makefile @@ -23,7 +23,7 @@ # Makefile for the drm device driver. This driver provides support for the # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. -FULL_AMD_PATH=$(src)/.. +FULL_AMD_PATH=$(srctree)/$(src)/.. DISPLAY_FOLDER_NAME=display FULL_AMD_DISPLAY_PATH = $(FULL_AMD_PATH)/$(DISPLAY_FOLDER_NAME) diff --git a/drivers/gpu/drm/amd/lib/Makefile b/drivers/gpu/drm/amd/lib/Makefile index 6902430..d534992 100644 --- a/drivers/gpu/drm/amd/lib/Makefile +++ b/drivers/gpu/drm/amd/lib/Makefile @@ -27,6 +27,6 @@ # driver components or later moved to kernel/lib for sharing with # other drivers. -ccflags-y := -I$(src)/../include +ccflags-y := -I $(srctree)/$(src)/../include obj-$(CONFIG_CHASH) += chash.o diff --git a/drivers/gpu/drm/arm/display/komeda/Makefile b/drivers/gpu/drm/arm/display/komeda/Makefile index 1b875e5..a72e30c 100644 --- a/drivers/gpu/drm/arm/display/komeda/Makefile +++ b/drivers/gpu/drm/arm/display/komeda/Makefile @@ -1,8 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 ccflags-y := \ - -I$(src)/../include \ - -I$(src) + -I $(srctree)/$(src)/../include \ + -I $(srctree)/$(src) komeda-y := \ komeda_drv.o \ diff --git a/drivers/gpu/drm/i915/gvt/Makefile b/drivers/gpu/drm/i915/gvt/Makefile index 271fb46..ea8324a 100644 --- a/drivers/gpu/drm/i915/gvt/Makefile +++ b/drivers/gpu/drm/i915/gvt/Makefile @@ -5,5 +5,5 @@ 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$(src) -I$(src)/$(GVT_DIR) +ccflags-y += -I $(srctree)/$(src) -I $(srctree)/$(src)/$(GVT_DIR)/ i915-y += $(addprefix $(GVT_DIR)/, $(GVT_SOURCE)) diff --git a/drivers/gpu/drm/msm/Makefile b/drivers/gpu/drm/msm/Makefile index 56a70c7..b7b1ebd 100644 --- a/drivers/gpu/drm/msm/Makefile +++ b/drivers/gpu/drm/msm/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 -ccflags-y := -Idrivers/gpu/drm/msm -ccflags-y += -Idrivers/gpu/drm/msm/disp/dpu1 -ccflags-$(CONFIG_DRM_MSM_DSI) += -Idrivers/gpu/drm/msm/dsi +ccflags-y := -I $(srctree)/$(src) +ccflags-y += -I $(srctree)/$(src)/disp/dpu1 +ccflags-$(CONFIG_DRM_MSM_DSI) += -I $(srctree)/$(src)/dsi msm-y := \ adreno/adreno_device.o \ diff --git a/drivers/gpu/drm/nouveau/Kbuild b/drivers/gpu/drm/nouveau/Kbuild index ea3035e..4fae728 100644 --- a/drivers/gpu/drm/nouveau/Kbuild +++ b/drivers/gpu/drm/nouveau/Kbuild @@ -1,7 +1,7 @@ -ccflags-y += -I$(src)/include -ccflags-y += -I$(src)/include/nvkm -ccflags-y += -I$(src)/nvkm -ccflags-y += -I$(src) +ccflags-y += -I $(srctree)/$(src)/include +ccflags-y += -I $(srctree)/$(src)/include/nvkm +ccflags-y += -I $(srctree)/$(src)/nvkm +ccflags-y += -I $(srctree)/$(src) # NVKM - HW resource manager #- code also used by various userspace tools/tests