Skip to content

Commit 6b6124b

Browse files
Liu ChengZhealexdeucher
authored andcommitted
drm/amdgpu: fix PSP autoload twice in FLR
Assigning false to block->status.hw overwrites PSP's previous hardware status, which causes the PSP to Resume operation after hardware init. Remove this assignment and let the PSP execute Resume operation when it is told to. v2: Remove the braces. v3: Modify the description. Signed-off-by: Liu ChengZhe <[email protected]> Reviewed-by: Luben Tuikov <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 278a4b5 commit 6b6124b

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2574,14 +2574,16 @@ static int amdgpu_device_ip_reinit_early_sriov(struct amdgpu_device *adev)
25742574
AMD_IP_BLOCK_TYPE_IH,
25752575
};
25762576

2577+
for (i = 0; i < adev->num_ip_blocks; i++)
2578+
adev->ip_blocks[i].status.hw = false;
2579+
25772580
for (i = 0; i < ARRAY_SIZE(ip_order); i++) {
25782581
int j;
25792582
struct amdgpu_ip_block *block;
25802583

25812584
for (j = 0; j < adev->num_ip_blocks; j++) {
25822585
block = &adev->ip_blocks[j];
25832586

2584-
block->status.hw = false;
25852587
if (block->version->type != ip_order[i] ||
25862588
!block->status.valid)
25872589
continue;

0 commit comments

Comments
 (0)