> -----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 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
