Skip to content

GitLab

Commit fe009913 authored by Dave Airlie's avatar Dave Airlie
Browse files

fbdev: update for resources/RAC API removal

parent 16ea2bb4
Show whitespace changes
Inline Side-by-side
src/fbdev.c
View file @ fe009913
...@@ -27,8 +27,10 @@ ...@@ -27,8 +27,10 @@
#include "afb.h" #include "afb.h"
#endif #endif
#ifndef XSERVER_LIBPCIACCESS
#include "xf86Resources.h" #include "xf86Resources.h"
#include "xf86RAC.h" #include "xf86RAC.h"
#endif
#include "fbdevhw.h" #include "fbdevhw.h"
...@@ -413,6 +415,7 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags) ...@@ -413,6 +415,7 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags)
fPtr->pEnt = xf86GetEntityInfo(pScrn->entityList[0]); fPtr->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
#ifndef XSERVER_LIBPCIACCESS
pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT; pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
/* XXX Is this right? Can probably remove RAC_FB */ /* XXX Is this right? Can probably remove RAC_FB */
pScrn->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT; pScrn->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
...@@ -423,7 +426,7 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags) ...@@ -423,7 +426,7 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags)
"xf86RegisterResources() found resource conflicts\n"); "xf86RegisterResources() found resource conflicts\n");
return FALSE; return FALSE;
} }
#endif
/* open device */ /* open device */
if (!fbdevHWInit(pScrn,NULL,xf86FindOptionValue(fPtr->pEnt->device->options,"fbdev"))) if (!fbdevHWInit(pScrn,NULL,xf86FindOptionValue(fPtr->pEnt->device->options,"fbdev")))
return FALSE; 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