diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2022-04-21 09:53:33 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2022-04-21 09:53:33 +0000 |
| commit | af22ac312c282d7fcccfc4c2a8aac9380675f6d1 (patch) | |
| tree | 9512cad42486b7fa4c9a6a19c1c83eb4107e45dc /sys/dev | |
| parent | a75434b1ba7c81b372ae9f902436ec66b0ebcbd1 (diff) | |
drm/amd/display: Fix allocate_mst_payload assert on resume
From Roman Li
6a03581ccffa571bfa1a9f3a097e1a4d7164fd2d in linux 5.15.y/5.15.35
f4346fb3edf7720db3f7f5e1cab1f667cd024280 in mainline linux
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 |
1 files changed, 2 insertions, 1 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 6d365997afe..01b189e114e 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 @@ -2298,7 +2298,8 @@ static int dm_resume(void *handle) * this is the case when traversing through already created * MST connectors, should be skipped */ - if (aconnector->mst_port) + if (aconnector->dc_link && + aconnector->dc_link->type == dc_connection_mst_branch) continue; mutex_lock(&aconnector->hpd_lock); |