View | Details | Raw Unified | Return to bug 15017 | Differences between
and this patch

Collapse All | Expand All

(-)a/drivers/gpu/drm/radeon/r600.c (-2 / +7 lines)
Lines 2473-2480 int r600_irq_set(struct radeon_device *rdev) Link Here
2473
		return -EINVAL;
2473
		return -EINVAL;
2474
	}
2474
	}
2475
	/* don't enable anything if the ih is disabled */
2475
	/* don't enable anything if the ih is disabled */
2476
	if (!rdev->ih.enabled)
2476
	if (!rdev->ih.enabled) {
2477
		r600_disable_interrupts(rdev);
2478
		/* force the active interrupt state to all disabled */
2479
		r600_disable_interrupt_state(rdev);
2477
		return 0;
2480
		return 0;
2481
	}
2478
2482
2479
	if (ASIC_IS_DCE3(rdev)) {
2483
	if (ASIC_IS_DCE3(rdev)) {
2480
		hpd1 = RREG32(DC_HPD1_INT_CONTROL) & ~DC_HPDx_INT_EN;
2484
		hpd1 = RREG32(DC_HPD1_INT_CONTROL) & ~DC_HPDx_INT_EN;
Lines 2692-2697 int r600_irq_process(struct radeon_device *rdev) Link Here
2692
	bool queue_hotplug = false;
2696
	bool queue_hotplug = false;
2693
2697
2694
	DRM_DEBUG("r600_irq_process start: rptr %d, wptr %d\n", rptr, wptr);
2698
	DRM_DEBUG("r600_irq_process start: rptr %d, wptr %d\n", rptr, wptr);
2699
	if (!rdev->ih.enabled)
2700
		return IRQ_NONE;
2695
2701
2696
	spin_lock_irqsave(&rdev->ih.lock, flags);
2702
	spin_lock_irqsave(&rdev->ih.lock, flags);
2697
2703
2698
- 

Return to bug 15017