linux-next: build failures after merge of the amdgpu tree

[Stephen Rothwell]

Hi all,

After merging the amdgpu tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function 'dm_dmub_hw_init':
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1111:38: error: 'struct dc_debug_options' has no member named 'dpia_debug'
 1111 |    hw_params.disable_dpia = dc->debug.dpia_debug.bits.disable_dpia;
      |                                      ^
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function 'amdgpu_dm_atomic_check':
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:10728:34: error: unused variable 'mgr' [-Werror=unused-variable]
10728 |  struct drm_dp_mst_topology_mgr *mgr;
      |                                  ^~~
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:10727:36: error: unused variable 'mst_state' [-Werror=unused-variable]
10727 |  struct drm_dp_mst_topology_state *mst_state;
      |                                    ^~~~~~~~~
cc1: all warnings being treated as errors

Caused by commits

  df91b2adc24a ("drm/amd/display: Add DP 2.0 MST DM Support")
  707021dc0e16 ("drm/amd/display: Enable dpia in dmub only for DCN31 B0")

CONFIG_DRM_AMD_DC_DCN is not set for this build.

I have used the amdgpu tree frm next-20211026 for today.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpGxhnpoMZJP.pgp
Description: OpenPGP digital signature