[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xserver-xorg-video-tdfx: Changes to 'debian-experimental'



 debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff |   21 ++++++----
 1 file changed, 13 insertions(+), 8 deletions(-)

New commits:
commit 8859a01e9fb6730dbc559a0a60ab9584581ca4b2
Author: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
Date:   Thu Mar 12 12:17:41 2015 +0100

    refresh patch

diff --git a/debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff b/debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff
index 588f513..75eddfb 100644
--- a/debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff
+++ b/debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff
@@ -1,6 +1,6 @@
---- xserver-xorg-video-tdfx.orig/src/tdfx_driver.c
-+++ xserver-xorg-video-tdfx/src/tdfx_driver.c
-@@ -2689,8 +2689,16 @@
+--- a/src/tdfx_driver.c
++++ b/src/tdfx_driver.c
+@@ -2591,26 +2591,39 @@
    TDFXPtr pTDFX;
  
    TDFXTRACE("TDFXValidMode start\n");
@@ -16,16 +16,21 @@
 +    return MODE_BAD;
 +  }
    /* Banshee doesn't support interlace, but Voodoo 3 and higher do. */
-   pScrn = xf86Screens[scrnIndex];
    pTDFX = TDFXPTR(pScrn);
-@@ -2704,13 +2712,19 @@
+   if (mode->Flags&V_INTERLACE) {
+     switch (pTDFX->ChipType) {
+-      case PCI_CHIP_BANSHEE:
+-        return MODE_BAD;
+       case PCI_CHIP_VELOCITY:
+       case PCI_CHIP_VOODOO3:
+       case PCI_CHIP_VOODOO4:
+       case PCI_CHIP_VOODOO5:
          return MODE_OK;
-         break;
++      case PCI_CHIP_BANSHEE:
        default:
 +        xf86DrvMsg(pScrn->scrnIndex, X_INFO, "rejecting mode with unsupported"
-+	           " interlace flag\n");
++                   " interlace flag\n");
          return MODE_BAD;
-         break;
      }
    }
    /* In clock doubled mode widths must be divisible by 16 instead of 8 */


Reply to: