qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Let the old radeon driver build with xserver 1.8

Browse Source
This commit is contained in:
matthieu 2010-07-14 11:40:19 +00:00
parent 99887c42a6
commit 15cde5d3dc
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
driver/xf86-video-ati/src/radeon_driver.c
View File

@ -94,7 +94,9 @@
#include "xf86_OSproc.h" #include "xf86_OSproc.h"
#include "xf86RAC.h" #include "xf86RAC.h"
#include "xf86RandR12.h" #include "xf86RandR12.h"
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 7
#include "xf86Resources.h" #include "xf86Resources.h"
#endif
#include "xf86cmap.h" #include "xf86cmap.h"
#include "vbe.h" #include "vbe.h"
@ -2886,12 +2888,13 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
PCI_DEV_DEV(info->PciInfo), PCI_DEV_DEV(info->PciInfo),
PCI_DEV_FUNC(info->PciInfo)); PCI_DEV_FUNC(info->PciInfo));
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 7
if (xf86RegisterResources(info->pEnt->index, 0, ResExclusive)) if (xf86RegisterResources(info->pEnt->index, 0, ResExclusive))
goto fail; goto fail;
xf86SetOperatingState(resVga, info->pEnt->index, ResUnusedOpr); xf86SetOperatingState(resVga, info->pEnt->index, ResUnusedOpr);
pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_VIEWPORT | RAC_CURSOR; pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_VIEWPORT | RAC_CURSOR;
#endif
pScrn->monitor = pScrn->confScreen->monitor; pScrn->monitor = pScrn->confScreen->monitor;
/* Allocate an xf86CrtcConfig */ /* Allocate an xf86CrtcConfig */

2
driver/xf86-video-ati/src/radeon_probe.c
View File

@ -44,7 +44,9 @@
#include "atipcirename.h" #include "atipcirename.h"
#include "xf86.h" #include "xf86.h"
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 7
#include "xf86Resources.h" #include "xf86Resources.h"
#endif
#include "radeon_chipset_gen.h" #include "radeon_chipset_gen.h"