diff options
| author | Dave Airlie <airlied@linux.ie> | 2005-03-26 00:53:01 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-03-26 00:53:01 +0000 |
| commit | 04cbb8d174cc5e3c7ecdd4e171170213ecb3c7ed (patch) | |
| tree | c10f24d28e53dba3db25540f774f3ae1c98f6ab0 /src/atipreinit.c | |
| parent | 5be4bf9000bdf58584a10a6b8e285d0f173304fa (diff) | |
bugzilla #2057 (https://bugs.freedesktop.org/show_bug.cgi?id=2057)
attachment #1516 (https://bugs.freedesktop.org/attachment.cgi?id=1516)
Add TVOUT Support for Mach64 (Leif Delgass, fixed up for Xorg by me).
Diffstat (limited to 'src/atipreinit.c')
| -rw-r--r-- | src/atipreinit.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/atipreinit.c b/src/atipreinit.c index ebe54ad1..4327efb1 100644 --- a/src/atipreinit.c +++ b/src/atipreinit.c @@ -597,6 +597,13 @@ ATIPreInit #else /* AVOID_CPIO */ +#ifdef TV_OUT + + pATI->pVBE = NULL; + pATI->pInt10 = NULL; + +#endif /* TV_OUT */ + /* * If there is an ix86-style BIOS, ensure its initialisation entry point * has been executed, and retrieve DDC and VBE information from it. @@ -629,9 +636,17 @@ ATIPreInit if ((pVBE = VBEInit(pInt10Info, pATI->iEntity))) { ConfiguredMonitor = vbeDoEDID(pVBE, pDDCModule); +#ifdef TV_OUT + pATI->pInt10 = pInt10Info; + pATI->pVBE = pVBE; + pVBE = NULL; +#else vbeFree(pVBE); +#endif /* TV_OUT */ } +#ifndef TV_OUT xf86UnloadSubModule(pVBEModule); +#endif /* TV_OUT */ } if (!(flags & PROBE_DETECT)) @@ -654,9 +669,13 @@ ATIPreInit } } +#ifndef TV_OUT /* De-activate int10 */ xf86FreeInt10(pInt10Info); xf86UnloadSubModule(pInt10Module); +#else + pInt10Info = NULL; +#endif /* TV_OUT */ if (flags & PROBE_DETECT) { |