X Strike Force X.Org X11 SVN commit: r209 - trunk/debian/patches
Author: branden
Date: 2005-06-14 15:06:14 -0500 (Tue, 14 Jun 2005)
New Revision: 209
Added:
trunk/debian/patches/024_ati_r128_and_radeon_enable_build_without_vgahw.diff
Removed:
trunk/debian/patches/024b_ati_r128_and_radeon_enable_build_without_vgahw.diff
Log:
Rename file.
Copied: trunk/debian/patches/024_ati_r128_and_radeon_enable_build_without_vgahw.diff (from rev 196, trunk/debian/patches/024b_ati_r128_and_radeon_enable_build_without_vgahw.diff)
Deleted: trunk/debian/patches/024b_ati_r128_and_radeon_enable_build_without_vgahw.diff
===================================================================
--- trunk/debian/patches/024b_ati_r128_and_radeon_enable_build_without_vgahw.diff 2005-06-14 20:04:50 UTC (rev 208)
+++ trunk/debian/patches/024b_ati_r128_and_radeon_enable_build_without_vgahw.diff 2005-06-14 20:06:14 UTC (rev 209)
@@ -1,323 +0,0 @@
-$Id$
-
-diff -urN xc/programs/Xserver/hw/xfree86/drivers/ati.orig/Imakefile xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile
---- xc/programs/Xserver/hw/xfree86/drivers/ati.orig/Imakefile 2005-03-28 22:44:48.983747744 +1000
-+++ xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile 2005-03-28 22:44:52.317240976 +1000
-@@ -157,8 +157,13 @@
-
- #endif
-
-+/* The VGAHW layer is not built on all architectures. */
-+#if XF86VgaHw
-+VGAHWDEFINES = -DWITH_VGAHW
-+#endif
-+
- DEFINES = $(CPIODEFINES) $(DGADEFINES) $(NONPCIDEFINES) $(NOLEGACYDEFINES) \
-- $(DRIDEFINES)
-+ $(DRIDEFINES) $(VGAHWDEFINES)
-
- SRCS1 = ati.c atiadapter.c atibus.c atichip.c atiident.c atioption.c \
- atiprobe.c atividmem.c $(CPIOSRCS1) $(MODSRCS1) \
-diff -urN xc/programs/Xserver/hw/xfree86/drivers/ati.orig/r128_driver.c xc/programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c
---- xc/programs/Xserver/hw/xfree86/drivers/ati.orig/r128_driver.c 2005-03-28 22:44:49.039739232 +1000
-+++ xc/programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c 2005-03-28 22:44:52.322240216 +1000
-@@ -87,10 +87,16 @@
- #include "vbe.h"
-
- /* fbdevhw & vgahw */
--#include "fbdevhw.h"
-+#ifdef WITH_VGAHW
- #include "vgaHW.h"
-+#endif
-+#include "fbdevhw.h"
- #include "dixstruct.h"
-
-+ /* DPMS support. */
-+#define DPMS_SERVER
-+#include "extensions/dpms.h"
-+
- #include "r128_chipset.h"
-
- #ifndef MAX
-@@ -179,6 +185,7 @@
- { 4, 4, 3, 3, 2, 3, 1, 16, 12, "64-bit DDR SGRAM" },
- };
-
-+#ifdef WITH_VGAHW
- static const char *vgahwSymbols[] = {
- "vgaHWFreeHWRec",
- "vgaHWGetHWRec",
-@@ -189,6 +196,7 @@
- "vgaHWUnlock",
- NULL
- };
-+#endif
-
- static const char *fbdevHWSymbols[] = {
- "fbdevHWInit",
-@@ -335,7 +343,10 @@
- * Tell the loader about symbols from other modules that this module might
- * refer to.
- */
-- xf86LoaderRefSymLists(vgahwSymbols,
-+ xf86LoaderRefSymLists(
-+#ifdef WITH_VGAHW
-+ vgahwSymbols,
-+#endif
- fbSymbols,
- xaaSymbols,
- ramdacSymbols,
-@@ -1873,12 +1884,14 @@
- return TRUE;
- }
-
-+#ifdef WITH_VGAHW
- if (!xf86LoadSubModule(pScrn, "vgahw")) return FALSE;
- xf86LoaderReqSymLists(vgahwSymbols, NULL);
- if (!vgaHWGetHWRec(pScrn)) {
- R128FreeRec(pScrn);
- return FALSE;
- }
-+#endif
-
- info->PciInfo = xf86GetPciInfoForEntity(info->pEnt->index);
- info->PciTag = pciTag(info->PciInfo->bus,
-@@ -1989,7 +2002,9 @@
- if (pInt10)
- xf86FreeInt10(pInt10);
-
-+#ifdef WITH_VGAHW
- vgaHWFreeHWRec(pScrn);
-+#endif
- R128FreeRec(pScrn);
- return FALSE;
- }
-@@ -2802,16 +2817,20 @@
- R128InfoPtr info = R128PTR(pScrn);
- unsigned char *R128MMIO = info->MMIO;
- R128SavePtr save = &info->SavedReg;
-+#ifdef WITH_VGAHW
- vgaHWPtr hwp = VGAHWPTR(pScrn);
-+#endif
-
- R128TRACE(("R128Save\n"));
- if (info->FBDev) {
- fbdevHWSave(pScrn);
- return;
- }
-+#ifdef WITH_VGAHW
- vgaHWUnlock(hwp);
- vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_ALL); /* save mode, fonts, cmap */
- vgaHWLock(hwp);
-+#endif
-
- R128SaveMode(pScrn, save);
-
-@@ -2828,7 +2847,9 @@
- R128InfoPtr info = R128PTR(pScrn);
- unsigned char *R128MMIO = info->MMIO;
- R128SavePtr restore = &info->SavedReg;
-+#ifdef WITH_VGAHW
- vgaHWPtr hwp = VGAHWPTR(pScrn);
-+#endif
-
- R128TRACE(("R128Restore\n"));
- if (info->FBDev) {
-@@ -2844,9 +2865,12 @@
- OUTREG(R128_DP_DATATYPE, restore->dp_datatype);
-
- R128RestoreMode(pScrn, restore);
-+
-+#ifdef WITH_VGAHW
- vgaHWUnlock(hwp);
- vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_MODE | VGA_SR_FONTS );
- vgaHWLock(hwp);
-+#endif
-
- R128WaitForVerticalSync(pScrn);
- R128Unblank(pScrn);
-@@ -3581,8 +3605,12 @@
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-
- R128TRACE(("R128FreeScreen\n"));
-+
-+#ifdef WITH_VGAHW
- if (xf86LoaderCheckSymbol("vgaHWFreeHWRec"))
- vgaHWFreeHWRec(pScrn);
-+#endif
-+
- R128FreeRec(pScrn);
- }
-
-diff -urN xc/programs/Xserver/hw/xfree86/drivers/ati.orig/radeon_driver.c xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
---- xc/programs/Xserver/hw/xfree86/drivers/ati.orig/radeon_driver.c 2005-03-28 22:44:49.050737560 +1000
-+++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2005-03-28 22:44:52.328239304 +1000
-@@ -91,9 +91,15 @@
- #include "xf86cmap.h"
- #include "vbe.h"
-
-- /* fbdevhw * vgaHW definitions */
--#include "fbdevhw.h"
-+ /* fbdevhw & vgaHW definitions */
-+#ifdef WITH_VGAHW
- #include "vgaHW.h"
-+#endif
-+#include "fbdevhw.h"
-+
-+ /* DPMS support. */
-+#define DPMS_SERVER
-+#include "extensions/dpms.h"
-
- #include "radeon_chipset.h"
-
-@@ -221,6 +227,7 @@
-
- const OptionInfoRec *RADEONOptionsWeak(void) { return RADEONOptions; }
-
-+#ifdef WITH_VGAHW
- static const char *vgahwSymbols[] = {
- "vgaHWFreeHWRec",
- "vgaHWGetHWRec",
-@@ -232,6 +239,7 @@
- "vgaHWGetIOBase",
- NULL
- };
-+#endif
-
- static const char *fbdevHWSymbols[] = {
- "fbdevHWInit",
-@@ -388,7 +396,10 @@
- * Tell the loader about symbols from other modules that this module might
- * refer to.
- */
-- xf86LoaderRefSymLists(vgahwSymbols,
-+ xf86LoaderRefSymLists(
-+#ifdef WITH_VGAHW
-+ vgahwSymbols,
-+#endif
- fbSymbols,
- xaaSymbols,
- #if 0
-@@ -4364,12 +4375,13 @@
- xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, info->Options);
-
- /* By default, don't do VGA IOs on ppc */
--#ifdef __powerpc__
-+#if defined(__powerpc__) || !defined(WITH_VGAHW)
- info->VGAAccess = FALSE;
- #else
- info->VGAAccess = TRUE;
- #endif
-
-+#ifdef WITH_VGAHW
- xf86GetOptValBool(info->Options, OPTION_VGA_ACCESS, &info->VGAAccess);
- if (info->VGAAccess) {
- if (!xf86LoadSubModule(pScrn, "vgahw"))
-@@ -4387,7 +4399,10 @@
- " VGA module load skipped\n");
- if (info->VGAAccess)
- vgaHWGetIOBase(VGAHWPTR(pScrn));
--
-+#else
-+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VGAHW support not compiled in,"
-+ " disabling VGA support.\n");
-+#endif
-
- if (!RADEONPreInitWeight(pScrn))
- goto fail;
-@@ -4502,8 +4517,10 @@
- if (pInt10)
- xf86FreeInt10(pInt10);
-
-+#ifdef WITH_VGAHW
- if (info->VGAAccess)
- vgaHWFreeHWRec(pScrn);
-+#endif
-
- fail2:
- if(info->MMIO) RADEONUnmapMMIO(pScrn);
-@@ -5945,23 +5962,25 @@
- }
-
- if (!info->IsSecondary) {
-+#ifdef WITH_VGAHW
- if (info->VGAAccess) {
- vgaHWPtr hwp = VGAHWPTR(pScrn);
-
- vgaHWUnlock(hwp);
--#if defined(__powerpc__)
-+# if defined(__powerpc__)
- /* temporary hack to prevent crashing on PowerMacs when trying to
- * read VGA fonts and colormap, will find a better solution
- * in the future. TODO: Check if there's actually some VGA stuff
- * setup in the card at all !!
- */
- vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_MODE); /* Save mode only */
--#else
-+# else
- /* Save mode * & fonts & cmap */
- vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_MODE | VGA_SR_FONTS);
--#endif
-+# endif
- vgaHWLock(hwp);
- }
-+#endif
- save->dp_datatype = INREG(RADEON_DP_DATATYPE);
- save->rbbm_soft_reset = INREG(RADEON_RBBM_SOFT_RESET);
- save->clock_cntl_index = INREG(RADEON_CLOCK_CNTL_INDEX);
-@@ -6019,34 +6038,38 @@
- #endif
-
- if (info->VGAAccess) {
-+#ifdef WITH_VGAHW
- vgaHWPtr hwp = VGAHWPTR(pScrn);
- if (!info->IsSecondary) {
- vgaHWUnlock(hwp);
--#if defined(__powerpc__)
-+# if defined(__powerpc__)
- /* Temporary hack to prevent crashing on PowerMacs when trying to
- * write VGA fonts, will find a better solution in the future
- */
- vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_MODE );
--#else
-+# else
- vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_MODE | VGA_SR_FONTS );
--#endif
-+# endif
- vgaHWLock(hwp);
-+#endif
- } else {
- RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn);
- ScrnInfoPtr pScrn0 = pRADEONEnt->pPrimaryScrn;
- RADEONInfoPtr info0 = RADEONPTR(pScrn0);
- vgaHWPtr hwp0;
-
-+#ifdef WITH_VGAHW
- if (info0->VGAAccess) {
- hwp0 = VGAHWPTR(pScrn0);
- vgaHWUnlock(hwp0);
--#if defined(__powerpc__)
-+# if defined(__powerpc__)
- vgaHWRestore(pScrn0, &hwp0->SavedReg, VGA_SR_MODE);
--#else
-+# else
- vgaHWRestore(pScrn0, &hwp0->SavedReg, VGA_SR_MODE | VGA_SR_FONTS );
--#endif
-+# endif
- vgaHWLock(hwp0);
- }
-+#endif
- }
- }
- RADEONUnblank(pScrn);
-@@ -7594,8 +7617,10 @@
- }
- }
-
-+#ifdef WITH_VGAHW
- if (info->VGAAccess && xf86LoaderCheckSymbol("vgaHWFreeHWRec"))
- vgaHWFreeHWRec(pScrn);
-+#endif
- RADEONFreeRec(pScrn);
- }
-
Reply to: