gcc throws compile error with below message:
HDRINST usr/include/drm/i915_drm.h drivers/gpu/drm/amd/amdgpu/../display/dc/dml/Makefile:70: *** missing 'endif'. Stop. scripts/Makefile.modbuiltin:55: recipe for target 'drivers/gpu/drm/amd/amdgpu' failed make[3]: *** [drivers/gpu/drm/amd/amdgpu] Error 2 make[3]: *** Waiting for unfinished jobs.... HDRINST usr/include/drm/omap_drm.h HDRINST usr/include/drm/tegra_drm.h HDRINST usr/include/drm/drm_sarea.h HDRINST usr/include/drm/panfrost_drm.h HDRINST usr/include/drm/drm.h scripts/Makefile.modbuiltin:55: recipe for target 'drivers/gpu/drm' failed make[2]: *** [drivers/gpu/drm] Error 2 scripts/Makefile.modbuiltin:55: recipe for target 'drivers/gpu' failed make[1]: *** [drivers/gpu] Error 2 make[1]: *** Waiting for unfinished jobs....
Add 'endif' to Makefile to stop compile error.
Signed-off-by: Austin Kim austindh.kim@gmail.com --- drivers/gpu/drm/amd/display/dc/dml/Makefile | 1 + 1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/amd/display/dc/dml/Makefile b/drivers/gpu/drm/amd/display/dc/dml/Makefile index a2eb59e..5b2a65b 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/Makefile +++ b/drivers/gpu/drm/amd/display/dc/dml/Makefile @@ -44,6 +44,7 @@ CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/display_rq_dlg_calc_20.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20v2.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/display_rq_dlg_calc_20v2.o := $(dml_ccflags) +endif ifdef CONFIG_DRM_AMD_DC_DCN2_1 CFLAGS_$(AMDDALPATH)/dc/dml/dcn21/display_mode_vba_21.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/dcn21/display_rq_dlg_calc_21.o := $(dml_ccflags)
(+CC Stephen Rothwell, Mark Brown)
On Mon, Sep 16, 2019 at 1:46 PM Austin Kim austindh.kim@gmail.com wrote:
gcc throws compile error with below message:
GNU Make throws ...
This is probably a merge mistake in linux-next.
If so, this should be directly fixed in the linux-next.
If it is not fixed in time, please inform Linus to *not* follow the linux-next.
Thanks.
HDRINST usr/include/drm/i915_drm.h drivers/gpu/drm/amd/amdgpu/../display/dc/dml/Makefile:70: *** missing 'endif'. Stop. scripts/Makefile.modbuiltin:55: recipe for target 'drivers/gpu/drm/amd/amdgpu' failed make[3]: *** [drivers/gpu/drm/amd/amdgpu] Error 2 make[3]: *** Waiting for unfinished jobs.... HDRINST usr/include/drm/omap_drm.h HDRINST usr/include/drm/tegra_drm.h HDRINST usr/include/drm/drm_sarea.h HDRINST usr/include/drm/panfrost_drm.h HDRINST usr/include/drm/drm.h scripts/Makefile.modbuiltin:55: recipe for target 'drivers/gpu/drm' failed make[2]: *** [drivers/gpu/drm] Error 2 scripts/Makefile.modbuiltin:55: recipe for target 'drivers/gpu' failed make[1]: *** [drivers/gpu] Error 2 make[1]: *** Waiting for unfinished jobs....
Add 'endif' to Makefile to stop compile error.
Signed-off-by: Austin Kim austindh.kim@gmail.com
drivers/gpu/drm/amd/display/dc/dml/Makefile | 1 + 1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/amd/display/dc/dml/Makefile b/drivers/gpu/drm/amd/display/dc/dml/Makefile index a2eb59e..5b2a65b 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/Makefile +++ b/drivers/gpu/drm/amd/display/dc/dml/Makefile @@ -44,6 +44,7 @@ CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/display_rq_dlg_calc_20.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20v2.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/display_rq_dlg_calc_20v2.o := $(dml_ccflags) +endif ifdef CONFIG_DRM_AMD_DC_DCN2_1 CFLAGS_$(AMDDALPATH)/dc/dml/dcn21/display_mode_vba_21.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/dcn21/display_rq_dlg_calc_21.o := $(dml_ccflags) -- 2.6.2
On Tue, Sep 17, 2019 at 02:46:48AM +0900, Masahiro Yamada wrote:
(+CC Stephen Rothwell, Mark Brown)
On Mon, Sep 16, 2019 at 1:46 PM Austin Kim austindh.kim@gmail.com wrote:
gcc throws compile error with below message:
GNU Make throws ...
I don't have the original patch so I don't know what the issue being reported is :/ Whatever it is it wasn't caught by any of the builds done during the process of building -next and nothing is jumping out at me on KernelCI.
This is probably a merge mistake in linux-next.
If so, this should be directly fixed in the linux-next.
If it is not fixed in time, please inform Linus to *not* follow the linux-next.
It's probably worth coordinating this merge with DRM, it's not *super* complex but clearly there's some potential for error here and it was definitely annoyingly fiddly.
On Tue, Sep 17, 2019 at 02:46:48AM +0900, Masahiro Yamada wrote:
On Mon, Sep 16, 2019 at 1:46 PM Austin Kim austindh.kim@gmail.com wrote:
gcc throws compile error with below message:
GNU Make throws ...
Xinpeng Liu via Nick Desaulniers sent a description of the problem and a patch so I think I'll be able to fix this. However...
This is probably a merge mistake in linux-next.
If so, this should be directly fixed in the linux-next.
If it is not fixed in time, please inform Linus to *not* follow the linux-next.
...as I said before I think you definitely need to coordinate with the DRM people - Nick Desaulniers' patch 0f0727d971f6f (drm/amd/display: readd -msse2 to prevent Clang from emitting libcalls to undefined SW FP routines) breaks in places that don't have merge conflicts due to this change. I wouldn't rely on the merge going well if things are sent as-is, the only reason this one showed up was that other people were adding new files to the Makefile.
I've CCed Nick.
dri-devel@lists.freedesktop.org
-
Austin Kim -
Mark Brown -
Masahiro Yamada