rpms/xorg-x11-drv-ati/F-8 .cvsignore, 1.21, 1.22 radeon-git-upstream-fixes.patch, 1.4, 1.5 sources, 1.21, 1.22 xorg-x11-drv-ati.spec, 1.73, 1.74 radeon-6.7.196-atombios-support.patch, 1.3, NONE radeon-6.7.196-fix-igp.patch, 1.1, NONE
Dave Airlie (airlied)
fedora-extras-commits at redhat.com
Fri Feb 8 06:27:04 UTC 2008
Author: airlied
Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23582
Modified Files:
.cvsignore radeon-git-upstream-fixes.patch sources
xorg-x11-drv-ati.spec
Removed Files:
radeon-6.7.196-atombios-support.patch
radeon-6.7.196-fix-igp.patch
Log Message:
* Fri Feb 08 2008 Dave Airlie <airlied at redhat.com> 6.7.197-1
- rebase to 6.7.197 + git fixes
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-8/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore 19 Nov 2007 00:13:28 -0000 1.21
+++ .cvsignore 8 Feb 2008 06:26:28 -0000 1.22
@@ -1 +1 @@
-xf86-video-ati-6.7.196.tar.bz2
+xf86-video-ati-6.7.197.tar.bz2
radeon-git-upstream-fixes.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.4 -r 1.5 radeon-git-upstream-fixes.patch
Index: radeon-git-upstream-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-8/radeon-git-upstream-fixes.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- radeon-git-upstream-fixes.patch 19 Dec 2007 04:57:35 -0000 1.4
+++ radeon-git-upstream-fixes.patch 8 Feb 2008 06:26:28 -0000 1.5
@@ -1,4789 +1,35910 @@
-commit ce4fa1cedec0cf56b9979dfaa12a8d3a7c643df4
-Author: Arkadiusz Miskiewicz <arekm at maven.pl>
-Date: Tue Dec 18 15:34:14 2007 -0500
+commit 7f4db96123fdcba9874226352802d702c2a498bd
+Author: Dave Airlie <airlied at redhat.com>
+Date: Fri Feb 8 10:47:10 2008 +1000
- RADEON: fix fd leak in lid detect code
+ add rv670 pciids
-commit 20568f66f9a9a60a33bd9a69ccc14a891c656836
-Author: Arkadiusz Miskiewicz <arekm at maven.pl>
-Date: Tue Dec 18 15:32:10 2007 -0500
+commit e8899b9978291c62a65f468c92f340f65ad5479d
+Author: Alex Deucher <alex at botch2.(none)>
+Date: Thu Feb 7 19:27:38 2008 -0500
- RADEON: more cleanups and warning fixes
+ R6xx: fix ddc after my i2c rework
+
+ Seems r6xx does something different for its i2c table,
+ revert to the old behavior for now.
-commit 1496194200adbcb044ec3977367a0908262e389c
-Author: Arkadiusz Miskiewicz <arekm at maven.pl>
-Date: Tue Dec 18 15:29:53 2007 -0500
+commit 435de6c4e46ff2bebd4cee58888a66b936cd3fdf
+Author: Alex Deucher <alex at samba.(none)>
+Date: Thu Feb 7 19:14:13 2008 -0500
- RADEON: driver cleanups, warning fixes
+ RADEON: sync up with latest upstream versions
+
+ atombios.h
+ ObjectID.h
-commit 44d07c4ccce9acb5bd21a17acb082e91f7225764
-Author: Alex Deucher <alex at t41p.hsd1.va.comcast.net>
-Date: Mon Dec 17 18:56:12 2007 -0500
+commit 692789a293970f70b88ccb6adcf0676d8b495ae2
+Author: George Sapountzis <gsap7 at yahoo.gr>
+Date: Thu Feb 7 18:03:37 2008 +0200
- RADEON: typo from last commit
+ mach64: factor out BIOS multimedia parsing
-commit 4da3782239921eb377216d4de4a9cc5bb55e0e8a
-Author: Alex Deucher <alex at t41p.hsd1.va.comcast.net>
-Date: Mon Dec 17 18:51:31 2007 -0500
+commit 933328ffd6d1d872a18d3de8624c4df845a64588
+Author: George Sapountzis <gsap7 at yahoo.gr>
+Date: Thu Feb 7 18:03:03 2008 +0200
+
+ mach64: complement hint for sparc
+
+commit 956c8c81f3ff434930a0cb17b027b2f8e4eeabb2
+Author: George Sapountzis <gsap7 at yahoo.gr>
+Date: Thu Feb 7 18:02:31 2008 +0200
+
+ mach64: consolidate refclk #2
+
+commit dce4cc26a8e2bf53805ec63763243f3ff6b4a6d3
+Author: George Sapountzis <gsap7 at yahoo.gr>
+Date: Thu Feb 7 18:02:17 2008 +0200
+
+ mach64: consolidate refclk #1
+
+commit f7ed807f0d82a7446ebc4acdd4e94df44a675f19
+Author: George Sapountzis <gsap7 at yahoo.gr>
+Date: Thu Feb 7 18:01:59 2008 +0200
+
+ mach64: cosmetic
+
+commit cda1cd198f33c26ef1b51532a2126468369743b8
+Author: George Sapountzis <gsap7 at yahoo.gr>
+Date: Thu Feb 7 18:01:33 2008 +0200
- RADEON: add output enable masks
+ mach64: factor out BIOS clock parsing
+
+commit 73ff279469be9c7cbf9f533b85fcb553694ff413
+Author: George Sapountzis <gsap7 at yahoo.gr>
+Date: Thu Feb 7 18:00:55 2008 +0200
+
+ mach64: BIOSBase is no longer used
+
+commit caea326cc6f1932bb299f451be013651a5749ea7
+Author: Dave Airlie <airlied at linux.ie>
+Date: Wed Feb 6 06:36:13 2008 +1000
+
+ r300: move fragprog setup code to prepare composite for now
+
+commit 470cd6a401c6a3e8fea981a8fe97c28be3cfb81d
+Author: Dave Airlie <airlied at linux.ie>
+Date: Wed Feb 6 06:04:13 2008 +1000
+
+ r300: remove r300 specific vertex emission
- add output enable masks for outputs that drive
- more than one connector. Make sure we don't turn off
- an output that's driving another connector.
+ Set the vertex and fragment engine to expect the mask coords.
-commit 5c5d2d19b2b032a06dd333b4ecc029aac342fb93
+commit f65e8dfac23adfa199026765fe3a1ea08cf4da67
+Author: Alex Deucher <alex at cube.(none)>
+Date: Sun Feb 3 00:09:59 2008 -0500
+
+ RADEON: rework i2c handling
+
+ Split out clk, data, and lock regs and masks. some cards use different
+ regs and masks for each. For cards with ATOMBIOS, use the i2c bios
+ table to grab the i2c data.
+
+commit a38a903debc0a50dbc73f59dc2741bbea76d2bd9
Author: Alex Deucher <alex at t41p.hsd1.va.comcast.net>
-Date: Mon Dec 17 18:15:55 2007 -0500
+Date: Fri Feb 1 02:59:07 2008 -0500
- RADEON: whitespace clean-ups
+ RADEON: don't restore LVDS_PLL_CNTL for now
+
+ seems to cause problems with resume for some users.
+ this needs further investigation.
+ see bug 12596
-commit 9f1d8220315c8894a17f2cc328025dc682b0c6e0
+commit 5d7bea2b62c86868baf1960665a40249a43bafc5
Author: Alex Deucher <alex at t41p.hsd1.va.comcast.net>
-Date: Mon Dec 17 18:04:05 2007 -0500
+Date: Fri Feb 1 02:53:22 2008 -0500
- RADEON: more PLL fixes
+ RADEON: remove redundant RADEONDisableDisplays()
- - reduce the calculation accuracy
- - certain LVDS panels seem to only like certain ref_divs
- - add pll flags to handle special cases
- - adjust the pll limits on legacy cards
+ use RADEONBlank() instead
-commit 4747c1f3cd4167b6a51d4864a297719ea48b9346
+commit 73b437ce232c94c0067a0d2f70538b6e1e8c07a7
Author: Alex Deucher <alex at t41p.hsd1.va.comcast.net>
-Date: Sun Dec 16 14:07:29 2007 -0500
+Date: Fri Feb 1 02:47:06 2008 -0500
- RADEON: Make sure LVDS_EN bit is set when enabling LVDS
+ RADEON: remove unused "aspect" scaler option
-commit b653e5a628bfa4dfb168e96f93f41eb910f409fb
-Author: Michel Dänzer <michel at tungstengraphics.com>
-Date: Sat Dec 15 00:50:10 2007 +0100
+commit f1fb9e4daa29bc379f653f847254db1496b625fd
+Author: Alex Deucher <alex at t41p.hsd1.va.comcast.net>
+Date: Fri Feb 1 02:39:18 2008 -0500
+
+ RADEON: Implement "center" mode for RMX on legacy radeons
+
+commit bcd590103e04bfdb4f12413beacebf344f07e88e
+Author: Alex Deucher <alex at botch2.(none)>
+Date: Tue Jan 29 12:12:54 2008 -0500
+
+ RADEON: update man page to reflect AGP 1x default revert
+
+commit 09348a83d06ba9d3129499c4daedd44a68771530
+Author: Alex Deucher <alex at botch2.(none)>
+Date: Tue Jan 29 12:09:24 2008 -0500
- radeon: Default to 1x again with non-v3 AGP cards.
+ Seems the default is more reliable... we can't win.
- Seems more reliable in general than what was set up by firmware - fingers
- crossed...
+ Revert "radeon: Default to 1x again with non-v3 AGP cards."
+
+ This reverts commit b653e5a628bfa4dfb168e96f93f41eb910f409fb.
-commit 6229825fa5d6715569098afbb21a40f7a2e7e6be
-Author: Michel Dänzer <michel at tungstengraphics.com>
-Date: Sat Dec 15 00:48:26 2007 +0100
+commit 0c26806245381b925b73ff9f3b747e3dcf0ebd6f
+Author: Alex Deucher <alex at botch2.(none)>
+Date: Tue Jan 29 10:26:48 2008 -0500
- radeon: Warning fixes.
+ RADEON: Add new RV380 pci id
- The lid detection code probably wouldn't work on other non-x86 platforms
- though...
+ bug 14289
[...39915 lines suppressed...]
-- sptr=src+j*srcPitch;
-+ for (j = 0; j < h; j++) {
-+ dptr = (CARD32 *)(dst + j * dstPitch);
-+ sptr = src + j * srcPitch;
-
-- for(i=w;i>0;i--){
-- dptr[0]=((sptr[0])<<24)|((sptr[1])<<16)|(sptr[2]);
-- dptr++;
-- sptr+=3;
-+ for (i = 0; i < w; i++, sptr += 3) {
-+ dptr[i] = (sptr[2] << 16) | (sptr[1] << 8) | sptr[0];
- }
+ #if X_BYTE_ORDER == X_BIG_ENDIAN
+ /* restore byte swapping */
+- OUTREG(RADEON_SURFACE_CNTL, info->ModeReg.surface_cntl);
++ OUTREG(RADEON_SURFACE_CNTL, info->ModeReg->surface_cntl);
+ #endif
+ }
+ }
+@@ -2359,7 +2356,7 @@ RADEONCopyMungedData(
+
+ #if X_BYTE_ORDER == X_BIG_ENDIAN
+ unsigned char *RADEONMMIO = info->MMIO;
+- OUTREG(RADEON_SURFACE_CNTL, (info->ModeReg.surface_cntl
++ OUTREG(RADEON_SURFACE_CNTL, (info->ModeReg->surface_cntl
+ | RADEON_NONSURF_AP0_SWP_32BPP)
+ & ~RADEON_NONSURF_AP0_SWP_16BPP);
+ #endif
+@@ -2397,7 +2394,7 @@ RADEONCopyMungedData(
}
+ #if X_BYTE_ORDER == X_BIG_ENDIAN
+ /* restore byte swapping */
+- OUTREG(RADEON_SURFACE_CNTL, info->ModeReg.surface_cntl);
++ OUTREG(RADEON_SURFACE_CNTL, info->ModeReg->surface_cntl);
+ #endif
+ }
+ }
+@@ -2578,9 +2575,9 @@ RADEONDisplayVideo(
-@@ -2927,17 +2922,17 @@ RADEONPutImage(
+ /* Figure out which head we are on for dot clock */
+ if (radeon_crtc->crtc_id == 1)
+- dot_clock = info->ModeReg.dot_clock_freq_2;
++ dot_clock = info->ModeReg->dot_clock_freq_2;
+ else
+- dot_clock = info->ModeReg.dot_clock_freq;
++ dot_clock = info->ModeReg->dot_clock_freq;
- switch(id) {
- case FOURCC_RGB24:
-- dstPitch=(width*4+0x0f)&(~0x0f);
-- srcPitch=width*3;
-+ dstPitch = width * 4;
-+ srcPitch = width * 3;
- break;
- case FOURCC_RGBA32:
-- dstPitch=(width*4+0x0f)&(~0x0f);
-- srcPitch=width*4;
-+ dstPitch = width * 4;
-+ srcPitch = width * 4;
- break;
- case FOURCC_RGB16:
- case FOURCC_RGBT16:
-- dstPitch=(width*2+0x0f)&(~0x0f);
-- srcPitch=(width*2+3)&(~0x03);
-+ dstPitch = width * 2;
-+ srcPitch = (width * 2 + 3) & ~3;
- break;
- case FOURCC_YV12:
- case FOURCC_I420:
-@@ -2950,11 +2945,20 @@ RADEONPutImage(
- case FOURCC_UYVY:
- case FOURCC_YUY2:
- default:
-- dstPitch = ((width << 1) + 63) & ~63;
-- srcPitch = (width << 1);
-+ dstPitch = width * 2;
-+ srcPitch = width * 2;
- break;
- }
+ if (dot_clock < 17500)
+ ecp_div = 0;
+@@ -2736,7 +2733,8 @@ RADEONDisplayVideo(
+ }
+ else {
+ left = (left >> 16) & 7;
+- leftuv = left >> 1;
++ if (!is_rgb)
++ leftuv = left >> 1;
+ }
-+#ifdef XF86DRI
-+ if (info->directRenderingEnabled && info->DMAForXv) {
-+ /* The upload blit only supports multiples of 64 bytes */
-+ dstPitch = (dstPitch + 63) & ~63;
-+ } else
-+#endif
-+ /* The overlay only supports multiples of 16 bytes */
-+ dstPitch = (dstPitch + 15) & ~15;
-+
- new_size = dstPitch * height;
- if (id == FOURCC_YV12 || id == FOURCC_I420) {
- new_size += (dstPitch >> 1) * ((height + 1) & ~1);
+ RADEONWaitForFifo(pScrn, 2);
+@@ -2745,7 +2743,7 @@ RADEONDisplayVideo(
+ while(!(INREG(RADEON_OV0_REG_LOAD_CNTL) & RADEON_REG_LD_CTL_LOCK_READBACK));
+
+ RADEONWaitForFifo(pScrn, 10);
+- OUTREG(RADEON_OV0_H_INC, h_inc | ((h_inc_uv >> 1) << 16));
++ OUTREG(RADEON_OV0_H_INC, h_inc | ((is_rgb? h_inc_uv: (h_inc_uv >> 1)) << 16));
+ OUTREG(RADEON_OV0_STEP_BY, step_by_y | (step_by_uv << 8) |
+ predownscale << 4 | predownscale << 12);
+
+@@ -2810,7 +2808,8 @@ RADEONDisplayVideo(
+ OUTREG(RADEON_OV0_VID_BUF_PITCH0_VALUE, pitch);
+ OUTREG(RADEON_OV0_VID_BUF_PITCH1_VALUE, is_planar ? pitch >> 1 : pitch);
+ OUTREG(RADEON_OV0_P1_X_START_END, (src_w + left - 1) | (left << 16));
+- src_w >>= 1;
++ if (!is_rgb)
++ src_w >>= 1;
+ OUTREG(RADEON_OV0_P2_X_START_END, (src_w + leftuv - 1) | (leftuv << 16));
+ OUTREG(RADEON_OV0_P3_X_START_END, (src_w + leftuv - 1) | (leftuv << 16));
+ OUTREG(RADEON_OV0_VID_BUF0_BASE_ADRS, offset1);
+diff --git a/src/theatre.h b/src/theatre.h
+index 3c1fd4b..958b443 100644
+--- a/src/theatre.h
++++ b/src/theatre.h
+@@ -57,25 +57,6 @@ void ResetTheatreRegsForTVout(TheatrePtr t);
+ void ResetTheatreRegsForNoTVout(TheatrePtr t);
+
+
+-#define TheatreSymbolsList \
+- "InitTheatre" \
+- "RT_SetTint", \
+- "RT_SetSaturation", \
+- "RT_SetBrightness", \
+- "RT_SetSharpness", \
+- "RT_SetContrast", \
+- "RT_SetInterlace", \
+- "RT_SetStandard", \
+- "RT_SetCombFilter", \
+- "RT_SetOutputVideoSize", \
+- "RT_SetConnector", \
+- "ResetTheatreRegsForNoTVout", \
+- "ResetTheatreRegsForTVout", \
+- "DumpRageTheatreRegs", \
+- "ShutdownTheatre"
+-
+-#ifdef XFree86LOADER
+-
+ #define xf86_InitTheatre ((void (*)(TheatrePtr t))LoaderSymbol("InitTheatre"))
+
+ #define xf86_RT_SetTint ((void (*)(TheatrePtr, int))LoaderSymbol("RT_SetTint"))
+@@ -94,24 +75,5 @@ void ResetTheatreRegsForNoTVout(TheatrePtr t);
+ #define xf86_ResetTheatreRegsForTVout ((void (*)(TheatrePtr))LoaderSymbol("ResetTheatreRegsForTVout"))
+ #define xf86_ResetTheatreRegsForNoTVout ((void (*)(TheatrePtr))LoaderSymbol("ResetTheatreRegsForNoTVout"))
+ #define xf86_RT_GetSignalStatus ((void (*)(TheatrePtr))LoaderSymbol("xf86_RT_GetSignalStatus"))
+-#else
+-
+-#define xf86_InitTheatre InitTheatre
+-
+-#define xf86_RT_SetTint RT_SetTint
+-#define xf86_RT_SetSaturation RT_SetSaturation
+-#define xf86_RT_SetBrightness RT_SetBrightness
+-#define xf86_RT_SetSharpness RT_SetSharpness
+-#define xf86_RT_SetContrast RT_SetContrast
+-#define xf86_RT_SetInterlace RT_SetInterlace
+-#define xf86_RT_SetStandard RT_SetStandard
+-#define xf86_RT_SetOutputVideoSize RT_SetOutputVideoSize
+-#define xf86_RT_SetConnector RT_SetConnector
+-
+-#define xf86_RageTheatreDebugGain RageTheatreDebugGain
+-#define xf86_ShutdownTheatre ShutdownTheatre
+-#define xf86_DumpRageTheatreRegs DumpRageTheatreRegs
+-#define xf86_ResetTheatreRegsForNoTVout ResetTheatreRegsForNoTVout
+-#endif
+
+ #endif
+diff --git a/src/theatre_detect.h b/src/theatre_detect.h
+index b414308..5fed160 100644
+--- a/src/theatre_detect.h
++++ b/src/theatre_detect.h
+@@ -41,17 +41,6 @@
+ TheatrePtr DetectTheatre(GENERIC_BUS_Ptr b);
+
+
+-#define TheatreDetectSymbolsList \
+- "DetectTheatre"
+-
+-#ifdef XFree86LOADER
+-
+ #define xf86_DetectTheatre ((TheatrePtr (*)(GENERIC_BUS_Ptr))LoaderSymbol("DetectTheatre"))
+
+-#else
+-
+-#define xf86_DetectTheatre DetectTheatre
+-
+-#endif
+-
+ #endif
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-8/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources 19 Nov 2007 00:13:28 -0000 1.21
+++ sources 8 Feb 2008 06:26:28 -0000 1.22
@@ -1 +1 @@
-06db625391c75c8be86c4dd5a5d713e6 xf86-video-ati-6.7.196.tar.bz2
+7bd53945ce6d0b48b7fd558039e82aa2 xf86-video-ati-6.7.197.tar.bz2
Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-8/xorg-x11-drv-ati.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- xorg-x11-drv-ati.spec 17 Jan 2008 08:22:18 -0000 1.73
+++ xorg-x11-drv-ati.spec 8 Feb 2008 06:26:28 -0000 1.74
@@ -4,8 +4,8 @@
Summary: Xorg X11 ati video driver
Name: xorg-x11-drv-ati
-Version: 6.7.196
-Release: 6%{?dist}
+Version: 6.7.197
+Release: 1%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -18,8 +18,6 @@
# Radeon patches (0-99)
Patch3: radeon-git-upstream-fixes.patch
-Patch5: radeon-6.7.196-atombios-support.patch
-Patch6: radeon-6.7.196-fix-igp.patch
# Rage 128 patches (100-199)
# mach64 patches (200-299)
@@ -44,8 +42,6 @@
%setup -q -n %{tarball}-%{version}
%patch3 -p1 -b .fixes
-%patch5 -p1 -b .atombios
-%patch6 -p1 -b .fixigp
%build
aclocal ; automake -a ; autoconf
@@ -87,6 +83,9 @@
%{_mandir}/man4/radeon.4*
%changelog
+* Fri Feb 08 2008 Dave Airlie <airlied at redhat.com> 6.7.197-1
+- rebase to 6.7.197 + git fixes
+
* Thu Jan 17 2008 Dave Airlie <airlied at redhat.com> 6.7.196-6
- fix IGP chips after last update
--- radeon-6.7.196-atombios-support.patch DELETED ---
--- radeon-6.7.196-fix-igp.patch DELETED ---
More information about the fedora-extras-commits
mailing list