[PATCH 5/5 2.6.17-rc6-mm2] add vsync interrupt support to intelfb driver

From: Eric Hustvedt <redacted>

[05/05] intelfb: Honor FB_ACTIVATE_VBL for display panning

Extends the intelfb_vsync struct to store panning offset. The interrupt
service routine uses the stored panning offset if a pan is requested
for the vsync. intelfbhw_disable_irq also pans the display if there is a
pending request.

Signed-off-by: Eric Hustvedt <redacted>
Signed-off-by: Dennis Munsie <redacted>
---

drivers/video/intelfb/intelfb.h    |    2 ++
drivers/video/intelfb/intelfbdrv.c |    2 ++
drivers/video/intelfb/intelfbhw.c  |   17 ++++++++++++++++-
3 files changed, 20 insertions(+), 1 deletion(-)

diff -X linux-2.6.17-rc4-vsyncwait/Documentation/dontdiff -Naurp  
linux-2.6.17-rc4-vsyncwait/drivers/video/intelfb/intelfb.h  
linux-2.6.17-rc4-panning/drivers/video/intelfb/intelfb.h

--- linux-2.6.17-rc4-vsyncwait/drivers/video/intelfb/intelfb.h	 

2006-06-09 10:41:06.000000000 -0600

+++ linux-2.6.17-rc4-panning/drivers/video/intelfb/intelfb.h	 

2006-06-09 11:06:08.000000000 -0600

@@ -211,6 +211,8 @@ struct intelfb_heap_data {

struct intelfb_vsync {
	wait_queue_head_t wait;
	unsigned int count;
+	int pan_display;
+	u32 pan_offset;
};
struct intelfb_info {
diff -X linux-2.6.17-rc4-vsyncwait/Documentation/dontdiff -Naurp  
linux-2.6.17-rc4-vsyncwait/drivers/video/intelfb/intelfbdrv.c  
linux-2.6.17-rc4-panning/drivers/video/intelfb/intelfbdrv.c

--- linux-2.6.17-rc4-vsyncwait/drivers/video/intelfb/intelfbdrv.c	 

2006-06-13 12:31:50.000000000 -0600

+++ linux-2.6.17-rc4-panning/drivers/video/intelfb/intelfbdrv.c	 

2006-06-13 12:40:33.000000000 -0600

@@ -900,6 +900,8 @@ intelfb_pci_register(struct pci_dev *pde

	init_waitqueue_head(&dinfo->vsync.wait);
	spin_lock_init(&dinfo->int_lock);
	dinfo->irq_flags = 0;
+	dinfo->vsync.pan_display = 0;
+	dinfo->vsync.pan_offset = 0;
	return 0;
diff -X linux-2.6.17-rc4-vsyncwait/Documentation/dontdiff -Naurp  
linux-2.6.17-rc4-vsyncwait/drivers/video/intelfb/intelfbhw.c  
linux-2.6.17-rc4-panning/drivers/video/intelfb/intelfbhw.c

--- linux-2.6.17-rc4-vsyncwait/drivers/video/intelfb/intelfbhw.c	 

2006-06-13 12:31:22.000000000 -0600

+++ linux-2.6.17-rc4-panning/drivers/video/intelfb/intelfbhw.c	 

2006-06-13 12:40:18.000000000 -0600

@@ -371,7 +371,14 @@ intelfbhw_pan_display(struct fb_var_scre

	offset += dinfo->fb.offset << 12;
-	OUTREG(DSPABASE, offset);
+	dinfo->vsync.pan_offset = offset;
+	if ((var->activate & FB_ACTIVATE_VBL) &&
+	    !intelfbhw_enable_irq(dinfo, 0)) {
+		dinfo->vsync.pan_display = 1;
+	} else {
+		dinfo->vsync.pan_display = 0;
+		OUTREG(DSPABASE, offset);
+	}
	return 0;
}

@@ -2013,6 +2020,10 @@ intelfbhw_irq(int irq, void *dev_id, str

	if (tmp & VSYNC_PIPE_A_INTERRUPT) {
		dinfo->vsync.count++;
+		if (dinfo->vsync.pan_display) {
+			dinfo->vsync.pan_display = 0;
+			OUTREG(DSPABASE, dinfo->vsync.pan_offset);
+		}
		wake_up_interruptible(&dinfo->vsync.wait);
		handled = 1;
	}

@@ -2056,6 +2067,10 @@ intelfbhw_disable_irq(struct intelfb_inf

	u16 tmp;
	if (test_and_clear_bit(0, &dinfo->irq_flags)) {
+		if (dinfo->vsync.pan_display) {
+			dinfo->vsync.pan_display = 0;
+			OUTREG(DSPABASE, dinfo->vsync.pan_offset);
+		}
		spin_lock_irq(&dinfo->int_lock);
		OUTREG16(HWSTAM, 0xffff);
		OUTREG16(IMR, 0xffff);