X Strike Force X.Org X11 SVN commit: r1314 - in branches/modular/driver/xf86-video-mga-X11R7.0-1.2.1.3/debian: . patches
Author: dnusinow
Date: 2006-02-26 17:29:39 -0500 (Sun, 26 Feb 2006)
New Revision: 1314
Added:
branches/modular/driver/xf86-video-mga-X11R7.0-1.2.1.3/debian/patches/02_mga_increase_minimum_pixel_clock.diff
Modified:
branches/modular/driver/xf86-video-mga-X11R7.0-1.2.1.3/debian/changelog
branches/modular/driver/xf86-video-mga-X11R7.0-1.2.1.3/debian/patches/series
Log:
* Port patches from trunk:
+ general/099m_mga_increase_minimum_pixel_clock.diff
Modified: branches/modular/driver/xf86-video-mga-X11R7.0-1.2.1.3/debian/changelog
===================================================================
--- branches/modular/driver/xf86-video-mga-X11R7.0-1.2.1.3/debian/changelog 2006-02-26 22:26:42 UTC (rev 1313)
+++ branches/modular/driver/xf86-video-mga-X11R7.0-1.2.1.3/debian/changelog 2006-02-26 22:29:39 UTC (rev 1314)
@@ -2,8 +2,9 @@
* Port patches from trunk:
+ general/032_fix_matrox_display.diff
+ + general/099m_mga_increase_minimum_pixel_clock.diff
- -- David Nusinow <dnusinow@debian.org> Sun, 26 Feb 2006 17:26:00 -0500
+ -- David Nusinow <dnusinow@debian.org> Sun, 26 Feb 2006 17:28:53 -0500
xserver-xorg-video-mga (1:1.2.1.3-1) experimental; urgency=low
Added: branches/modular/driver/xf86-video-mga-X11R7.0-1.2.1.3/debian/patches/02_mga_increase_minimum_pixel_clock.diff
===================================================================
--- branches/modular/driver/xf86-video-mga-X11R7.0-1.2.1.3/debian/patches/02_mga_increase_minimum_pixel_clock.diff 2006-02-26 22:26:42 UTC (rev 1313)
+++ branches/modular/driver/xf86-video-mga-X11R7.0-1.2.1.3/debian/patches/02_mga_increase_minimum_pixel_clock.diff 2006-02-26 22:29:39 UTC (rev 1314)
@@ -0,0 +1,21 @@
+Index: xf86-video-mga-X11R7.0-1.2.1.3/src/mga_driver.c
+===================================================================
+--- xf86-video-mga-X11R7.0-1.2.1.3.orig/src/mga_driver.c 2006-01-12 22:54:45.000000000 -0500
++++ xf86-video-mga-X11R7.0-1.2.1.3/src/mga_driver.c 2006-02-26 17:28:33.000000000 -0500
+@@ -1861,8 +1861,14 @@
+
+ /* XXX Set HW cursor use */
+
+- /* Set the min pixel clock */
+- pMga->MinClock = 12000; /* XXX Guess, need to check this */
++ /*
++ * Set the min pixel clock; this was originally guessed to be 12000,
++ * but an MGA G550 user reports that modes with clocks less than 17750
++ * lock up the card. See
++ * <URL: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=261993 >
++ */
++ pMga->MinClock = 17750;
++
+ xf86DrvMsg(pScrn->scrnIndex, X_DEFAULT, "Min pixel clock is %d MHz\n",
+ pMga->MinClock / 1000);
+ /*
Modified: branches/modular/driver/xf86-video-mga-X11R7.0-1.2.1.3/debian/patches/series
===================================================================
--- branches/modular/driver/xf86-video-mga-X11R7.0-1.2.1.3/debian/patches/series 2006-02-26 22:26:42 UTC (rev 1313)
+++ branches/modular/driver/xf86-video-mga-X11R7.0-1.2.1.3/debian/patches/series 2006-02-26 22:29:39 UTC (rev 1314)
@@ -1 +1,2 @@
01_fix_matrox_display.diff
+02_mga_increase_minimum_pixel_clock.diff
Reply to: