rpms/xorg-x11-drv-ati/F-11 mkxinf, NONE, 1.1 radeon-6.12.2-hax.patch, NONE, 1.1 radeon-modeset-fixes.patch, 1.3, 1.4 radeon-modeset.patch, 1.47, 1.48 xorg-x11-drv-ati.spec, 1.190, 1.191 radeon.xinf, 1.12, NONE
Adam Jackson
ajax at fedoraproject.org
Thu May 21 19:32:16 UTC 2009
Author: ajax
Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6409
Modified Files:
radeon-modeset-fixes.patch radeon-modeset.patch
xorg-x11-drv-ati.spec
Added Files:
mkxinf radeon-6.12.2-hax.patch
Removed Files:
radeon.xinf
Log Message:
* Thu May 21 2009 Adam Jackson <ajax at redhat.com> 6.12.2-15
- Update to tip of 6.12 branch, 74cb2aba79049b792c22abf25ade3693b802b260
- Drop stuff from radeon-modeset-fixes.patch to match
- Generate radeon.xinf automatically from the CSV
- radeon-6.12.2-hax.patch: Fix cursor setup and initial framebuffer clear
in KMS.
--- NEW FILE mkxinf ---
#!/usr/bin/python
import csv
import sys
csvfile = open(sys.argv[1])
dialect = csv.Sniffer().sniff(csvfile.read(1024))
csvfile.seek(0)
reader = csv.reader(csvfile, dialect)
# pciid, define, family, mobility, igp, nocrtc2, Nointtvout, singledac, name
for line in reader:
if line[0].find("pciid") is not -1:
continue
if line[2].find("MACH") is not -1 or line[2].find("R128") is not -1:
continue
print "alias pcivideo:v00001002d0000%ssv*sd*bc*sc*i* radeon # %s" % \
(line[0].split('x')[1], line[8])
radeon-6.12.2-hax.patch:
--- NEW FILE radeon-6.12.2-hax.patch ---
The memset hack is probably right. The cursor hack probably needs to be
replicated in the kernel.
diff -up xf86-video-ati-6.12.2/src/radeon_cursor.c.jx xf86-video-ati-6.12.2/src/radeon_cursor.c
--- xf86-video-ati-6.12.2/src/radeon_cursor.c.jx 2009-05-21 13:56:38.000000000 -0400
+++ xf86-video-ati-6.12.2/src/radeon_cursor.c 2009-05-21 13:56:39.000000000 -0400
@@ -372,7 +372,7 @@ Bool RADEONCursorInit(ScreenPtr pScreen)
(unsigned int)radeon_crtc->cursor_offset);
}
/* set the cursor mode the same on both crtcs to avoid corruption */
- if (IS_AVIVO_VARIANT)
+ if (IS_AVIVO_VARIANT && !info->drm_mode_setting)
OUTREG(AVIVO_D1CUR_CONTROL + radeon_crtc->crtc_offset,
(AVIVO_D1CURSOR_MODE_24BPP << AVIVO_D1CURSOR_MODE_SHIFT));
}
diff -up xf86-video-ati-6.12.2/src/radeon_driver.c.jx xf86-video-ati-6.12.2/src/radeon_driver.c
--- xf86-video-ati-6.12.2/src/radeon_driver.c.jx 2009-05-21 13:56:38.000000000 -0400
+++ xf86-video-ati-6.12.2/src/radeon_driver.c 2009-05-21 13:59:08.000000000 -0400
@@ -3911,8 +3911,9 @@ Bool RADEONScreenInit(int scrnIndex, Scr
}
/* Clear the framebuffer */
- memset(info->FB + pScrn->fbOffset, 0,
- pScrn->virtualY * pScrn->displayWidth * info->CurrentLayout.pixel_bytes);
+ if (!info->drm_mode_setting)
+ memset(info->FB + pScrn->fbOffset, 0,
+ pScrn->virtualY * pScrn->displayWidth * info->CurrentLayout.pixel_bytes);
/* set the modes with desired rotation, etc. */
pScrn->pScreen = pScreen;
radeon-modeset-fixes.patch:
Index: radeon-modeset-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11/radeon-modeset-fixes.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- radeon-modeset-fixes.patch 5 May 2009 05:34:41 -0000 1.3
+++ radeon-modeset-fixes.patch 21 May 2009 19:32:15 -0000 1.4
@@ -1,7 +1,6 @@
-diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index b368115..8e33a76 100644
---- a/src/drmmode_display.c
-+++ b/src/drmmode_display.c
+diff -up xf86-video-ati-6.12.2/src/drmmode_display.c.modeset-fixes xf86-video-ati-6.12.2/src/drmmode_display.c
+--- xf86-video-ati-6.12.2/src/drmmode_display.c.modeset-fixes 2009-05-21 11:28:31.000000000 -0400
++++ xf86-video-ati-6.12.2/src/drmmode_display.c 2009-05-21 11:28:31.000000000 -0400
@@ -458,7 +458,11 @@ static void
drmmode_crtc_gamma_set(xf86CrtcPtr crtc, uint16_t *red, uint16_t *green,
uint16_t *blue, int size)
@@ -15,7 +14,7 @@ index b368115..8e33a76 100644
}
static const xf86CrtcFuncsRec drmmode_crtc_funcs = {
-@@ -954,8 +958,6 @@ static void drmmode_load_palette(ScrnInfoPtr pScrn, int numColors,
+@@ -954,8 +958,6 @@ static void drmmode_load_palette(ScrnInf
int index, j, i;
int c;
@@ -24,7 +23,7 @@ index b368115..8e33a76 100644
for (c = 0; c < xf86_config->num_crtc; c++) {
xf86CrtcPtr crtc = xf86_config->crtc[c];
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
-@@ -966,8 +968,7 @@ static void drmmode_load_palette(ScrnInfoPtr pScrn, int numColors,
+@@ -966,8 +968,7 @@ static void drmmode_load_palette(ScrnInf
lut_b[i] = drmmode_crtc->lut_b[i] << 6;
}
@@ -34,7 +33,7 @@ index b368115..8e33a76 100644
case 15:
for (i = 0; i < numColors; i++) {
index = indices[i];
-@@ -1003,7 +1004,6 @@ static void drmmode_load_palette(ScrnInfoPtr pScrn, int numColors,
+@@ -1003,7 +1004,6 @@ static void drmmode_load_palette(ScrnInf
}
break;
}
@@ -42,209 +41,4 @@ index b368115..8e33a76 100644
/* Make the change through RandR */
#ifdef RANDR_12_INTERFACE
-diff --git a/src/radeon_accel.c b/src/radeon_accel.c
-index 9d02ac8..5577f84 100644
---- a/src/radeon_accel.c
-+++ b/src/radeon_accel.c
-@@ -491,7 +491,7 @@ void RADEONEngineInit(ScrnInfoPtr pScrn)
- "num quad-pipes is %d\n", info->accel_state->num_gb_pipes);
-
- if (IS_R300_3D || IS_R500_3D) {
-- uint32_t gb_tile_config = (R300_ENABLE_TILING | R300_TILE_SIZE_16 | R300_SUBPIXEL_1_16);
-+ uint32_t gb_tile_config = (R300_ENABLE_TILING | R300_TILE_SIZE_16);
-
- switch(info->accel_state->num_gb_pipes) {
- case 2: gb_tile_config |= R300_PIPE_COUNT_R300; break;
-diff --git a/src/radeon_commonfuncs.c b/src/radeon_commonfuncs.c
-index 6c22339..9e23463 100644
---- a/src/radeon_commonfuncs.c
-+++ b/src/radeon_commonfuncs.c
-@@ -72,7 +72,7 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn)
- FINISH_ACCEL();
- }
-
-- gb_tile_config = (R300_ENABLE_TILING | R300_TILE_SIZE_16 | R300_SUBPIXEL_1_16);
-+ gb_tile_config = (R300_ENABLE_TILING | R300_TILE_SIZE_16);
-
- switch(info->accel_state->num_gb_pipes) {
- case 2: gb_tile_config |= R300_PIPE_COUNT_R300; break;
-@@ -110,21 +110,21 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn)
- OUT_ACCEL_REG(R300_GB_AA_CONFIG, 0);
- OUT_ACCEL_REG(R300_RB3D_DSTCACHE_CTLSTAT, R300_DC_FLUSH_3D | R300_DC_FREE_3D);
- OUT_ACCEL_REG(R300_RB3D_ZCACHE_CTLSTAT, R300_ZC_FLUSH | R300_ZC_FREE);
-- OUT_ACCEL_REG(R300_GB_MSPOS0, ((8 << R300_MS_X0_SHIFT) |
-- (8 << R300_MS_Y0_SHIFT) |
-- (8 << R300_MS_X1_SHIFT) |
-- (8 << R300_MS_Y1_SHIFT) |
-- (8 << R300_MS_X2_SHIFT) |
-- (8 << R300_MS_Y2_SHIFT) |
-- (8 << R300_MSBD0_Y_SHIFT) |
-- (7 << R300_MSBD0_X_SHIFT)));
-- OUT_ACCEL_REG(R300_GB_MSPOS1, ((8 << R300_MS_X3_SHIFT) |
-- (8 << R300_MS_Y3_SHIFT) |
-- (8 << R300_MS_X4_SHIFT) |
-- (8 << R300_MS_Y4_SHIFT) |
-- (8 << R300_MS_X5_SHIFT) |
-- (8 << R300_MS_Y5_SHIFT) |
-- (8 << R300_MSBD1_SHIFT)));
-+ OUT_ACCEL_REG(R300_GB_MSPOS0, ((6 << R300_MS_X0_SHIFT) |
-+ (6 << R300_MS_Y0_SHIFT) |
-+ (6 << R300_MS_X1_SHIFT) |
-+ (6 << R300_MS_Y1_SHIFT) |
-+ (6 << R300_MS_X2_SHIFT) |
-+ (6 << R300_MS_Y2_SHIFT) |
-+ (6 << R300_MSBD0_Y_SHIFT) |
-+ (6 << R300_MSBD0_X_SHIFT)));
-+ OUT_ACCEL_REG(R300_GB_MSPOS1, ((6 << R300_MS_X3_SHIFT) |
-+ (6 << R300_MS_Y3_SHIFT) |
-+ (6 << R300_MS_X4_SHIFT) |
-+ (6 << R300_MS_Y4_SHIFT) |
-+ (6 << R300_MS_X5_SHIFT) |
-+ (6 << R300_MS_Y5_SHIFT) |
-+ (6 << R300_MSBD1_SHIFT)));
- FINISH_ACCEL();
-
- BEGIN_ACCEL(5);
-@@ -557,10 +557,10 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn)
- OUT_ACCEL_REG(R300_SC_EDGERULE, 0xA5294A5);
- if (IS_R300_3D) {
- /* clip has offset 1440 */
-- OUT_ACCEL_REG(R300_SC_CLIP_0_A, ((1088 << R300_CLIP_X_SHIFT) |
-- (1088 << R300_CLIP_Y_SHIFT)));
-- OUT_ACCEL_REG(R300_SC_CLIP_0_B, (((1080 + 2920) << R300_CLIP_X_SHIFT) |
-- ((1080 + 2920) << R300_CLIP_Y_SHIFT)));
-+ OUT_ACCEL_REG(R300_SC_CLIP_0_A, ((1440 << R300_CLIP_X_SHIFT) |
-+ (1440 << R300_CLIP_Y_SHIFT)));
-+ OUT_ACCEL_REG(R300_SC_CLIP_0_B, ((4080 << R300_CLIP_X_SHIFT) |
-+ (4080 << R300_CLIP_Y_SHIFT)));
- } else {
- OUT_ACCEL_REG(R300_SC_CLIP_0_A, ((0 << R300_CLIP_X_SHIFT) |
- (0 << R300_CLIP_Y_SHIFT)));
-diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
-index ca46505..b49c2fb 100644
---- a/src/radeon_exa_render.c
-+++ b/src/radeon_exa_render.c
-@@ -1718,7 +1718,7 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
- R300_RS_COUNT_HIRES_EN));
-
- /* R300_INST_COUNT_RS - highest RS instruction used */
-- OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(1) | R300_TX_OFFSET_RS(6));
-+ OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(1));
-
- OUT_ACCEL_REG(R300_US_CODE_OFFSET, (R300_ALU_CODE_OFFSET(0) |
- R300_ALU_CODE_SIZE(0) |
-@@ -1740,7 +1740,7 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
- ((2 << R300_RS_COUNT_IT_COUNT_SHIFT) |
- R300_RS_COUNT_HIRES_EN));
-
-- OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0) | R300_TX_OFFSET_RS(6));
-+ OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0));
-
- OUT_ACCEL_REG(R300_US_CODE_OFFSET, (R300_ALU_CODE_OFFSET(0) |
- R300_ALU_CODE_SIZE(0) |
-@@ -1967,7 +1967,7 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
- R300_RS_COUNT_HIRES_EN));
-
- /* 2 RS instructions: 1 for tex0 (src), 1 for tex1 (mask) */
-- OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(1) | R300_TX_OFFSET_RS(6));
-+ OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(1));
-
- OUT_ACCEL_REG(R500_US_CODE_ADDR, (R500_US_CODE_START_ADDR(0) |
- R500_US_CODE_END_ADDR(2)));
-@@ -1979,7 +1979,7 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
- ((2 << R300_RS_COUNT_IT_COUNT_SHIFT) |
- R300_RS_COUNT_HIRES_EN));
-
-- OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0) | R300_TX_OFFSET_RS(6));
-+ OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0));
-
- OUT_ACCEL_REG(R500_US_CODE_ADDR, (R500_US_CODE_START_ADDR(0) |
- R500_US_CODE_END_ADDR(1)));
-@@ -2159,8 +2159,12 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
-
- /* Clear out scissoring */
- BEGIN_ACCEL(2);
-- OUT_ACCEL_REG(R300_SC_SCISSOR0, ((0 << R300_SCISSOR_X_SHIFT) |
-- (0 << R300_SCISSOR_Y_SHIFT)));
-+ if (IS_R300_3D)
-+ OUT_ACCEL_REG(R300_SC_SCISSOR0, ((1440 << R300_SCISSOR_X_SHIFT) |
-+ (1440 << R300_SCISSOR_Y_SHIFT)));
-+ else
-+ OUT_ACCEL_REG(R300_SC_SCISSOR0, ((0 << R300_SCISSOR_X_SHIFT) |
-+ (0 << R300_SCISSOR_Y_SHIFT)));
- OUT_ACCEL_REG(R300_SC_SCISSOR1, ((8191 << R300_SCISSOR_X_SHIFT) |
- (8191 << R300_SCISSOR_Y_SHIFT)));
- FINISH_ACCEL();
-diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
-index 852f4ac..bc4101a 100644
---- a/src/radeon_textured_videofuncs.c
-+++ b/src/radeon_textured_videofuncs.c
-@@ -458,7 +458,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
- R300_RS_COUNT_HIRES_EN));
-
- /* R300_INST_COUNT_RS - highest RS instruction used */
-- OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(1) | R300_TX_OFFSET_RS(6));
-+ OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(1));
-
- /* Pixel stack frame size. */
- OUT_ACCEL_REG(R300_US_PIXSIZE, 5);
-@@ -835,7 +835,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
- ((2 << R300_RS_COUNT_IT_COUNT_SHIFT) |
- R300_RS_COUNT_HIRES_EN));
- /* R300_INST_COUNT_RS - highest RS instruction used */
-- OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0) | R300_TX_OFFSET_RS(6));
-+ OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0));
-
- OUT_ACCEL_REG(R300_US_PIXSIZE, 2); /* highest temp used */
-
-@@ -967,7 +967,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
- ((2 << R300_RS_COUNT_IT_COUNT_SHIFT) |
- R300_RS_COUNT_HIRES_EN));
- /* R300_INST_COUNT_RS - highest RS instruction used */
-- OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0) | R300_TX_OFFSET_RS(6));
-+ OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0));
-
- OUT_ACCEL_REG(R300_US_PIXSIZE, 0); /* highest temp used */
-
-@@ -1040,7 +1040,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
- R300_RS_COUNT_HIRES_EN));
-
- /* R300_INST_COUNT_RS - highest RS instruction used */
-- OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(1) | R300_TX_OFFSET_RS(6));
-+ OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(1));
-
- /* Pixel stack frame size. */
- OUT_ACCEL_REG(R300_US_PIXSIZE, 5);
-@@ -1512,7 +1512,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
- R300_RS_COUNT_HIRES_EN));
-
- /* R300_INST_COUNT_RS - highest RS instruction used */
-- OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0) | R300_TX_OFFSET_RS(6));
-+ OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0));
-
- /* Pixel stack frame size. */
- OUT_ACCEL_REG(R300_US_PIXSIZE, 0); /* highest temp used */
-@@ -1601,7 +1601,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
- }
- }
-
-- qwords = info->new_cs ? 8 : 6;
-+ qwords = info->new_cs ? 7 : 6;
- BEGIN_ACCEL(qwords);
- OUT_ACCEL_REG(R300_TX_INVALTAGS, 0);
- OUT_ACCEL_REG(R300_TX_ENABLE, txenable);
-@@ -2131,10 +2131,10 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
- BEGIN_ACCEL(2);
- if (IS_R300_3D) {
- /* R300 has an offset */
-- OUT_ACCEL_REG(R300_SC_SCISSOR0, (((dstX + 1088) << R300_SCISSOR_X_SHIFT) |
-- ((dstY + 1088) << R300_SCISSOR_Y_SHIFT)));
-- OUT_ACCEL_REG(R300_SC_SCISSOR1, (((dstX + dstw + 1088 - 1) << R300_SCISSOR_X_SHIFT) |
-- ((dstY + dsth + 1088 - 1) << R300_SCISSOR_Y_SHIFT)));
-+ OUT_ACCEL_REG(R300_SC_SCISSOR0, (((dstX + 1440) << R300_SCISSOR_X_SHIFT) |
-+ ((dstY + 1440) << R300_SCISSOR_Y_SHIFT)));
-+ OUT_ACCEL_REG(R300_SC_SCISSOR1, (((dstX + dstw + 1440 - 1) << R300_SCISSOR_X_SHIFT) |
-+ ((dstY + dsth + 1440 - 1) << R300_SCISSOR_Y_SHIFT)));
- } else {
- OUT_ACCEL_REG(R300_SC_SCISSOR0, (((dstX) << R300_SCISSOR_X_SHIFT) |
- ((dstY) << R300_SCISSOR_Y_SHIFT)));
+diff -up xf86-video-ati-6.12.2/src/radeon_accel.c.modeset-fixes xf86-video-ati-6.12.2/src/radeon_accel.c
radeon-modeset.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -p -N -r 1.47 -r 1.48 radeon-modeset.patch
Index: radeon-modeset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11/radeon-modeset.patch,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- radeon-modeset.patch 16 Apr 2009 08:18:33 -0000 1.47
+++ radeon-modeset.patch 21 May 2009 19:32:15 -0000 1.48
@@ -1,1084 +1,6 @@
-commit 4f6eff7a49eb66bb701eda8f378a94c9dc7478f2
-Author: Dave Airlie <airlied at redhat.com>
-Date: Thu Apr 16 18:03:03 2009 +1000
-
- radeon: make drmmode palette code
-
- valgrind pointed out I'd missed this before.
-
- still some work left to do
-
-commit f2f1862719dd3438d96822bdd0dd8863321a15d0
-Author: Dave Airlie <airlied at redhat.com>
-Date: Thu Apr 16 16:32:21 2009 +1000
-
- radeon: change wait idle return code.
-
- this returns EBUSY which may or may not be the coorect answer
-
-commit c2ec15d95b27fa28bb01bd915110574a745e5567
-Author: Dave Airlie <airlied at redhat.com>
-Date: Wed Apr 15 21:28:31 2009 +1000
-
- radeon: remove some unneeded comments
-
-commit d3b5de69ea1283e0949d10d4bcbe260dad4f1066
-Author: Dave Airlie <airlied at redhat.com>
-Date: Wed Apr 15 17:21:57 2009 +1000
-
- radeon: todo gamma crtc set
-
-commit 9bc652046201fb67d2f96569137f50120c578c3f
-Author: Dave Airlie <airlied at redhat.com>
-Date: Wed Apr 15 17:13:40 2009 +1000
-
- radeon: add zaphod support for kms
-
- wow that was a lot easier than I thought
-
-commit d8c115adcaf6e8775d812c3f6e94f894920d47b2
-Author: Dave Airlie <airlied at redhat.com>
-Date: Wed Apr 15 12:39:39 2009 +1000
-
- radeon: fixup bo map caching hopefully
-
-commit ebd92d5ba4c19cd0af0a237d4367ae0cda63d1e1
-Author: Dave Airlie <airlied at redhat.com>
-Date: Wed Apr 15 12:04:19 2009 +1000
-
- radeon: fix kms rotation properly
-
-commit 356083345a8c8b2b75e62c0c0643855fb05c9f38
-Author: Dave Airlie <airlied at redhat.com>
-Date: Wed Apr 15 11:37:33 2009 +1000
-
- radeon: remove pointless memory/bo abstraction
-
-commit a322a475ed97d0ee212ea136b0387f49e1103026
-Author: Dave Airlie <airlied at redhat.com>
-Date: Tue Apr 7 11:17:46 2009 +1000
-
- radeon: cache mmaps
-
-commit add7f96a096ac2403aae259a5a457137207015d4
-Author: Dave Airlie <airlied at redhat.com>
-Date: Tue Apr 7 10:48:48 2009 +1000
-
- radeon: mismerge accel dfs only if we have non-agp
-
-commit 982598d830691cd1b39e5aa2c9c409786e059fd3
-Author: Dave Airlie <airlied at redhat.com>
-Date: Tue Apr 7 09:15:08 2009 +1000
-
- radeon: remove function
-
-commit 41fbe7ce72bf978092dd4f6d0410178cc21e441f
-Author: Dave Airlie <airlied at redhat.com>
-Date: Mon Apr 6 18:39:27 2009 +1000
-
- radeon: add config.h to fix mmap
-
-commit bb15e058079254a88a2194d70659f6694f59262f
-Author: Dave Airlie <airlied at redhat.com>
-Date: Mon Apr 6 15:19:13 2009 +1000
-
- radeon: drop lots of unused code
-
-commit 8695b9394e5597d393007165552f8cd77ca55002
-Author: Dave Airlie <airlied at redhat.com>
-Date: Mon Apr 6 13:03:46 2009 +1000
-
- radeon: fixup mmap for new kernel API
-
-commit 783f402a7b248f1aea9c8f267a3a69e1f95bdc8b
-Author: Dave Airlie <airlied at redhat.com>
-Date: Mon Apr 6 10:18:41 2009 +1000
-
- radeon DDX: update API
-
-commit 9c81d3fb250610c1979122ff50bd8b4173b9547a
-Author: Dave Airlie <airlied at linux.ie>
-Date: Sun Apr 5 11:11:19 2009 +1000
-
- radeon: fix compile
-
-commit 842c290e17d2096a82319731afc1e043aa8e1df4
-Author: Dave Airlie <airlied at redhat.com>
-Date: Fri Apr 3 20:34:05 2009 +1100
-
- r600: fix src offsets after kms changes
-
-commit af04b0d061123ccb763975c368fb0dda38977fe6
-Author: Dave Airlie <airlied at redhat.com>
-Date: Wed Apr 1 21:55:46 2009 +1000
-
- radeon: fix r100/r200 xv better
-
-commit 666f8ee5f9201282e3a2f2b02e1c9699e8bf9b82
-Author: Dave Airlie <airlied at redhat.com>
-Date: Wed Apr 1 18:14:27 2009 +1000
-
- radeon: fixup textured video hopefully for kms
-
-commit d50d3ab2d09a15dab26698450bc1b900fd421682
-Author: Dave Airlie <airlied at redhat.com>
-Date: Wed Apr 1 17:12:05 2009 +1000
-
- radeon: make FUS work with DRI2
-
-commit 63f5c44278db2e42286402ab507c9494665084a6
-Author: Dave Airlie <airlied at redhat.com>
-Date: Wed Mar 25 14:02:42 2009 +1000
-
- reenable UTS
-
-commit 21db8c83ff6c6b66c0d4b1f3ae35e642fb19b66d
-Author: Dave Airlie <airlied at redhat.com>
-Date: Wed Mar 25 13:57:18 2009 +1000
-
- radeon: remove drm_mm paths, assume mm = kms for now
-
-commit 0d598ea813c2422ed16d0020ecc04a15438e917f
-Author: Dave Airlie <airlied at redhat.com>
-Date: Tue Mar 24 15:35:53 2009 +1000
-
- radeon: fix mismerge in kms paths
-
-commit 7a6cf9ade0f6ce5416aa635a8518b25d58cf32a8
-Author: Adam Jackson <ajax at redhat.com>
-Date: Fri Mar 13 14:04:59 2009 +1000
-
- radeon: make shadowfb run on kms r600
-
-commit 6d24c7a78c346086c6cca889b599c4124229a42d
-Author: Dave Airlie <airlied at redhat.com>
-Date: Fri Mar 13 14:01:07 2009 +1000
-
- radeon: do some rotate fixups - still not perfect
-
-commit de55e58c72e53948d5fdbc252ea3ea3f7e3377af
-Author: Dave Airlie <airlied at redhat.com>
-Date: Fri Mar 13 14:00:13 2009 +1000
-
- kms: explicitly dpms on after mode setting
-
-commit 5e1bc153cd49ae56c0910e934a915f16caf5d232
-Author: Dave Airlie <airlied at redhat.com>
-Date: Fri Mar 13 13:59:43 2009 +1000
-
- radeon: update for drm mode api change
-
-commit 86af107d30daccd5f6e2b5fe8017621197e095f8
-Author: Dave Airlie <airlied at linux.ie>
-Date: Tue Mar 10 22:33:51 2009 +1000
-
- r600: fix merge issue that breaks Xv
-
-commit a49b34e1155ee757aef942e3303186d950fb3256
-Author: Dave Airlie <airlied at redhat.com>
-Date: Thu Mar 5 16:05:41 2009 +1000
-
- radeon: add support for relocatable CRTC inside VLINE
-
- We cannot let userspace decide which CRTC it wants because its userspace
- and might not own the crtc, so we need to provide a way to relocate it
-
-commit 09b179b6d45c040d4b33b97c9dfc5bbec3c226ba
-Author: Dave Airlie <airlied at redhat.com>
-Date: Tue Mar 3 15:30:21 2009 +1000
-
- radeon: initial framebuffer resize support
-
[...6130 lines suppressed...]
pPriv->w = width;
pPriv->h = height;
@@ -8901,10 +7691,9 @@ index 79671c0..aed229c 100644
RADEONDisplayTexturedVideoCP(pScrn, pPriv);
else
#endif
-diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
-index 05acb93..852f4ac 100644
---- a/src/radeon_textured_videofuncs.c
-+++ b/src/radeon_textured_videofuncs.c
+diff -up xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c.modeset xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c
+--- xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c.modeset 2009-05-21 11:01:45.000000000 -0400
++++ xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c 2009-05-21 11:01:45.000000000 -0400
@@ -87,11 +87,25 @@ do { \
#endif /* !ACCEL_CP */
@@ -8931,7 +7720,7 @@ index 05acb93..852f4ac 100644
uint32_t txformat;
uint32_t txfilter, txformat0, txformat1, txoffset, txpitch;
uint32_t dst_offset, dst_pitch, dst_format;
-@@ -101,19 +115,57 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -101,19 +115,57 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
int dstxoff, dstyoff, pixel_shift, vtx_count;
BoxPtr pBox = REGION_RECTS(&pPriv->clip);
int nBox = REGION_NUM_RECTS(&pPriv->clip);
@@ -8992,7 +7781,7 @@ index 05acb93..852f4ac 100644
dst_pitch = pPixmap->devKind;
}
-@@ -144,7 +196,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -144,7 +196,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
RADEON_WAIT_DMA_GUI_IDLE);
FINISH_ACCEL();
@@ -9001,7 +7790,7 @@ index 05acb93..852f4ac 100644
RADEONInit3DEngine(pScrn);
}
-@@ -222,15 +274,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -222,15 +274,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
if (IS_R500_3D && ((pPriv->h - 1) & 0x800))
txpitch |= R500_TXHEIGHT_11;
@@ -9024,7 +7813,7 @@ index 05acb93..852f4ac 100644
FINISH_ACCEL();
txenable = R300_TEX_0_ENABLE;
-@@ -246,19 +302,22 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -246,19 +302,22 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
R300_TX_MIN_FILTER_LINEAR |
R300_TX_MAG_FILTER_LINEAR);
@@ -9050,7 +7839,7 @@ index 05acb93..852f4ac 100644
FINISH_ACCEL();
txenable |= R300_TEX_1_ENABLE | R300_TEX_2_ENABLE;
}
-@@ -279,13 +338,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -279,13 +338,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
R300_TX_MAG_FILTER_NEAREST |
(1 << R300_TX_ID_SHIFT));
@@ -9072,7 +7861,7 @@ index 05acb93..852f4ac 100644
FINISH_ACCEL();
/* Enable tex 1 */
-@@ -1536,11 +1601,18 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1536,11 +1601,18 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
}
}
@@ -9093,7 +7882,7 @@ index 05acb93..852f4ac 100644
OUT_ACCEL_REG(R300_RB3D_COLORPITCH0, colorpitch);
blendcntl = RADEON_SRC_BLEND_GL_ONE | RADEON_DST_BLEND_GL_ZERO;
-@@ -1587,11 +1659,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1587,11 +1659,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
if (RADEONTilingEnabled(pScrn, pPixmap))
colorpitch |= RADEON_COLOR_TILE_ENABLE;
@@ -9115,7 +7904,7 @@ index 05acb93..852f4ac 100644
OUT_ACCEL_REG(RADEON_RB3D_COLORPITCH, colorpitch);
-@@ -1630,7 +1710,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1630,7 +1710,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
R200_CLAMP_S_CLAMP_LAST |
R200_CLAMP_T_CLAMP_LAST;
@@ -9125,7 +7914,7 @@ index 05acb93..852f4ac 100644
OUT_ACCEL_REG(RADEON_PP_CNTL,
RADEON_TEX_0_ENABLE | RADEON_TEX_1_ENABLE | RADEON_TEX_2_ENABLE |
-@@ -1649,21 +1730,22 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1649,21 +1730,22 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
(pPriv->w - 1) |
((pPriv->h - 1) << RADEON_TEX_VSIZE_SHIFT));
OUT_ACCEL_REG(R200_PP_TXPITCH_0, pPriv->src_pitch - 32);
@@ -9151,7 +7940,7 @@ index 05acb93..852f4ac 100644
/* similar to r300 code. Note the big problem is that hardware constants
* are 8 bits only, representing 0.0-1.0. We can get that up (using bias
-@@ -1799,7 +1881,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1799,7 +1881,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
R200_CLAMP_S_CLAMP_LAST |
R200_CLAMP_T_CLAMP_LAST;
@@ -9161,7 +7950,7 @@ index 05acb93..852f4ac 100644
OUT_ACCEL_REG(RADEON_PP_CNTL,
RADEON_TEX_0_ENABLE |
-@@ -1817,7 +1900,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1817,7 +1900,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
(pPriv->w - 1) |
((pPriv->h - 1) << RADEON_TEX_VSIZE_SHIFT));
OUT_ACCEL_REG(R200_PP_TXPITCH_0, pPriv->src_pitch - 32);
@@ -9170,7 +7959,7 @@ index 05acb93..852f4ac 100644
/* MAD temp1 / 2, const0.a * 2, temp0.ggg, -const0.rgb */
OUT_ACCEL_REG(R200_PP_TXCBLEND_0,
-@@ -1901,7 +1984,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1901,7 +1984,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
FINISH_ACCEL();
}
else {
@@ -9180,7 +7969,7 @@ index 05acb93..852f4ac 100644
OUT_ACCEL_REG(RADEON_PP_CNTL,
RADEON_TEX_0_ENABLE | RADEON_TEX_BLEND_0_ENABLE);
-@@ -1922,7 +2006,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1922,7 +2006,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
((pPriv->h - 1) << RADEON_TEX_VSIZE_SHIFT));
OUT_ACCEL_REG(R200_PP_TXPITCH_0, pPriv->src_pitch - 32);
@@ -9189,7 +7978,7 @@ index 05acb93..852f4ac 100644
OUT_ACCEL_REG(R200_PP_TXCBLEND_0,
R200_TXC_ARG_A_ZERO |
-@@ -1945,7 +2029,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1945,7 +2029,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
info->accel_state->texW[0] = 1;
info->accel_state->texH[0] = 1;
@@ -9199,7 +7988,7 @@ index 05acb93..852f4ac 100644
OUT_ACCEL_REG(RADEON_PP_CNTL,
RADEON_TEX_0_ENABLE | RADEON_TEX_BLEND_0_ENABLE);
-@@ -1959,8 +2044,9 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1959,8 +2044,9 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
RADEON_CLAMP_S_CLAMP_LAST |
RADEON_CLAMP_T_CLAMP_LAST |
RADEON_YUV_TO_RGB);
@@ -9210,11 +7999,10 @@ index 05acb93..852f4ac 100644
OUT_ACCEL_REG(RADEON_PP_TXCBLEND_0,
RADEON_COLOR_ARG_A_ZERO |
RADEON_COLOR_ARG_B_ZERO |
-diff --git a/src/radeon_video.c b/src/radeon_video.c
-index 42aa036..bd6408d 100644
---- a/src/radeon_video.c
-+++ b/src/radeon_video.c
-@@ -287,7 +287,7 @@ void RADEONInitVideo(ScreenPtr pScreen)
+diff -up xf86-video-ati-6.12.2/src/radeon_video.c.modeset xf86-video-ati-6.12.2/src/radeon_video.c
+--- xf86-video-ati-6.12.2/src/radeon_video.c.modeset 2009-04-07 11:31:32.000000000 -0400
++++ xf86-video-ati-6.12.2/src/radeon_video.c 2009-05-21 11:01:45.000000000 -0400
+@@ -284,7 +284,7 @@ void RADEONInitVideo(ScreenPtr pScreen)
memcpy(newAdaptors, adaptors, num_adaptors * sizeof(XF86VideoAdaptorPtr));
adaptors = newAdaptors;
@@ -9223,7 +8011,7 @@ index 42aa036..bd6408d 100644
overlayAdaptor = RADEONSetupImageVideo(pScreen);
if (overlayAdaptor != NULL) {
adaptors[num_adaptors++] = overlayAdaptor;
-@@ -297,9 +297,12 @@ void RADEONInitVideo(ScreenPtr pScreen)
+@@ -294,9 +294,12 @@ void RADEONInitVideo(ScreenPtr pScreen)
RADEONInitOffscreenImages(pScreen);
}
@@ -9238,7 +8026,7 @@ index 42aa036..bd6408d 100644
#endif
) {
texturedAdaptor = RADEONSetupImageTexturedVideo(pScreen);
-@@ -2200,7 +2203,7 @@ RADEONCopyData(
+@@ -2197,7 +2200,7 @@ RADEONCopyData(
#ifdef XF86DRI
@@ -9247,10 +8035,9 @@ index 42aa036..bd6408d 100644
{
uint8_t *buf;
uint32_t bufPitch, dstPitchOff;
-diff --git a/src/radeon_video.h b/src/radeon_video.h
-index 34fb07f..7b75ec3 100644
---- a/src/radeon_video.h
-+++ b/src/radeon_video.h
+diff -up xf86-video-ati-6.12.2/src/radeon_video.h.modeset xf86-video-ati-6.12.2/src/radeon_video.h
+--- xf86-video-ati-6.12.2/src/radeon_video.h.modeset 2009-04-07 11:31:53.000000000 -0400
++++ xf86-video-ati-6.12.2/src/radeon_video.h 2009-05-21 11:01:45.000000000 -0400
@@ -121,6 +121,9 @@ typedef struct {
int w, h;
int drw_x, drw_y;
Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11/xorg-x11-drv-ati.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -p -r1.190 -r1.191
--- xorg-x11-drv-ati.spec 15 May 2009 04:02:00 -0000 1.190
+++ xorg-x11-drv-ati.spec 21 May 2009 19:32:15 -0000 1.191
@@ -5,26 +5,29 @@
Summary: Xorg X11 ati video driver
Name: xorg-x11-drv-ati
Version: 6.12.2
-Release: 14%{?dist}
+Release: 15%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: http://www.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
-Source1: radeon.xinf
+Source0: http://www.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+# unlike the other drivers, radeon.xinf is generated
+Source1: mkxinf
+Patch0: radeon-6.12.2-stable-branch.patch
Patch1: radeon-modeset.patch
Patch2: radeon-modeset-fixes.patch
Patch3: radeon-modeset-still-more-fixes.patch
Patch6: radeon-6.9.0-bgnr-enable.patch
-Patch7: radeon-6.12.1-r600-fb-size.patch
Patch8: radeon-src-readback-cpu.patch
Patch9: radeon-6.12.2-rs690-hack.patch
Patch10: radeon-6.12.2-lvds-default-modes.patch
+Patch11: radeon-6.12.2-hax.patch
ExcludeArch: s390 s390x
+BuildRequires: python
BuildRequires: xorg-x11-server-sdk >= 1.4.99.1
BuildRequires: mesa-libGL-devel >= 6.4-4
BuildRequires: libdrm-devel >= 2.4.0-0.21
@@ -43,14 +46,15 @@ X.Org X11 ati video driver.
%prep
%setup -q -n %{tarball}-%{version}
+%patch0 -p1 -b .stable
%patch1 -p1 -b .modeset
%patch2 -p1 -b .modeset-fixes
%patch3 -p1 -b .modeset-still-more-fixes
%patch6 -p1 -b .bgnr
-%patch7 -p1 -b .r600-fb-size
%patch8 -p1 -b .srcrb
%patch9 -p1 -b .rs690
%patch10 -p1 -b .lvds
+%patch11 -p1 -b .fixups
%build
autoreconf -iv
@@ -62,8 +66,10 @@ rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
+%{SOURCE1} src/pcidb/ati_pciids.csv > radeon.xinf
+
mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
-install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
+install -m 0644 radeon.xinf $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
@@ -82,6 +88,13 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man4/radeon.4*
%changelog
+* Thu May 21 2009 Adam Jackson <ajax at redhat.com> 6.12.2-15
+- Update to tip of 6.12 branch, 74cb2aba79049b792c22abf25ade3693b802b260
+- Drop stuff from radeon-modeset-fixes.patch to match
+- Generate radeon.xinf automatically from the CSV
+- radeon-6.12.2-hax.patch: Fix cursor setup and initial framebuffer clear
+ in KMS.
+
* Thu May 14 2009 Kyle McMartin <kyle at redhat.com> 6.12.2-14
- radeon-modeset-still-more-fixes.patch: Bump the GEM interface version to
31 so we don't activate it... (#500801)
--- radeon.xinf DELETED ---
More information about the fedora-extras-commits
mailing list