linux-next: manual merge of the amdgpu tree with Linus' tree

Stephen Rothwell
2020-08-25T01:35:50Z

[-- Attachment #1: Type: text/plain, Size: 1349 bytes --]

Hi all,

Today's linux-next merge of the amdgpu tree got a conflict in:

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

between commit:

3b2e973dff59 ("drm/amd/display: add dmcub check on RENOIR")

from Linus' tree and commit:

4a580877bdcb ("drm/amdgpu: Get DRM dev from adev by inline-f")

from the amdgpu tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

--
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index df9338257ae0,785f21ea35df..000000000000
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@@ -1383,8 -1389,8 +1389,8 @@@ static int dm_late_init(void *handle
struct dmcu *dmcu = NULL;
bool ret = true;

- if (!adev->dm.fw_dmcu)
+ if (!adev->dm.fw_dmcu && !adev->dm.dmub_fw)
- return detect_mst_link_for_all_connectors(adev->ddev);
+ return detect_mst_link_for_all_connectors(adev_to_drm(adev));

dmcu = adev->dm.dc->res_pool->dmcu;