From cf0d16dfaaf545cb0fd4dbe1cd045a9a47c58236 Mon Sep 17 00:00:00 2001
From: Eric Hustvedt <ehustvedt@cecropia.com>
Date: Tue, 20 Jun 2006 14:36:42 -0400
Subject: [PATCH] --- yaml --- r: 37243 b: refs/heads/master c:
 f80d0d23f2010b7682e06449345e8199a2b2619c h: refs/heads/master i:   37241:
 e7d5a9459f6e80e0afd16d93c5a1d4f1742bcdb2   37239:
 5bc37cbb15a8d05e1328538b9bdca69b82fa0bcb v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/video/intelfb/intelfb.h    |  2 ++
 trunk/drivers/video/intelfb/intelfbdrv.c |  2 ++
 trunk/drivers/video/intelfb/intelfbhw.c  | 16 +++++++++++++++-
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 46fbaf5a5396..c721a9a276c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37bced38b3d09c3de7c871790eddde81a3ce57cb
+refs/heads/master: f80d0d23f2010b7682e06449345e8199a2b2619c
diff --git a/trunk/drivers/video/intelfb/intelfb.h b/trunk/drivers/video/intelfb/intelfb.h
index 65ac37071a02..abd4c5632e38 100644
--- a/trunk/drivers/video/intelfb/intelfb.h
+++ b/trunk/drivers/video/intelfb/intelfb.h
@@ -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 --git a/trunk/drivers/video/intelfb/intelfbdrv.c b/trunk/drivers/video/intelfb/intelfbdrv.c
index 08f8241bb92a..9e93f820a939 100644
--- a/trunk/drivers/video/intelfb/intelfbdrv.c
+++ b/trunk/drivers/video/intelfb/intelfbdrv.c
@@ -900,6 +900,8 @@ intelfb_pci_register(struct pci_dev *pdev, const struct pci_device_id *ent)
 	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 --git a/trunk/drivers/video/intelfb/intelfbhw.c b/trunk/drivers/video/intelfb/intelfbhw.c
index 0f9631c2ad33..8038f558611d 100644
--- a/trunk/drivers/video/intelfb/intelfbhw.c
+++ b/trunk/drivers/video/intelfb/intelfbhw.c
@@ -371,7 +371,13 @@ intelfbhw_pan_display(struct fb_var_screeninfo *var, struct fb_info *info)
 
 	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;
 }
@@ -1965,6 +1971,10 @@ intelfbhw_irq(int irq, void *dev_id, struct pt_regs *fp) {
 
 	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;
 	}
@@ -2007,6 +2017,10 @@ intelfbhw_disable_irq(struct intelfb_info *dinfo) {
 	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);