diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-07-28 11:14:57 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-07-28 11:14:57 +1000 |
| commit | 8f8428c28d1747b5b127307e710076022a4f7e0b (patch) | |
| tree | d959d028c3bbf3bfa29ab66e7255c57907af76d6 | |
| parent | 32338c01531f26e599b69318157d86f9c1ea7d11 (diff) | |
Revert "i740: fixup for rac/resources"
This reverts commit 32338c01531f26e599b69318157d86f9c1ea7d11.
| -rw-r--r-- | src/i740_driver.c | 20 | ||||
| -rw-r--r-- | src/i740_video.c | 1 |
2 files changed, 21 insertions, 0 deletions
diff --git a/src/i740_driver.c b/src/i740_driver.c index 1f855aa..b563c00 100644 --- a/src/i740_driver.c +++ b/src/i740_driver.c @@ -52,6 +52,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "xf86.h" #include "xf86_OSproc.h" +#include "xf86Resources.h" +#include "xf86RAC.h" #include "xf86cmap.h" /* If the driver uses port I/O directly, it needs: */ @@ -432,9 +434,17 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) { pI740->PciInfo->func); #endif + if (xf86RegisterResources(pI740->pEnt->index, 0, ResNone)) + return FALSE; + if (pI740->usePIO) + pScrn->racIoFlags = RAC_FB | RAC_COLORMAP; + else + pScrn->racMemFlags = RAC_FB | RAC_COLORMAP; + /* Set pScrn->monitor */ pScrn->monitor = pScrn->confScreen->monitor; + flags24=Support24bppFb | Support32bppFb | SupportConvert32to24; if (!xf86SetDepthBpp(pScrn, 0, 0, 0, flags24)) { return FALSE; @@ -730,8 +740,18 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) { /* We wont be using the VGA access after the probe */ if (!xf86ReturnOptValBool(pI740->Options, OPTION_USE_PIO, FALSE)) { + resRange vgaio[] = { {ResShrIoBlock,0x3B0,0x3BB}, + {ResShrIoBlock,0x3C0,0x3DF}, + _END }; + resRange vgamem[] = {{ResShrMemBlock,0xA0000,0xAFFFF}, + {ResShrMemBlock,0xB8000,0xBFFFF}, + {ResShrMemBlock,0xB0000,0xB7FFF}, + _END }; + pI740->usePIO=FALSE; I740SetMMIOAccess(pI740); + xf86SetOperatingState(vgaio, pI740->pEnt->index, ResUnusedOpr); + xf86SetOperatingState(vgamem, pI740->pEnt->index, ResDisableOpr); } else { pI740->usePIO=TRUE; } diff --git a/src/i740_video.c b/src/i740_video.c index 8cfe09a..ad6c5f9 100644 --- a/src/i740_video.c +++ b/src/i740_video.c @@ -58,6 +58,7 @@ #include "xf86.h" #include "xf86_OSproc.h" +#include "xf86Resources.h" #include "compiler.h" #include "xf86PciInfo.h" #include "xf86Pci.h" |