Skip to content

Commit 4f56acd

Browse files
yifancomalexdeucher
authored andcommitted
drm/amdgpu: remove asymmetrical irq disabling in vcn 4.0.5 suspend
There is no irq enabled in vcn 4.0.5 resume, causing wrong amdgpu_irq_src status. Beside, current set function callbacks are empty with no real effect. Signed-off-by: Yifan Zhang <yifan1.zhang@amd.com> Acked-by: Saleemkhan Jamadar <saleemkhan.jamadar@amd.com> Reviewed-by: Veerabadhran Gopalakrishnan <Veerabadhran.Gopalakrishnan@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent de4a733 commit 4f56acd

File tree

2 files changed

+0
-36
lines changed

2 files changed

+0
-36
lines changed

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2017,22 +2017,6 @@ static int vcn_v4_0_set_powergating_state(void *handle, enum amd_powergating_sta
20172017
return ret;
20182018
}
20192019

2020-
/**
2021-
* vcn_v4_0_set_interrupt_state - set VCN block interrupt state
2022-
*
2023-
* @adev: amdgpu_device pointer
2024-
* @source: interrupt sources
2025-
* @type: interrupt types
2026-
* @state: interrupt states
2027-
*
2028-
* Set VCN block interrupt state
2029-
*/
2030-
static int vcn_v4_0_set_interrupt_state(struct amdgpu_device *adev, struct amdgpu_irq_src *source,
2031-
unsigned type, enum amdgpu_interrupt_state state)
2032-
{
2033-
return 0;
2034-
}
2035-
20362020
/**
20372021
* vcn_v4_0_set_ras_interrupt_state - set VCN block RAS interrupt state
20382022
*
@@ -2097,7 +2081,6 @@ static int vcn_v4_0_process_interrupt(struct amdgpu_device *adev, struct amdgpu_
20972081
}
20982082

20992083
static const struct amdgpu_irq_src_funcs vcn_v4_0_irq_funcs = {
2100-
.set = vcn_v4_0_set_interrupt_state,
21012084
.process = vcn_v4_0_process_interrupt,
21022085
};
21032086

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

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,6 @@ static int vcn_v4_0_5_hw_fini(void *handle)
269269
vcn_v4_0_5_set_powergating_state(adev, AMD_PG_STATE_GATE);
270270
}
271271
}
272-
273-
amdgpu_irq_put(adev, &adev->vcn.inst[i].irq, 0);
274272
}
275273

276274
return 0;
@@ -1668,22 +1666,6 @@ static int vcn_v4_0_5_set_powergating_state(void *handle, enum amd_powergating_s
16681666
return ret;
16691667
}
16701668

1671-
/**
1672-
* vcn_v4_0_5_set_interrupt_state - set VCN block interrupt state
1673-
*
1674-
* @adev: amdgpu_device pointer
1675-
* @source: interrupt sources
1676-
* @type: interrupt types
1677-
* @state: interrupt states
1678-
*
1679-
* Set VCN block interrupt state
1680-
*/
1681-
static int vcn_v4_0_5_set_interrupt_state(struct amdgpu_device *adev, struct amdgpu_irq_src *source,
1682-
unsigned type, enum amdgpu_interrupt_state state)
1683-
{
1684-
return 0;
1685-
}
1686-
16871669
/**
16881670
* vcn_v4_0_5_process_interrupt - process VCN block interrupt
16891671
*
@@ -1726,7 +1708,6 @@ static int vcn_v4_0_5_process_interrupt(struct amdgpu_device *adev, struct amdgp
17261708
}
17271709

17281710
static const struct amdgpu_irq_src_funcs vcn_v4_0_5_irq_funcs = {
1729-
.set = vcn_v4_0_5_set_interrupt_state,
17301711
.process = vcn_v4_0_5_process_interrupt,
17311712
};
17321713

0 commit comments

Comments
 (0)