[PATCH] drm/amd/display: build failed for DCN2.1

[PATCH] drm/amd/display: build failed for DCN2.1

[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

Re: [PATCH] drm/amd/display: build failed for DCN2.1

[Nick Desaulniers]

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

Re: [PATCH] drm/amd/display: build failed for DCN2.1

[Mark Brown]

[-- 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

Re: [PATCH] drm/amd/display: build failed for DCN2.1

[Mark Brown]

[-- 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

Re: [PATCH] drm/amd/display: build failed for DCN2.1

[Daniel Liu]

[-- 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