Commit fe009913 authored by Dave Airlie's avatar Dave Airlie

fbdev: update for resources/RAC API removal

parent 16ea2bb4
......@@ -27,8 +27,10 @@
#include "afb.h"
#endif
#ifndef XSERVER_LIBPCIACCESS
#include "xf86Resources.h"
#include "xf86RAC.h"
#endif
#include "fbdevhw.h"
......@@ -413,6 +415,7 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags)
fPtr->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
#ifndef XSERVER_LIBPCIACCESS
pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
/* XXX Is this right? Can probably remove RAC_FB */
pScrn->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
......@@ -423,7 +426,7 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags)
"xf86RegisterResources() found resource conflicts\n");
return FALSE;
}
#endif
/* open device */
if (!fbdevHWInit(pScrn,NULL,xf86FindOptionValue(fPtr->pEnt->device->options,"fbdev")))
return FALSE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment