rpms/xorg-x11-drv-ati/F-9 radeon-git-upstream-fixes2.patch, 1.7, 1.8 xorg-x11-drv-ati.spec, 1.98, 1.99

Dave Airlie (airlied) fedora-extras-commits at redhat.com
Thu Jun 26 06:28:41 UTC 2008 

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21841

Modified Files:
	radeon-git-upstream-fixes2.patch xorg-x11-drv-ati.spec 
Log Message:
* Thu Jun 26 2008 Dave Airlie <airlied at redhat.com> 6.8.0-18
- update to latest git 6.8.192 beta


radeon-git-upstream-fixes2.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.7 -r 1.8 radeon-git-upstream-fixes2.patch
Index: radeon-git-upstream-fixes2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-9/radeon-git-upstream-fixes2.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- radeon-git-upstream-fixes2.patch	28 May 2008 06:27:52 -0000	1.7
+++ radeon-git-upstream-fixes2.patch	26 Jun 2008 06:27:58 -0000	1.8
@@ -1,1499 +1,16 @@
-commit faea008806802ec0e045754ec1eca492ebae320e
-Author: Alex Deucher <alex at botch2.com>
-Date:   Tue May 27 18:36:01 2008 -0400
-
-    R3/4/5xx: use get_param to get the num_gb_pipes from the drm
-
-commit 965a5dbcd9dc4bf1cdd7f2bbdec15e9733b2e090
-Author: Alex Deucher <alex at botch2.com>
-Date:   Tue May 27 16:48:41 2008 -0400
-
-    RADEON: improve support for secondary cards
-    
-    this should fix bugs 16115, 16035
-
-commit 5f951a5573f0c7572230c9aa4d3f75d67f91ed71
-Author: Alex Deucher <alex at botch2.com>
-Date:   Wed May 21 00:35:14 2008 -0400
-
-    ATOM: remove duplicate code
-
-commit edce33e87fb79a540d8c285f205d4c3f2c2bc9f4
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed May 28 06:43:40 2008 +1000
-
-    radeon: fix surface access on avivo chips.
-    
-    This should fix VT switch on vesafb
-
-commit 307bd65a25ee425d8359dd30572b002ce2338f91
-Author: Michael Babej <mbabej at redhat.com>
-Date:   Tue May 27 19:13:49 2008 +1000
-
-    r600: fix vt switch issue
-    
-    RH BZ 441492
-
-commit bf48c9eb8ec592515be9d1732d60283af715674d
-Author: Dave Airlie <airlied at linux.ie>
-Date:   Sat May 24 11:51:20 2008 +1000
-
-    atombios: for LVDS set use ref div as per legacy
-
-commit 04500c8419b1aeaeac7968492b82e1d7cad1d05b
-Author: Alan Coopersmith <alan.coopersmith at sun.com>
-Date:   Tue May 20 20:34:31 2008 -0700
-
-    Strip ^M's from src/AtomBios/includes/ObjectID.h
-
-commit 521a0488d1c414209c3534dc242000faa332a441
-Author: Alan Coopersmith <alan.coopersmith at sun.com>
-Date:   Tue May 20 20:33:37 2008 -0700
-
-    On non-gcc compilers, use C99's __func__ instead of gcc's __FUNCTION__
-
-commit b7c80d0c86646105d2bce5d4d59ba6c45aa7cafc
-Author: Tobias Diedrich <ranma+freedesktop at tdiedrich.de>
-Date:   Tue May 20 19:16:54 2008 -0400
-
-    R200/R300: fix gamma setup for overlay
-    
-    More pending.  See bug 16001
-
-commit 69423482e2e94637142a9ba675589a1449a346a8
-Author: Alex Deucher <alex at botch2.com>
-Date:   Tue May 20 18:57:13 2008 -0400
-
-    RADEON: cleanup connection detection and remove duplicate code
-
-commit 55e4469f59c82bb5762673de5f3f27d18b0bd9a3
-Author: Alex Deucher <alex at botch2.com>
-Date:   Tue May 20 17:46:58 2008 -0400
-
-    RADEON: enable cloning on multi-crtc cards
-
-commit 12f185634071980041aaac6265d89708b181b215
-Author: Alex Deucher <alex at botch2.com>
-Date:   Tue May 20 16:05:41 2008 -0400
-
-    ATOM: Ignore invalid connector entries
-
-commit 19e97f74e39fc2b35727708ac429de33d0b70162
-Author: Egbert Eich <eich at freedesktop.org>
-Date:   Tue May 20 11:16:15 2008 +0200
-
-    Change RMX code to follow the programming algorithm suggested by ATI.
-    
-    ATI provides the following algorithm to calculate the RMX scaling ratios
-    in its programming specs:
-    when RMX_AUTO_RATIO_HORZ_INC set to 1,Horizontal auto ratio result trucated,
-    and then incremented by 1.
-    Horz_Ratio = ( ((Active display width in characters (including overscan) + 1)
-    / (Panel width in characters)) x 4096 + 1 )
-    else
-    Horz_Ratio = ( ((Active display width in characters (including overscan))
-    / (Panel width in characters)) x 4096 + 1 )
-    
-    when RMX_AUTO_RATIO_VERT_INC set to 1, Vertical auto ratio result trucated,
-    and then incremented by 1.
-    Vert_Ration = ( ((Active display width in characters (including overscan) + 1)
-    / (Panel width in characters)) x 4096 + 1)
-    else
-    Vert_Ration = ( ((Active display width in characters (including overscan))
-    / (Panel width in characters)) x 4096 + 1)
-    
-    This patch implements this behavor. Additionally it avoids the use of floats.
-
-commit a4f3d0088ba763ed8eab1d331959b5ecde8262e8
-Author: Alex Deucher <alex at botch2.com>
-Date:   Tue May 20 11:42:53 2008 -0400
-
-    R3/4/5xx: fixup logic from last commit
-    
-    Spotted by otaylor and MrCooper
-
-commit 130e55738047f2a073bcc47e3e1400f7b694a81b
-Author: Alex Deucher <alex at botch2.com>
-Date:   Tue May 20 11:32:42 2008 -0400
-
-    R3/4/5xx: fix EXA rotation
-    
-    xrandr uses PictOpSrc for rotation which we were falling back on since
-    render semanties require alpha=0 for REPEAT_NONE when there is no alpha
-    channel and there is a transform. If the dst has no alpha channel we
-    should be ok I think.
-    
-    Otayler and I discussed this on IRC.  the more general fix would be
-    to clip the dst to the src and mask for bounded ops like in/add/over
-    in the pixel exact transform case.
-
-commit cc9f510770700228e5d597c872e926a4e99bd950
-Author: Corbin Simpson <MostAwesomeDude at gmail.com>
-Date:   Wed May 14 16:49:01 2008 -0400
-
-    RADEON: missing stdint.h includes
-
-commit 71fa57f871dba03260dba2180ce1dab44048ac1a
-Author: Alex Deucher <alex at cube.(none)>
-Date:   Wed May 14 13:36:38 2008 -0400
-
-    Add RS600 support
-
-commit 582c1a1b2c7b1032e9f9f54ca36100c57f580c5c
-Author: Alex Deucher <alex at cube.(none)>
-Date:   Tue May 13 20:50:25 2008 -0400
-
-    RS4xx: Split out RS400 and RS480 as separate families
-    
-    RS400 (intel based IGP) and RS480 (AMD based IGP) have different
-    MC setups and need to be handled differently
-
-commit 708e7c98f636738fbcc47a597bc94b309a4dc1c4
-Author: Michel Dänzer <michel at tungstengraphics.com>
-Date:   Tue May 13 11:00:38 2008 +0200
-
-    Reinstate CARD* types that are part of external interfaces.
-    
-    The compiler pointed this out...
-
-commit 908b7b940e3ef296836bc94680ebb8ab67650e31
-Author: Matt Turner <mattst88 at gmail.com>
-Date:   Mon May 12 12:06:33 2008 -0400
-
-    Replace CARD{8,16,32} with uint{8,16,32}_t
-    
-    As has been done with xf86-video-intel, replace all CARD* datatypes with
-    uint*_t datatypes available from stdint.h.
-
-commit 87e66ce76430890ab4939ffcd42f72b9288eb598
-Author: Avi Rozen <avi.rozen at gmail.com>
-Date:   Mon May 12 08:33:38 2008 -0400
-
-    RADEON: fix lockup on start
-    
-    see debian bug 480312
-
-commit 94bf8f01bd43cb103fffecfe04d04a214f892baf
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon May 12 20:02:51 2008 +1000
-
-    radeon: fix set_cursor_colours remove fb offset
-
-commit 1d0f1d31e2ed1d91ee87cb3e02ce48c8c07aa418
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon May 12 15:44:35 2008 +1000
-
-    radeon: rs485 vs rs485m.. mobile? non-mobile? bi?
-    
-    So it appears we have in the wild two chipsets with the same PCI ID (0x1002:0x5974)
-    that are mobile and non-mobile.
-    
-    the RH bug references is a desktop system.
[...6390 lines suppressed...]
++	return 6;
++    else if (user_gamma > 2350)  /* 2.5  */
++	return 7;
++    else
++	return 0;
++}
++
+ 
+ /****************************************************************************
+  * SetTransform                                                             *
+@@ -957,8 +991,8 @@ static void RADEONSetTransform (ScrnInfoPtr pScrn,
  				float	    red_intensity,
  				float	    green_intensity,
  				float	    blue_intensity,
@@ -16832,7 +16982,7 @@
  {
      RADEONInfoPtr    info = RADEONPTR(pScrn);
      unsigned char   *RADEONMMIO = info->MMIO;
-@@ -975,11 +986,11 @@ static void RADEONSetTransform (ScrnInfoPtr pScrn,
+@@ -975,32 +1009,17 @@ static void RADEONSetTransform (ScrnInfoPtr pScrn,
      float	    Loff = 64.0;
      float	    Coff = 512.0f;
  
@@ -16849,7 +16999,29 @@
  
      if (ref >= 2)
  	return;
-@@ -1143,16 +1154,16 @@ static void RADEONSetOverlayAlpha(ScrnInfoPtr pScrn, int ov_alpha, int gr_alpha,
+ 
+     /* translate from user_gamma (gamma x 1000) to radeon gamma table index value */
+-    if (user_gamma <= 925)       /* 0.85 */
+-	gamma = 1;
+-    else if (user_gamma <= 1050) /* 1.0  */
+-	gamma = 0;
+-    else if (user_gamma <= 1150) /* 1.1  */
+-	gamma = 2;
+-    else if (user_gamma <= 1325) /* 1.2  */
+-	gamma = 3;
+-    else if (user_gamma <= 1575) /* 1.45 */
+-	gamma = 4;
+-    else if (user_gamma <= 1950) /* 1.7  */
+-	gamma = 5;
+-    else if (user_gamma <= 2350) /* 2.2  */
+-	gamma = 6;
+-    else if (user_gamma > 2350)  /* 2.5  */
+-	gamma = 7;
++    gamma = RADEONTranslateUserGamma(user_gamma);
+ 
+     if (gamma >= 8) 
+ 	return;
+@@ -1143,16 +1162,16 @@ static void RADEONSetOverlayAlpha(ScrnInfoPtr pScrn, int ov_alpha, int gr_alpha,
       /* not yet supported */
  }
  
@@ -16870,7 +17042,7 @@
  
  	rbits = (colorKey & pScrn->mask.red) >> pScrn->offset.red;
  	gbits = (colorKey & pScrn->mask.green) >> pScrn->offset.green;
-@@ -1164,7 +1175,7 @@ static void RADEONSetColorKey(ScrnInfoPtr pScrn, CARD32 colorKey)
+@@ -1164,7 +1183,7 @@ static void RADEONSetColorKey(ScrnInfoPtr pScrn, CARD32 colorKey)
      }
      else
      {
@@ -16879,7 +17051,7 @@
  
  	bits = colorKey & ((1 << info->CurrentLayout.depth) - 1);
  	r = bits;
-@@ -1307,7 +1318,7 @@ static void RADEONSetupTheatre(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
+@@ -1307,7 +1326,7 @@ static void RADEONSetupTheatre(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
      RADEONPLLPtr  pll = &(info->pll);
      TheatrePtr t;
  
@@ -16888,7 +17060,7 @@
      int i;
                
      pPriv->theatre = NULL;
-@@ -1401,7 +1412,7 @@ RADEONAllocAdaptor(ScrnInfoPtr pScrn)
+@@ -1401,7 +1420,7 @@ RADEONAllocAdaptor(ScrnInfoPtr pScrn)
      XF86VideoAdaptorPtr adapt;
      RADEONInfoPtr info = RADEONPTR(pScrn);
      RADEONPortPrivPtr pPriv;
@@ -16897,7 +17069,7 @@
      int ecp;
  
      if(!(adapt = xf86XVAllocateVideoAdaptorRec(pScrn)))
-@@ -2159,22 +2170,22 @@ RADEONCopyData(
+@@ -2159,22 +2178,22 @@ RADEONCopyData(
    unsigned int bpp
  ){
      RADEONInfoPtr info = RADEONPTR(pScrn);
@@ -16929,7 +17101,7 @@
  	RADEONHostDataParams( pScrn, dst, dstPitch, bpp, &dstPitchOff, &x, &y );
  
  	while ( (buf = RADEONHostDataBlit( pScrn, bpp, w, dstPitchOff, &bufPitch,
-@@ -2235,21 +2246,21 @@ RADEONCopyRGB24Data(
+@@ -2235,21 +2254,21 @@ RADEONCopyRGB24Data(
    unsigned int h,
    unsigned int w
  ){
@@ -16955,7 +17127,7 @@
  						       &bufPitch, x, &y, &h,
  						       &hpass )) )
  	{
-@@ -2282,7 +2293,7 @@ RADEONCopyRGB24Data(
+@@ -2282,7 +2301,7 @@ RADEONCopyRGB24Data(
  #endif
  
  	for (j = 0; j < h; j++) {
@@ -16964,7 +17136,7 @@
  	    sptr = src + j * srcPitch;
  
  	    for (i = 0; i < w; i++, sptr += 3) {
-@@ -2333,8 +2344,8 @@ RADEONCopyMungedData(
+@@ -2333,8 +2352,8 @@ RADEONCopyMungedData(
  
      if ( info->directRenderingEnabled && info->DMAForXv )
      {
@@ -16975,7 +17147,7 @@
  	int blitX, blitY;
  	unsigned int hpass;
  
-@@ -2365,8 +2376,8 @@ RADEONCopyMungedData(
+@@ -2365,8 +2384,8 @@ RADEONCopyMungedData(
      else
  #endif /* XF86DRI */
      {
@@ -16986,7 +17158,7 @@
  	int i, j;
  
  #if X_BYTE_ORDER == X_BIG_ENDIAN
-@@ -2420,7 +2431,7 @@ RADEONCopyMungedData(
+@@ -2420,7 +2439,7 @@ RADEONCopyMungedData(
   * is measured in bytes, and the offset from the beginning of card space is
   * returned.
   */
@@ -16995,7 +17167,7 @@
  RADEONAllocateMemory(
     ScrnInfoPtr pScrn,
     void **mem_struct,
-@@ -2542,7 +2553,7 @@ RADEONDisplayVideo(
+@@ -2542,7 +2561,7 @@ RADEONDisplayVideo(
      RADEONInfoPtr info = RADEONPTR(pScrn);
      xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
      unsigned char *RADEONMMIO = info->MMIO;
@@ -17004,7 +17176,7 @@
      double h_inc_d;
      int p1_h_accum_init, p23_h_accum_init;
      int p1_v_accum_init, p23_v_accum_init;
-@@ -2552,12 +2563,12 @@ RADEONDisplayVideo(
+@@ -2552,12 +2571,12 @@ RADEONDisplayVideo(
      int y_mult;
      int x_off;
      int y_off;
@@ -17020,7 +17192,18 @@
      double dsr;
      int tap_set;
      int predownscale=0;
-@@ -2873,7 +2884,7 @@ RADEONDisplayVideo(
+@@ -2867,13 +2886,18 @@ RADEONDisplayVideo(
+ 		break;
+     }
+ 
++    if (info->ChipFamily < CHIP_FAMILY_R200) {
++	scale_cntl &= ~RADEON_SCALER_GAMMA_SEL_MASK;
++	scale_cntl |= ((RADEONTranslateUserGamma(pPriv->gamma)) << 5);
++    }
++
+     OUTREG(RADEON_OV0_SCALE_CNTL, scale_cntl);
+     OUTREG(RADEON_OV0_REG_LOAD_CNTL, 0);
+ }
  
  
  static void
@@ -17029,7 +17212,7 @@
  {
  #if HAVE_XV_DRAWABLE_HELPER
      xf86XVFillKeyHelperDrawable(pDraw, colorKey, clipBoxes);
-@@ -2906,7 +2917,7 @@ RADEONPutImage(
+@@ -2906,7 +2930,7 @@ RADEONPutImage(
     int top, left, npixels, nlines, bpp;
     int idconv = id;
     BoxRec dstBox;
@@ -17038,7 +17221,7 @@
     xf86CrtcPtr crtc;
  
     /*
-@@ -2979,7 +2990,8 @@ RADEONPutImage(
+@@ -2979,7 +3003,8 @@ RADEONPutImage(
     case FOURCC_I420:
  	/* it seems rs4xx chips (all of them???) either can't handle planar
  	   yuv at all or would need some unknown different setup. */
@@ -17048,7 +17231,7 @@
  	    /* need 16bytes alignment for u,v plane, so 2 times that for width
  	       but blitter needs 64bytes alignment. 128byte is a waste but dstpitch
  	       for uv planes needs to be dstpitch yplane >> 1 for now. */
-@@ -3462,7 +3474,7 @@ RADEONPutVideo(
+@@ -3462,7 +3487,7 @@ RADEONPutVideo(
     int srcPitch, srcPitch2, dstPitch;
     int bpp;
     BoxRec dstBox;


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-9/xorg-x11-drv-ati.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- xorg-x11-drv-ati.spec	28 May 2008 06:27:52 -0000	1.98
+++ xorg-x11-drv-ati.spec	26 Jun 2008 06:27:58 -0000	1.99
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.8.0
-Release:   17%{?dist}
+Release:   18%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -91,6 +91,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Thu Jun 26 2008 Dave Airlie <airlied at redhat.com> 6.8.0-18
+- update to latest git 6.8.192 beta
+
 * Wed May 28 2008 Dave Airlie <airlied at redhat.com> 6.8.0-17
 - fix multiple VT switch issues on r600 cards
 - assorted upstream goodness

More information about the fedora-extras-commits mailing list