rpms/xorg-x11-drv-ati/F-8 .cvsignore, 1.22, 1.23 radeon-git-upstream-fixes.patch, 1.5, 1.6 sources, 1.22, 1.23 xorg-x11-drv-ati.spec, 1.75, 1.76
Dave Airlie (airlied)
fedora-extras-commits at redhat.com
Tue Feb 26 08:53:17 UTC 2008
Author: airlied
Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19809
Modified Files:
.cvsignore radeon-git-upstream-fixes.patch sources
xorg-x11-drv-ati.spec
Log Message:
* Thu Feb 26 2008 Dave Airlie <airlied at redhat.com> 6.8.0-1
- rebase to 6.8.0 + git fixes
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-8/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore 8 Feb 2008 06:26:28 -0000 1.22
+++ .cvsignore 26 Feb 2008 08:52:29 -0000 1.23
@@ -1 +1 @@
-xf86-video-ati-6.7.197.tar.bz2
+xf86-video-ati-6.8.0.tar.bz2
radeon-git-upstream-fixes.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.5 -r 1.6 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- radeon-git-upstream-fixes.patch 8 Feb 2008 06:26:28 -0000 1.5
+++ radeon-git-upstream-fixes.patch 26 Feb 2008 08:52:29 -0000 1.6
@@ -1,35910 +1,3393 @@
-commit 7f4db96123fdcba9874226352802d702c2a498bd
-Author: Dave Airlie <airlied at redhat.com>
-Date: Fri Feb 8 10:47:10 2008 +1000
-
- add rv670 pciids
-
-commit e8899b9978291c62a65f468c92f340f65ad5479d
-Author: Alex Deucher <alex at botch2.(none)>
-Date: Thu Feb 7 19:27:38 2008 -0500
-
- R6xx: fix ddc after my i2c rework
-
- Seems r6xx does something different for its i2c table,
- revert to the old behavior for now.
-
-commit 435de6c4e46ff2bebd4cee58888a66b936cd3fdf
-Author: Alex Deucher <alex at samba.(none)>
-Date: Thu Feb 7 19:14:13 2008 -0500
-
- RADEON: sync up with latest upstream versions
-
- atombios.h
- ObjectID.h
-
-commit 692789a293970f70b88ccb6adcf0676d8b495ae2
-Author: George Sapountzis <gsap7 at yahoo.gr>
-Date: Thu Feb 7 18:03:37 2008 +0200
-
- mach64: factor out BIOS multimedia parsing
-
-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
-
- 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
+commit 8ea75b268f11794f4a7e7bac52cb256490ed3fd2
Author: Dave Airlie <airlied at linux.ie>
-Date: Wed Feb 6 06:36:13 2008 +1000
+Date: Tue Feb 26 16:29:19 2008 +1000
- r300: move fragprog setup code to prepare composite for now
+ regs: fix spelling properly
-commit 470cd6a401c6a3e8fea981a8fe97c28be3cfb81d
+commit f2816064a6c2c4c35ccba74b9aa80547e25c012e
Author: Dave Airlie <airlied at linux.ie>
-Date: Wed Feb 6 06:04:13 2008 +1000
-
- r300: remove r300 specific vertex emission
-
- Set the vertex and fragment engine to expect the mask coords.
-
-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: Fri Feb 1 02:59:07 2008 -0500
-
- 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 5d7bea2b62c86868baf1960665a40249a43bafc5
-Author: Alex Deucher <alex at t41p.hsd1.va.comcast.net>
-Date: Fri Feb 1 02:53:22 2008 -0500
-
- RADEON: remove redundant RADEONDisableDisplays()
-
- use RADEONBlank() instead
-
-commit 73b437ce232c94c0067a0d2f70538b6e1e8c07a7
-Author: Alex Deucher <alex at t41p.hsd1.va.comcast.net>
-Date: Fri Feb 1 02:47:06 2008 -0500
-
- RADEON: remove unused "aspect" scaler option
-
-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
-
- Seems the default is more reliable... we can't win.
-
- Revert "radeon: Default to 1x again with non-v3 AGP cards."
-
- This reverts commit b653e5a628bfa4dfb168e96f93f41eb910f409fb.
-
-commit 0c26806245381b925b73ff9f3b747e3dcf0ebd6f
-Author: Alex Deucher <alex at botch2.(none)>
-Date: Tue Jan 29 10:26:48 2008 -0500
-
- RADEON: Add new RV380 pci id
-
- bug 14289
-
-commit ce77ed78a877023da72dbe51609aef9a07e250b1
-Author: Maciej Cencora <m.cencora at gmail.com>
-Date: Mon Jan 28 19:02:56 2008 -0500
-
- RS690: Implement MC idle check
-
-commit b7de4ff52cfbdd85ee65000613632e21b92af24e
-Author: George Sapountzis <gsap7 at yahoo.gr>
-Date: Sat Jan 26 19:28:05 2008 +0200
-
- mach64: add hint for sparc and minor cosmetic.
-
-commit 09d713aa0ed6367b4457420b3c2832fe8eca9b00
-Author: Alex Deucher <alex at botch2.(none)>
-Date: Wed Jan 23 18:05:41 2008 -0500
-
- Revert "RADEON: adjust PAL mode hstart"
-
- This reverts commit 719a9a376e34d99032af75e3f7b002670ccb816b.
-
- This breaks TV out on some cards.
-
-commit 719a9a376e34d99032af75e3f7b002670ccb816b
-Author: Alex Deucher <alex at botch2.(none)>
-Date: Sun Jan 20 18:40:53 2008 -0500
+Date: Tue Feb 26 16:28:24 2008 +1000
- RADEON: adjust PAL mode hstart
+ regs: fix spelling mistake
- Most people seem to get a more aligned picture with this setting
+ pointed out by plaes on irc
-commit b2db8657fb888cff6d64c6dcb182caac389776ce
-Author: Alex Deucher <alex at botch2.(none)>
-Date: Sun Jan 20 18:33:22 2008 -0500
-
- RADEON: re-work i2c for DDC
-
- Unify the radeon/avivo paths and grab the data/clk masks from bios
- if available
-
-commit a43003b24022a833e604f41b2873c0350b34181c
[...38663 lines suppressed...]
-+ if (!is_rgb)
-+ leftuv = left >> 1;
- }
+-static void
++void
+ RADEONQueryBestSize(
+ ScrnInfoPtr pScrn,
+ Bool motion,
+@@ -2040,10 +2051,14 @@ RADEONQueryBestSize(
+ unsigned int *p_w, unsigned int *p_h,
+ pointer data
+ ){
+- if(vid_w > (drw_w << 4))
+- drw_w = vid_w >> 4;
+- if(vid_h > (drw_h << 4))
+- drw_h = vid_h >> 4;
++ RADEONPortPrivPtr pPriv = (RADEONPortPrivPtr)data;
++
++ if (!pPriv->textured) {
++ if (vid_w > (drw_w << 4))
++ drw_w = vid_w >> 4;
++ if (vid_h > (drw_h << 4))
++ drw_h = vid_h >> 4;
++ }
+
+ *p_w = drw_w;
+ *p_h = drw_h;
+@@ -2405,7 +2420,7 @@ RADEONCopyMungedData(
+ * is measured in bytes, and the offset from the beginning of card space is
+ * returned.
+ */
+-static CARD32
++CARD32
+ RADEONAllocateMemory(
+ ScrnInfoPtr pScrn,
+ void **mem_struct,
+@@ -2482,7 +2497,7 @@ RADEONAllocateMemory(
+ return offset;
+ }
- 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"))
+-static void
++void
+ RADEONFreeMemory(
+ ScrnInfoPtr pScrn,
+ void *mem_struct
+@@ -3122,7 +3137,7 @@ RADEONPutImage(
+ }
- #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
+-static int
++int
+ RADEONQueryImageAttributes(
+ ScrnInfoPtr pScrn,
+ int id,
+diff --git a/src/radeon_video.h b/src/radeon_video.h
+index 072f40e..a9e9e7d 100644
+--- a/src/radeon_video.h
++++ b/src/radeon_video.h
+@@ -81,8 +81,8 @@ typedef struct {
+ Bool autopaint_colorkey;
+ xf86CrtcPtr desired_crtc;
+
+-#ifdef USE_EXA
+ int size;
++#ifdef USE_EXA
+ ExaOffscreenArea *off_screen;
#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);
+@@ -90,6 +90,20 @@ typedef struct {
+ int video_offset;
--#define TheatreDetectSymbolsList \
-- "DetectTheatre"
--
--#ifdef XFree86LOADER
--
- #define xf86_DetectTheatre ((TheatrePtr (*)(GENERIC_BUS_Ptr))LoaderSymbol("DetectTheatre"))
+ Atom device_id, location_id, instance_id;
++
++ /* textured video */
++ Bool textured;
++ DrawablePtr pDraw;
++ PixmapPtr pPixmap;
++
++ CARD32 src_offset;
++ CARD32 src_pitch;
++ CARD8 *src_addr;
++
++ int id;
++ int src_x1, src_y1, src_x2, src_y2;
++ int dst_x1, dst_y1, dst_x2, dst_y2;
++ int src_w, src_h, dst_w, dst_h;
+ } RADEONPortPrivRec, *RADEONPortPrivPtr;
+
+
+@@ -99,5 +113,20 @@ void RADEONResetI2C(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv);
+ void RADEONVIP_init(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv);
+ void RADEONVIP_reset(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv);
+
++CARD32
++RADEONAllocateMemory(ScrnInfoPtr pScrn, void **mem_struct, int size);
++void
++RADEONFreeMemory(ScrnInfoPtr pScrn, void *mem_struct);
++
++int RADEONSetPortAttribute(ScrnInfoPtr, Atom, INT32, pointer);
++int RADEONGetPortAttribute(ScrnInfoPtr, Atom ,INT32 *, pointer);
++void RADEONStopVideo(ScrnInfoPtr, pointer, Bool);
++void RADEONQueryBestSize(ScrnInfoPtr, Bool, short, short, short, short,
++ unsigned int *, unsigned int *, pointer);
++int RADEONQueryImageAttributes(ScrnInfoPtr, int, unsigned short *,
++ unsigned short *, int *, int *);
++
++XF86VideoAdaptorPtr
++RADEONSetupImageTexturedVideo(ScreenPtr pScreen);
--#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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources 8 Feb 2008 06:26:28 -0000 1.22
+++ sources 26 Feb 2008 08:52:29 -0000 1.23
@@ -1 +1 @@
-7bd53945ce6d0b48b7fd558039e82aa2 xf86-video-ati-6.7.197.tar.bz2
+3c97c7925ebf4162eeb3463e23adc0e3 xf86-video-ati-6.8.0.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.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- xorg-x11-drv-ati.spec 8 Feb 2008 06:31:43 -0000 1.75
+++ xorg-x11-drv-ati.spec 26 Feb 2008 08:52:29 -0000 1.76
@@ -4,7 +4,7 @@
Summary: Xorg X11 ati video driver
Name: xorg-x11-drv-ati
-Version: 6.7.197
+Version: 6.8.0
Release: 1%{?dist}
URL: http://www.x.org
License: MIT
@@ -83,6 +83,9 @@
%{_mandir}/man4/radeon.4*
%changelog
+* Thu Feb 26 2008 Dave Airlie <airlied at redhat.com> 6.8.0-1
+- rebase to 6.8.0 + git fixes
+
* Fri Feb 08 2008 Dave Airlie <airlied at redhat.com> 6.7.197-1
- rebase to 6.7.197 + git fixes
More information about the fedora-extras-commits
mailing list