rpms/xorg-x11-drv-ati/F-9 radeon-git-upstream-fixes2.patch, 1.6, 1.7 xorg-x11-drv-ati.spec, 1.97, 1.98
Dave Airlie (airlied)
fedora-extras-commits at redhat.com
Wed May 28 06:28:33 UTC 2008
Author: airlied
Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29111
Modified Files:
radeon-git-upstream-fixes2.patch xorg-x11-drv-ati.spec
Log Message:
* 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
radeon-git-upstream-fixes2.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.6 -r 1.7 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- radeon-git-upstream-fixes2.patch 24 May 2008 01:56:13 -0000 1.6
+++ radeon-git-upstream-fixes2.patch 28 May 2008 06:27:52 -0000 1.7
@@ -1,8 +1,1500 @@
+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.
[...3115 lines suppressed...]
@@ -12858,7 +14979,7 @@
#define AVIVO_DACA_ENABLE 0x7800
# define AVIVO_DAC_ENABLE (1 << 0)
#define AVIVO_DACA_SOURCE_SELECT 0x7804
-@@ -3745,6 +3825,8 @@
+@@ -3745,6 +3834,8 @@
# define AVIVO_LVDS_BACKLIGHT_LEVEL_MASK 0x0000ff00
# define AVIVO_LVDS_BACKLIGHT_LEVEL_SHIFT 8
@@ -12867,7 +14988,35 @@
#define AVIVO_GPIO_0 0x7e30
#define AVIVO_GPIO_1 0x7e40
#define AVIVO_GPIO_2 0x7e50
-@@ -3832,6 +3914,7 @@
+@@ -3793,6 +3884,15 @@
+ # define AVIVO_I2C_EN (1 << 0)
+ # define AVIVO_I2C_RESET (1 << 8)
+
++#define R600_GENERAL_PWRMGT 0x618
++# define R600_OPEN_DRAIN_PADS (1 << 11)
++
++#define R600_LOWER_GPIO_ENABLE 0x710
++#define R600_CTXSW_VID_LOWER_GPIO_CNTL 0x718
++#define R600_HIGH_VID_LOWER_GPIO_CNTL 0x71c
++#define R600_MEDIUM_VID_LOWER_GPIO_CNTL 0x720
++#define R600_LOW_VID_LOWER_GPIO_CNTL 0x724
++
+ #define R600_MC_VM_FB_LOCATION 0x2180
+ #define R600_MC_VM_AGP_TOP 0x2184
+ #define R600_MC_VM_AGP_BOT 0x2188
+@@ -3809,6 +3909,11 @@
+ #define R600_CONFIG_F0_BASE 0x542C
+ #define R600_CONFIG_APER_SIZE 0x5430
+
++#define R600_ROM_CNTL 0x1600
++# define R600_SCK_OVERWRITE (1 << 1)
++# define R600_SCK_PRESCALE_CRYSTAL_CLK_SHIFT 28
++# define R600_SCK_PRESCALE_CRYSTAL_CLK_MASK (0xf << 28)
++
+ #define R600_BIOS_0_SCRATCH 0x1724
+ #define R600_BIOS_1_SCRATCH 0x1728
+ #define R600_BIOS_2_SCRATCH 0x172c
+@@ -3832,6 +3937,7 @@
#define R300_GB_SELECT 0x401c
#define R300_GB_ENABLE 0x4008
#define R300_GB_AA_CONFIG 0x4020
@@ -12875,7 +15024,7 @@
#define R300_GB_MSPOS0 0x4010
# define R300_MS_X0_SHIFT 0
# define R300_MS_Y0_SHIFT 4
-@@ -3850,6 +3933,10 @@
+@@ -3850,6 +3956,10 @@
# define R300_MS_Y5_SHIFT 20
# define R300_MSBD1_SHIFT 24
@@ -12886,7 +15035,7 @@
#define R300_GA_POLY_MODE 0x4288
# define R300_FRONT_PTYPE_POINT (0 << 4)
# define R300_FRONT_PTYPE_LINE (1 << 4)
-@@ -3889,6 +3976,8 @@
+@@ -3889,6 +3999,8 @@
# define R300_ALPHA3_SHADING_GOURAUD (2 << 14)
#define R300_GA_OFFSET 0x4290
@@ -12895,7 +15044,7 @@
#define R300_VAP_CNTL_STATUS 0x2140
# define R300_PVS_BYPASS (1 << 8)
#define R300_VAP_PVS_STATE_FLUSH_REG 0x2284
-@@ -3899,6 +3988,7 @@
+@@ -3899,6 +4011,7 @@
# define R300_VF_MAX_VTX_NUM_SHIFT 18
# define R300_GL_CLIP_SPACE_DEF (0 << 22)
# define R300_DX_CLIP_SPACE_DEF (1 << 22)
@@ -12903,7 +15052,7 @@
#define R300_VAP_VTE_CNTL 0x20B0
# define R300_VPORT_X_SCALE_ENA (1 << 0)
# define R300_VPORT_X_OFFSET_ENA (1 << 1)
-@@ -3909,6 +3999,7 @@
+@@ -3909,6 +4022,7 @@
# define R300_VTX_XY_FMT (1 << 8)
# define R300_VTX_Z_FMT (1 << 9)
# define R300_VTX_W0_FMT (1 << 10)
@@ -12911,7 +15060,7 @@
#define R300_VAP_PSC_SGN_NORM_CNTL 0x21DC
#define R300_VAP_PROG_STREAM_CNTL_0 0x2150
# define R300_DATA_TYPE_0_SHIFT 0
-@@ -3986,6 +4077,123 @@
+@@ -3986,6 +4100,123 @@
# define R300_PVS_LAST_VTX_SRC_INST_SHIFT 0
#define R300_VAP_PVS_VECTOR_INDX_REG 0x2200
#define R300_VAP_PVS_VECTOR_DATA_REG 0x2204
@@ -13035,7 +15184,7 @@
#define R300_VAP_PVS_FLOW_CNTL_OPC 0x22DC
#define R300_VAP_OUT_VTX_FMT_0 0x2090
# define R300_VTX_POS_PRESENT (1 << 0)
-@@ -4019,6 +4227,9 @@
+@@ -4019,6 +4250,9 @@
# define R300_CLIP_DISABLE (1 << 16)
# define R300_UCP_CULL_ONLY_ENA (1 << 17)
# define R300_BOUNDARY_EDGE_FLAG_ENA (1 << 18)
@@ -13045,7 +15194,7 @@
#define R300_SU_TEX_WRAP 0x42a0
#define R300_SU_POLY_OFFSET_ENABLE 0x42b4
-@@ -4036,6 +4247,7 @@
+@@ -4036,6 +4270,7 @@
# define R300_RS_COUNT_HIRES_EN (1 << 18)
#define R300_RS_IP_0 0x4310
@@ -13053,7 +15202,7 @@
# define R300_RS_TEX_PTR(x) (x << 0)
# define R300_RS_COL_PTR(x) (x << 6)
# define R300_RS_COL_FMT(x) (x << 9)
-@@ -4063,7 +4275,10 @@
+@@ -4063,7 +4298,10 @@
# define R300_RS_W_EN (1 << 4)
# define R300_TX_OFFSET_RS(x) (x << 5)
#define R300_RS_INST_0 0x4330
@@ -13064,7 +15213,7 @@
#define R300_TX_INVALTAGS 0x4100
#define R300_TX_FILTER0_0 0x4400
-@@ -4082,6 +4297,7 @@
+@@ -4082,6 +4320,7 @@
# define R300_TX_MIN_FILTER_NEAREST (1 << 11)
# define R300_TX_MAG_FILTER_LINEAR (2 << 9)
# define R300_TX_MIN_FILTER_LINEAR (2 << 11)
@@ -13072,7 +15221,7 @@
#define R300_TX_FILTER1_0 0x4440
#define R300_TX_FORMAT0_0 0x4480
# define R300_TXWIDTH_SHIFT 0
-@@ -4164,11 +4380,16 @@
+@@ -4164,11 +4403,16 @@
# define R300_TX_FORMAT_SWAP_YUV (1 << 24)
#define R300_TX_FORMAT2_0 0x4500
@@ -13090,7 +15239,7 @@
#define R300_TX_ENABLE 0x4104
# define R300_TEX_0_ENABLE (1 << 0)
-@@ -4189,7 +4410,7 @@
+@@ -4189,7 +4433,7 @@
# define R300_OUT_FMT_C2_16_MPEG (7 << 0)
# define R300_OUT_FMT_C2_4 (8 << 0)
# define R300_OUT_FMT_C_3_3_2 (9 << 0)
@@ -13099,7 +15248,7 @@
# 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 +4448,221 @@
+@@ -4227,28 +4471,221 @@
# define R300_TEX_CODE_OFFSET(x) (x << 13)
# define R300_TEX_CODE_SIZE(x) (x << 18)
#define R300_US_CODE_ADDR_0 0x4610
@@ -13324,7 +15473,7 @@
#define R300_RB3D_ZSTENCILCNTL 0x4f04
#define R300_RB3D_ZCACHE_CTLSTAT 0x4f18
#define R300_RB3D_BW_CNTL 0x4f1c
-@@ -4256,6 +4670,9 @@
+@@ -4256,6 +4693,9 @@
#define R300_RB3D_ZTOP 0x4f14
#define R300_RB3D_ROPCNTL 0x4e18
#define R300_RB3D_BLENDCNTL 0x4e04
@@ -13334,7 +15483,7 @@
#define R300_RB3D_ABLENDCNTL 0x4e08
#define R300_RB3D_DSTCACHE_CTLSTAT 0x4e4c
#define R300_RB3D_COLOROFFSET0 0x4e28
-@@ -4387,7 +4804,7 @@
+@@ -4387,7 +4827,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)
@@ -13343,7 +15492,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 +4957,7 @@
+@@ -4540,7 +4980,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)
@@ -13352,7 +15501,7 @@
#define R500_US_CMN_INST_0 0xb800
# define R500_INST_TYPE_ALU (0 << 0)
# define R500_INST_TYPE_OUT (1 << 0)
-@@ -4779,17 +5196,18 @@
+@@ -4779,17 +5219,18 @@
#define R500_GA_US_VECTOR_DATA 0x4254
#define R500_RS_INST_0 0x4320
@@ -13382,7 +15531,7 @@
#define R500_US_FC_CTRL 0x4624
#define R500_US_CODE_ADDR 0x4630
-@@ -4797,16 +5215,18 @@
+@@ -4797,16 +5238,18 @@
#define R500_US_CODE_OFFSET 0x4638
#define R500_RS_IP_0 0x4074
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.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- xorg-x11-drv-ati.spec 24 May 2008 01:56:13 -0000 1.97
+++ xorg-x11-drv-ati.spec 28 May 2008 06:27:52 -0000 1.98
@@ -5,7 +5,7 @@
Summary: Xorg X11 ati video driver
Name: xorg-x11-drv-ati
Version: 6.8.0
-Release: 16%{?dist}
+Release: 17%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -91,6 +91,10 @@
%{_mandir}/man4/radeon.4*
%changelog
+* 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
+
* Sat May 24 2008 Dave Airlie <airlied at redhat.com> 6.8.0-16
- Fix PLL on r600 LVDS (#444542)
- update to other upstream fixes
More information about the scm-commits
mailing list