Commitfd3e3a0

Nicholas Kazlauskas

authored and

aaliuamd

committed

drm/amd/display: Fix DPIA outbox timeout after S3/S4/reset

[Why]The HW interrupt gets disabled after S3/S4/reset so we don't receivenotifications for HPD or AUX from DMUB - leading to timeout andblack screen with (or without) DPIA links connected.[How]Re-enable the interrupt after S3/S4/reset like we do for the otherDC interrupts.Guard both instances of the outbox interrupt enable or we'll hangduring restore on ASIC that don't support it.Fixes: 19fde255f248 ("drm/amd/display: Fix DPIA outbox timeout after GPU reset")Reviewed-by: Jude Shih <Jude.Shih@amd.com>Acked-by: Pavle Kotarac <Pavle.Kotarac@amd.com>Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>

1 parent2d31404 commitfd3e3a0Copy full SHA for fd3e3a0

File tree

1 file changed

-1

lines changed

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

1 file changed

-1

lines changed

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

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2452,7 +2452,8 @@ static int dm_resume(void *handle)`
`2452`	`2452`	`if (amdgpu_in_reset(adev)) {`
`2453`	`2453`	`dc_state=dm->cached_dc_state;`
`2454`	`2454`
`2455`		`-amdgpu_dm_outbox_init(adev);`
	`2455`	`+if (dc_enable_dmub_notifications(adev->dm.dc))`
	`2456`	`+amdgpu_dm_outbox_init(adev);`
`2456`	`2457`
`2457`	`2458`	`r=dm_dmub_hw_init(adev);`
`2458`	`2459`	`if (r)`
`@@ -2503,6 +2504,10 @@ static int dm_resume(void *handle)`
`2503`	`2504`	`dc_resource_state_construct(dm->dc,dm_state->context);`
`2504`	`2505`	`#endif`
`2505`	`2506`
	`2507`	`+/* Re-enable outbox interrupts for DPIA. */`
	`2508`	`+if (dc_enable_dmub_notifications(adev->dm.dc))`
	`2509`	`+amdgpu_dm_outbox_init(adev);`
	`2510`	`+`
`2506`	`2511`	`/* Before powering on DC we need to re-initialize DMUB. */`
`2507`	`2512`	`r=dm_dmub_hw_init(adev);`
`2508`	`2513`	`if (r)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitfd3e3a0

File tree

1 file changed

1 file changed

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

0 commit comments