Merge branch 'master'

5 files changed, 18 insertions, 23 deletions

diff --git a/drivers/video/matrox/matroxfb_DAC1064.c b/drivers/video/matrox/matroxfb_DAC1064.c
index 149680f8bcf0..0fbd9b5149f1 100644
--- a/drivers/video/matrox/matroxfb_DAC1064.c
+++ b/drivers/video/matrox/matroxfb_DAC1064.c
@@ -657,7 +657,6 @@ static int MGA1064_preinit(WPMINFO2) {
         /* ACCESS_FBINFO(capable.cfb4) = 0; ... preinitialized by 0 */
         ACCESS_FBINFO(capable.text) = 1;
         ACCESS_FBINFO(capable.vxres) = vxres_mystique;
-        ACCESS_FBINFO(features.accel.has_cacheflush) = 1;
 
         ACCESS_FBINFO(outputs[0]).output = &m1064;
         ACCESS_FBINFO(outputs[0]).src = ACCESS_FBINFO(outputs[0]).default_src;
@@ -842,7 +841,6 @@ static int MGAG100_preinit(WPMINFO2) {
         /* ACCESS_FBINFO(capable.cfb4) = 0; ... preinitialized by 0 */
         ACCESS_FBINFO(capable.text) = 1;
         ACCESS_FBINFO(capable.vxres) = vxres_g100;
-        ACCESS_FBINFO(features.accel.has_cacheflush) = 1;
         ACCESS_FBINFO(capable.plnwt) = ACCESS_FBINFO(devflags.accelerator) == FB_ACCEL_MATROX_MGAG100
                         ? ACCESS_FBINFO(devflags.sgram) : 1;
 
@@ -980,7 +978,7 @@ static void MGAG100_reset(WPMINFO2) {
                                 hw->MXoptionReg |= 0x40;        /* FIXME... */
                                 pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, hw->MXoptionReg);
                         }
-                        mga_setr(M_EXTVGA_INDEX, 0x06, 0x50);
+                        mga_setr(M_EXTVGA_INDEX, 0x06, 0x00);
                 }
         }
         if (ACCESS_FBINFO(devflags.g450dac)) {
diff --git a/drivers/video/matrox/matroxfb_accel.c b/drivers/video/matrox/matroxfb_accel.c
index c7f3e1321224..a5c825d99466 100644
--- a/drivers/video/matrox/matroxfb_accel.c
+++ b/drivers/video/matrox/matroxfb_accel.c
@@ -122,7 +122,7 @@ void matrox_cfbX_init(WPMINFO2) {
         ACCESS_FBINFO(fbops).fb_copyarea = cfb_copyarea;
         ACCESS_FBINFO(fbops).fb_fillrect = cfb_fillrect;
         ACCESS_FBINFO(fbops).fb_imageblit = cfb_imageblit;
-        ACCESS_FBINFO(fbops).fb_cursor = soft_cursor;
+        ACCESS_FBINFO(fbops).fb_cursor = NULL;
 
         accel = (ACCESS_FBINFO(fbcon).var.accel_flags & FB_ACCELF_TEXT) == FB_ACCELF_TEXT;
 
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
index e02da41f1b26..1e74f4cca53b 100644
--- a/drivers/video/matrox/matroxfb_base.c
+++ b/drivers/video/matrox/matroxfb_base.c
@@ -264,7 +264,6 @@ static void matroxfb_disable_irq(WPMINFO2) {
 }
 
 int matroxfb_wait_for_sync(WPMINFO u_int32_t crtc) {
-        wait_queue_t __wait;
         struct matrox_vsync *vs;
         unsigned int cnt;
         int ret;
@@ -286,7 +285,6 @@ int matroxfb_wait_for_sync(WPMINFO u_int32_t crtc) {
         if (ret) {
                 return ret;
         }
-        init_waitqueue_entry(&__wait, current);
 
         cnt = vs->cnt;
         ret = wait_event_interruptible_timeout(vs->wait, cnt != vs->cnt, HZ/10);
@@ -500,10 +498,6 @@ static int matroxfb_pitch_adjust(CPMINFO int xres, int bpp) {
         } else {
                 xres_new = matroxfb_test_and_set_rounding(PMINFO xres, bpp);
         }
-        if (!xres_new) return 0;
-        if (xres != xres_new) {
-                printk(KERN_INFO "matroxfb: cannot set xres to %d, rounded up to %d\n", xres, xres_new);
-        }
         return xres_new;
 }
 
@@ -1285,7 +1279,7 @@ static int matroxfb_getmemory(WPMINFO unsigned int maxSize, unsigned int *realSi
         vaddr_t vm;
         unsigned int offs;
         unsigned int offs2;
-        unsigned char store, orig;
+        unsigned char orig;
         unsigned char bytes[32];
         unsigned char* tmp;
 
@@ -1301,16 +1295,12 @@ static int matroxfb_getmemory(WPMINFO unsigned int maxSize, unsigned int *realSi
         orig = mga_inb(M_EXTVGA_DATA);
         mga_outb(M_EXTVGA_DATA, orig | 0x80);
 
-        store = mga_readb(vm, 0x1234);
         tmp = bytes;
         for (offs = 0x100000; offs < maxSize; offs += 0x200000)
                 *tmp++ = mga_readb(vm, offs);
         for (offs = 0x100000; offs < maxSize; offs += 0x200000)
                 mga_writeb(vm, offs, 0x02);
-        if (ACCESS_FBINFO(features.accel.has_cacheflush))
-                mga_outb(M_CACHEFLUSH, 0x00);
-        else
-                mga_writeb(vm, 0x1234, 0x99);
+        mga_outb(M_CACHEFLUSH, 0x00);
         for (offs = 0x100000; offs < maxSize; offs += 0x200000) {
                 if (mga_readb(vm, offs) != 0x02)
                         break;
@@ -1321,7 +1311,6 @@ static int matroxfb_getmemory(WPMINFO unsigned int maxSize, unsigned int *realSi
         tmp = bytes;
         for (offs2 = 0x100000; offs2 < maxSize; offs2 += 0x200000)
                 mga_writeb(vm, offs2, *tmp++);
-        mga_writeb(vm, 0x1234, store);
 
         mga_outb(M_EXTVGA_INDEX, 0x03);
         mga_outb(M_EXTVGA_DATA, orig);
@@ -1430,6 +1419,20 @@ static struct board {
                 MGA_1164,
                 &vbMystique,
                 "Mystique 220 (PCI)"},
+        {PCI_VENDOR_ID_MATROX,  PCI_DEVICE_ID_MATROX_MYS_AGP,   0x02,
+                0,                      0,
+                DEVF_VIDEO64BIT | DEVF_CROSS4MB,
+                180000,
+                MGA_1064,
+                &vbMystique,
+                "Mystique (AGP)"},
+        {PCI_VENDOR_ID_MATROX,  PCI_DEVICE_ID_MATROX_MYS_AGP,   0xFF,
+                0,                      0,
+                DEVF_VIDEO64BIT | DEVF_SWAPS | DEVF_CROSS4MB,
+                220000,
+                MGA_1164,
+                &vbMystique,
+                "Mystique 220 (AGP)"},
 #endif
 #ifdef CONFIG_FB_MATROX_G
         {PCI_VENDOR_ID_MATROX,  PCI_DEVICE_ID_MATROX_G100_MM,   0xFF,
diff --git a/drivers/video/matrox/matroxfb_base.h b/drivers/video/matrox/matroxfb_base.h
index 85a0b2558452..a8c47ad2cdb6 100644
--- a/drivers/video/matrox/matroxfb_base.h
+++ b/drivers/video/matrox/matroxfb_base.h
@@ -272,10 +272,6 @@ struct matrox_DAC1064_features {
         u_int8_t        xmiscctrl;
 };
 
-struct matrox_accel_features {
-        int             has_cacheflush;
-};
-
 /* current hardware status */
 struct mavenregs {
         u_int8_t regs[256];
@@ -440,7 +436,6 @@ struct matrox_fb_info {
         struct {
                 struct matrox_pll_features pll;
                 struct matrox_DAC1064_features DAC1064;
-                struct matrox_accel_features accel;
                               } features;
         struct {
                 spinlock_t      DAC;
diff --git a/drivers/video/matrox/matroxfb_crtc2.c b/drivers/video/matrox/matroxfb_crtc2.c
index 429047ac615a..d52d7d825c41 100644
--- a/drivers/video/matrox/matroxfb_crtc2.c
+++ b/drivers/video/matrox/matroxfb_crtc2.c
@@ -576,7 +576,6 @@ static struct fb_ops matroxfb_dh_ops = {
         .fb_fillrect =  cfb_fillrect,
         .fb_copyarea =  cfb_copyarea,
         .fb_imageblit = cfb_imageblit,
-        .fb_cursor =    soft_cursor,
 };
 
 static struct fb_var_screeninfo matroxfb_dh_defined = {