rpms/xorg-x11-drv-ati/F-9 radeon-git-upstream-fixes2.patch, 1.8, 1.9 xorg-x11-drv-ati.spec, 1.99, 1.100
Dave Airlie (airlied)
fedora-extras-commits at redhat.com
Wed Jul 30 01:00:52 UTC 2008
- Previous message (by thread): rpms/dhcpv6/devel .cvsignore, 1.20, 1.21 dhcpv6.spec, 1.91, 1.92 sources, 1.20, 1.21
- Next message (by thread): rpms/xorg-x11-drv-ati/devel r128-bios-size.patch, NONE, 1.1 radeon-git-upstream-fixes2.patch, 1.4, 1.5 xorg-x11-drv-ati.spec, 1.91, 1.92
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: airlied
Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31351
Modified Files:
radeon-git-upstream-fixes2.patch xorg-x11-drv-ati.spec
Log Message:
* Wed Jul 30 2008 Dave Airlie <airlied at redhat.com> 6.8.0-19
- Update to latest upstream release + fixes
radeon-git-upstream-fixes2.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.8 -r 1.9 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- radeon-git-upstream-fixes2.patch 26 Jun 2008 06:27:58 -0000 1.8
+++ radeon-git-upstream-fixes2.patch 30 Jul 2008 01:00:22 -0000 1.9
@@ -1,5 +1,2121 @@
+commit 1f3eee3682f3598a303c9c3accfbe01b245cacf9
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date: Tue Jul 29 20:29:32 2008 -0400
+
+ Change prim types for exa and textured video to help avoid tearing
+
+ - r1xx - switch from tri fan to rect list
+ - r2xx/r3xx/r4xx/r5xx - switch from tri fan to quad list
+
+commit 5b5441f8cc119db0d1e03dd35bd06015a26270dd
+Author: Brice Goglin <bgoglin at debian.org>
+Date: Tue Jul 29 23:31:14 2008 +0200
+
+ Increase default GART size to 32MB on >=R300
+
+commit 0a505297f09aefb1b4432176a263bfdf6f256f77
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date: Mon Jul 28 17:12:41 2008 -0400
+
+ Fix error in driver connector table for powerbook w/ vga
+
+commit d5799ac53c3e1b2ca1da97780b171a44060c3aad
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date: Mon Jul 28 11:09:10 2008 -0400
+
+ Add quirk for oem x300 card
+
+ - debian bug 492457
+
+commit 64dbadddcf6d069c0472f37afeab89d3e31e937d
+Author: Owain Gordon Ainsworth <oga at openbsd.org>
+Date: Mon Jul 28 10:40:58 2008 +1000
+
+ radeon: don't call ioctl unless DRI is initialised
+
+commit 1c5858484da4fb1c9bc3ac3b4d7a97863ab99730
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date: Mon Jul 21 23:47:45 2008 -0400
+
+ First pass at InitDispBandwidth() for AVIVO chips
+
+ - support for LB allocation
+ - MC priority bumps for display1/2 on RV515 variants and RS690
+ If you are having display underflow problems (flickering on sides of
+ screen in high res modes, etc.) on RV515 or RS690 boards, try setting:
+ Option "DisplayPriority" "HIGH" in your config.
+ - still no support for full display watermark programming yet
+
+ Something similar might be useful in rhd as well.
+
+commit b0378bb145c8a915c943bef7d17f2cdecfccc891
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date: Mon Jul 21 13:47:09 2008 -0400
+
+ Interlaced mode fixups for AVIVO chips
+
+commit c18fad622a3c4f9572051120d83af68b625b5686
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date: Mon Jul 21 10:36:48 2008 -0400
+
+ Clear display priority bits before resetting them
+
+commit dc231ff8e063313d2bcf5acccad67a9f8a7e3314
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date: Mon Jul 21 10:30:41 2008 -0400
+
+ Clean up legacy display watermark setup
+
+ - makes crtc1 and crtc2 watermark setup independant.
+ - fixes the case where only crtc2 is active
+
+commit f9034214f070fe3054cd9cefd7034252de234f38
+Author: Michel Dänzer <michel at tungstengraphics.com>
+Date: Mon Jul 21 09:09:02 2008 +0200
+
+ Call DRM modeset ioctl after the IRQ has been initialized.
+
+ This lets the DRM know it can safely disable the vblank interrupts.
+
+commit ecb6347a3d7071890600c98c2addef3a8ca260ee
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date: Sat Jul 19 11:34:16 2008 -0400
+
+ Add oem quirk for external tmds setup on Dell Inspiron 8600
+
+ Noticed by fnord42 on IRC.
+
+commit df53d12a06fad41f00cff849458cb358ab5e2098
+Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
+Date: Thu Jul 17 14:37:05 2008 +1000
+
+ Fix console switch on R500
+
+ This patch fixes the console switch for me on R5xx.
+
+ There are two aspects to it:
+
+ - Fix the ordering of avivo_restore() to better match what's
+ happening in the driver & ATOM, properly locking/unlocking and
+ only enabling the CRTCs after everything has been properly
+ programmed.
+
+ - Don't ASIC_INIT if the card has any CRTC enabled. This is the
+ best I came up with for avoiding spurrious ASIC_INIT on cards that
+ -are- POSTed but don't have the BIOS coming from c0000 on x86. The
+ problem with spurrious ASIC_INIT is that we do it before we do
+ RADEONSave(), so that screws up the console switch.
+
+ Note that I think we also should save/restore the palette, I don't think
+ we do. right now, it's a minor issue for me because I fixed offb to be
+ able to set it on AVIVO's but it might still have to be done in the long
+ run.
+
+ Tested with a VGA analog setup on DACA and a DVI setup on TMDS 0. I
+ haven't tested any other combo but that should get us going.
+
+ Cheers,
+ Ben.
+
+ Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit e8c07270e1fc2ee455320370692aaf90abac2773
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date: Tue Jul 15 17:50:32 2008 -0400
+
+ ATOM: fix for r4xx cards with no VRAM_Usage tables
+
+ fixes bug 15954
+
+commit da41e71efd41907d9347a902720bce60b32550e5
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date: Mon Jul 14 13:21:38 2008 -0400
+
+ ATOM: Add support for UpdateCRTC_DoubleBufferRegisters cmd table
+
+ locks/unlocks the crtc/grph/mode regs before updating the crtc
+
+commit a5e0cf13dc7ace6cf0e44e18b73b9a9266e740ab
+Author: Julien Cristau <jcristau at debian.org>
+Date: Sun Jul 6 12:17:28 2008 +0200
+
+ Link with -lpciaccess and -ldrm if needed
+
+ This makes sure the driver ends up with a DT_NEEDED reference to
+ the libraries it's using.
+
+commit f8da849fd89322a54cc4d722767da755358eab70
+Author: Michel Dänzer <michel at tungstengraphics.com>
+Date: Sun Jul 13 11:31:03 2008 +0200
+
+ Only declare local variable when it's used.
+
+commit a6db4dc65aec560f3b1f37ff73ec6b0bd8207295
+Author: Dave Airlie <airlied at linux.ie>
+Date: Sat Jul 12 18:47:07 2008 +1000
+
+ atombios: fix typo in mode conversion for panel
+
+commit 19a0d5879851eff23a3e7d5cdea55bd784051115
+Author: Dave Airlie <airlied at linux.ie>
+Date: Sat Jul 12 17:04:25 2008 +1000
+
+ atombios: use macro to get offset into table
+
+commit a9746114369d516072d841ec356ec3ba3d0be71a
+Author: Dave Airlie <airlied at linux.ie>
+Date: Sat Jul 12 10:46:36 2008 +1000
+
+ pciid: add radeon HD3850.
+
+ pci id from legume on #radeon
+
+commit ab14f725676e4d4e45278c64b03fe2d328a3e439
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date: Fri Jul 11 19:05:00 2008 -0400
+
+ R300: NUM_FPU adjustments for VAP_CNTL
+
+commit 810c28cc2660b73e03e4d27be97988fc5321a06f
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date: Fri Jul 11 15:31:57 2008 -0400
+
+ Make sure cursor offsets are properly aligned when using EXA
+
+commit 7e67d0163579a44f104e8f354a929ac9b33e4c21
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date: Fri Jul 11 14:30:17 2008 -0400
+
+ Fix cursor with multi-head and rotation
+
+commit 9086d008fb8c3cde0633b90ce19ffbf4eded388d
[...8444 lines suppressed...]
# define R300_OUT_FMT_C_11_11_10 (11 << 0)
# define R300_OUT_FMT_C_10_11_11 (12 << 0)
# define R300_OUT_FMT_C_2_10_10_10 (13 << 0)
-@@ -4227,28 +4488,223 @@
+@@ -4227,28 +4512,223 @@
# define R300_TEX_CODE_OFFSET(x) (x << 13)
# define R300_TEX_CODE_SIZE(x) (x << 18)
#define R300_US_CODE_ADDR_0 0x4610
@@ -15573,7 +19700,7 @@
#define R300_RB3D_ZSTENCILCNTL 0x4f04
#define R300_RB3D_ZCACHE_CTLSTAT 0x4f18
#define R300_RB3D_BW_CNTL 0x4f1c
-@@ -4256,6 +4712,9 @@
+@@ -4256,6 +4736,9 @@
#define R300_RB3D_ZTOP 0x4f14
#define R300_RB3D_ROPCNTL 0x4e18
#define R300_RB3D_BLENDCNTL 0x4e04
@@ -15583,7 +19710,7 @@
#define R300_RB3D_ABLENDCNTL 0x4e08
#define R300_RB3D_DSTCACHE_CTLSTAT 0x4e4c
#define R300_RB3D_COLOROFFSET0 0x4e28
-@@ -4387,7 +4846,7 @@
+@@ -4387,7 +4870,7 @@
# define R500_ALPHA_SRCP_OP_1_MINUS_2A0 (0 << 30)
# define R500_ALPHA_SRCP_OP_A1_MINUS_A0 (1 << 30)
# define R500_ALPHA_SRCP_OP_A1_PLUS_A0 (2 << 30)
@@ -15592,7 +19719,7 @@
#define R500_US_ALU_RGBA_INST_0 0xb000
# define R500_ALU_RGBA_OP_MAD (0 << 0)
# define R500_ALU_RGBA_OP_DP3 (1 << 0)
-@@ -4540,7 +4999,7 @@
+@@ -4540,7 +5023,7 @@
# define R500_RGB_SRCP_OP_1_MINUS_2RGB0 (0 << 30)
# define R500_RGB_SRCP_OP_RGB1_MINUS_RGB0 (1 << 30)
# define R500_RGB_SRCP_OP_RGB1_PLUS_RGB0 (2 << 30)
@@ -15601,7 +19728,7 @@
#define R500_US_CMN_INST_0 0xb800
# define R500_INST_TYPE_ALU (0 << 0)
# define R500_INST_TYPE_OUT (1 << 0)
-@@ -4779,17 +5238,18 @@
+@@ -4779,17 +5262,18 @@
#define R500_GA_US_VECTOR_DATA 0x4254
#define R500_RS_INST_0 0x4320
@@ -15631,7 +19758,7 @@
#define R500_US_FC_CTRL 0x4624
#define R500_US_CODE_ADDR 0x4630
-@@ -4797,16 +5257,18 @@
+@@ -4797,16 +5281,18 @@
#define R500_US_CODE_OFFSET 0x4638
#define R500_RS_IP_0 0x4074
@@ -15977,7 +20104,7 @@
adapt->pFormats = Formats;
adapt->nPorts = num_texture_ports;
diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
-index e0f3bba..f0dad03 100644
+index e0f3bba..d39f74d 100644
--- a/src/radeon_textured_videofuncs.c
+++ b/src/radeon_textured_videofuncs.c
@@ -74,22 +74,21 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
@@ -16455,9 +20582,46 @@
FINISH_VIDEO();
BEGIN_VIDEO(1);
-@@ -538,8 +593,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -431,6 +486,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+ OUT_VIDEO_REG(R200_PP_TXFILTER_0,
+ R200_MAG_FILTER_LINEAR |
+ R200_MIN_FILTER_LINEAR |
++ R200_CLAMP_S_CLAMP_LAST |
++ R200_CLAMP_T_CLAMP_LAST |
+ R200_YUV_TO_RGB);
+ OUT_VIDEO_REG(R200_PP_TXFORMAT_0, txformat);
+ OUT_VIDEO_REG(R200_PP_TXFORMAT_X_0, 0);
+@@ -466,8 +523,11 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+ OUT_VIDEO_REG(RADEON_SE_VTX_FMT, RADEON_SE_VTX_FMT_XY |
+ RADEON_SE_VTX_FMT_ST0);
+
+- OUT_VIDEO_REG(RADEON_PP_TXFILTER_0, RADEON_MAG_FILTER_LINEAR |
++ OUT_VIDEO_REG(RADEON_PP_TXFILTER_0,
++ RADEON_MAG_FILTER_LINEAR |
+ RADEON_MIN_FILTER_LINEAR |
++ RADEON_CLAMP_S_CLAMP_LAST |
++ RADEON_CLAMP_T_CLAMP_LAST |
+ RADEON_YUV_TO_RGB);
+ OUT_VIDEO_REG(RADEON_PP_TXFORMAT_0, txformat);
+ OUT_VIDEO_REG(RADEON_PP_TXOFFSET_0, pPriv->src_offset);
+@@ -527,47 +587,50 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+
+ #ifdef ACCEL_CP
+ if (info->ChipFamily < CHIP_FAMILY_R200) {
+- BEGIN_RING(4 * VTX_DWORD_COUNT + 3);
++ BEGIN_RING(3 * VTX_DWORD_COUNT + 3);
+ OUT_RING(CP_PACKET3(RADEON_CP_PACKET3_3D_DRAW_IMMD,
+- 4 * VTX_DWORD_COUNT + 1));
++ 3 * VTX_DWORD_COUNT + 1));
+ OUT_RING(RADEON_CP_VC_FRMT_XY |
+ RADEON_CP_VC_FRMT_ST0);
+- OUT_RING(RADEON_CP_VC_CNTL_PRIM_TYPE_TRI_FAN |
++ OUT_RING(RADEON_CP_VC_CNTL_PRIM_TYPE_RECT_LIST |
+ RADEON_CP_VC_CNTL_PRIM_WALK_RING |
+ RADEON_CP_VC_CNTL_MAOS_ENABLE |
RADEON_CP_VC_CNTL_VTX_FMT_RADEON_MODE |
- (4 << RADEON_CP_VC_CNTL_NUM_SHIFT));
+- (4 << RADEON_CP_VC_CNTL_NUM_SHIFT));
++ (3 << RADEON_CP_VC_CNTL_NUM_SHIFT));
} else {
- if (IS_R300_VARIANT || IS_AVIVO_VARIANT)
- BEGIN_RING(4 * VTX_DWORD_COUNT + 6);
@@ -16466,7 +20630,10 @@
else
BEGIN_RING(4 * VTX_DWORD_COUNT + 2);
OUT_RING(CP_PACKET3(R200_CP_PACKET3_3D_DRAW_IMMD_2,
-@@ -549,8 +604,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+ 4 * VTX_DWORD_COUNT));
+- OUT_RING(RADEON_CP_VC_CNTL_PRIM_TYPE_TRI_FAN |
++ OUT_RING(RADEON_CP_VC_CNTL_PRIM_TYPE_QUAD_LIST |
+ RADEON_CP_VC_CNTL_PRIM_WALK_RING |
(4 << RADEON_CP_VC_CNTL_NUM_SHIFT));
}
#else /* ACCEL_CP */
@@ -16474,10 +20641,36 @@
- BEGIN_VIDEO(3 + VTX_DWORD_COUNT * 4);
+ if (IS_R300_3D || IS_R500_3D)
+ BEGIN_VIDEO(2 + VTX_DWORD_COUNT * 4);
++ else if (info->ChipFamily < CHIP_FAMILY_R200)
++ BEGIN_VIDEO(1 + VTX_DWORD_COUNT * 3);
else
BEGIN_VIDEO(1 + VTX_DWORD_COUNT * 4);
-@@ -575,10 +630,9 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+ if (info->ChipFamily < CHIP_FAMILY_R200) {
+- OUT_VIDEO_REG(RADEON_SE_VF_CNTL, (RADEON_VF_PRIM_TYPE_TRIANGLE_FAN |
++ OUT_VIDEO_REG(RADEON_SE_VF_CNTL, (RADEON_VF_PRIM_TYPE_RECTANGLE_LIST |
+ RADEON_VF_PRIM_WALK_DATA |
+ RADEON_VF_RADEON_MODE |
+- 4 << RADEON_VF_NUM_VERTICES_SHIFT));
++ (3 << RADEON_VF_NUM_VERTICES_SHIFT)));
+ } else {
+ OUT_VIDEO_REG(RADEON_SE_VF_CNTL, (RADEON_VF_PRIM_TYPE_QUAD_LIST |
+ RADEON_VF_PRIM_WALK_DATA |
+- 4 << RADEON_VF_NUM_VERTICES_SHIFT));
++ (4 << RADEON_VF_NUM_VERTICES_SHIFT)));
+ }
+ #endif
+-
+- VTX_OUT((float)dstX, (float)dstY,
+- xFixedToFloat(srcTopLeft.x) / info->texW[0], xFixedToFloat(srcTopLeft.y) / info->texH[0]);
++ if (info->ChipFamily >= CHIP_FAMILY_R200) {
++ VTX_OUT((float)dstX, (float)dstY,
++ xFixedToFloat(srcTopLeft.x) / info->texW[0], xFixedToFloat(srcTopLeft.y) / info->texH[0]);
++ }
+ VTX_OUT((float)dstX, (float)(dstY + dsth),
+ xFixedToFloat(srcBottomLeft.x) / info->texW[0], xFixedToFloat(srcBottomLeft.y) / info->texH[0]);
+ VTX_OUT((float)(dstX + dstw), (float)(dstY + dsth),
+@@ -575,10 +638,9 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
VTX_OUT((float)(dstX + dstw), (float)dstY,
xFixedToFloat(srcTopRight.x) / info->texW[0], xFixedToFloat(srcTopRight.y) / info->texH[0]);
@@ -16491,11 +20684,11 @@
#ifdef ACCEL_CP
ADVANCE_RING();
-@@ -589,6 +643,14 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -589,6 +651,14 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
pBox++;
}
-+ if (IS_R300_3D | IS_R500_3D) {
++ if (IS_R300_3D || IS_R500_3D) {
+ BEGIN_VIDEO(2);
+ OUT_VIDEO_REG(R300_RB3D_DSTCACHE_CTLSTAT, R300_RB3D_DC_FLUSH_ALL);
+ } else
@@ -16762,6 +20955,24 @@
/* FIXME: need to revisit this when we add more modes */
+diff --git a/src/radeon_version.h b/src/radeon_version.h
+index ccc1367..5717ead 100644
+--- a/src/radeon_version.h
++++ b/src/radeon_version.h
+@@ -39,10 +39,9 @@
+ #define R200_DRIVER_NAME "r200"
+ #define R300_DRIVER_NAME "r300"
+
+-#define RADEON_VERSION_MAJOR 4
+-#define RADEON_VERSION_MAJOR_TILED 5
+-#define RADEON_VERSION_MINOR 3
+-#define RADEON_VERSION_PATCH 0
++#define RADEON_VERSION_MAJOR PACKAGE_VERSION_MAJOR
++#define RADEON_VERSION_MINOR PACKAGE_VERSION_MINOR
++#define RADEON_VERSION_PATCH PACKAGE_VERSION_PATCHLEVEL
+
+ #ifndef RADEON_VERSION_EXTRA
+ #define RADEON_VERSION_EXTRA ""
diff --git a/src/radeon_video.c b/src/radeon_video.c
index 7502e1e..ac60166 100644
--- a/src/radeon_video.c
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.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- xorg-x11-drv-ati.spec 26 Jun 2008 06:27:58 -0000 1.99
+++ xorg-x11-drv-ati.spec 30 Jul 2008 01:00:22 -0000 1.100
@@ -5,7 +5,7 @@
Summary: Xorg X11 ati video driver
Name: xorg-x11-drv-ati
Version: 6.8.0
-Release: 18%{?dist}
+Release: 19%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -91,6 +91,9 @@
%{_mandir}/man4/radeon.4*
%changelog
+* Wed Jul 30 2008 Dave Airlie <airlied at redhat.com> 6.8.0-19
+- Update to latest upstream release + fixes
+
* Thu Jun 26 2008 Dave Airlie <airlied at redhat.com> 6.8.0-18
- update to latest git 6.8.192 beta
- Previous message (by thread): rpms/dhcpv6/devel .cvsignore, 1.20, 1.21 dhcpv6.spec, 1.91, 1.92 sources, 1.20, 1.21
- Next message (by thread): rpms/xorg-x11-drv-ati/devel r128-bios-size.patch, NONE, 1.1 radeon-git-upstream-fixes2.patch, 1.4, 1.5 xorg-x11-drv-ati.spec, 1.91, 1.92
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list