Commit 79c2bbc5 authored by Jerome Glisse's avatar Jerome Glisse Committed by Dave Airlie
Browse files

drm/radeon/kms: r600/r700 don't process IRQ if not initialized

In some rare case the wptr returned from the hw wasn't 0 and leaded
to trick r600_process_irq that their were irq to process. Add a
check to bail out if irq hasn't been initialized this will avoid
oops provoqued by the rare wptr != 0 on initialization.
Signed-off-by: default avatarJerome Glisse <>
Reviewed-by: default avatarAlex Deucher <>
Signed-off-by: default avatarDave Airlie <>
parent 0c45249f
......@@ -2473,8 +2473,12 @@ int r600_irq_set(struct radeon_device *rdev)
return -EINVAL;
/* don't enable anything if the ih is disabled */
if (!rdev->ih.enabled)
if (!rdev->ih.enabled) {
/* force the active interrupt state to all disabled */
return 0;
if (ASIC_IS_DCE3(rdev)) {
......@@ -2692,6 +2696,8 @@ int r600_irq_process(struct radeon_device *rdev)
bool queue_hotplug = false;
DRM_DEBUG("r600_irq_process start: rptr %d, wptr %d\n", rptr, wptr);
if (!rdev->ih.enabled)
return IRQ_NONE;
spin_lock_irqsave(&rdev->ih.lock, flags);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment