diff options
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 56 | ||||
| -rw-r--r-- | src/geode.h (renamed from src/amd.h) | 2 | ||||
| -rw-r--r-- | src/geode_blend.h (renamed from src/amd_blend.h) | 0 | ||||
| -rw-r--r-- | src/geode_common.c (renamed from src/amd_common.c) | 2 | ||||
| -rw-r--r-- | src/geode_dcon.c (renamed from src/amd_dcon.c) | 2 | ||||
| -rw-r--r-- | src/geode_driver.c (renamed from src/amd_driver.c) | 275 | ||||
| -rw-r--r-- | src/geode_fourcc.h (renamed from src/amd_fourcc.h) | 0 | ||||
| -rw-r--r-- | src/geode_msr.c (renamed from src/amd_msr.c) | 0 | ||||
| -rw-r--r-- | src/geode_pcirename.h (renamed from src/amd_pcirename.h) | 0 | ||||
| -rw-r--r-- | src/gx_accel.c (renamed from src/amd_gx_accel.c) | 4 | ||||
| -rw-r--r-- | src/gx_cursor.c (renamed from src/amd_gx_cursor.c) | 2 | ||||
| -rw-r--r-- | src/gx_driver.c (renamed from src/amd_gx_driver.c) | 4 | ||||
| -rw-r--r-- | src/gx_randr.c (renamed from src/amd_gx_randr.c) | 2 | ||||
| -rw-r--r-- | src/gx_regacc.c (renamed from src/amd_gx_regacc.c) | 0 | ||||
| -rw-r--r-- | src/gx_rotate.c (renamed from src/amd_gx_rotate.c) | 2 | ||||
| -rw-r--r-- | src/gx_shadow.c (renamed from src/amd_gx_shadow.c) | 2 | ||||
| -rw-r--r-- | src/gx_vga.c (renamed from src/amd_gx_vga.c) | 0 | ||||
| -rw-r--r-- | src/gx_video.c (renamed from src/amd_gx_video.c) | 4 | ||||
| -rw-r--r-- | src/lx_cursor.c (renamed from src/amd_lx_cursor.c) | 2 | ||||
| -rw-r--r-- | src/lx_driver.c (renamed from src/amd_lx_driver.c) | 4 | ||||
| -rw-r--r-- | src/lx_exa.c (renamed from src/amd_lx_exa.c) | 4 | ||||
| -rw-r--r-- | src/lx_randr.c (renamed from src/amd_lx_randr.c) | 2 | ||||
| -rw-r--r-- | src/lx_regacc.c (renamed from src/amd_lx_regacc.c) | 0 | ||||
| -rw-r--r-- | src/lx_rotate.c (renamed from src/amd_lx_rotate.c) | 2 | ||||
| -rw-r--r-- | src/lx_vga.c (renamed from src/amd_lx_vga.c) | 0 | ||||
| -rw-r--r-- | src/lx_video.c (renamed from src/amd_lx_video.c) | 4 | ||||
| -rw-r--r-- | src/panel.c | 2 |
29 files changed, 192 insertions, 193 deletions
@@ -11,11 +11,11 @@ suppport dynamic rotation with XRandR, and Xv overlay support. = Configuration options = -You can specify the AMD driver in the normal fashion: +You can specify the Geode driver in the normal fashion: Section "Device" Identifier "AMD Geode" - Driver "amd" + Driver "geode" Option "blah" "blah" ... EndSection diff --git a/configure.ac b/configure.ac index 5b8b429..6bae556 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-amd], 2.7.7.7, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver%2FAMD], - xf86-video-amd) + xf86-video-geode) AC_CONFIG_SRCDIR([Makefile.am]) AM_CONFIG_HEADER([config.h]) @@ -120,7 +120,7 @@ fi AM_CONDITIONAL([I386ARCH], [test $is386 = true]) -DRIVER_NAME=amd +DRIVER_NAME=geode AC_SUBST([DRIVER_NAME]) XORG_MANPAGE_SECTIONS diff --git a/src/Makefile.am b/src/Makefile.am index 035007a..e96b687 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -34,38 +34,38 @@ AM_CFLAGS = @XORG_CFLAGS@ \ -DLINUX_2_6 @AMD_CFLAGS@ AM_CCASFLAGS = @XORG_CFLAGS@ -amd_drv_la_LTLIBRARIES = amd_drv.la -amd_drv_la_LDFLAGS = -module -avoid-version -amd_drv_ladir = @moduledir@/drivers +geode_drv_la_LTLIBRARIES = geode_drv.la +geode_drv_la_LDFLAGS = -module -avoid-version +geode_drv_ladir = @moduledir@/drivers -amd_drv_la_SOURCES = \ - amd.h \ - amd_blend.h \ - amd_fourcc.h \ +geode_drv_la_SOURCES = \ + geode.h \ + geode_blend.h \ + geode_fourcc.h \ build_num.h \ cim_dev.h \ - amd_driver.c \ - amd_common.c \ - amd_dcon.c \ - amd_msr.c \ - amd_gx_driver.c\ - amd_gx_accel.c \ - amd_gx_cursor.c \ - amd_gx_video.c \ - amd_gx_regacc.c \ - amd_gx_rotate.c \ - amd_gx_randr.c \ + geode_driver.c \ + geode_common.c \ + geode_dcon.c \ + geode_msr.c \ + gx_driver.c\ + gx_accel.c \ + gx_cursor.c \ + gx_video.c \ + gx_regacc.c \ + gx_rotate.c \ + gx_randr.c \ durango.c \ panel.c \ - amd_lx_driver.c \ - amd_lx_cursor.c \ - amd_lx_video.c \ - amd_lx_regacc.c \ - amd_lx_rotate.c \ - amd_lx_randr.c \ - amd_lx_exa.c \ + lx_driver.c \ + lx_cursor.c \ + lx_video.c \ + lx_regacc.c \ + lx_rotate.c \ + lx_randr.c \ + lx_exa.c \ cimarron.c \ - amd_pcirename.h + geode_pcirename.h EXTRA_DIST = \ cim/cim_defs.h \ @@ -138,8 +138,8 @@ EXTRA_DIST = \ panel/pnl_init.c \ panel/readme.txt \ \ - amd_gx_vga.c \ - amd_lx_vga.c + gx_vga.c \ + lx_vga.c ztv_drv_la_LTLIBRARIES = ztv_drv.la ztv_drv_la_LDFLAGS = -module -avoid-version @@ -28,7 +28,7 @@ #ifndef _AMD_GEODE_H_ #define _AMD_GEODE_H_ -#include "amd_pcirename.h" +#include "geode_pcirename.h" #include "xaa.h" #include "exa.h" diff --git a/src/amd_blend.h b/src/geode_blend.h index 6748ec0..6748ec0 100644 --- a/src/amd_blend.h +++ b/src/geode_blend.h diff --git a/src/amd_common.c b/src/geode_common.c index 375ade8..083b2f6 100644 --- a/src/amd_common.c +++ b/src/geode_common.c @@ -38,7 +38,7 @@ #include <sys/ioctl.h> #include "xf86.h" -#include "amd.h" +#include "geode.h" #define move0(d,s,n) \ __asm__ __volatile__( \ diff --git a/src/amd_dcon.c b/src/geode_dcon.c index 8dd6a69..27cad18 100644 --- a/src/amd_dcon.c +++ b/src/geode_dcon.c @@ -33,7 +33,7 @@ #include <xf86Resources.h> #include <compiler.h> -#include "amd.h" +#include "geode.h" #include <unistd.h> static Bool diff --git a/src/amd_driver.c b/src/geode_driver.c index 4d11194..303f865 100644 --- a/src/amd_driver.c +++ b/src/geode_driver.c @@ -25,10 +25,10 @@ */ /* - * File Contents: This is the main module configures the interfacing - * with the X server. The individual modules will be - * loaded based upon the options selected from the - * XF86Config. This file also has modules for finding + * File Contents: This is the main module configures the interfacing + * with the X server. The individual modules will be + * loaded based upon the options selected from the + * XF86Config. This file also has modules for finding * supported modes, turning on the modes based on options. * * Project: Amd Xfree Frame buffer device driver. @@ -48,7 +48,7 @@ #include "xf86Pci.h" #include "xf86cmap.h" -#include "amd.h" +#include "geode.h" #include "build_num.h" #define RC_MAX_DEPTH 24 @@ -81,7 +81,7 @@ #define AMD_NAME "AMD" #define AMD_DRIVER_NAME "amd" #define _id(n,m) n##m -#define _cat(n,m) _id(n,m) +#define _cat(n,m) _id(n,m) #define AMD_VERSION_CURRENT ((_cat(0x,_MAJOR) << 24) | \ (_cat(0x,_MINOR) << 16) | (_cat(0x,_BL) << 8) \ | _cat(0x,_BLREV)) @@ -89,18 +89,20 @@ /* Forward definitions */ static const OptionInfoRec *AmdAvailableOptions(int chipid, int busid); static void AmdIdentify(int); + #ifdef XSERVER_LIBPCIACCESS static Bool AmdPciProbe(DriverPtr, int, struct pci_device *, intptr_t); #else static Bool AmdProbe(DriverPtr, int); #endif - #ifdef XSERVER_LIBPCIACCESS static const struct pci_id_match amdDeviceMatch[] = { - { PCI_VENDOR_ID_NS, PCI_CHIP_REDCLOUD, PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, 0 }, - { PCI_VENDOR_ID_AMD, PCI_CHIP_GEODELX, PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, 0 }, - { 0, 0, 0 } + {PCI_VENDOR_ID_NS, PCI_CHIP_REDCLOUD, PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, + 0}, + {PCI_VENDOR_ID_AMD, PCI_CHIP_GEODELX, PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, + 0}, + {0, 0, 0} }; #endif /* XSERVER_LIBPCIACCESS */ @@ -200,8 +202,8 @@ OptionInfoRec LX_GeodeOptions[] = { {LX_OPTION_NOPANEL, "NoPanel", OPTV_BOOLEAN, {0}, FALSE}, {LX_OPTION_COLOR_KEY, "ColorKey", OPTV_INTEGER, {0}, FALSE}, {LX_OPTION_EXA_SCRATCH_BFRSZ, "ExaScratch", OPTV_INTEGER, {0}, FALSE}, - {LX_OPTION_FBSIZE, "FBSize", OPTV_INTEGER, {0}, FALSE }, - {LX_OPTION_PANEL_GEOMETRY, "PanelGeometry", OPTV_STRING, {0}, FALSE }, + {LX_OPTION_FBSIZE, "FBSize", OPTV_INTEGER, {0}, FALSE}, + {LX_OPTION_PANEL_GEOMETRY, "PanelGeometry", OPTV_STRING, {0}, FALSE}, {-1, NULL, OPTV_NONE, {0}, FALSE} }; @@ -224,8 +226,8 @@ OptionInfoRec GX_GeodeOptions[] = { {GX_OPTION_COLOR_KEY, "ColorKey", OPTV_INTEGER, {0}, FALSE}, {GX_OPTION_OSM_IMG_BUFS, "OSMImageBuffers", OPTV_INTEGER, {0}, FALSE}, {GX_OPTION_OSM_CLR_BUFS, "OSMColorExpBuffers", OPTV_INTEGER, {0}, FALSE}, - {GX_OPTION_FBSIZE, "FBSize", OPTV_INTEGER, {0}, FALSE }, - {GX_OPTION_PANEL_GEOMETRY, "PanelGeometry", OPTV_STRING, {0}, FALSE }, + {GX_OPTION_FBSIZE, "FBSize", OPTV_INTEGER, {0}, FALSE}, + {GX_OPTION_PANEL_GEOMETRY, "PanelGeometry", OPTV_STRING, {0}, FALSE}, {-1, NULL, OPTV_NONE, {0}, FALSE} }; #endif @@ -312,8 +314,8 @@ static XF86ModuleVersionInfo AmdVersionRec = { GET_MODULE_MAJOR_VERSION(AMD_VERSION_CURRENT), GET_MODULE_MINOR_VERSION(AMD_VERSION_CURRENT), (GET_MODULE_PATCHLEVEL(AMD_VERSION_CURRENT) >> 8) * 100 + - (GET_MODULE_PATCHLEVEL(AMD_VERSION_CURRENT) & 0xff), - ABI_CLASS_VIDEODRV, /* This is a video driver */ + (GET_MODULE_PATCHLEVEL(AMD_VERSION_CURRENT) & 0xff), + ABI_CLASS_VIDEODRV, /* This is a video driver */ ABI_VIDEODRV_VERSION, MOD_CLASS_VIDEODRV, {0, 0, 0, 0} @@ -328,8 +330,8 @@ static XF86ModuleVersionInfo GeodeVersionRec = { GET_MODULE_MAJOR_VERSION(AMD_VERSION_CURRENT), GET_MODULE_MINOR_VERSION(AMD_VERSION_CURRENT), (GET_MODULE_PATCHLEVEL(AMD_VERSION_CURRENT) >> 8) * 100 + - (GET_MODULE_PATCHLEVEL(AMD_VERSION_CURRENT) & 0xff), - ABI_CLASS_VIDEODRV, /* This is a video driver */ + (GET_MODULE_PATCHLEVEL(AMD_VERSION_CURRENT) & 0xff), + ABI_CLASS_VIDEODRV, /* This is a video driver */ ABI_VIDEODRV_VERSION, MOD_CLASS_VIDEODRV, {0, 0, 0, 0} @@ -338,25 +340,24 @@ static XF86ModuleVersionInfo GeodeVersionRec = { static pointer GeodeSetup(pointer Module, pointer Options, int *ErrorMajor, int *ErrorMinor) { - static Bool init = FALSE; - int flag = 0; + static Bool init = FALSE; + int flag = 0; #ifdef XSERVER_LIBPCIACCESS - flag = HaveDriverFuncs; + flag = HaveDriverFuncs; #endif - if (init) { - *ErrorMajor = LDR_ONCEONLY; - return (pointer) NULL; - } + if (init) { + *ErrorMajor = LDR_ONCEONLY; + return (pointer) NULL; + } - init = TRUE; - xf86AddDriver(&GEODE, Module, flag); + init = TRUE; + xf86AddDriver(&GEODE, Module, flag); - LoaderRefSymLists(amdVgahwSymbols, amdVbeSymbols, - amdFbSymbols, amdXaaSymbols, - amdInt10Symbols, amdRamdacSymbols, NULL); + LoaderRefSymLists(amdVgahwSymbols, amdVbeSymbols, + amdFbSymbols, amdXaaSymbols, amdInt10Symbols, amdRamdacSymbols, NULL); - return (pointer) TRUE; + return (pointer) TRUE; } static pointer @@ -365,32 +366,33 @@ AmdSetup(pointer Module, pointer Options, int *ErrorMajor, int *ErrorMinor) static Bool Initialised = FALSE; if (!Initialised) { - Initialised = TRUE; - xf86AddDriver(&AMD, Module, + Initialised = TRUE; + xf86AddDriver(&AMD, Module, #ifdef XSERVER_LIBPCIACCESS - HaveDriverFuncs + HaveDriverFuncs #else - 0 + 0 #endif - ); - - /* Tell the loader about symbols from other modules that this - * module might refer to. - */ - LoaderRefSymLists(amdVgahwSymbols, amdVbeSymbols, - amdFbSymbols, amdXaaSymbols, - amdInt10Symbols, amdRamdacSymbols, NULL); - return (pointer) TRUE; + ); + + /* Tell the loader about symbols from other modules that this + * module might refer to. + */ + LoaderRefSymLists(amdVgahwSymbols, amdVbeSymbols, + amdFbSymbols, amdXaaSymbols, + amdInt10Symbols, amdRamdacSymbols, NULL); + return (pointer) TRUE; } /*The return value must be non-NULL on success */ if (ErrorMajor) - *ErrorMajor = LDR_ONCEONLY; + *ErrorMajor = LDR_ONCEONLY; return NULL; } _X_EXPORT XF86ModuleData amdModuleData = { &AmdVersionRec, AmdSetup, NULL }; -_X_EXPORT XF86ModuleData geodeModuleData = { &GeodeVersionRec, GeodeSetup, NULL }; +_X_EXPORT XF86ModuleData geodeModuleData = + { &GeodeVersionRec, GeodeSetup, NULL }; #endif /*End of XFree86Loader */ @@ -403,9 +405,9 @@ _X_EXPORT XF86ModuleData geodeModuleData = { &GeodeVersionRec, GeodeSetup, NULL * Parameters. * flags : flags may be used in PreInit* * - * Returns : none + * Returns : none * - * Comments : none + * Comments : none * *------------------------------------------------------------------------ */ @@ -436,11 +438,11 @@ AmdAvailableOptions(int chipid, int busid) switch (chipid) { #ifdef HAVE_LX case PCI_CHIP_GEODELX: - return LX_GeodeOptions; + return LX_GeodeOptions; #endif #ifdef HAVE_GX case PCI_CHIP_REDCLOUD: - return GX_GeodeOptions; + return GX_GeodeOptions; #endif } return no_GeodeOptions; @@ -450,9 +452,7 @@ AmdAvailableOptions(int chipid, int busid) static Bool AmdPciProbe(DriverPtr driver, - int entity_num, - struct pci_device *device, - intptr_t match_data) + int entity_num, struct pci_device *device, intptr_t match_data) { ScrnInfoPtr scrn = NULL; int cpu_detected; @@ -460,34 +460,33 @@ AmdPciProbe(DriverPtr driver, ErrorF("AmdPciProbe: Probing for supported devices!\n"); scrn = xf86ConfigPciEntity(scrn, 0, entity_num, GeodePCIchipsets, - NULL, NULL, NULL, NULL, NULL); + NULL, NULL, NULL, NULL, NULL); - if (scrn != NULL) - { - scrn->driverName = AMD_DRIVER_NAME; - scrn->name = AMD_NAME; - scrn->Probe = NULL; + if (scrn != NULL) { + scrn->driverName = AMD_DRIVER_NAME; + scrn->name = AMD_NAME; + scrn->Probe = NULL; - switch (device->device_id) { + switch (device->device_id) { #ifdef HAVE_LX - case PCI_CHIP_GEODELX: - cpu_detected = LX; - LXSetupChipsetFPtr(scrn); - break; + case PCI_CHIP_GEODELX: + cpu_detected = LX; + LXSetupChipsetFPtr(scrn); + break; #endif #ifdef HAVE_GX - case PCI_CHIP_REDCLOUD: - cpu_detected = GX2; - GXSetupChipsetFPtr(scrn); - break; + case PCI_CHIP_REDCLOUD: + cpu_detected = GX2; + GXSetupChipsetFPtr(scrn); + break; #endif - default: - ErrorF("AmdPciProbe: unknown device ID\n"); - return FALSE; - } + default: + ErrorF("AmdPciProbe: unknown device ID\n"); + return FALSE; + } - DEBUGMSG(1, (0, X_INFO, "AmdPciProbe: CPUDetected %d!\n", - cpu_detected)); + DEBUGMSG(1, (0, X_INFO, "AmdPciProbe: CPUDetected %d!\n", + cpu_detected)); } return scrn != NULL; } @@ -503,7 +502,7 @@ AmdPciProbe(DriverPtr driver, * Parameters. * drv :a pointer to the geode driver * flags :flags may passed to check the config and probe detect - * + * * Returns :TRUE on success and FALSE on failure. * * Comments :This should ne minimal probe and it should under no @@ -530,82 +529,82 @@ AmdProbe(DriverPtr drv, int flags) * * driver, and return if there are none. */ if ((numDevSections = xf86MatchDevice(AMD_NAME, &devSections)) <= 0) { - DEBUGMSG(1, (0, X_INFO, "AmdProbe: failed 1!\n")); - return FALSE; + DEBUGMSG(1, (0, X_INFO, "AmdProbe: failed 1!\n")); + return FALSE; } DEBUGMSG(1, (0, X_INFO, "AmdProbe: Before MatchPciInstances!\n")); /* PCI BUS */ if (xf86GetPciVideoInfo()) { - numUsed = xf86MatchPciInstances(AMD_NAME, PCI_VENDOR_ID_NS, - GeodeChipsets, GeodePCIchipsets, - devSections, numDevSections, drv, &usedChips); - - if (numUsed <= 0) - numUsed = xf86MatchPciInstances(AMD_NAME, PCI_VENDOR_ID_AMD, - GeodeChipsets, GeodePCIchipsets, - devSections, numDevSections, drv, &usedChips); - - DEBUGMSG(1, (0, X_INFO, "AmdProbe: MatchPCI (%d)!\n", numUsed)); - - if (numUsed > 0) { - if (flags & PROBE_DETECT) - foundScreen = TRUE; - else { - /* Durango only supports one instance, */ - /* so take the first one */ - for (i = 0; i < numUsed; i++) { - /* Allocate a ScrnInfoRec */ - ScrnInfoPtr pScrni = xf86AllocateScreen(drv, 0); - - EntityInfoPtr pEnt = xf86GetEntityInfo(usedChips[i]); - PciChipsets *p_id; - - for (p_id = GeodePCIchipsets; p_id->numChipset != -1; - p_id++) { - if (pEnt->chipset == p_id->numChipset) { - switch (pEnt->chipset) { + numUsed = xf86MatchPciInstances(AMD_NAME, PCI_VENDOR_ID_NS, + GeodeChipsets, GeodePCIchipsets, + devSections, numDevSections, drv, &usedChips); + + if (numUsed <= 0) + numUsed = xf86MatchPciInstances(AMD_NAME, PCI_VENDOR_ID_AMD, + GeodeChipsets, GeodePCIchipsets, + devSections, numDevSections, drv, &usedChips); + + DEBUGMSG(1, (0, X_INFO, "AmdProbe: MatchPCI (%d)!\n", numUsed)); + + if (numUsed > 0) { + if (flags & PROBE_DETECT) + foundScreen = TRUE; + else { + /* Durango only supports one instance, */ + /* so take the first one */ + for (i = 0; i < numUsed; i++) { + /* Allocate a ScrnInfoRec */ + ScrnInfoPtr pScrni = xf86AllocateScreen(drv, 0); + + EntityInfoPtr pEnt = xf86GetEntityInfo(usedChips[i]); + PciChipsets *p_id; + + for (p_id = GeodePCIchipsets; p_id->numChipset != -1; + p_id++) { + if (pEnt->chipset == p_id->numChipset) { + switch (pEnt->chipset) { #ifdef HAVE_LX - case PCI_CHIP_GEODELX: - CPUDetected = LX; - drvr_setup = &LXSetupChipsetFPtr; - break; + case PCI_CHIP_GEODELX: + CPUDetected = LX; + drvr_setup = &LXSetupChipsetFPtr; + break; #endif #ifdef HAVE_GX - case PCI_CHIP_REDCLOUD: - CPUDetected = GX2; - drvr_setup = &GXSetupChipsetFPtr; - break; + case PCI_CHIP_REDCLOUD: + CPUDetected = GX2; + drvr_setup = &GXSetupChipsetFPtr; + break; #endif - default: + default: break; - } - break; - } - } - xfree(pEnt); - if (drvr_setup == NULL) - return FALSE; - - DEBUGMSG(1, (0, X_INFO, "AmdProbe: CPUDetected %d!\n", - CPUDetected)); - - pScrni->driverName = AMD_DRIVER_NAME; - pScrni->name = AMD_NAME; - pScrni->Probe = AmdProbe; - drvr_setup(pScrni); - - foundScreen = TRUE; - xf86ConfigActivePciEntity(pScrni, usedChips[i], - GeodePCIchipsets, NULL, NULL, NULL, NULL, NULL); - } - } - } + } + break; + } + } + xfree(pEnt); + if (drvr_setup == NULL) + return FALSE; + + DEBUGMSG(1, (0, X_INFO, "AmdProbe: CPUDetected %d!\n", + CPUDetected)); + + pScrni->driverName = AMD_DRIVER_NAME; + pScrni->name = AMD_NAME; + pScrni->Probe = AmdProbe; + drvr_setup(pScrni); + + foundScreen = TRUE; + xf86ConfigActivePciEntity(pScrni, usedChips[i], + GeodePCIchipsets, NULL, NULL, NULL, NULL, NULL); + } + } + } } if (usedChips) - xfree(usedChips); + xfree(usedChips); if (devSections) - xfree(devSections); + xfree(devSections); DEBUGMSG(1, (0, X_INFO, "AmdProbe: result (%d)!\n", foundScreen)); return foundScreen; } diff --git a/src/amd_fourcc.h b/src/geode_fourcc.h index f34c2fb..f34c2fb 100644 --- a/src/amd_fourcc.h +++ b/src/geode_fourcc.h diff --git a/src/amd_msr.c b/src/geode_msr.c index 12b9f73..12b9f73 100644 --- a/src/amd_msr.c +++ b/src/geode_msr.c diff --git a/src/amd_pcirename.h b/src/geode_pcirename.h index f0f5cf8..f0f5cf8 100644 --- a/src/amd_pcirename.h +++ b/src/geode_pcirename.h diff --git a/src/amd_gx_accel.c b/src/gx_accel.c index 1655801..5461455 100644 --- a/src/amd_gx_accel.c +++ b/src/gx_accel.c @@ -49,13 +49,13 @@ #include "xf86_OSproc.h" #include "xf86Pci.h" #include "xf86PciInfo.h" -#include "amd.h" +#include "geode.h" #include "gfx_defs.h" #include "gfx_regs.h" /* Common macros for blend operations are here */ -#include "amd_blend.h" +#include "geode_blend.h" #undef ulong typedef unsigned long ulong; diff --git a/src/amd_gx_cursor.c b/src/gx_cursor.c index bcd6279..bec7fde 100644 --- a/src/amd_gx_cursor.c +++ b/src/gx_cursor.c @@ -38,7 +38,7 @@ #include "xf86_OSproc.h" #include "xf86Pci.h" #include "xf86PciInfo.h" -#include "amd.h" +#include "geode.h" /* Forward declarations of the functions */ static void GXSetCursorColors(ScrnInfoPtr pScrni, int bg, int fg); diff --git a/src/amd_gx_driver.c b/src/gx_driver.c index 316901f..1a8eff4 100644 --- a/src/amd_gx_driver.c +++ b/src/gx_driver.c @@ -48,13 +48,13 @@ #include "fb.h" #include "randrstr.h" -#include "amd.h" +#include "geode.h" #include "gfx_defs.h" #include "gfx_regs.h" #include "panel.h" /* Bring in VGA functions */ -#include "amd_gx_vga.c" +#include "gx_vga.c" #define GX_MIN_PITCH 1024 #define GX_MAX_PITCH 8192 diff --git a/src/amd_gx_randr.c b/src/gx_randr.c index 96f3f5d..9ab446f 100644 --- a/src/amd_gx_randr.c +++ b/src/gx_randr.c @@ -39,7 +39,7 @@ #include <X11/extensions/randr.h> #include <randrstr.h> -#include "amd.h" +#include "geode.h" static int GXRandRGeneration; diff --git a/src/amd_gx_regacc.c b/src/gx_regacc.c index cd1b429..cd1b429 100644 --- a/src/amd_gx_regacc.c +++ b/src/gx_regacc.c diff --git a/src/amd_gx_rotate.c b/src/gx_rotate.c index 0b81851..b689da2 100644 --- a/src/amd_gx_rotate.c +++ b/src/gx_rotate.c @@ -29,7 +29,7 @@ #include "xf86.h" #include "shadow.h" -#include "amd.h" +#include "geode.h" static void * GXWindowLinear(ScreenPtr pScreen, CARD32 row, CARD32 offset, int mode, diff --git a/src/amd_gx_shadow.c b/src/gx_shadow.c index cf02ad7..436a46a 100644 --- a/src/amd_gx_shadow.c +++ b/src/gx_shadow.c @@ -39,7 +39,7 @@ #include "xf86Resources.h" #include "xf86PciInfo.h" #include "xf86Pci.h" -#include "amd.h" +#include "geode.h" #include "shadowfb.h" #include "servermd.h" diff --git a/src/amd_gx_vga.c b/src/gx_vga.c index b46675a..b46675a 100644 --- a/src/amd_gx_vga.c +++ b/src/gx_vga.c diff --git a/src/amd_gx_video.c b/src/gx_video.c index 7df3cd2..7d2f0f4 100644 --- a/src/amd_gx_video.c +++ b/src/gx_video.c @@ -52,14 +52,14 @@ #include "xf86fbman.h" #include "regionstr.h" -#include "amd.h" +#include "geode.h" #include "xf86xv.h" #include <X11/extensions/Xv.h> #include "xaa.h" #include "xaalocal.h" #include "dixstruct.h" #include "fourcc.h" -#include "amd_fourcc.h" +#include "geode_fourcc.h" #define OFF_DELAY 200 /* milliseconds */ #define FREE_DELAY 60000 diff --git a/src/amd_lx_cursor.c b/src/lx_cursor.c index 307a8c4..ccc7d6c 100644 --- a/src/amd_lx_cursor.c +++ b/src/lx_cursor.c @@ -31,7 +31,7 @@ #include "xf86_OSproc.h" #include "xf86Pci.h" #include "xf86PciInfo.h" -#include "amd.h" +#include "geode.h" /* Forward declarations of the functions */ static void LXSetCursorColors(ScrnInfoPtr pScrni, int bg, int fg); diff --git a/src/amd_lx_driver.c b/src/lx_driver.c index 6acd09f..aa8145e 100644 --- a/src/amd_lx_driver.c +++ b/src/lx_driver.c @@ -65,10 +65,10 @@ #include "randrstr.h" #include "cim_defs.h" #include "cim_regs.h" -#include "amd.h" +#include "geode.h" /* Bring in VGA functions */ -#include "amd_lx_vga.c" +#include "lx_vga.c" /* Chipset types */ diff --git a/src/amd_lx_exa.c b/src/lx_exa.c index b0bb057..a606da5 100644 --- a/src/amd_lx_exa.c +++ b/src/lx_exa.c @@ -37,11 +37,11 @@ #include "xf86.h" #include "exa.h" -#include "amd.h" +#include "geode.h" #include "cim_defs.h" #include "cim_regs.h" -#include "amd_blend.h" +#include "geode_blend.h" static const struct exa_format_t { int exa; diff --git a/src/amd_lx_randr.c b/src/lx_randr.c index 155eefa..df9133c 100644 --- a/src/amd_lx_randr.c +++ b/src/lx_randr.c @@ -38,7 +38,7 @@ #include <X11/extensions/randr.h> #include <randrstr.h> -#include "amd.h" +#include "geode.h" static int LXRandRGeneration; diff --git a/src/amd_lx_regacc.c b/src/lx_regacc.c index 2acf5ce..2acf5ce 100644 --- a/src/amd_lx_regacc.c +++ b/src/lx_regacc.c diff --git a/src/amd_lx_rotate.c b/src/lx_rotate.c index 300e327..16096d9 100644 --- a/src/amd_lx_rotate.c +++ b/src/lx_rotate.c @@ -29,7 +29,7 @@ #include "xf86.h" #include "shadow.h" -#include "amd.h" +#include "geode.h" static void LXShadowSave(ScreenPtr pScreen, ExaOffscreenArea *area) diff --git a/src/amd_lx_vga.c b/src/lx_vga.c index 699ca21..699ca21 100644 --- a/src/amd_lx_vga.c +++ b/src/lx_vga.c diff --git a/src/amd_lx_video.c b/src/lx_video.c index b26ea30..a9b3672 100644 --- a/src/amd_lx_video.c +++ b/src/lx_video.c @@ -46,11 +46,11 @@ #include "regionstr.h" #include "dixstruct.h" -#include "amd.h" +#include "geode.h" #include "xf86xv.h" #include <X11/extensions/Xv.h> #include "fourcc.h" -#include "amd_fourcc.h" +#include "geode_fourcc.h" #include "cim/cim_defs.h" #include "cim/cim_regs.h" diff --git a/src/panel.c b/src/panel.c index 31eb9e7..4cb2cf7 100644 --- a/src/panel.c +++ b/src/panel.c @@ -43,7 +43,7 @@ #include "panel.h" #include "gfx_defs.h" -#include "amd.h" +#include "geode.h" #define PLATFORM_DYNAMIC 1 /* runtime selection */ #define PLATFORM_DRACO 0 /* Draco + 9210 */ |