diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2020-01-01 00:00:25 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2020-01-01 00:00:25 +0000 |
| commit | a662ef81aabffb80ad9c30487ab40f254813c095 (patch) | |
| tree | 46ebb1606f16925b8784e51fa5c7f27e45abe788 /sys/dev/pci/drm | |
| parent | 535190dc25a6f5ac9d4feed5f26be47d802e60d4 (diff) | |
drm/amd/display: Fix dongle_caps containing stale information.
From David Galiffi
59fc1675b5731b6cb57ad668ab2022add0433d5d in linux 4.19.y/4.19.92
dd998291dbe92106d8c4a7581c409b356928d711 in mainline linux
Diffstat (limited to 'sys/dev/pci/drm')
| -rw-r--r-- | sys/dev/pci/drm/amd/display/dc/core/dc_link.c | 2 | ||||
| -rw-r--r-- | sys/dev/pci/drm/amd/display/dc/core/dc_link_dp.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/pci/drm/amd/display/dc/core/dc_link.c b/sys/dev/pci/drm/amd/display/dc/core/dc_link.c index e1f4d30a2ad..5f8cf7c7e93 100644 --- a/sys/dev/pci/drm/amd/display/dc/core/dc_link.c +++ b/sys/dev/pci/drm/amd/display/dc/core/dc_link.c @@ -1950,7 +1950,7 @@ static bool dp_active_dongle_validate_timing( break; } - if (dongle_caps->dongle_type != DISPLAY_DONGLE_DP_HDMI_CONVERTER || + if (dpcd_caps->dongle_type != DISPLAY_DONGLE_DP_HDMI_CONVERTER || dongle_caps->extendedCapValid == false) return true; diff --git a/sys/dev/pci/drm/amd/display/dc/core/dc_link_dp.c b/sys/dev/pci/drm/amd/display/dc/core/dc_link_dp.c index 036f9414639..ddc21dfb04e 100644 --- a/sys/dev/pci/drm/amd/display/dc/core/dc_link_dp.c +++ b/sys/dev/pci/drm/amd/display/dc/core/dc_link_dp.c @@ -2172,6 +2172,7 @@ static void get_active_converter_info( uint8_t data, struct dc_link *link) { union dp_downstream_port_present ds_port = { .byte = data }; + memset(&link->dpcd_caps.dongle_caps, 0, sizeof(link->dpcd_caps.dongle_caps)); /* decode converter info*/ if (!ds_port.fields.PORT_PRESENT) { |