* [PATCH] drm/amdgpu: use spin_lock_irqsave to avoid deadlock by local interrupt
@ 2022-01-10 5:13 Guchun Chen
2022-01-10 15:41 ` Zytaruk, Kelly
2022-01-10 16:09 ` Deucher, Alexander
0 siblings, 2 replies; 7+ messages in thread
From: Guchun Chen @ 2022-01-10 5:13 UTC (permalink / raw)
To: amd-gfx, alexander.deucher, christian.koenig, xinhui.pan,
kelly.zytaruk, qiliang.huang, bokun.zhang
Cc: Guchun Chen
This is observed in SRIOV case with virtual KMS as display.
_raw_spin_lock_irqsave+0x37/0x40
drm_handle_vblank+0x69/0x350 [drm]
? try_to_wake_up+0x432/0x5c0
? amdgpu_vkms_prepare_fb+0x1c0/0x1c0 [amdgpu]
drm_crtc_handle_vblank+0x17/0x20 [drm]
amdgpu_vkms_vblank_simulate+0x4d/0x80 [amdgpu]
__hrtimer_run_queues+0xfb/0x230
hrtimer_interrupt+0x109/0x220
__sysvec_apic_timer_interrupt+0x64/0xe0
asm_call_irq_on_stack+0x12/0x20
Fixes: ba5317109d0c("drm/amdgpu: create amdgpu_vkms (v4)")
Signed-off-by: Guchun Chen <guchun.chen@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
index 2dcc68e04e84..d99c8779b51e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
@@ -144,15 +144,16 @@ static void amdgpu_vkms_crtc_atomic_disable(struct drm_crtc *crtc,
static void amdgpu_vkms_crtc_atomic_flush(struct drm_crtc *crtc,
struct drm_atomic_state *state)
{
+ unsigned long flags;
if (crtc->state->event) {
- spin_lock(&crtc->dev->event_lock);
+ spin_lock_irqsave(&crtc->dev->event_lock, flags);
if (drm_crtc_vblank_get(crtc) != 0)
drm_crtc_send_vblank_event(crtc, crtc->state->event);
else
drm_crtc_arm_vblank_event(crtc, crtc->state->event);
- spin_unlock(&crtc->dev->event_lock);
+ spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
crtc->state->event = NULL;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* RE: [PATCH] drm/amdgpu: use spin_lock_irqsave to avoid deadlock by local interrupt
2022-01-10 5:13 [PATCH] drm/amdgpu: use spin_lock_irqsave to avoid deadlock by local interrupt Guchun Chen
@ 2022-01-10 15:41 ` Zytaruk, Kelly
2022-01-11 3:00 ` Chen, Guchun
2022-01-10 16:09 ` Deucher, Alexander
1 sibling, 1 reply; 7+ messages in thread
From: Zytaruk, Kelly @ 2022-01-10 15:41 UTC (permalink / raw)
To: Chen, Guchun, amd-gfx, Deucher, Alexander, Koenig, Christian,
Pan, Xinhui, Huang, Qiliang (Warden),
Zhang, Bokun
I can confirm that the fault no longer occurs when the patch is implemented.
Thanks,
Kelly
-----Original Message-----
From: Chen, Guchun <Guchun.Chen@amd.com>
Sent: January 10, 2022 12:14 AM
To: amd-gfx@lists.freedesktop.org; Deucher, Alexander <Alexander.Deucher@amd.com>; Koenig, Christian <Christian.Koenig@amd.com>; Pan, Xinhui <Xinhui.Pan@amd.com>; Zytaruk, Kelly <Kelly.Zytaruk@amd.com>; Huang, Qiliang (Warden) <Qiliang.Huang@amd.com>; Zhang, Bokun <Bokun.Zhang@amd.com>
Cc: Chen, Guchun <Guchun.Chen@amd.com>
Subject: [PATCH] drm/amdgpu: use spin_lock_irqsave to avoid deadlock by local interrupt
This is observed in SRIOV case with virtual KMS as display.
_raw_spin_lock_irqsave+0x37/0x40
drm_handle_vblank+0x69/0x350 [drm]
? try_to_wake_up+0x432/0x5c0
? amdgpu_vkms_prepare_fb+0x1c0/0x1c0 [amdgpu]
drm_crtc_handle_vblank+0x17/0x20 [drm]
amdgpu_vkms_vblank_simulate+0x4d/0x80 [amdgpu]
__hrtimer_run_queues+0xfb/0x230
hrtimer_interrupt+0x109/0x220
__sysvec_apic_timer_interrupt+0x64/0xe0
asm_call_irq_on_stack+0x12/0x20
Fixes: ba5317109d0c("drm/amdgpu: create amdgpu_vkms (v4)")
Signed-off-by: Guchun Chen <guchun.chen@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
index 2dcc68e04e84..d99c8779b51e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
@@ -144,15 +144,16 @@ static void amdgpu_vkms_crtc_atomic_disable(struct drm_crtc *crtc, static void amdgpu_vkms_crtc_atomic_flush(struct drm_crtc *crtc,
struct drm_atomic_state *state)
{
+ unsigned long flags;
if (crtc->state->event) {
- spin_lock(&crtc->dev->event_lock);
+ spin_lock_irqsave(&crtc->dev->event_lock, flags);
if (drm_crtc_vblank_get(crtc) != 0)
drm_crtc_send_vblank_event(crtc, crtc->state->event);
else
drm_crtc_arm_vblank_event(crtc, crtc->state->event);
- spin_unlock(&crtc->dev->event_lock);
+ spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
crtc->state->event = NULL;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/amdgpu: use spin_lock_irqsave to avoid deadlock by local interrupt
2022-01-10 5:13 [PATCH] drm/amdgpu: use spin_lock_irqsave to avoid deadlock by local interrupt Guchun Chen
2022-01-10 15:41 ` Zytaruk, Kelly
@ 2022-01-10 16:09 ` Deucher, Alexander
1 sibling, 0 replies; 7+ messages in thread
From: Deucher, Alexander @ 2022-01-10 16:09 UTC (permalink / raw)
To: Chen, Guchun, amd-gfx, Koenig, Christian, Pan, Xinhui, Zytaruk,
Kelly, Huang, Qiliang (Warden),
Zhang, Bokun
[-- Attachment #1: Type: text/plain, Size: 2401 bytes --]
[AMD Official Use Only]
Acked-by: Alex Deucher <alexander.deucher@amd.com>
________________________________
From: Chen, Guchun <Guchun.Chen@amd.com>
Sent: Monday, January 10, 2022 12:13 AM
To: amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>; Deucher, Alexander <Alexander.Deucher@amd.com>; Koenig, Christian <Christian.Koenig@amd.com>; Pan, Xinhui <Xinhui.Pan@amd.com>; Zytaruk, Kelly <Kelly.Zytaruk@amd.com>; Huang, Qiliang (Warden) <Qiliang.Huang@amd.com>; Zhang, Bokun <Bokun.Zhang@amd.com>
Cc: Chen, Guchun <Guchun.Chen@amd.com>
Subject: [PATCH] drm/amdgpu: use spin_lock_irqsave to avoid deadlock by local interrupt
This is observed in SRIOV case with virtual KMS as display.
_raw_spin_lock_irqsave+0x37/0x40
drm_handle_vblank+0x69/0x350 [drm]
? try_to_wake_up+0x432/0x5c0
? amdgpu_vkms_prepare_fb+0x1c0/0x1c0 [amdgpu]
drm_crtc_handle_vblank+0x17/0x20 [drm]
amdgpu_vkms_vblank_simulate+0x4d/0x80 [amdgpu]
__hrtimer_run_queues+0xfb/0x230
hrtimer_interrupt+0x109/0x220
__sysvec_apic_timer_interrupt+0x64/0xe0
asm_call_irq_on_stack+0x12/0x20
Fixes: ba5317109d0c("drm/amdgpu: create amdgpu_vkms (v4)")
Signed-off-by: Guchun Chen <guchun.chen@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
index 2dcc68e04e84..d99c8779b51e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
@@ -144,15 +144,16 @@ static void amdgpu_vkms_crtc_atomic_disable(struct drm_crtc *crtc,
static void amdgpu_vkms_crtc_atomic_flush(struct drm_crtc *crtc,
struct drm_atomic_state *state)
{
+ unsigned long flags;
if (crtc->state->event) {
- spin_lock(&crtc->dev->event_lock);
+ spin_lock_irqsave(&crtc->dev->event_lock, flags);
if (drm_crtc_vblank_get(crtc) != 0)
drm_crtc_send_vblank_event(crtc, crtc->state->event);
else
drm_crtc_arm_vblank_event(crtc, crtc->state->event);
- spin_unlock(&crtc->dev->event_lock);
+ spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
crtc->state->event = NULL;
}
--
2.17.1
[-- Attachment #2: Type: text/html, Size: 4667 bytes --]
^ permalink raw reply related [flat|nested] 7+ messages in thread
* RE: [PATCH] drm/amdgpu: use spin_lock_irqsave to avoid deadlock by local interrupt
2022-01-10 15:41 ` Zytaruk, Kelly
@ 2022-01-11 3:00 ` Chen, Guchun
2022-01-11 4:14 ` Zytaruk, Kelly
0 siblings, 1 reply; 7+ messages in thread
From: Chen, Guchun @ 2022-01-11 3:00 UTC (permalink / raw)
To: Zytaruk, Kelly, amd-gfx, Deucher, Alexander, Koenig, Christian,
Pan, Xinhui, Huang, Qiliang (Warden),
Zhang, Bokun
[Public]
Thanks Kelly. I will push this patch with a tag like "Tested-by: Zytaruk, Kelly <kelly.zytaruk@amd.com>". Pls let me know if you have any concern.
Regards,
Guchun
-----Original Message-----
From: Zytaruk, Kelly <Kelly.Zytaruk@amd.com>
Sent: Monday, January 10, 2022 11:42 PM
To: Chen, Guchun <Guchun.Chen@amd.com>; amd-gfx@lists.freedesktop.org; Deucher, Alexander <Alexander.Deucher@amd.com>; Koenig, Christian <Christian.Koenig@amd.com>; Pan, Xinhui <Xinhui.Pan@amd.com>; Huang, Qiliang (Warden) <Qiliang.Huang@amd.com>; Zhang, Bokun <Bokun.Zhang@amd.com>
Subject: RE: [PATCH] drm/amdgpu: use spin_lock_irqsave to avoid deadlock by local interrupt
I can confirm that the fault no longer occurs when the patch is implemented.
Thanks,
Kelly
-----Original Message-----
From: Chen, Guchun <Guchun.Chen@amd.com>
Sent: January 10, 2022 12:14 AM
To: amd-gfx@lists.freedesktop.org; Deucher, Alexander <Alexander.Deucher@amd.com>; Koenig, Christian <Christian.Koenig@amd.com>; Pan, Xinhui <Xinhui.Pan@amd.com>; Zytaruk, Kelly <Kelly.Zytaruk@amd.com>; Huang, Qiliang (Warden) <Qiliang.Huang@amd.com>; Zhang, Bokun <Bokun.Zhang@amd.com>
Cc: Chen, Guchun <Guchun.Chen@amd.com>
Subject: [PATCH] drm/amdgpu: use spin_lock_irqsave to avoid deadlock by local interrupt
This is observed in SRIOV case with virtual KMS as display.
_raw_spin_lock_irqsave+0x37/0x40
drm_handle_vblank+0x69/0x350 [drm]
? try_to_wake_up+0x432/0x5c0
? amdgpu_vkms_prepare_fb+0x1c0/0x1c0 [amdgpu]
drm_crtc_handle_vblank+0x17/0x20 [drm]
amdgpu_vkms_vblank_simulate+0x4d/0x80 [amdgpu]
__hrtimer_run_queues+0xfb/0x230
hrtimer_interrupt+0x109/0x220
__sysvec_apic_timer_interrupt+0x64/0xe0
asm_call_irq_on_stack+0x12/0x20
Fixes: ba5317109d0c("drm/amdgpu: create amdgpu_vkms (v4)")
Signed-off-by: Guchun Chen <guchun.chen@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
index 2dcc68e04e84..d99c8779b51e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
@@ -144,15 +144,16 @@ static void amdgpu_vkms_crtc_atomic_disable(struct drm_crtc *crtc, static void amdgpu_vkms_crtc_atomic_flush(struct drm_crtc *crtc,
struct drm_atomic_state *state)
{
+ unsigned long flags;
if (crtc->state->event) {
- spin_lock(&crtc->dev->event_lock);
+ spin_lock_irqsave(&crtc->dev->event_lock, flags);
if (drm_crtc_vblank_get(crtc) != 0)
drm_crtc_send_vblank_event(crtc, crtc->state->event);
else
drm_crtc_arm_vblank_event(crtc, crtc->state->event);
- spin_unlock(&crtc->dev->event_lock);
+ spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
crtc->state->event = NULL;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* RE: [PATCH] drm/amdgpu: use spin_lock_irqsave to avoid deadlock by local interrupt
2022-01-11 3:00 ` Chen, Guchun
@ 2022-01-11 4:14 ` Zytaruk, Kelly
0 siblings, 0 replies; 7+ messages in thread
From: Zytaruk, Kelly @ 2022-01-11 4:14 UTC (permalink / raw)
To: Chen, Guchun, amd-gfx, Deucher, Alexander, Koenig, Christian,
Pan, Xinhui, Huang, Qiliang (Warden),
Zhang, Bokun
Thanks Guchun.
Tag is okay.
Kelly
-----Original Message-----
From: Chen, Guchun <Guchun.Chen@amd.com>
Sent: January 10, 2022 10:01 PM
To: Zytaruk, Kelly <Kelly.Zytaruk@amd.com>; amd-gfx@lists.freedesktop.org; Deucher, Alexander <Alexander.Deucher@amd.com>; Koenig, Christian <Christian.Koenig@amd.com>; Pan, Xinhui <Xinhui.Pan@amd.com>; Huang, Qiliang (Warden) <Qiliang.Huang@amd.com>; Zhang, Bokun <Bokun.Zhang@amd.com>
Subject: RE: [PATCH] drm/amdgpu: use spin_lock_irqsave to avoid deadlock by local interrupt
[Public]
Thanks Kelly. I will push this patch with a tag like "Tested-by: Zytaruk, Kelly <kelly.zytaruk@amd.com>". Pls let me know if you have any concern.
Regards,
Guchun
-----Original Message-----
From: Zytaruk, Kelly <Kelly.Zytaruk@amd.com>
Sent: Monday, January 10, 2022 11:42 PM
To: Chen, Guchun <Guchun.Chen@amd.com>; amd-gfx@lists.freedesktop.org; Deucher, Alexander <Alexander.Deucher@amd.com>; Koenig, Christian <Christian.Koenig@amd.com>; Pan, Xinhui <Xinhui.Pan@amd.com>; Huang, Qiliang (Warden) <Qiliang.Huang@amd.com>; Zhang, Bokun <Bokun.Zhang@amd.com>
Subject: RE: [PATCH] drm/amdgpu: use spin_lock_irqsave to avoid deadlock by local interrupt
I can confirm that the fault no longer occurs when the patch is implemented.
Thanks,
Kelly
-----Original Message-----
From: Chen, Guchun <Guchun.Chen@amd.com>
Sent: January 10, 2022 12:14 AM
To: amd-gfx@lists.freedesktop.org; Deucher, Alexander <Alexander.Deucher@amd.com>; Koenig, Christian <Christian.Koenig@amd.com>; Pan, Xinhui <Xinhui.Pan@amd.com>; Zytaruk, Kelly <Kelly.Zytaruk@amd.com>; Huang, Qiliang (Warden) <Qiliang.Huang@amd.com>; Zhang, Bokun <Bokun.Zhang@amd.com>
Cc: Chen, Guchun <Guchun.Chen@amd.com>
Subject: [PATCH] drm/amdgpu: use spin_lock_irqsave to avoid deadlock by local interrupt
This is observed in SRIOV case with virtual KMS as display.
_raw_spin_lock_irqsave+0x37/0x40
drm_handle_vblank+0x69/0x350 [drm]
? try_to_wake_up+0x432/0x5c0
? amdgpu_vkms_prepare_fb+0x1c0/0x1c0 [amdgpu]
drm_crtc_handle_vblank+0x17/0x20 [drm]
amdgpu_vkms_vblank_simulate+0x4d/0x80 [amdgpu]
__hrtimer_run_queues+0xfb/0x230
hrtimer_interrupt+0x109/0x220
__sysvec_apic_timer_interrupt+0x64/0xe0
asm_call_irq_on_stack+0x12/0x20
Fixes: ba5317109d0c("drm/amdgpu: create amdgpu_vkms (v4)")
Signed-off-by: Guchun Chen <guchun.chen@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
index 2dcc68e04e84..d99c8779b51e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
@@ -144,15 +144,16 @@ static void amdgpu_vkms_crtc_atomic_disable(struct drm_crtc *crtc, static void amdgpu_vkms_crtc_atomic_flush(struct drm_crtc *crtc,
struct drm_atomic_state *state)
{
+ unsigned long flags;
if (crtc->state->event) {
- spin_lock(&crtc->dev->event_lock);
+ spin_lock_irqsave(&crtc->dev->event_lock, flags);
if (drm_crtc_vblank_get(crtc) != 0)
drm_crtc_send_vblank_event(crtc, crtc->state->event);
else
drm_crtc_arm_vblank_event(crtc, crtc->state->event);
- spin_unlock(&crtc->dev->event_lock);
+ spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
crtc->state->event = NULL;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/amdgpu: use spin_lock_irqsave to avoid deadlock by local interrupt
2022-01-11 5:21 Guchun Chen
@ 2022-01-11 10:50 ` Christian König
0 siblings, 0 replies; 7+ messages in thread
From: Christian König @ 2022-01-11 10:50 UTC (permalink / raw)
To: Guchun Chen, amd-gfx, alexander.deucher, xinhui.pan,
kelly.zytaruk, qiliang.huang, bokun.zhang
Am 11.01.22 um 06:21 schrieb Guchun Chen:
> This is observed in SRIOV case with virtual KMS as display.
>
> _raw_spin_lock_irqsave+0x37/0x40
> drm_handle_vblank+0x69/0x350 [drm]
> ? try_to_wake_up+0x432/0x5c0
> ? amdgpu_vkms_prepare_fb+0x1c0/0x1c0 [amdgpu]
> drm_crtc_handle_vblank+0x17/0x20 [drm]
> amdgpu_vkms_vblank_simulate+0x4d/0x80 [amdgpu]
> __hrtimer_run_queues+0xfb/0x230
> hrtimer_interrupt+0x109/0x220
> __sysvec_apic_timer_interrupt+0x64/0xe0
> asm_call_irq_on_stack+0x12/0x20
>
> Fixes: ba5317109d0c("drm/amdgpu: create amdgpu_vkms (v4)")
> Signed-off-by: Guchun Chen <guchun.chen@amd.com>
> Acked-by: Alex Deucher <alexander.deucher@amd.com>
> Tested-by: Kelly Zytaruk <kelly.zytaruk@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
> index 2dcc68e04e84..d99c8779b51e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
> @@ -144,15 +144,16 @@ static void amdgpu_vkms_crtc_atomic_disable(struct drm_crtc *crtc,
> static void amdgpu_vkms_crtc_atomic_flush(struct drm_crtc *crtc,
> struct drm_atomic_state *state)
> {
> + unsigned long flags;
> if (crtc->state->event) {
Please add an empty line between decleration and code, apart from that
feel free to add an Acked-by: Christian König <christian.koenig@amd.com>
to the patch as well.
Regards,
Christian.
> - spin_lock(&crtc->dev->event_lock);
> + spin_lock_irqsave(&crtc->dev->event_lock, flags);
>
> if (drm_crtc_vblank_get(crtc) != 0)
> drm_crtc_send_vblank_event(crtc, crtc->state->event);
> else
> drm_crtc_arm_vblank_event(crtc, crtc->state->event);
>
> - spin_unlock(&crtc->dev->event_lock);
> + spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
>
> crtc->state->event = NULL;
> }
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] drm/amdgpu: use spin_lock_irqsave to avoid deadlock by local interrupt
@ 2022-01-11 5:21 Guchun Chen
2022-01-11 10:50 ` Christian König
0 siblings, 1 reply; 7+ messages in thread
From: Guchun Chen @ 2022-01-11 5:21 UTC (permalink / raw)
To: amd-gfx, alexander.deucher, christian.koenig, xinhui.pan,
kelly.zytaruk, qiliang.huang, bokun.zhang
Cc: Guchun Chen
This is observed in SRIOV case with virtual KMS as display.
_raw_spin_lock_irqsave+0x37/0x40
drm_handle_vblank+0x69/0x350 [drm]
? try_to_wake_up+0x432/0x5c0
? amdgpu_vkms_prepare_fb+0x1c0/0x1c0 [amdgpu]
drm_crtc_handle_vblank+0x17/0x20 [drm]
amdgpu_vkms_vblank_simulate+0x4d/0x80 [amdgpu]
__hrtimer_run_queues+0xfb/0x230
hrtimer_interrupt+0x109/0x220
__sysvec_apic_timer_interrupt+0x64/0xe0
asm_call_irq_on_stack+0x12/0x20
Fixes: ba5317109d0c("drm/amdgpu: create amdgpu_vkms (v4)")
Signed-off-by: Guchun Chen <guchun.chen@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Tested-by: Kelly Zytaruk <kelly.zytaruk@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
index 2dcc68e04e84..d99c8779b51e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
@@ -144,15 +144,16 @@ static void amdgpu_vkms_crtc_atomic_disable(struct drm_crtc *crtc,
static void amdgpu_vkms_crtc_atomic_flush(struct drm_crtc *crtc,
struct drm_atomic_state *state)
{
+ unsigned long flags;
if (crtc->state->event) {
- spin_lock(&crtc->dev->event_lock);
+ spin_lock_irqsave(&crtc->dev->event_lock, flags);
if (drm_crtc_vblank_get(crtc) != 0)
drm_crtc_send_vblank_event(crtc, crtc->state->event);
else
drm_crtc_arm_vblank_event(crtc, crtc->state->event);
- spin_unlock(&crtc->dev->event_lock);
+ spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
crtc->state->event = NULL;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-01-11 10:50 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-10 5:13 [PATCH] drm/amdgpu: use spin_lock_irqsave to avoid deadlock by local interrupt Guchun Chen
2022-01-10 15:41 ` Zytaruk, Kelly
2022-01-11 3:00 ` Chen, Guchun
2022-01-11 4:14 ` Zytaruk, Kelly
2022-01-10 16:09 ` Deucher, Alexander
2022-01-11 5:21 Guchun Chen
2022-01-11 10:50 ` Christian König
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.