[arch-commits] Commit in xf86-video-ati (6 files)

Jan de Groot jgc at archlinux.org
Wed May 14 15:43:40 EDT 2008


    Date: Wednesday, May 14, 2008 @ 15:43:40
  Author: jgc
Revision: 1715

Merged revisions 2-1714 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/xf86-video-ati/trunk

........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r586 | alexander | 2008-04-21 10:20:39 +0000 (Mon, 21 Apr 2008) | 2 lines
  
  * rebuilt against mesa 7.0.3rc3
........
  r681 | alexander | 2008-04-21 15:28:25 +0000 (Mon, 21 Apr 2008) | 2 lines
  
  * rebuilt against mesa 7.0.3
........

Modified:
  xf86-video-ati/repos/extra-x86_64/	(properties)
  xf86-video-ati/repos/extra-x86_64/PKGBUILD
Deleted:
  xf86-video-ati/trunk/01_gen_pci_ids.diff
  xf86-video-ati/trunk/02_add_ddc_type_6.diff
  xf86-video-ati/trunk/03_add_option_for_lvds_mode.diff
  xf86-video-ati/trunk/radeon-dualhead-mouse.patch

----------------------------------------+
 repos/extra-x86_64/PKGBUILD            |   12 +-
 trunk/01_gen_pci_ids.diff              |   18 ---
 trunk/02_add_ddc_type_6.diff           |  109 -----------------------
 trunk/03_add_option_for_lvds_mode.diff |  141 -------------------------------
 trunk/radeon-dualhead-mouse.patch      |   62 -------------
 5 files changed, 6 insertions(+), 336 deletions(-)


Property changes on: xf86-video-ati/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /xf86-video-ati/trunk:1
   + /xf86-video-ati/trunk:1-1714

Modified: repos/extra-x86_64/PKGBUILD
===================================================================
--- repos/extra-x86_64/PKGBUILD	2008-05-14 19:42:25 UTC (rev 1714)
+++ repos/extra-x86_64/PKGBUILD	2008-05-14 19:43:40 UTC (rev 1715)
@@ -3,21 +3,19 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xf86-video-ati
 pkgver=6.8.0
-pkgrel=2
-_mesaver="7.0.3-rc2"
+pkgrel=4
+_mesaver="7.0.3"
 pkgdesc="X.org ati video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 depends=('libdrm>=2.3.0')
-makedepends=('pkgconfig' 'xorg-server>=1.4' 'imake' 'mesa>=7.0.3rc2'
+makedepends=('pkgconfig' 'xorg-server>=1.4' 'imake' 'mesa>=7.0.3'
 	     'glproto>=1.4.9' 'xf86driproto' 'diffutils')
 groups=('xorg-video-drivers')
 options=('!libtool')
 license=('custom')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-	http://www.mesa3d.org/beta/MesaLib-${_mesaver}.tar.gz)
-md5sums=('3c97c7925ebf4162eeb3463e23adc0e3'
-         '141f5c1c89b090d0f0bd92522ebb8de9')
+       http://downloads.sourceforge.net/sourceforge/mesa3d/MesaLib-${_mesaver}.tar.bz2)
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
@@ -49,3 +47,5 @@
   cd drivers/dri
   make DESTDIR=${startdir}/pkg install || return 1
 }
+md5sums=('3c97c7925ebf4162eeb3463e23adc0e3'
+         'e6e6379d7793af40a6bc3ce1bace572e')

Deleted: trunk/01_gen_pci_ids.diff
===================================================================
--- trunk/01_gen_pci_ids.diff	2008-05-14 19:42:25 UTC (rev 1714)
+++ trunk/01_gen_pci_ids.diff	2008-05-14 19:43:40 UTC (rev 1715)
@@ -1,18 +0,0 @@
----
- src/Makefile.am |    6 ++++++
- 1 file changed, 6 insertions(+)
-
-Index: xserver-xorg-video-ati/src/Makefile.am
-===================================================================
---- xserver-xorg-video-ati.orig/src/Makefile.am	2007-10-06 02:44:47.000000000 +0200
-+++ xserver-xorg-video-ati/src/Makefile.am	2007-10-06 02:48:34.000000000 +0200
-@@ -192,3 +192,9 @@
- 	theatre_reg.h \
- 	atipciids.h \
- 	atipcirename.h
-+
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = ati.ids
-+
-+ati.ids: atipciids.h
-+	awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/atipciids.h | sed -e 's/0x/1002/' > ati.ids

Deleted: trunk/02_add_ddc_type_6.diff
===================================================================
--- trunk/02_add_ddc_type_6.diff	2008-05-14 19:42:25 UTC (rev 1714)
+++ trunk/02_add_ddc_type_6.diff	2008-05-14 19:43:40 UTC (rev 1715)
@@ -1,109 +0,0 @@
-From: Dave Airlie <airlied at linux.ie>
-Date: Sat, 6 Oct 2007 10:11:19 +0000 (+1000)
-Subject: radeon: add support for DDC type 6
-X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-video-ati.git;a=commitdiff;h=0b03a73b7dcb4aa192c42f2a4c842d324c358122
-
-radeon: add support for DDC type 6
-
-thanks to arekm on xorg-devel for testing/feedback
----
-
---- a/src/radeon_bios.c
-+++ b/src/radeon_bios.c
-@@ -176,6 +176,9 @@ static Bool RADEONGetATOMConnectorInfoFr
- 		case RADEON_LCD_GPIO_MASK:
- 		    info->BiosConnector[i].DDCType = DDC_LCD;
- 		    break;
-+		case RADEON_MDGPIO_EN_REG:
-+		    info->BiosConnector[i].DDCType = DDC_GPIO;
-+		    break;
- 		default:
- 		    info->BiosConnector[i].DDCType = DDC_NONE_DETECTED;
- 		    break;
-@@ -277,7 +280,7 @@ static Bool RADEONGetLegacyConnectorInfo
- 		    tmp1 = RADEON_BIOS8(tmp0+2) & 0x07;
- 		    if (tmp1) {	    
- 			info->BiosConnector[4].DDCType	= tmp1;      
--			if (info->BiosConnector[4].DDCType > DDC_LCD) {
-+			if (info->BiosConnector[4].DDCType > DDC_GPIO) {
- 			    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- 				       "Unknown DDCType %d found\n",
- 				       info->BiosConnector[4].DDCType);
---- a/src/radeon_output.c
-+++ b/src/radeon_output.c
-@@ -75,13 +75,14 @@ const char *TMDSTypeName[4] = {
-   "None"
- };
- 
--const char *DDCTypeName[6] = {
-+const char *DDCTypeName[7] = {
-   "None",
-   "MONID",
-   "DVI_DDC",
-   "VGA_DDC",
-   "CRT2_DDC",
--  "LCD_DDC"
-+  "LCD_DDC",
-+  "GPIO_DDC"
- };
- 
- const char *DACTypeName[4] = {
-@@ -277,7 +278,7 @@ RADEONDisplayDDCConnected(ScrnInfoPtr pS
-     DDCReg = radeon_output->DDCReg;
- 
-     /* Read and output monitor info using DDC2 over I2C bus */
--    if (radeon_output->pI2CBus && info->ddc2 && (DDCReg != RADEON_LCD_GPIO_MASK)) {
-+    if (radeon_output->pI2CBus && info->ddc2 && (DDCReg != RADEON_LCD_GPIO_MASK) && (DDCReg != RADEON_MDGPIO_EN_REG)) {
- 	OUTREG(DDCReg, INREG(DDCReg) &
- 	       (CARD32)~(RADEON_GPIO_A_0 | RADEON_GPIO_A_1));
- 
-@@ -331,7 +332,7 @@ RADEONDisplayDDCConnected(ScrnInfoPtr pS
- 	    usleep(15000);
- 	    if(*MonInfo)  break;
- 	}
--    } else if (radeon_output->pI2CBus && info->ddc2 && DDCReg == RADEON_LCD_GPIO_MASK) {
-+    } else if (radeon_output->pI2CBus && info->ddc2 && ((DDCReg == RADEON_LCD_GPIO_MASK) || (DDCReg == RADEON_MDGPIO_EN_REG))) {
-          *MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex, radeon_output->pI2CBus);
-     } else {
- 	xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "DDC2/I2C is not properly initialized\n");
-@@ -2206,6 +2207,10 @@ static void RADEONI2CGetBits(I2CBusPtr b
-         val = INREG(b->DriverPrivate.uval+4);
-         *Clock = (val & (1<<13)) != 0;
-         *data  = (val & (1<<12)) != 0;
-+    } else if (b->DriverPrivate.uval == RADEON_MDGPIO_EN_REG) {
-+        val = INREG(b->DriverPrivate.uval+4);
-+        *Clock = (val & (1<<19)) != 0;
-+        *data  = (val & (1<<18)) != 0;
-     } else {
-         val = INREG(b->DriverPrivate.uval);
-         *Clock = (val & RADEON_GPIO_Y_1) != 0;
-@@ -2225,6 +2230,11 @@ static void RADEONI2CPutBits(I2CBusPtr b
-         val |= (Clock ? 0:(1<<13));
-         val |= (data ? 0:(1<<12));
-         OUTREG(b->DriverPrivate.uval, val);
-+    } else if (b->DriverPrivate.uval == RADEON_MDGPIO_EN_REG) {
-+        val = INREG(b->DriverPrivate.uval) & (CARD32)~((1<<18) | (1<<19));
-+        val |= (Clock ? 0:(1<<19));
-+        val |= (data ? 0:(1<<18));
-+        OUTREG(b->DriverPrivate.uval, val);
-     } else {
-         val = INREG(b->DriverPrivate.uval) & (CARD32)~(RADEON_GPIO_EN_0 | RADEON_GPIO_EN_1);
-         val |= (Clock ? 0:RADEON_GPIO_EN_1);
-@@ -2547,6 +2557,7 @@ void RADEONInitConnector(xf86OutputPtr o
-     case DDC_VGA  : DDCReg = RADEON_GPIO_VGA_DDC; break;
-     case DDC_CRT2 : DDCReg = RADEON_GPIO_CRT2_DDC; break;
-     case DDC_LCD  : DDCReg = RADEON_LCD_GPIO_MASK; break;
-+    case DDC_GPIO : DDCReg = RADEON_MDGPIO_EN_REG; break;
-     default: break;
-     }
- 
---- a/src/radeon_probe.h
-+++ b/src/radeon_probe.h
-@@ -60,6 +60,7 @@ typedef enum
-     DDC_VGA,
-     DDC_CRT2,
-     DDC_LCD,
-+    DDC_GPIO,
- } RADEONDDCType;
- 
- typedef enum

Deleted: trunk/03_add_option_for_lvds_mode.diff
===================================================================
--- trunk/03_add_option_for_lvds_mode.diff	2008-05-14 19:42:25 UTC (rev 1714)
+++ trunk/03_add_option_for_lvds_mode.diff	2008-05-14 19:43:40 UTC (rev 1715)
@@ -1,141 +0,0 @@
-From: Alex Deucher <alex at t41p.hsd1.va.comcast.net>
-Date: Sun, 7 Oct 2007 23:39:47 +0000 (-0400)
-Subject: RADEON: still more LVDS fixes
-X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-video-ati.git;a=commitdiff;h=051435610a66735fd455bbb526fa294fcfe8c0b6
-
-RADEON: still more LVDS fixes
-
-Seems some laptops need the native mode from the bios for
-LVDS while others seem to prefer a CVT mode.  Add an option
-to pick the preferred mode.  The default it to use the bios
-table timing.
----
-
---- a/man/radeon.man
-+++ b/man/radeon.man
-@@ -383,6 +383,14 @@ case.  This is only useful for LVDS pane
- The default is
- .B on.
- .TP
-+.BI "Option \*qLVDSBiosNativeMode\*q \*q" boolean \*q
-+On some laptops, the LVDS mode from the timing tables in the bios does 
-+not work properly.  In those cases, a CVT mode seems to work better.  
-+If you get a blank screen or have LVDS display problems, disable this 
-+option to use a CVT mode.  
-+The default is
-+.B on.
-+.TP
- .BI "Option \*qDRI\*q \*q" boolean \*q
- Enable DRI support.  This option allows you to enable to disable the DRI.  
- The default is
---- a/src/radeon.h
-+++ b/src/radeon.h
-@@ -157,7 +157,8 @@ typedef enum {
- #if defined(__powerpc__)
-     OPTION_MAC_MODEL,
- #endif
--    OPTION_DEFAULT_TMDS_PLL
-+    OPTION_DEFAULT_TMDS_PLL,
-+    OPTION_LVDS_BIOS_NATIVE_MODE
- } RADEONOpts;
- 
- 
-@@ -816,6 +817,8 @@ typedef struct {
-     RADEONMacModel    MacModel;
- #endif
- 
-+    Bool              LVDSBiosNativeMode;
-+
-     Rotation rotation;
-     void (*PointerMoved)(int, int, int);
-     CreateScreenResourcesProcPtr CreateScreenResources;
---- a/src/radeon_driver.c
-+++ b/src/radeon_driver.c
-@@ -190,6 +190,7 @@ static const OptionInfoRec RADEONOptions
- #if defined(__powerpc__)
-     { OPTION_MAC_MODEL,      "MacModel",         OPTV_STRING,  {0}, FALSE },
- #endif
-+    { OPTION_LVDS_BIOS_NATIVE_MODE, "LVDSBiosNativeMode", OPTV_BOOLEAN, {0}, TRUE },
-     { -1,                    NULL,               OPTV_NONE,    {0}, FALSE }
- };
- 
---- a/src/radeon_modes.c
-+++ b/src/radeon_modes.c
-@@ -95,20 +95,45 @@ static DisplayModePtr RADEONTVModes(xf86
- static DisplayModePtr RADEONFPNativeMode(xf86OutputPtr output)
- {
-     ScrnInfoPtr pScrn = output->scrn;
-+    RADEONInfoPtr info = RADEONPTR(pScrn);
-     RADEONOutputPrivatePtr radeon_output = output->driver_private;
-     DisplayModePtr  new   = NULL;
-+    char            stmp[32];
- 
-     if (radeon_output->PanelXRes != 0 &&
- 	radeon_output->PanelYRes != 0 &&
- 	radeon_output->DotClock != 0) {
- 
--	/* Add native panel size */
--	new = xf86CVTMode(radeon_output->PanelXRes, radeon_output->PanelYRes, 60.0, TRUE, FALSE);
-+	if (info->LVDSBiosNativeMode) {
-+	    new             = xnfcalloc(1, sizeof (DisplayModeRec));
-+	    sprintf(stmp, "%dx%d", radeon_output->PanelXRes, radeon_output->PanelYRes);
-+	    new->name       = xnfalloc(strlen(stmp) + 1);
-+	    strcpy(new->name, stmp);
-+	    new->HDisplay   = radeon_output->PanelXRes;
-+	    new->VDisplay   = radeon_output->PanelYRes;
-+
-+	    new->HTotal     = new->HDisplay + radeon_output->HBlank;
-+	    new->HSyncStart = new->HDisplay + radeon_output->HOverPlus;
-+	    new->HSyncEnd   = new->HSyncStart + radeon_output->HSyncWidth;
-+	    new->VTotal     = new->VDisplay + radeon_output->VBlank;
-+	    new->VSyncStart = new->VDisplay + radeon_output->VOverPlus;
-+	    new->VSyncEnd   = new->VSyncStart + radeon_output->VSyncWidth;
-+
-+	    new->Clock      = radeon_output->DotClock;
-+	    new->Flags      = 0;
-+
-+	} else {
-+	    /* Add native panel size */
-+	    new = xf86CVTMode(radeon_output->PanelXRes, radeon_output->PanelYRes, 60.0, FALSE, FALSE);
- 
--	new->type       = M_T_DRIVER | M_T_PREFERRED;
-+	}
- 
--	new->next       = NULL;
--	new->prev       = NULL;
-+	if (new) {
-+	    new->type       = M_T_DRIVER | M_T_PREFERRED;
-+
-+	    new->next       = NULL;
-+	    new->prev       = NULL;
-+	}
- 
- 	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Added native panel mode: %dx%d\n",
- 		   radeon_output->PanelXRes, radeon_output->PanelYRes);
-@@ -159,7 +184,7 @@ static void RADEONAddScreenModes(xf86Out
- 	    }
- 	}
- 
--	new = xf86CVTMode(width, height, 60.0, TRUE, FALSE);
-+	new = xf86CVTMode(width, height, 60.0, FALSE, FALSE);
- 
- 	new->type      |= M_T_USERDEF;
- 
---- a/src/radeon_output.c
-+++ b/src/radeon_output.c
-@@ -2440,6 +2440,15 @@ RADEONGetLVDSInfo (xf86OutputPtr output)
- 	}
-     }
- 
-+    info->LVDSBiosNativeMode = TRUE;
-+    if (!xf86ReturnOptValBool(info->Options, OPTION_LVDS_BIOS_NATIVE_MODE, TRUE)) {
-+	info->LVDSBiosNativeMode = FALSE;
-+	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Using CVT mode for LVDS\n");
-+    } else {
-+	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Using LVDS Native Mode\n");
-+    }
-+
-+
-     /* The panel size we collected from BIOS may not be the
-      * maximum size supported by the panel.  If not, we update
-      * it now.  These will be used if no matching mode can be

Deleted: trunk/radeon-dualhead-mouse.patch
===================================================================
--- trunk/radeon-dualhead-mouse.patch	2008-05-14 19:42:25 UTC (rev 1714)
+++ trunk/radeon-dualhead-mouse.patch	2008-05-14 19:43:40 UTC (rev 1715)
@@ -1,62 +0,0 @@
-From: Michel Dänzer <michel at tungstengraphics.com>
-Date: Mon, 5 Nov 2007 09:30:23 +0000 (+0100)
-Subject: Revert "radeon: Reinstate sync in radeon_crtc_show/hide_cursor."
-X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-video-ati.git;a=commitdiff;h=d41d73f5f9d8baee7137e94da2c7852ea0412180
-
-Revert "radeon: Reinstate sync in radeon_crtc_show/hide_cursor."
-
-This reverts commit 0241cac643fa1c08a45ea44f5c670b290e760ad8.
-
-Taking the DRI lock in paths called from the SIGIO handler isn't safe. For
-example, the SIGIO handler may be called while the lock is held by an AIGLX
-context, resulting in deadlock. See e.g.
-https://bugs.freedesktop.org/show_bug.cgi?id=13005 .
----
-
---- a/src/radeon_cursor.c
-+++ b/src/radeon_cursor.c
-@@ -98,22 +98,12 @@ radeon_crtc_show_cursor (xf86CrtcPtr crt
-     RADEONInfoPtr      info       = RADEONPTR(pScrn);
-     unsigned char     *RADEONMMIO = info->MMIO;
- 
--#ifdef XF86DRI
--    if (info->CPStarted && pScrn->pScreen) DRILock(pScrn->pScreen, 0);
--#endif
--
--    RADEON_SYNC(info, pScrn);
--
-     if (crtc_id == 0) 
- 	OUTREGP(RADEON_CRTC_GEN_CNTL, RADEON_CRTC_CUR_EN | 2 << 20, 
- 		~(RADEON_CRTC_CUR_EN | RADEON_CRTC_CUR_MODE_MASK));
-     else if (crtc_id == 1)
- 	OUTREGP(RADEON_CRTC2_GEN_CNTL, RADEON_CRTC2_CUR_EN | 2 << 20,
- 		~(RADEON_CRTC2_CUR_EN | RADEON_CRTC2_CUR_MODE_MASK));
--
--#ifdef XF86DRI
--    if (info->CPStarted && pScrn->pScreen) DRIUnlock(pScrn->pScreen);
--#endif
- }
- 
- void
-@@ -125,20 +115,12 @@ radeon_crtc_hide_cursor (xf86CrtcPtr crt
-     RADEONInfoPtr      info       = RADEONPTR(pScrn);
-     unsigned char     *RADEONMMIO = info->MMIO;
- 
--#ifdef XF86DRI
--    if (info->CPStarted && pScrn->pScreen) DRILock(pScrn->pScreen, 0);
--#endif
--
--    RADEON_SYNC(info, pScrn);
--
-     if (crtc_id == 0)
- 	OUTREGP(RADEON_CRTC_GEN_CNTL, 0, ~RADEON_CRTC_CUR_EN);
-     else if (crtc_id == 1)
- 	OUTREGP(RADEON_CRTC2_GEN_CNTL, 0, ~RADEON_CRTC2_CUR_EN);
- 
--#ifdef XF86DRI
--    if (info->CPStarted && pScrn->pScreen) DRIUnlock(pScrn->pScreen);
--#endif
-+
- }
- 
- void





More information about the arch-commits mailing list