| From foo@baz Mon Dec 18 14:12:34 CET 2017 |
| From: Arnd Bergmann <arnd@arndb.de> |
| Date: Tue, 14 Mar 2017 22:27:11 +0100 |
| Subject: drm: amd: remove broken include path |
| |
| From: Arnd Bergmann <arnd@arndb.de> |
| |
| |
| [ Upstream commit 655d9ca9ac075da1ef2a45012ba48a39f6eb1f58 ] |
| |
| The AMD ACP driver adds "-I../acp -I../acp/include" to the gcc command |
| line, which makes no sense, since these are evaluated relative to the |
| build directory. When we build with "make W=1", they instead cause |
| a warning: |
| |
| cc1: error: ../acp/: No such file or directory [-Werror=missing-include-dirs] |
| cc1: error: ../acp/include: No such file or directory [-Werror=missing-include-dirs] |
| cc1: all warnings being treated as errors |
| ../scripts/Makefile.build:289: recipe for target 'drivers/gpu/drm/amd/amdgpu/amdgpu_drv.o' failed |
| ../scripts/Makefile.build:289: recipe for target 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.o' failed |
| ../scripts/Makefile.build:289: recipe for target 'drivers/gpu/drm/amd/amdgpu/amdgpu_kms.o' failed |
| |
| This removes the subdir-ccflags variable that evidently did not |
| serve any purpose here. |
| |
| Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Sasha Levin <alexander.levin@verizon.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/gpu/drm/amd/acp/Makefile | 2 -- |
| 1 file changed, 2 deletions(-) |
| |
| --- a/drivers/gpu/drm/amd/acp/Makefile |
| +++ b/drivers/gpu/drm/amd/acp/Makefile |
| @@ -3,6 +3,4 @@ |
| # of AMDSOC/AMDGPU drm driver. |
| # It provides the HW control for ACP related functionalities. |
| |
| -subdir-ccflags-y += -I$(AMDACPPATH)/ -I$(AMDACPPATH)/include |
| - |
| AMD_ACP_FILES := $(AMDACPPATH)/acp_hw.o |
