diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2023-06-19 00:50:43 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2023-06-19 00:50:43 +0000 |
| commit | a9761470f7d2f9ec9f9eea878791c5293166b031 (patch) | |
| tree | d87e9c79fbc1c25a67ac6ef9736fb2893744fc19 /sys | |
| parent | 4a12ae932770a04d6fafbe1d50019e97e22dd132 (diff) | |
drm/amd/display: Have Payload Properly Created After Resume
From Fangzhi Zuo
4042d7ad40f1c3182225461c62926f217a3d0ede in linux-6.1.y/6.1.33
482e6ad9adde69d9da08864b4ccf4dfd53edb2f0 in mainline linux
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 0aca5c3b723..b3d59c1586d 100644 --- a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -2765,7 +2765,7 @@ static int dm_resume(void *handle) * this is the case when traversing through already created * MST connectors, should be skipped */ - if (aconnector->dc_link->type == dc_connection_mst_branch) + if (aconnector && aconnector->mst_port) continue; mutex_lock(&aconnector->hpd_lock); @@ -6494,7 +6494,7 @@ static int dm_encoder_helper_atomic_check(struct drm_encoder *encoder, int clock, bpp = 0; bool is_y420 = false; - if (!aconnector->port || !aconnector->dc_sink) + if (!aconnector->port) return 0; mst_port = aconnector->port; |