Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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 <jglisse@redhat.com>
Reviewed-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 0c45249f

drivers/gpu/drm/radeon/r600.c

+7 −1
Original line number Diff line number Diff line
@@ -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) {

		r600_disable_interrupts(rdev);

		/* force the active interrupt state to all disabled */

		r600_disable_interrupt_state(rdev);

		return 0;

	}



	if (ASIC_IS_DCE3(rdev)) {

		hpd1 = RREG32(DC_HPD1_INT_CONTROL) & ~DC_HPDx_INT_EN;
@@ -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);