Commit ee93b86b authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: remove gui_idle interrupt infrastructure 



It was only used for dynpm, but has been replaced with
a better implementation using fences.  Remove it.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 95f5a3ac

drivers/gpu/drm/radeon/evergreen.c

+0 −5
Original line number Diff line number Diff line
@@ -2528,10 +2528,6 @@ int evergreen_irq_set(struct radeon_device *rdev) 
		DRM_DEBUG("evergreen_irq_set: hdmi 5\n");

		afmt6 |= AFMT_AZ_FORMAT_WTRIG_MASK;

	}

	if (rdev->irq.gui_idle) {

		DRM_DEBUG("gui idle\n");

		grbm_int_cntl |= GUI_IDLE_INT_ENABLE;

	}



	if (rdev->family >= CHIP_CAYMAN) {

		cayman_cp_int_cntl_setup(rdev, 0, cp_int_cntl);
@@ -3066,7 +3062,6 @@ int evergreen_irq_process(struct radeon_device *rdev) 
			break;

		case 233: /* GUI IDLE */

			DRM_DEBUG("IH: GUI idle\n");

			wake_up(&rdev->irq.idle_queue);

			break;

		default:

			DRM_DEBUG("Unhandled interrupt: %d %d\n", src_id, src_data);

drivers/gpu/drm/radeon/r100.c

+0 −19
Original line number Diff line number Diff line
@@ -700,9 +700,6 @@ int r100_irq_set(struct radeon_device *rdev) 
	if (atomic_read(&rdev->irq.ring_int[RADEON_RING_TYPE_GFX_INDEX])) {

		tmp |= RADEON_SW_INT_ENABLE;

	}

	if (rdev->irq.gui_idle) {

		tmp |= RADEON_GUI_IDLE_MASK;

	}

	if (rdev->irq.crtc_vblank_int[0] ||

	    atomic_read(&rdev->irq.pflip[0])) {

		tmp |= RADEON_CRTC_VBLANK_MASK;
@@ -739,12 +736,6 @@ static uint32_t r100_irq_ack(struct radeon_device *rdev) 
		RADEON_CRTC_VBLANK_STAT | RADEON_CRTC2_VBLANK_STAT |

		RADEON_FP_DETECT_STAT | RADEON_FP2_DETECT_STAT;



	/* the interrupt works, but the status bit is permanently asserted */

	if (rdev->irq.gui_idle && radeon_gui_idle(rdev)) {

		if (!rdev->irq.gui_idle_acked)

			irq_mask |= RADEON_GUI_IDLE_STAT;

	}



	if (irqs) {

		WREG32(RADEON_GEN_INT_STATUS, irqs);

	}
@@ -756,9 +747,6 @@ int r100_irq_process(struct radeon_device *rdev) 
	uint32_t status, msi_rearm;

	bool queue_hotplug = false;



	/* reset gui idle ack.  the status bit is broken */

	rdev->irq.gui_idle_acked = false;



	status = r100_irq_ack(rdev);

	if (!status) {

		return IRQ_NONE;
@@ -771,11 +759,6 @@ int r100_irq_process(struct radeon_device *rdev) 
		if (status & RADEON_SW_INT_TEST) {

			radeon_fence_process(rdev, RADEON_RING_TYPE_GFX_INDEX);

		}

		/* gui idle interrupt */

		if (status & RADEON_GUI_IDLE_STAT) {

			rdev->irq.gui_idle_acked = true;

			wake_up(&rdev->irq.idle_queue);

		}

		/* Vertical blank interrupts */

		if (status & RADEON_CRTC_VBLANK_STAT) {

			if (rdev->irq.crtc_vblank_int[0]) {
@@ -805,8 +788,6 @@ int r100_irq_process(struct radeon_device *rdev) 
		}

		status = r100_irq_ack(rdev);

	}

	/* reset gui idle ack.  the status bit is broken */

	rdev->irq.gui_idle_acked = false;

	if (queue_hotplug)

		schedule_work(&rdev->hotplug_work);

	if (rdev->msi_enabled) {

drivers/gpu/drm/radeon/r600.c

+0 −5
Original line number Diff line number Diff line
@@ -3088,10 +3088,6 @@ int r600_irq_set(struct radeon_device *rdev) 
		DRM_DEBUG("r600_irq_set: hdmi 0\n");

		hdmi1 |= HDMI0_AZ_FORMAT_WTRIG_MASK;

	}

	if (rdev->irq.gui_idle) {

		DRM_DEBUG("gui idle\n");

		grbm_int_cntl |= GUI_IDLE_INT_ENABLE;

	}



	WREG32(CP_INT_CNTL, cp_int_cntl);

	WREG32(DxMODE_INT_MASK, mode_int);
@@ -3475,7 +3471,6 @@ int r600_irq_process(struct radeon_device *rdev) 
			break;

		case 233: /* GUI IDLE */

			DRM_DEBUG("IH: GUI idle\n");

			wake_up(&rdev->irq.idle_queue);

			break;

		default:

			DRM_DEBUG("Unhandled interrupt: %d %d\n", src_id, src_data);

drivers/gpu/drm/radeon/radeon.h

+0 −4
Original line number Diff line number Diff line
@@ -566,9 +566,6 @@ struct radeon_irq { 
	atomic_t			pflip[RADEON_MAX_CRTCS];

	wait_queue_head_t		vblank_queue;

	bool				hpd[RADEON_MAX_HPD_PINS];

	bool				gui_idle;

	bool				gui_idle_acked;

	wait_queue_head_t		idle_queue;

	bool				afmt[RADEON_MAX_AFMT_BLOCKS];

	union radeon_irq_stat_regs	stat_regs;

};
@@ -583,7 +580,6 @@ void radeon_irq_kms_enable_afmt(struct radeon_device *rdev, int block); 
void radeon_irq_kms_disable_afmt(struct radeon_device *rdev, int block);

void radeon_irq_kms_enable_hpd(struct radeon_device *rdev, unsigned hpd_mask);

void radeon_irq_kms_disable_hpd(struct radeon_device *rdev, unsigned hpd_mask);

int radeon_irq_kms_wait_gui_idle(struct radeon_device *rdev);



/*

 * CP & rings.

drivers/gpu/drm/radeon/radeon_device.c

+0 −1
Original line number Diff line number Diff line
@@ -1013,7 +1013,6 @@ int radeon_device_init(struct radeon_device *rdev, 
	init_rwsem(&rdev->pm.mclk_lock);

	init_rwsem(&rdev->exclusive_lock);

	init_waitqueue_head(&rdev->irq.vblank_queue);

	init_waitqueue_head(&rdev->irq.idle_queue);

	r = radeon_gem_init(rdev);

	if (r)

		return r;