Filter high-bandwidth modes on G200SE.

3 files changed, 34 insertions, 0 deletions

diff --git a/configure.ac b/configure.ac
index 35b82b9..815782b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -109,6 +109,10 @@ CFLAGS="$XORG_CFLAGS"
 AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
               [XSERVER_LIBPCIACCESS=yes], [XSERVER_LIBPCIACCESS=no],
               [#include "xorg-server.h"])
+AC_CHECK_DECL(xf86ModeBandwidth,
+	      [AC_DEFINE(HAVE_XF86MODEBANDWIDTH, 1, [Have xf86ModeBandwidth])],
+	      [],
+	      [#include "xf86Modes.h"])
 CFLAGS="$save_CFLAGS"
 
 if test "x$XSERVER_LIBPCIACCESS" = xyes; then
diff --git a/src/mga.h b/src/mga.h
index c46fdbb..695e911 100644
--- a/src/mga.h
+++ b/src/mga.h
@@ -454,6 +454,7 @@ typedef struct {
 
     int is_Gx50:1;
     int is_G200SE:1;
+    CARD32		reg_1e24;   /* model revision on g200se */
 
     Bool		Primary;
     Bool		Interleave;
diff --git a/src/mga_driver.c b/src/mga_driver.c
index 52ec22c..981385a 100644
--- a/src/mga_driver.c
+++ b/src/mga_driver.c
@@ -1053,6 +1053,10 @@ MGACountRam(ScrnInfoPtr pScrn)
 
 	base = pMga->FbBase;
 
+	/* XXX bad place for this */
+	if (pMga->is_G200SE)
+	    pMga->reg_1e24 = INREG(0x1e24); /* stash the model for later */
+
 	if (pMga->is_G200SE) {
 	    OUTREG8(MGAREG_SEQ_INDEX, 0x01);
 	    seq1 = INREG8(MGAREG_SEQ_DATA);
@@ -4276,6 +4280,28 @@ MGAFreeScreen(int scrnIndex, int flags)
 
 }
 
+#ifndef HAVE_XF86MODEBANDWIDTH
+
+#define MODE_BANDWIDTH MODE_BAD
+
+/** Calculates the memory bandwidth (in MiB/sec) of a mode. */
+static unsigned int
+xf86ModeBandwidth(DisplayModePtr mode, int depth)
+{
+    float a_active, a_total, active_percent, pixels_per_second;
+    int bytes_per_pixel = (depth + 7) / 8;
+
+    if (!mode->HTotal || !mode->VTotal || !mode->Clock)
+	return 0;
+
+    a_active = mode->HDisplay * mode->VDisplay;
+    a_total = mode->HTotal * mode->VTotal;
+    active_percent = a_active / a_total;
+    pixels_per_second = active_percent * mode->Clock * 1000.0;
+
+    return (unsigned int)(pixels_per_second * bytes_per_pixel / (1024 * 1024));
+}
+#endif
 
 /* Checks if a mode is suitable for the selected chipset. */
 
@@ -4292,6 +4318,9 @@ MGAValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
 	    return MODE_VIRTUAL_X;
 	if (mode->VDisplay > 1200)
 	    return MODE_VIRTUAL_Y;
+	if (pMga->reg_1e24 == 0x01 &&
+	    xf86ModeBandwidth(mode, pScrn->bitsPerPixel) > 256)
+	    return MODE_BANDWIDTH;
     }
 
     lace = 1 + ((mode->Flags & V_INTERLACE) != 0);