Re: [PATCH] drm/amd/display: fix undefined struct member reference

From: Kazlauskas, Nicholas
Date: Tue Dec 10 2019 - 15:56:10 EST

On 2019-12-10 3:54 p.m., Liu, Zhan wrote:

-----Original Message-----
From: Arnd Bergmann <arnd@xxxxxxxx>
Sent: 2019/December/10, Tuesday 3:31 PM
To: Wentland, Harry <Harry.Wentland@xxxxxxx>; Li, Sun peng (Leo)
<Sunpeng.Li@xxxxxxx>; Deucher, Alexander
<Alexander.Deucher@xxxxxxx>; Koenig, Christian
<Christian.Koenig@xxxxxxx>; Zhou, David(ChunMing)
<David1.Zhou@xxxxxxx>; David Airlie <airlied@xxxxxxxx>; Daniel Vetter
<daniel@xxxxxxxx>; Liu, Zhan <Zhan.Liu@xxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>; Laktyushkin, Dmytro
<Dmytro.Laktyushkin@xxxxxxx>; Lakha, Bhawanpreet
<Bhawanpreet.Lakha@xxxxxxx>; Lei, Jun <Jun.Lei@xxxxxxx>; Liu,
Charlene <Charlene.Liu@xxxxxxx>; Yang, Eric <Eric.Yang2@xxxxxxx>;
Cornij, Nikola <Nikola.Cornij@xxxxxxx>; amd-gfx@xxxxxxxxxxxxxxxxxxxxx;
dri-devel@xxxxxxxxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx
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

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 <arnd@xxxxxxxx>

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 <zhan.liu@xxxxxxx>

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
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,
.num_dsc = 5,

static const struct dc_debug_options debug_defaults_drv = {

dri-devel mailing list