linux-next: build failure 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/dc/core/dc.c: In function 'program_timing_sync':
drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c:1409:17: error: 'struct dc_config' has no member named 'use_pipe_ctx_sync_logic'
 1409 |   if (dc->config.use_pipe_ctx_sync_logic) {
      |                 ^
drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c:1412:20: error: 'struct pipe_ctx' has no member named 'pipe_idx_syncd'
 1412 |     if (pipe_set[j]->pipe_idx_syncd == pipe_set[0]->pipe_idx_syncd) {
      |                    ^~
drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c:1412:51: error: 'struct pipe_ctx' has no member named 'pipe_idx_syncd'
 1412 |     if (pipe_set[j]->pipe_idx_syncd == pipe_set[0]->pipe_idx_syncd) {
      |                                                   ^~
drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c:1418:17: error: 'struct pipe_ctx' has no member named 'pipe_idx_syncd'
 1418 |      pipe_set[j]->pipe_idx_syncd = pipe_set[0]->pipe_idx_syncd;
      |                 ^~
drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c:1418:47: error: 'struct pipe_ctx' has no member named 'pipe_idx_syncd'
 1418 |      pipe_set[j]->pipe_idx_syncd = pipe_set[0]->pipe_idx_syncd;
      |                                               ^~

Caused by git doing a bad automatic merge with Linus' tree because commit

  75b950ef6166 ("Revert "drm/amd/display: Fix for otg synchronization logic"")

has been cherry-picked into the amdgpu tree and then a fixed version of
the reverted commit applied on top.  It would be easier if just a
fix up for the oriingal commit was added to the amdgpu tree, or Linus'
tree was merged into the amdgpu tree and then the fixed version applied.

I have used the amdgpu tree from next-20220113 for today.

-- 
Cheers,
Stephen Rothwell

Attachment: pgppCHJMaMafT.pgp
Description: OpenPGP digital signature