An initialization was added for two optional struct members. One of
these is always present in the dcn20_resource file, but the other one
depends on CONFIG_DRM_AMD_DC_DSC_SUPPORT and causes a build failure if
that is missing:
drivers/gpu/drm/amd/amdgpu/../display/dc/dcn20/dcn20_resource.c:926:14: error: excess elements in struct initializer [-Werror]
.num_dsc = 5,
Add another #ifdef around the assignment.
Fixes: c3d03c5a196f ("drm/amd/display: Include num_vmid and num_dsc within NV14's resource caps")
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
index faab89d1e694..fdf93e6edf43 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
@@ -923,7 +923,9 @@ static const struct resource_caps res_cap_nv14 = {
.num_dwb = 1,
.num_ddc = 5,
.num_vmid = 16,
+#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT
.num_dsc = 5,
+#endif
};
static const struct dc_debug_options debug_defaults_drv = {
--
2.20.0
> -----Original Message-----
> From: Arnd Bergmann <[email protected]>
> Sent: 2019/December/10, Tuesday 3:31 PM
> To: Wentland, Harry <[email protected]>; Li, Sun peng (Leo)
> <[email protected]>; Deucher, Alexander
> <[email protected]>; Koenig, Christian
> <[email protected]>; Zhou, David(ChunMing)
> <[email protected]>; David Airlie <[email protected]>; Daniel Vetter
> <[email protected]>; Liu, Zhan <[email protected]>
> Cc: Arnd Bergmann <[email protected]>; Laktyushkin, Dmytro
> <[email protected]>; Lakha, Bhawanpreet
> <[email protected]>; Lei, Jun <[email protected]>; Liu,
> Charlene <[email protected]>; Yang, Eric <[email protected]>;
> Cornij, Nikola <[email protected]>; [email protected];
> [email protected]; [email protected]
> Subject: [PATCH] drm/amd/display: fix undefined struct member reference
>
> An initialization was added for two optional struct members. One of these is
> always present in the dcn20_resource file, but the other one depends on
> CONFIG_DRM_AMD_DC_DSC_SUPPORT and causes a build failure if that is
> missing:
>
> drivers/gpu/drm/amd/amdgpu/../display/dc/dcn20/dcn20_resource.c:926:1
> 4: error: excess elements in struct initializer [-Werror]
> .num_dsc = 5,
>
> Add another #ifdef around the assignment.
>
> Fixes: c3d03c5a196f ("drm/amd/display: Include num_vmid and num_dsc
> within NV14's resource caps")
> Signed-off-by: Arnd Bergmann <[email protected]>
Thank you for catching that ???? On my side I kept that flag enabled all the time, so I didn't realize there was a warning hidden here.
Reviewed-by: Zhan Liu <[email protected]>
> ---
> drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> index faab89d1e694..fdf93e6edf43 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> @@ -923,7 +923,9 @@ static const struct resource_caps res_cap_nv14 = {
> .num_dwb = 1,
> .num_ddc = 5,
> .num_vmid = 16,
> +#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT
> .num_dsc = 5,
> +#endif
> };
>
> static const struct dc_debug_options debug_defaults_drv = {
> --
> 2.20.0
On 2019-12-10 3:54 p.m., Liu, Zhan wrote:
>
>
>> -----Original Message-----
>> From: Arnd Bergmann <[email protected]>
>> Sent: 2019/December/10, Tuesday 3:31 PM
>> To: Wentland, Harry <[email protected]>; Li, Sun peng (Leo)
>> <[email protected]>; Deucher, Alexander
>> <[email protected]>; Koenig, Christian
>> <[email protected]>; Zhou, David(ChunMing)
>> <[email protected]>; David Airlie <[email protected]>; Daniel Vetter
>> <[email protected]>; Liu, Zhan <[email protected]>
>> Cc: Arnd Bergmann <[email protected]>; Laktyushkin, Dmytro
>> <[email protected]>; Lakha, Bhawanpreet
>> <[email protected]>; Lei, Jun <[email protected]>; Liu,
>> Charlene <[email protected]>; Yang, Eric <[email protected]>;
>> Cornij, Nikola <[email protected]>; [email protected];
>> [email protected]; [email protected]
>> Subject: [PATCH] drm/amd/display: fix undefined struct member reference
>>
>> An initialization was added for two optional struct members. One of these is
>> always present in the dcn20_resource file, but the other one depends on
>> CONFIG_DRM_AMD_DC_DSC_SUPPORT and causes a build failure if that is
>> missing:
>>
>> drivers/gpu/drm/amd/amdgpu/../display/dc/dcn20/dcn20_resource.c:926:1
>> 4: error: excess elements in struct initializer [-Werror]
>> .num_dsc = 5,
>>
>> Add another #ifdef around the assignment.
>>
>> Fixes: c3d03c5a196f ("drm/amd/display: Include num_vmid and num_dsc
>> within NV14's resource caps")
>> Signed-off-by: Arnd Bergmann <[email protected]>
>
> Thank you for catching that ???? On my side I kept that flag enabled all the time, so I didn't realize there was a warning hidden here.
>
> Reviewed-by: Zhan Liu <[email protected]>
What tree is this reported on?
We dropped this flag whenever building DCN. Sounds like we're missing a
patch if you're getting this.
So this is a NAK from me for going into amd-staging-drm-next at least.
Nicholas Kazlauskas
>
>> ---
>> drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 ++
>> 1 file changed, 2 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
>> b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
>> index faab89d1e694..fdf93e6edf43 100644
>> --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
>> +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
>> @@ -923,7 +923,9 @@ static const struct resource_caps res_cap_nv14 = {
>> .num_dwb = 1,
>> .num_ddc = 5,
>> .num_vmid = 16,
>> +#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT
>> .num_dsc = 5,
>> +#endif
>> };
>>
>> static const struct dc_debug_options debug_defaults_drv = {
>> --
>> 2.20.0
>
> _______________________________________________
> dri-devel mailing list
> [email protected]
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
On Tue, Dec 10, 2019 at 9:56 PM Kazlauskas, Nicholas
<[email protected]> wrote:
> On 2019-12-10 3:54 p.m., Liu, Zhan wrote:
> >>
> >> Fixes: c3d03c5a196f ("drm/amd/display: Include num_vmid and num_dsc
> >> within NV14's resource caps")
> >> Signed-off-by: Arnd Bergmann <[email protected]>
> >
> > Thank you for catching that On my side I kept that flag enabled all the time, so I didn't realize there was a warning hidden here.
> >
> > Reviewed-by: Zhan Liu <[email protected]>
>
> What tree is this reported on?
This is plain linux-5.5-rc1.
> We dropped this flag whenever building DCN. Sounds like we're missing a
> patch if you're getting this.
>
> So this is a NAK from me for going into amd-staging-drm-next at least.
Fair enough, please revert c3d03c5a196f ("drm/amd/display: Include
num_vmid and num_dsc within NV14's resource caps") for 5.5-rc2 then.
Arnd
> -----Original Message-----
> From: Kazlauskas, Nicholas <[email protected]>
> Sent: Tuesday, December 10, 2019 3:56 PM
> To: Liu, Zhan <[email protected]>; Arnd Bergmann <[email protected]>;
> Wentland, Harry <[email protected]>; Li, Sun peng (Leo)
> <[email protected]>; Deucher, Alexander
> <[email protected]>; Koenig, Christian
> <[email protected]>; Zhou, David(ChunMing)
> <[email protected]>; David Airlie <[email protected]>; Daniel Vetter
> <[email protected]>
> Cc: Liu, Charlene <[email protected]>; Yang, Eric
> <[email protected]>; [email protected]; amd-
> [email protected]; Cornij, Nikola <[email protected]>;
> Laktyushkin, Dmytro <[email protected]>; dri-
> [email protected]; Lei, Jun <[email protected]>; Lakha,
> Bhawanpreet <[email protected]>
> Subject: Re: [PATCH] drm/amd/display: fix undefined struct member
> reference
>
> On 2019-12-10 3:54 p.m., Liu, Zhan wrote:
> >
> >
> >> -----Original Message-----
> >> From: Arnd Bergmann <[email protected]>
> >> Sent: 2019/December/10, Tuesday 3:31 PM
> >> To: Wentland, Harry <[email protected]>; Li, Sun peng (Leo)
> >> <[email protected]>; Deucher, Alexander
> <[email protected]>;
> >> Koenig, Christian <[email protected]>; Zhou, David(ChunMing)
> >> <[email protected]>; David Airlie <[email protected]>; Daniel Vetter
> >> <[email protected]>; Liu, Zhan <[email protected]>
> >> Cc: Arnd Bergmann <[email protected]>; Laktyushkin, Dmytro
> >> <[email protected]>; Lakha, Bhawanpreet
> >> <[email protected]>; Lei, Jun <[email protected]>; Liu,
> >> Charlene <[email protected]>; Yang, Eric <[email protected]>;
> >> Cornij, Nikola <[email protected]>;
> >> [email protected]; [email protected];
> >> [email protected]
> >> Subject: [PATCH] drm/amd/display: fix undefined struct member
> >> reference
> >>
> >> An initialization was added for two optional struct members. One of
> >> these is always present in the dcn20_resource file, but the other one
> >> depends on CONFIG_DRM_AMD_DC_DSC_SUPPORT and causes a build
> failure
> >> if that is
> >> missing:
> >>
> >>
> drivers/gpu/drm/amd/amdgpu/../display/dc/dcn20/dcn20_resource.c:926:1
> >> 4: error: excess elements in struct initializer [-Werror]
> >> .num_dsc = 5,
> >>
> >> Add another #ifdef around the assignment.
> >>
> >> Fixes: c3d03c5a196f ("drm/amd/display: Include num_vmid and num_dsc
> >> within NV14's resource caps")
> >> Signed-off-by: Arnd Bergmann <[email protected]>
> >
> > Thank you for catching that ???? On my side I kept that flag enabled all the
> time, so I didn't realize there was a warning hidden here.
> >
> > Reviewed-by: Zhan Liu <[email protected]>
>
> What tree is this reported on?
>
> We dropped this flag whenever building DCN. Sounds like we're missing a
> patch if you're getting this.
>
> So this is a NAK from me for going into amd-staging-drm-next at least.
>
Those patches are not upstream yet. They are queued for 5.6. So we need this patch for 5.5. I'll apply it.
Alex
> Nicholas Kazlauskas
>
> >
> >> ---
> >> drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 ++
> >> 1 file changed, 2 insertions(+)
> >>
> >> diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> >> b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> >> index faab89d1e694..fdf93e6edf43 100644
> >> --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> >> +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> >> @@ -923,7 +923,9 @@ static const struct resource_caps res_cap_nv14 = {
> >> .num_dwb = 1,
> >> .num_ddc = 5,
> >> .num_vmid = 16,
> >> +#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT
> >> .num_dsc = 5,
> >> +#endif
> >> };
> >>
> >> static const struct dc_debug_options debug_defaults_drv = {
> >> --
> >> 2.20.0
> >
> > _______________________________________________
> > dri-devel mailing list
> > [email protected]
> > https://lists.freedesktop.org/mailman/listinfo/dri-devel
> >