Skip to content

Commit a6e1775

Browse files
tsunglinxalexdeucher
authored andcommitted
drm/amd/display: No display after resume from WB/CB
[why] First MST sideband message returns AUX_RET_ERROR_HPD_DISCON on certain intel platform. Aux transaction considered failure if HPD unexpected pulled low. The actual aux transaction success in such case, hence do not return error. [how] Not returning error when AUX_RET_ERROR_HPD_DISCON detected on the first sideband message. v2: squash in fix (Alex) Reviewed-by: Jerry Zuo <Jerry.Zuo@amd.com> Acked-by: Brian Chang <Brian.Chang@amd.com> Signed-off-by: Tsung-hua Lin <Tsung-hua.Lin@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org
1 parent 3cb93f3 commit a6e1775

1 file changed

Lines changed: 37 additions & 0 deletions

File tree

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1372,7 +1372,44 @@ static const struct dmi_system_id hpd_disconnect_quirk_table[] = {
13721372
DMI_MATCH(DMI_PRODUCT_NAME, "Precision 3460"),
13731373
},
13741374
},
1375+
{
1376+
.matches = {
1377+
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
1378+
DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex Tower Plus 7010"),
1379+
},
1380+
},
1381+
{
1382+
.matches = {
1383+
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
1384+
DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex Tower 7010"),
1385+
},
1386+
},
1387+
{
1388+
.matches = {
1389+
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
1390+
DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex SFF Plus 7010"),
1391+
},
1392+
},
1393+
{
1394+
.matches = {
1395+
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
1396+
DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex SFF 7010"),
1397+
},
1398+
},
1399+
{
1400+
.matches = {
1401+
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
1402+
DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex Micro Plus 7010"),
1403+
},
1404+
},
1405+
{
1406+
.matches = {
1407+
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
1408+
DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex Micro 7010"),
1409+
},
1410+
},
13751411
{}
1412+
/* TODO: refactor this from a fixed table to a dynamic option */
13761413
};
13771414

13781415
static void retrieve_dmi_info(struct amdgpu_display_manager *dm)

0 commit comments

Comments
 (0)