* [PATCH] drm/amd/display: build failed for DCN2.1 @ 2019-09-16 9:03 Xinpeng Liu [not found] ` <1568624607-19067-1-git-send-email-danielliu861-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 0 siblings, 1 reply; 5+ messages in thread From: Xinpeng Liu @ 2019-09-16 9:03 UTC (permalink / raw) To: harry.wentland-5C7GfCeVMHo, sunpeng.li-5C7GfCeVMHo, christian.koenig-5C7GfCeVMHo, David1.Zhou-5C7GfCeVMHo, airlied-cv59FeDIM0c, Bhawanpreet.Lakha-5C7GfCeVMHo, ndesaulniers-hpIqsD4AKlfQT0dZR+AlfA, Jun.Lei-5C7GfCeVMHo, Roman.Li-5C7GfCeVMHo, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW Cc: Xinpeng Liu drivers/gpu/drm/amd/amdgpu/../display/dc/dml/Makefile:70: *** missing `endif'. Stop. make[4]: *** [drivers/gpu/drm/amd/amdgpu] Error 2 Signed-off-by: Xinpeng Liu <danielliu861@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) -- 1.8.3.1 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply related [flat|nested] 5+ messages in thread
[parent not found: <1568624607-19067-1-git-send-email-danielliu861-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>]
* Re: [PATCH] drm/amd/display: build failed for DCN2.1 [not found] ` <1568624607-19067-1-git-send-email-danielliu861-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> @ 2019-09-16 20:51 ` Nick Desaulniers [not found] ` <CAKwvOdn8-T3Q=LhiGu6H7dCpwXXrNAjpKJA5z0d+N4qB8bOapQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 0 siblings, 1 reply; 5+ messages in thread From: Nick Desaulniers @ 2019-09-16 20:51 UTC (permalink / raw) To: Xinpeng Liu, Mark Brown Cc: Zhou, David(ChunMing), Li, Sun peng (Leo), Harry Wentland, Roman.Li-5C7GfCeVMHo, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, David Airlie, Jun.Lei-5C7GfCeVMHo, Bhawanpreet.Lakha-5C7GfCeVMHo, Koenig, Christian On Mon, Sep 16, 2019 at 2:03 AM Xinpeng Liu <danielliu861@gmail.com> wrote: > > drivers/gpu/drm/amd/amdgpu/../display/dc/dml/Makefile:70: *** missing > `endif'. Stop. > make[4]: *** [drivers/gpu/drm/amd/amdgpu] Error 2 > > Signed-off-by: Xinpeng Liu <danielliu861@gmail.com> Tested-by: Nick Desaulniers <ndesaulniers@google.com> + Mark I think this was a result of the resolved merge conflict. See the -next only commit titled: Merge remote-tracking branch 'drm/drm-next' > --- > 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) > -- > 1.8.3.1 > -- Thanks, ~Nick Desaulniers _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 5+ messages in thread
[parent not found: <CAKwvOdn8-T3Q=LhiGu6H7dCpwXXrNAjpKJA5z0d+N4qB8bOapQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>]
* Re: [PATCH] drm/amd/display: build failed for DCN2.1 [not found] ` <CAKwvOdn8-T3Q=LhiGu6H7dCpwXXrNAjpKJA5z0d+N4qB8bOapQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> @ 2019-09-16 22:12 ` Mark Brown [not found] ` <20190916221203.GM4352-7j8lgAiuQgnQXOPxS62xeg@public.gmane.org> 0 siblings, 1 reply; 5+ messages in thread From: Mark Brown @ 2019-09-16 22:12 UTC (permalink / raw) To: Nick Desaulniers Cc: Zhou, David(ChunMing), Li, Sun peng (Leo), Bhawanpreet.Lakha-5C7GfCeVMHo, David Airlie, Roman.Li-5C7GfCeVMHo, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Xinpeng Liu, Jun.Lei-5C7GfCeVMHo, Harry Wentland, Koenig, Christian [-- Attachment #1.1: Type: text/plain, Size: 457 bytes --] On Mon, Sep 16, 2019 at 01:51:15PM -0700, Nick Desaulniers wrote: > + Mark > I think this was a result of the resolved merge conflict. See the > -next only commit titled: > Merge remote-tracking branch 'drm/drm-next' Yes, the DRM and the Kbuild people really need to coordinate with each other here I fear, it's pretty bad that stuff like this has to be done in a merge at all :/ The fact that make doesn't detect a missing endif is also concerning. [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --] [-- Attachment #2: Type: text/plain, Size: 153 bytes --] _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 5+ messages in thread
[parent not found: <20190916221203.GM4352-7j8lgAiuQgnQXOPxS62xeg@public.gmane.org>]
* Re: [PATCH] drm/amd/display: build failed for DCN2.1 [not found] ` <20190916221203.GM4352-7j8lgAiuQgnQXOPxS62xeg@public.gmane.org> @ 2019-09-16 22:36 ` Mark Brown [not found] ` <20190916223615.GP4352-7j8lgAiuQgnQXOPxS62xeg@public.gmane.org> 0 siblings, 1 reply; 5+ messages in thread From: Mark Brown @ 2019-09-16 22:36 UTC (permalink / raw) To: Nick Desaulniers Cc: Zhou, David(ChunMing), Li, Sun peng (Leo), Bhawanpreet.Lakha-5C7GfCeVMHo, David Airlie, Roman.Li-5C7GfCeVMHo, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Xinpeng Liu, Jun.Lei-5C7GfCeVMHo, Harry Wentland, Koenig, Christian [-- Attachment #1.1: Type: text/plain, Size: 581 bytes --] On Mon, Sep 16, 2019 at 11:12:03PM +0100, Mark Brown wrote: > On Mon, Sep 16, 2019 at 01:51:15PM -0700, Nick Desaulniers wrote: > > > + Mark > > I think this was a result of the resolved merge conflict. See the > > -next only commit titled: > > Merge remote-tracking branch 'drm/drm-next' > Yes, the DRM and the Kbuild people really need to coordinate with each > other here I fear, it's pretty bad that stuff like this has to be done > in a merge at all :/ The fact that make doesn't detect a missing endif > is also concerning. Applied now, thanks Xinpeng. [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --] [-- Attachment #2: Type: text/plain, Size: 153 bytes --] _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 5+ messages in thread
[parent not found: <20190916223615.GP4352-7j8lgAiuQgnQXOPxS62xeg@public.gmane.org>]
* Re: [PATCH] drm/amd/display: build failed for DCN2.1 [not found] ` <20190916223615.GP4352-7j8lgAiuQgnQXOPxS62xeg@public.gmane.org> @ 2019-09-17 6:07 ` Daniel Liu 0 siblings, 0 replies; 5+ messages in thread From: Daniel Liu @ 2019-09-17 6:07 UTC (permalink / raw) To: Mark Brown Cc: Zhou, David(ChunMing), Li, Sun peng (Leo), Bhawanpreet.Lakha-5C7GfCeVMHo, Nick Desaulniers, Roman.Li-5C7GfCeVMHo, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, David Airlie, Jun.Lei-5C7GfCeVMHo, Harry Wentland, Koenig, Christian [-- Attachment #1.1: Type: text/plain, Size: 734 bytes --] Welcome^_^! Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> 于2019年9月17日周二 上午6:36写道: > On Mon, Sep 16, 2019 at 11:12:03PM +0100, Mark Brown wrote: > > On Mon, Sep 16, 2019 at 01:51:15PM -0700, Nick Desaulniers wrote: > > > > > + Mark > > > I think this was a result of the resolved merge conflict. See the > > > -next only commit titled: > > > Merge remote-tracking branch 'drm/drm-next' > > > Yes, the DRM and the Kbuild people really need to coordinate with each > > other here I fear, it's pretty bad that stuff like this has to be done > > in a merge at all :/ The fact that make doesn't detect a missing endif > > is also concerning. > > Applied now, thanks Xinpeng. > [-- Attachment #1.2: Type: text/html, Size: 1098 bytes --] [-- Attachment #2: Type: text/plain, Size: 153 bytes --] _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-09-17 6:07 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-09-16 9:03 [PATCH] drm/amd/display: build failed for DCN2.1 Xinpeng Liu [not found] ` <1568624607-19067-1-git-send-email-danielliu861-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2019-09-16 20:51 ` Nick Desaulniers [not found] ` <CAKwvOdn8-T3Q=LhiGu6H7dCpwXXrNAjpKJA5z0d+N4qB8bOapQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2019-09-16 22:12 ` Mark Brown [not found] ` <20190916221203.GM4352-7j8lgAiuQgnQXOPxS62xeg@public.gmane.org> 2019-09-16 22:36 ` Mark Brown [not found] ` <20190916223615.GP4352-7j8lgAiuQgnQXOPxS62xeg@public.gmane.org> 2019-09-17 6:07 ` Daniel Liu
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.