rpms/xorg-x11-drv-ati/devel .cvsignore, 1.26, 1.27 radeon-modeset.patch, 1.38, 1.39 sources, 1.26, 1.27 xorg-x11-drv-ati.spec, 1.159, 1.160 radeon-6.11.0-git.patch, 1.5, NONE
Dave Airlie
airlied at fedoraproject.org
Sat Mar 14 08:43:16 UTC 2009
- Previous message (by thread): rpms/mldonkey/EL-4 .cvsignore, 1.3, 1.4 import.log, 1.3, 1.4 mldonkey.spec, 1.4, 1.5 sources, 1.3, 1.4 url_slashes.patch, 1.1, NONE
- Next message (by thread): rpms/gcc/devel gcc44-power7-2.patch,NONE,1.1 gcc.spec,1.31,1.32
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: airlied
Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7528
Modified Files:
.cvsignore radeon-modeset.patch sources xorg-x11-drv-ati.spec
Removed Files:
radeon-6.11.0-git.patch
Log Message:
* Sat Mar 14 2009 Dave Airlie <airlied at redhat.com> 6.12.0-1
- rebase to latest -ati upstream release
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore 27 Feb 2009 03:57:32 -0000 1.26
+++ .cvsignore 14 Mar 2009 08:42:43 -0000 1.27
@@ -1 +1 @@
-xf86-video-ati-6.11.0.tar.bz2
+xf86-video-ati-6.12.0.tar.bz2
radeon-modeset.patch:
Index: radeon-modeset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-modeset.patch,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- radeon-modeset.patch 13 Mar 2009 04:13:34 -0000 1.38
+++ radeon-modeset.patch 14 Mar 2009 08:42:44 -0000 1.39
@@ -1,5 +1,5 @@
diff --git a/configure.ac b/configure.ac
-index b094a50..29a19e3 100644
+index 3475f6a..727e2a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -114,8 +114,19 @@ if test "$DRI" = yes; then
@@ -2403,7 +2403,7 @@
+int radeon_bo_gem_name_buffer(dri_bo *bo, uint32_t *name);
+#endif
diff --git a/src/radeon_commonfuncs.c b/src/radeon_commonfuncs.c
-index eabd87d..8712a74 100644
+index a9bc7d2..6c22339 100644
--- a/src/radeon_commonfuncs.c
+++ b/src/radeon_commonfuncs.c
@@ -62,12 +62,15 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn)
@@ -4079,7 +4079,7 @@
+
+#endif
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
-index c0f5e7b..3c824a8 100644
+index d1b2f54..052ed1f 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -67,7 +67,7 @@
@@ -4091,7 +4091,7 @@
/* Driver data structures */
#include "radeon.h"
#include "radeon_reg.h"
-@@ -226,7 +226,10 @@ radeonShadowWindow(ScreenPtr screen, CARD32 row, CARD32 offset, int mode,
+@@ -229,7 +229,10 @@ radeonShadowWindow(ScreenPtr screen, CARD32 row, CARD32 offset, int mode,
stride = (pScrn->displayWidth * pScrn->bitsPerPixel) / 8;
*size = stride;
@@ -4103,7 +4103,7 @@
}
static Bool
RADEONCreateScreenResources (ScreenPtr pScreen)
-@@ -247,6 +250,13 @@ RADEONCreateScreenResources (ScreenPtr pScreen)
+@@ -250,6 +253,13 @@ RADEONCreateScreenResources (ScreenPtr pScreen)
radeonShadowWindow, 0, NULL))
return FALSE;
}
@@ -4117,7 +4117,7 @@
return TRUE;
}
-@@ -1658,6 +1668,7 @@ static Bool RADEONPreInitVRAM(ScrnInfoPtr pScrn)
+@@ -1661,6 +1671,7 @@ static Bool RADEONPreInitVRAM(ScrnInfoPtr pScrn)
}
pScrn->videoRam &= ~1023;
@@ -4125,7 +4125,7 @@
info->FbMapSize = pScrn->videoRam * 1024;
/* if the card is PCI Express reserve the last 32k for the gart table */
-@@ -1788,58 +1799,64 @@ static Bool RADEONPreInitChipType(ScrnInfoPtr pScrn)
+@@ -1791,58 +1802,64 @@ static Bool RADEONPreInitChipType(ScrnInfoPtr pScrn)
}
from = X_PROBED;
@@ -4233,7 +4233,7 @@
#ifdef XF86DRI
/* AGP/PCI */
-@@ -2014,6 +2031,15 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
+@@ -2017,6 +2034,15 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
}
info->accel_state->fifo_slots = 0;
@@ -4249,7 +4249,7 @@
if ((info->ChipFamily == CHIP_FAMILY_RS100) ||
(info->ChipFamily == CHIP_FAMILY_RS200) ||
(info->ChipFamily == CHIP_FAMILY_RS300) ||
-@@ -2038,6 +2064,9 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
+@@ -2041,6 +2067,9 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
if (!xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE)) {
int errmaj = 0, errmin = 0;
@@ -4259,7 +4259,7 @@
from = X_DEFAULT;
#if defined(USE_EXA)
#if defined(USE_XAA)
-@@ -2048,6 +2077,7 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
+@@ -2051,6 +2080,7 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
info->useEXA = TRUE;
} else if (xf86NameCmp(optstr, "XAA") == 0) {
from = X_CONFIG;
@@ -4267,7 +4267,7 @@
}
}
#else /* USE_XAA */
-@@ -2151,15 +2181,9 @@ static Bool RADEONPreInitInt10(ScrnInfoPtr pScrn, xf86Int10InfoPtr *ppInt10)
+@@ -2155,15 +2185,9 @@ static Bool RADEONPreInitInt10(ScrnInfoPtr pScrn, xf86Int10InfoPtr *ppInt10)
return TRUE;
}
@@ -4284,7 +4284,7 @@
if (!(info->dri = xcalloc(1, sizeof(struct radeon_dri)))) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,"Unable to allocate dri rec!\n");
-@@ -2170,6 +2194,22 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr pScrn)
+@@ -2174,6 +2198,22 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr pScrn)
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,"Unable to allocate cp rec!\n");
return FALSE;
}
@@ -4307,7 +4307,7 @@
info->cp->CPInUse = FALSE;
info->cp->CPStarted = FALSE;
info->cp->CPusecTimeout = RADEON_DEFAULT_CP_TIMEOUT;
-@@ -2727,6 +2767,37 @@ static const xf86CrtcConfigFuncsRec RADEONCRTCResizeFuncs = {
+@@ -2731,6 +2771,37 @@ static const xf86CrtcConfigFuncsRec RADEONCRTCResizeFuncs = {
RADEONCRTCResize
};
@@ -4345,7 +4345,7 @@
Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
{
xf86CrtcConfigPtr xf86_config;
-@@ -2747,6 +2818,8 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -2751,6 +2822,8 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
info = RADEONPTR(pScrn);
info->MMIO = NULL;
@@ -4354,7 +4354,7 @@
info->IsSecondary = FALSE;
info->IsPrimary = FALSE;
-@@ -2781,62 +2854,63 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -2785,62 +2858,63 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
}
info->PciInfo = xf86GetPciInfoForEntity(info->pEnt->index);
@@ -4465,7 +4465,7 @@
if (xf86RegisterResources(info->pEnt->index, 0, ResExclusive))
goto fail;
-@@ -2846,10 +2920,12 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -2850,10 +2924,12 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_VIEWPORT | RAC_CURSOR;
pScrn->monitor = pScrn->confScreen->monitor;
@@ -4482,7 +4482,7 @@
if (!RADEONPreInitVisual(pScrn))
goto fail;
-@@ -2863,164 +2939,224 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -2867,167 +2943,227 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
memcpy(info->Options, RADEONOptions, sizeof(RADEONOptions));
xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, info->Options);
@@ -4583,6 +4583,11 @@
+
+ RADEONPostInt10Check(pScrn, int10_save);
+- /* Save BIOS scratch registers */
+- RADEONSaveBIOSRegisters(pScrn, info->SavedReg);
++ /* Save BIOS scratch registers */
++ RADEONSaveBIOSRegisters(pScrn, info->SavedReg);
+
+ if (!RADEONPreInitBIOS(pScrn, pInt10))
+ goto fail;
#ifdef XF86DRI
@@ -4772,7 +4777,9 @@
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Kernel modesetting setup failed\n");
+ goto fail;
+ }
-+
+
+- for (i = 0; i < xf86_config->num_output; i++) {
+- xf86OutputPtr output = xf86_config->output[i];
+ info->dri->drmFD = info->drmmode.fd;
+ info->dri2.drm_fd = info->drmmode.fd;
+ info->dri2.enabled = FALSE;
@@ -4793,9 +4800,7 @@
+ {
+ struct drm_radeon_getparam gp;
+ int value;
-
-- for (i = 0; i < xf86_config->num_output; i++) {
-- xf86OutputPtr output = xf86_config->output[i];
++
+ memset(&gp, 0, sizeof(gp));
+ gp.param = RADEON_PARAM_FB_LOCATION;
+ gp.value = &value;
@@ -4834,7 +4839,7 @@
/* Get ScreenInit function */
if (!xf86LoadSubModule(pScrn, "fb")) return FALSE;
-@@ -3035,10 +3171,12 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -3042,10 +3178,12 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
if (!RADEONPreInitXv(pScrn)) goto fail;
}
@@ -4851,7 +4856,7 @@
}
if (pScrn->modes == NULL) {
-@@ -3191,6 +3329,9 @@ static void RADEONBlockHandler(int i, pointer blockData,
+@@ -3198,6 +3336,9 @@ static void RADEONBlockHandler(int i, pointer blockData,
#ifdef USE_EXA
info->accel_state->engineMode = EXA_ENGINEMODE_UNKNOWN;
@@ -4861,7 +4866,7 @@
#endif
}
-@@ -3279,7 +3420,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3286,7 +3427,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
int subPixelOrder = SubPixelUnknown;
char* s;
#endif
@@ -4870,7 +4875,7 @@
info->accelOn = FALSE;
#ifdef USE_XAA
-@@ -3299,58 +3440,61 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3306,58 +3447,61 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
"RADEONScreenInit %lx %ld\n",
pScrn->memPhysBase, pScrn->fbOffset);
#endif
@@ -4971,7 +4976,7 @@
/* Visual setup */
miClearVisualTypes();
if (!miSetVisualTypes(pScrn->depth,
-@@ -3384,19 +3528,21 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3391,19 +3535,21 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
hasDRI = info->directRenderingEnabled;
#endif /* XF86DRI */
@@ -5005,7 +5010,7 @@
}
}
-@@ -3433,7 +3579,10 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3440,7 +3586,10 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
#ifdef XF86DRI
if (hasDRI) {
info->accelDFS = xf86ReturnOptValBool(info->Options, OPTION_ACCEL_DFS,
@@ -5017,7 +5022,7 @@
/* Reserve approx. half of offscreen memory for local textures by
* default, can be overridden with Option "FBTexPercent".
-@@ -3459,7 +3608,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3466,7 +3615,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
#endif
#if defined(XF86DRI) && defined(USE_XAA)
@@ -5026,7 +5031,7 @@
info->dri->textureSize = -1;
if (xf86GetOptValInteger(info->Options, OPTION_FBTEX_PERCENT,
&(info->dri->textureSize))) {
-@@ -3477,7 +3626,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3484,7 +3633,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
#endif
#ifdef USE_XAA
@@ -5035,7 +5040,7 @@
return FALSE;
#endif
-@@ -3498,7 +3647,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3505,7 +3654,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
info->CurrentLayout.pixel_bytes);
int maxy = info->FbMapSize / width_bytes;
@@ -5044,7 +5049,7 @@
xf86DrvMsg(scrnIndex, X_ERROR,
"Static buffer allocation failed. Disabling DRI.\n");
xf86DrvMsg(scrnIndex, X_ERROR,
-@@ -3508,19 +3657,54 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3515,19 +3664,54 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
info->CurrentLayout.pixel_bytes * 3 + 1023) / 1024);
info->directRenderingEnabled = FALSE;
} else {
@@ -5103,7 +5108,7 @@
#endif
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
"Initializing fb layer\n");
-@@ -3544,7 +3728,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3551,7 +3735,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
if (info->r600_shadow_fb == FALSE) {
/* Init fb layer */
@@ -5112,7 +5117,7 @@
pScrn->virtualX, pScrn->virtualY,
pScrn->xDpi, pScrn->yDpi, pScrn->displayWidth,
pScrn->bitsPerPixel))
-@@ -3586,8 +3770,10 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3593,8 +3777,10 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
/* restore the memory map here otherwise we may get a hang when
* initializing the drm below
*/
@@ -5125,7 +5130,7 @@
/* Backing store setup */
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
-@@ -3597,7 +3783,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3604,7 +3790,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
/* DRI finalisation */
#ifdef XF86DRI
@@ -5134,7 +5139,7 @@
info->dri->pKernelDRMVersion->version_minor >= 19)
{
if (RADEONDRISetParam(pScrn, RADEON_SETPARAM_PCIGART_LOCATION, info->dri->pciGartOffset) < 0)
-@@ -3613,14 +3799,24 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3620,14 +3806,24 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
if (info->directRenderingEnabled) {
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
"DRI Finishing init !\n");
@@ -5160,7 +5165,7 @@
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Direct rendering enabled\n");
-@@ -3716,10 +3912,16 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3723,10 +3919,16 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
return FALSE;
}
}
@@ -5170,15 +5175,15 @@
- if (!xf86SetDesiredModes (pScrn))
+ if (info->drm_mode_setting) {
+ if (!drmmode_set_desired_modes(pScrn, &info->drmmode))
- return FALSE;
++ return FALSE;
+ } else {
+ if (!xf86SetDesiredModes (pScrn))
-+ return FALSE;
+ return FALSE;
+ }
/* Provide SaveScreen & wrap BlockHandler and CloseScreen */
/* Wrap CloseScreen */
-@@ -5296,7 +5498,7 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+@@ -5303,7 +5505,7 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
#ifdef XF86DRI
Bool CPStarted = info->cp->CPStarted;
@@ -5187,7 +5192,7 @@
DRILock(pScrn->pScreen, 0);
RADEONCP_STOP(pScrn, info);
}
-@@ -5319,8 +5521,10 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+@@ -5326,8 +5528,10 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
#endif
}
@@ -5200,7 +5205,7 @@
ret = xf86SetSingleMode (pScrn, mode, RR_Rotate_0);
-@@ -5332,16 +5536,19 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+@@ -5339,16 +5543,19 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
/* xf86SetRootClip would do, but can't access that here */
}
@@ -5228,7 +5233,7 @@
}
#endif
-@@ -5539,6 +5746,11 @@ void RADEONAdjustFrame(int scrnIndex, int x, int y, int flags)
+@@ -5546,6 +5753,11 @@ void RADEONAdjustFrame(int scrnIndex, int x, int y, int flags)
xf86OutputPtr output = config->output[config->compat_output];
xf86CrtcPtr crtc = output->crtc;
@@ -5240,7 +5245,7 @@
/* not handled */
if (IS_AVIVO_VARIANT)
return;
-@@ -5578,76 +5790,103 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
+@@ -5585,76 +5797,103 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
"RADEONEnterVT\n");
@@ -5393,7 +5398,7 @@
}
#endif
/* this will get XVideo going again, but only if XVideo was initialised
-@@ -5662,7 +5901,7 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
+@@ -5669,7 +5908,7 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
info->accel_state->XInited3D = FALSE;
#ifdef XF86DRI
@@ -5402,7 +5407,7 @@
if (info->ChipFamily >= CHIP_FAMILY_R600)
R600LoadShaders(pScrn);
RADEONCP_START(pScrn, info);
-@@ -5687,26 +5926,28 @@ void RADEONLeaveVT(int scrnIndex, int flags)
+@@ -5694,26 +5933,28 @@ void RADEONLeaveVT(int scrnIndex, int flags)
"RADEONLeaveVT\n");
#ifdef XF86DRI
if (RADEONPTR(pScrn)->directRenderingInited) {
@@ -5446,7 +5451,7 @@
/* Make sure 3D clients will re-upload textures to video RAM */
if (info->dri->textureSize) {
-@@ -5722,6 +5963,11 @@ void RADEONLeaveVT(int scrnIndex, int flags)
+@@ -5729,6 +5970,11 @@ void RADEONLeaveVT(int scrnIndex, int flags)
i = list[i].next;
} while (i != 0);
}
@@ -5458,7 +5463,7 @@
}
#endif
-@@ -5748,10 +5994,18 @@ void RADEONLeaveVT(int scrnIndex, int flags)
+@@ -5755,10 +6001,18 @@ void RADEONLeaveVT(int scrnIndex, int flags)
xf86_hide_cursors (pScrn);
@@ -5480,7 +5485,7 @@
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
"Ok, leaving now...\n");
-@@ -5805,7 +6059,8 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen)
+@@ -5812,7 +6066,8 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen)
#endif /* USE_XAA */
if (pScrn->vtSema) {
@@ -5490,7 +5495,7 @@
}
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
-@@ -5840,6 +6095,12 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen)
+@@ -5847,6 +6102,12 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen)
info->DGAModes = NULL;
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
"Unmapping memory\n");
@@ -8023,7 +8028,7 @@
+
+
diff --git a/src/radeon_probe.h b/src/radeon_probe.h
-index afc8e21..6138f36 100644
+index a0c6b2c..30fee18 100644
--- a/src/radeon_probe.h
+++ b/src/radeon_probe.h
@@ -146,6 +146,27 @@ typedef struct
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources 27 Feb 2009 03:57:32 -0000 1.26
+++ sources 14 Mar 2009 08:42:44 -0000 1.27
@@ -1 +1 @@
-b4120aa6a3bb22a7a3bc83cba060675a xf86-video-ati-6.11.0.tar.bz2
+540b25842f8e09164cf4d2376995dc68 xf86-video-ati-6.12.0.tar.bz2
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.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- xorg-x11-drv-ati.spec 13 Mar 2009 04:13:35 -0000 1.159
+++ xorg-x11-drv-ati.spec 14 Mar 2009 08:42:44 -0000 1.160
@@ -4,8 +4,8 @@
Summary: Xorg X11 ati video driver
Name: xorg-x11-drv-ati
-Version: 6.11.0
-Release: 10%{?dist}
+Version: 6.12.0
+Release: 1%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -14,7 +14,6 @@
Source0: http://www.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
Source1: radeon.xinf
-Patch0: radeon-6.11.0-git.patch
Patch1: radeon-modeset.patch
#Patch4: radeon-6.9.0-remove-limit-heuristics.patch
Patch5: radeon-6.9.0-panel-size-sanity.patch
@@ -40,7 +39,6 @@
%prep
%setup -q -n %{tarball}-%{version}
-%patch0 -p1 -b .git
%patch1 -p1 -b .modeset
#patch4 -p1 -b .remove-limit-heuristics
#%patch5 -p1 -b .panel-size
@@ -76,6 +74,9 @@
%{_mandir}/man4/radeon.4*
%changelog
+* Sat Mar 14 2009 Dave Airlie <airlied at redhat.com> 6.12.0-1
+- rebase to latest -ati upstream release
+
* Fri Mar 13 2009 Dave Airlie <airlied at redhat.com> 6.11.0-10
- radeon-modeset.patch: merge patches into kms patch
- radeon-6.11.0-git.patch: fix suspend/resume on r600
--- radeon-6.11.0-git.patch DELETED ---
- Previous message (by thread): rpms/mldonkey/EL-4 .cvsignore, 1.3, 1.4 import.log, 1.3, 1.4 mldonkey.spec, 1.4, 1.5 sources, 1.3, 1.4 url_slashes.patch, 1.1, NONE
- Next message (by thread): rpms/gcc/devel gcc44-power7-2.patch,NONE,1.1 gcc.spec,1.31,1.32
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list