summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMikita Lipski <mikita.lipski@amd.com>2018-05-03 17:08:51 -0400
committerAlex Deucher <alexander.deucher@amd.com>2018-05-29 13:30:38 -0500
commit4ea7fc09539bd2399c1fa7acea14529406120d9e (patch)
tree4b4b45b48d0417c0c702cb79860f13bb0a4bcbd9 /drivers
parent0b19fdc45feffd7569c081fe32a258df3c8ebb9b (diff)
downloadlinux-stable-4ea7fc09539bd2399c1fa7acea14529406120d9e.tar.gz
linux-stable-4ea7fc09539bd2399c1fa7acea14529406120d9e.tar.bz2
linux-stable-4ea7fc09539bd2399c1fa7acea14529406120d9e.zip
drm/amd/display: Do not program interrupt status on disabled crtc
Prevent interrupt programming of a crtc on which the stream is disabled and it doesn't have an OTG to reference. Signed-off-by: Mikita Lipski <mikita.lipski@amd.com> Reviewed-by: Harry Wentland <Harry.Wentland@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
index 4be21bf54749..a910f01838ab 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
@@ -555,6 +555,9 @@ static inline int dm_irq_state(struct amdgpu_device *adev,
return 0;
}
+ if (acrtc->otg_inst == -1)
+ return 0;
+
irq_source = dal_irq_type + acrtc->otg_inst;
st = (state == AMDGPU_IRQ_STATE_ENABLE);