rpms/xorg-x11-drv-ati/devel radeon-git-upstream-fixes.patch, 1.7, 1.8 xorg-x11-drv-ati.spec, 1.82, 1.83
Dave Airlie (airlied)
fedora-extras-commits at redhat.com
Tue Feb 26 08:49:55 UTC 2008
Author: airlied
Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19701
Modified Files:
xorg-x11-drv-ati.spec
Added Files:
radeon-git-upstream-fixes.patch
Log Message:
* Tue Feb 26 2008 Dave Airlie <airlied at redhat.com> 6.8.0-2
- rebase to upstream 6.8.0 release + git fixes
radeon-git-upstream-fixes.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.7 -r 1.8 radeon-git-upstream-fixes.patch
Index: radeon-git-upstream-fixes.patch
===================================================================
RCS file: radeon-git-upstream-fixes.patch
diff -N radeon-git-upstream-fixes.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ radeon-git-upstream-fixes.patch 26 Feb 2008 08:49:34 -0000 1.8
@@ -0,0 +1,3393 @@
+commit 8ea75b268f11794f4a7e7bac52cb256490ed3fd2
+Author: Dave Airlie <airlied at linux.ie>
+Date: Tue Feb 26 16:29:19 2008 +1000
+
+ regs: fix spelling properly
+
+commit f2816064a6c2c4c35ccba74b9aa80547e25c012e
+Author: Dave Airlie <airlied at linux.ie>
+Date: Tue Feb 26 16:28:24 2008 +1000
+
+ regs: fix spelling mistake
+
+ pointed out by plaes on irc
+
+commit 9d2ca30b90607085578dde1f314db663bd5f82ec
+Author: Alex Deucher <alex at samba.(none)>
+Date: Mon Feb 25 17:34:00 2008 -0500
+
+ R300/R500: clean up magic numbers in render code
+
+commit 153ad6fcf704cbf9f811d9986cd4baf04e82c9d2
+Author: Dave Airlie <airlied at linux.ie>
+Date: Mon Feb 25 07:10:48 2008 +1000
+
+ fixup check for EXA composite pointed out by Alan Swanson
+
+commit 85e470e64f629de72e361c77770e2e29998d1bf4
+Merge: 27ddb39... 1b84c76...
+Author: Alex Deucher <alex at samba.(none)>
+Date: Sun Feb 24 05:37:22 2008 -0500
+
+ Merge master and fix conflicts
+
+ Merge branch 'master' of ssh://agd5f@git.freedesktop.org/git/xorg/driver/xf86-video-ati
+
+ Conflicts:
+
+ src/radeon_commonfuncs.c
+
+commit 27ddb39b12a0b54e099fd5274c4c91f08e2d2822
+Author: Alex Deucher <alex at samba.(none)>
+Date: Sun Feb 24 05:30:11 2008 -0500
+
+ R300: clean up magic numbers in RADEONInit3DEngine
+
+commit d4c20f33ad6a1f88615cd7e09ad3638896873f9e
+Author: Alex Deucher <alex at samba.(none)>
+Date: Sun Feb 24 04:46:10 2008 -0500
+
+ R300: replace magic numbers in cache flush
+
+commit e52f1c8d2647b81d891ec0728dd582941a76c83f
+Author: Alex Deucher <alex at samba.(none)>
+Date: Sun Feb 24 04:43:18 2008 -0500
+
+ R300: fill in some more 3D bitfields
+
+commit 1b84c76f27c8d24cb42beae26abf000721901c1c
+Author: Dave Airlie <airlied at redhat.com>
+Date: Sun Feb 24 19:20:36 2008 +1100
+
+ rs690: initial textured video support
+
+commit 68158124366db883a901e960fe5f05f8df5efa42
+Author: Dave Airlie <airlied at redhat.com>
+Date: Tue Feb 19 19:51:18 2008 +1100
+
+ rs690: initial rs690 rotate
+
+ suffers same problem as r500 with clipping
+
+commit e614bb6965588bf09dcb87f5e08e67120ec9847f
+Author: Dave Airlie <airlied at redhat.com>
+Date: Sun Feb 24 01:46:05 2008 -0500
+
+ r500: convert fragprog to use register values
+
+commit 6ce9ee47c75620b2e5d211c5d59d17271a6a7b19
+Author: Dave Airlie <airlied at redhat.com>
+Date: Sat Feb 23 22:49:34 2008 -0500
+
+ r500: add textured video Xv adapter support
+
+commit 9aaf8b33b22b6ba112869558ae54e021b9487ad2
+Author: Dave Airlie <airlied at redhat.com>
+Date: Sat Feb 23 22:16:25 2008 -0500
+
+ r500: initial rotate support - not fully working yet.
+
+ Just an example of how to setup and run the r500 3D engine for rotation.
+ this rotates for me but I get some strange clipping on the bottom of my screen
+
+commit 05dc3e4fc19d056ce99a7b110665adab2ca1ea21
+Author: Adam Jackson <ajax at redhat.com>
+Date: Sat Feb 23 20:29:51 2008 -0500
+
+ Clarify R500 US setup.
+
+commit 080606ad528972623e1ed1124d8efe7705a73446
+Author: Adam Jackson <ajax at redhat.com>
+Date: Sat Feb 23 20:21:17 2008 -0500
+
+ Add the R500 US index/data pair.
+
+commit edfb3b6bbf0ee17ace8e6ba704a6f54e249fec63
+Author: Alex Deucher <alex at samba.(none)>
+Date: Sat Feb 23 19:59:33 2008 -0500
+
+ RADEON: no textured video yet on XPRESS chips
+
+ Still need to sort out the VAP and PVS stuff
+
+commit 4146bfe5d00e40a86d17826fac50d04b2469621d
+Author: Alex Deucher <alex at samba.(none)>
+Date: Sat Feb 23 19:21:52 2008 -0500
+
+ R500: fix typo in new r5xx regs
+
+commit d9be9f34b0d3313e7b22b2a8bb0a8924ad3116bf
+Author: Alex Deucher <alex at samba.(none)>
+Date: Sat Feb 23 19:06:30 2008 -0500
+
+ RADEON: add textured video support for r1xx-r4xx radeons
+
+ Based on the kdrive ati video code by Eric Anholt.
+ R3xx/R4xx still have some clipping issues in certain situations
+
+commit 9dc4acad79196e9d5d94dd710773bfa83456d47f
+Author: Alex Deucher <alex at cube.(none)>
+Date: Sat Feb 23 18:29:00 2008 -0500
+
+ RS6xx: gpio entry for DDIA varies depending on the number of DFP ports
+
+commit ed0a93edf28155308e7ab9d8705581bb38455ea0
+Author: Adam Jackson <ajax at redhat.com>
+Date: Sat Feb 23 15:02:17 2008 -0500
+
+ Fix R500_US_CONFIG.
+
+commit bc2bd6f841b51aeed3b6b4a47dbe758c200bc5a6
+Author: Adam Jackson <ajax at redhat.com>
+Date: Sat Feb 23 14:34:18 2008 -0500
+
+ Add R500 unified shader register block.
+
+commit a7b5c3bb74fc4de5e38a75ac31656445ce823464
+Author: Alex Deucher <alex at cube.(none)>
+Date: Fri Feb 22 19:35:11 2008 -0500
+
+ RS6xx: fix DDC on DDIA output (usually HDMI port)
+
+commit 3327a681e21101cc6f6e162f4e29f9937b69ccc3
+Author: Alex Deucher <alex at cube.(none)>
+Date: Fri Feb 22 17:05:56 2008 -0500
+
+ ATOM: properly set up DDIA output on RS6xx boards
+
+commit 1d0e9ab8b9451101b1b91943546f6c5833c21b3f
+Author: Michel Dänzer <michel at tungstengraphics.com>
+Date: Wed Feb 20 10:21:49 2008 +0100
+
+ radeon: Fix typo flagged by gcc -Wall.
+
+commit b5bd442b60dbc72fe4c1e928ab864aeb0fd7a3cb
+Author: Alex Deucher <alex at botch2.(none)>
+Date: Tue Feb 19 20:47:40 2008 -0500
+
+ R100: fix render accel for transforms
+
+ Not sure why we had a separate broken path for r100 vertex
+ submission.
+
+commit a0a73208a21546ac120fb9a463261836c9ea7b55
+Author: Alex Deucher <alex at botch2.(none)>
+Date: Tue Feb 19 20:11:19 2008 -0500
+
+ RADEON: restore clock gating and CP clock errata on VT switch
+
+ This may help people with hangs on resume
+
+commit b77e2aff7453a9f370beba37ca3c25b92b3f97ff
+Author: Alex Deucher <alex at botch2.(none)>
+Date: Tue Feb 19 19:55:41 2008 -0500
+
+ RADEON: fix DDC types 5 and 6
+
+commit af82172a82f2bdf96e571def659a1c70f92dfdbf
+Author: Alex Deucher <alex at botch2.(none)>
+Date: Tue Feb 19 19:39:35 2008 -0500
+
+ RADEON: update man page with supported chips
+diff --git a/man/radeon.man b/man/radeon.man
+index b4ade32..86be965 100644
[...3000 lines suppressed...]
++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Set up overlay video\n");
++ } else
++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to set up overlay video\n");
++ RADEONInitOffscreenImages(pScreen);
++ }
++
++ if (info->ChipFamily != CHIP_FAMILY_RS400) {
++ texturedAdaptor = RADEONSetupImageTexturedVideo(pScreen);
++ if (texturedAdaptor != NULL) {
++ adaptors[num_adaptors++] = texturedAdaptor;
++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Set up textured video\n");
++ } else
++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to set up textured video\n");
+ }
+
+ if(num_adaptors)
+@@ -300,6 +299,7 @@ void RADEONInitVideo(ScreenPtr pScreen)
+
+ if(newAdaptors)
+ xfree(newAdaptors);
++
+ }
+
+ /* client libraries expect an encoding */
+@@ -1611,6 +1611,8 @@ RADEONSetupImageVideo(ScreenPtr pScreen)
+ pPriv = (RADEONPortPrivPtr)(adapt->pPortPrivates[0].ptr);
+ REGION_NULL(pScreen, &(pPriv->clip));
+
++ pPriv->textured = FALSE;
++
+ if(pPriv->theatre != NULL)
+ {
+ /* video decoder is present, extend capabilities */
+@@ -1626,13 +1628,16 @@ RADEONSetupImageVideo(ScreenPtr pScreen)
+ return adapt;
+ }
+
+-static void
++void
+ RADEONStopVideo(ScrnInfoPtr pScrn, pointer data, Bool cleanup)
+ {
+ RADEONInfoPtr info = RADEONPTR(pScrn);
+ unsigned char *RADEONMMIO = info->MMIO;
+ RADEONPortPrivPtr pPriv = (RADEONPortPrivPtr)data;
+
++ if (pPriv->textured)
++ return;
++
+ REGION_EMPTY(pScrn->pScreen, &pPriv->clip);
+
+ if(cleanup) {
+@@ -1663,7 +1668,7 @@ RADEONStopVideo(ScrnInfoPtr pScrn, pointer data, Bool cleanup)
+ }
+ }
+
+-static int
++int
+ RADEONSetPortAttribute(ScrnInfoPtr pScrn,
+ Atom attribute,
+ INT32 value,
+@@ -1675,6 +1680,9 @@ RADEONSetPortAttribute(ScrnInfoPtr pScrn,
+ Bool setAlpha = FALSE;
+ unsigned char *RADEONMMIO = info->MMIO;
+
++ if (pPriv->textured)
++ return BadMatch;
++
+ RADEON_SYNC(info, pScrn);
+
+ #define RTFSaturation(a) (1.0 + ((a)*1.0)/1000.0)
+@@ -1937,7 +1945,7 @@ RADEONSetPortAttribute(ScrnInfoPtr pScrn,
+ return Success;
+ }
+
+-static int
++int
+ RADEONGetPortAttribute(ScrnInfoPtr pScrn,
+ Atom attribute,
+ INT32 *value,
+@@ -1946,6 +1954,9 @@ RADEONGetPortAttribute(ScrnInfoPtr pScrn,
+ RADEONInfoPtr info = RADEONPTR(pScrn);
+ RADEONPortPrivPtr pPriv = (RADEONPortPrivPtr)data;
+
++ if (pPriv->textured)
++ return BadMatch;
++
+ if (info->accelOn) RADEON_SYNC(info, pScrn);
+
+ if(attribute == xvAutopaintColorkey)
+@@ -2031,7 +2042,7 @@ RADEONGetPortAttribute(ScrnInfoPtr pScrn,
+ return Success;
+ }
+
+-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;
+ }
+
+-static void
++void
+ RADEONFreeMemory(
+ ScrnInfoPtr pScrn,
+ void *mem_struct
+@@ -3122,7 +3137,7 @@ RADEONPutImage(
+ }
+
+
+-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
+
+@@ -90,6 +90,20 @@ typedef struct {
+ int video_offset;
+
+ 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);
+
+ #endif
Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- xorg-x11-drv-ati.spec 19 Feb 2008 09:28:20 -0000 1.82
+++ xorg-x11-drv-ati.spec 26 Feb 2008 08:49:34 -0000 1.83
@@ -5,7 +5,7 @@
Summary: Xorg X11 ati video driver
Name: xorg-x11-drv-ati
Version: 6.8.0
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -17,6 +17,7 @@
Source3: radeon.xinf
# Radeon patches (0-99)
+Patch1: radeon-git-upstream-fixes.patch
Patch4: radeon-6.7.196-faster-ddc.patch
# Rage 128 patches (100-199)
@@ -42,6 +43,7 @@
%prep
%setup -q -n %{tarball}-%{version}
+%patch1 -p1 -b .git
%patch4 -p1 -b .ddc
%build
@@ -82,6 +84,9 @@
%{_mandir}/man4/radeon.4*
%changelog
+* Tue Feb 26 2008 Dave Airlie <airlied at redhat.com> 6.8.0-2
+- rebase to upstream 6.8.0 release + git fixes
+
* Tue Feb 19 2008 Dave Airlie <airlied at redhat.com> 6.8.0-1
- rebase to upstream 6.8.0 release.
More information about the fedora-extras-commits
mailing list