]> git.baikalelectronics.ru Git - kernel.git/commit
drm/amd/display: fix undefined struct member reference
authorArnd Bergmann <arnd@arndb.de>
Tue, 10 Dec 2019 20:30:46 +0000 (21:30 +0100)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 10 Dec 2019 22:14:51 +0000 (17:14 -0500)
commit3ee1218657b69287432b28ce6dbd0b6a48bbb7b8
tree69d1a8a9a2658959717a97e73d563e6edfdc7484
parentc8430d1b8fe78d5e72d4ce619852f855d4a56b0d
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:14: error: excess elements in struct initializer [-Werror]
   .num_dsc = 5,

Add another #ifdef around the assignment.

Fixes: 266c18737b21 ("drm/amd/display: Include num_vmid and num_dsc within NV14's resource caps")
Reviewed-by: Zhan Liu <zhan.liu@amd.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c