diff options
| author |   jsg <jsg@openbsd.org> | 2020-02-12 01:33:48 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2020-02-12 01:33:48 +0000 |
| commit | 7181fdb7ef59d3784a654a891d8a1c820bae9a57 (patch) | |
| tree | 356c8850380352740d0f0eef130e3321450de0fe | |
| parent | drm/rect: Avoid division by zero (diff) | |
| download | wireguard-openbsd-7181fdb7ef59d3784a654a891d8a1c820bae9a57.tar.xz wireguard-openbsd-7181fdb7ef59d3784a654a891d8a1c820bae9a57.zip | |
drm/amd/dm/mst: Ignore payload update failures
From Lyude Paul
abc51506fcebee12183f98a30f0aa67b32ee8542 in linux 4.19.y/4.19.103
58fe03d6dec908a1bec07eea7e94907af5c07eec in mainline linux
| -rw-r--r-- | sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c index 8403b6a9a77..d8c53ddc23b 100644 --- a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +++ b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c @@ -248,7 +248,8 @@ bool dm_helpers_dp_mst_write_payload_allocation_table( drm_dp_mst_reset_vcpi_slots(mst_mgr, mst_port); } - ret = drm_dp_update_payload_part1(mst_mgr); + /* It's OK for this to fail */ + drm_dp_update_payload_part1(mst_mgr); /* mst_mgr->->payloads are VC payload notify MST branch using DPCD or * AUX message. The sequence is slot 1-63 allocated sequence for each @@ -257,9 +258,6 @@ bool dm_helpers_dp_mst_write_payload_allocation_table( get_payload_table(aconnector, proposed_table); - if (ret) - return false; - return true; } @@ -310,7 +308,6 @@ bool dm_helpers_dp_mst_send_payload_allocation( struct amdgpu_dm_connector *aconnector; struct drm_dp_mst_topology_mgr *mst_mgr; struct drm_dp_mst_port *mst_port; - int ret; aconnector = stream->sink->priv; @@ -324,10 +321,8 @@ bool dm_helpers_dp_mst_send_payload_allocation( if (!mst_mgr->mst_state) return false; - ret = drm_dp_update_payload_part2(mst_mgr); - - if (ret) - return false; + /* It's OK for this to fail */ + drm_dp_update_payload_part2(mst_mgr); if (!enable) drm_dp_mst_deallocate_vcpi(mst_mgr, mst_port); |