diff --git a/src/AtomBios/Decoder.c b/src/AtomBios/Decoder.c

index cdaa9ef..c6e3c9f 100644

--- a/src/AtomBios/Decoder.c

+++ b/src/AtomBios/Decoder.c

@@ -210,7 +210,7 @@ CD_STATUS ParseTable(DEVICE_DATA STACK_BASED* pDeviceData, UINT8 IndexInMasterTa

 						{

               IndexInMasterTable=ProcessCommandProperties((PARSER_TEMP_DATA STACK_BASED *)&ParserTempData);

 							(*CallTable[IndexInMasterTable].function)((PARSER_TEMP_DATA STACK_BASED *)&ParserTempData);

-#if (PARSER_TYPE!=DRIVER_TYPE_PARSER)

+#if (!defined(__sparc__) && (PARSER_TYPE!=DRIVER_TYPE_PARSER))

               BIOS_STACK_MODIFIER();

 #endif

 						}

diff --git a/src/AtomBios/hwserv_drv.c b/src/AtomBios/hwserv_drv.c

index a5f5a5b..2a454a4 100644

--- a/src/AtomBios/hwserv_drv.c

+++ b/src/AtomBios/hwserv_drv.c

@@ -105,6 +105,10 @@ UINT8   ReadPCIReg8(PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

     CailReadPCIConfigData(pWorkingTableData->pDeviceData->CAIL,&rvl,pWorkingTableData->Index,sizeof(UINT8));

 	return rvl;

 }

+#else

+UINT8   ReadPCIReg8(PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

+{

+}

 #endif

@@ -117,6 +121,10 @@ UINT16	ReadPCIReg16(PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

     return rvl;

 }

+#else

+UINT16	ReadPCIReg16(PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

+{

+}

 #endif

@@ -129,6 +137,10 @@ UINT32  ReadPCIReg32   (PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

     CailReadPCIConfigData(pWorkingTableData->pDeviceData->CAIL,&rvl,pWorkingTableData->Index,sizeof(UINT32));

     return rvl;

 }

+#else

+UINT32  ReadPCIReg32   (PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

+{

+}

 #endif

@@ -142,6 +154,10 @@ VOID	WritePCIReg8	(PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

 }

+#else

+VOID	WritePCIReg8	(PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

+{

+}

 #endif

@@ -152,6 +168,10 @@ VOID    WritePCIReg16  (PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

         CailWritePCIConfigData(pWorkingTableData->pDeviceData->CAIL,&(pWorkingTableData->DestData32),pWorkingTableData->Index,sizeof(UINT16));

 }

+#else

+VOID    WritePCIReg16  (PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

+{

+}

 #endif

@@ -160,6 +180,10 @@ VOID    WritePCIReg32  (PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

 {

     CailWritePCIConfigData(pWorkingTableData->pDeviceData->CAIL,&(pWorkingTableData->DestData32),pWorkingTableData->Index,sizeof(UINT32));

 }

+#else

+VOID    WritePCIReg32  (PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

+{

+}

 #endif

@@ -174,6 +198,10 @@ UINT8   ReadSysIOReg8    (PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

     //rvl= (UINT8) ReadGenericPciCfg(dev,reg,sizeof(UINT8));

 	return rvl;

 }

+#else

+UINT8   ReadSysIOReg8    (PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

+{

+}

 #endif

@@ -187,6 +215,10 @@ UINT16	ReadSysIOReg16(PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

     return rvl;

 }

+#else

+UINT16	ReadSysIOReg16(PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

+{

+}

 #endif

@@ -200,6 +232,10 @@ UINT32  ReadSysIOReg32   (PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

     //rvl= (UINT32) ReadGenericPciCfg(dev,reg,sizeof(UINT32));

     return rvl;

 }

+#else

+UINT32  ReadSysIOReg32   (PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

+{

+}

 #endif

@@ -212,6 +248,10 @@ VOID	WriteSysIOReg8	(PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

     //WriteGenericPciCfg(dev,reg,sizeof(UINT8),(UINT32)value);

 }

+#else

+VOID	WriteSysIOReg8	(PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

+{

+}

 #endif

@@ -222,6 +262,10 @@ VOID    WriteSysIOReg16  (PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

     //WriteGenericPciCfg(dev,reg,sizeof(UINT16),(UINT32)value);

 }

+#else

+VOID    WriteSysIOReg16  (PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

+{

+}

 #endif

@@ -230,6 +274,10 @@ VOID    WriteSysIOReg32  (PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

 {

     //WriteGenericPciCfg(dev,reg,sizeof(UINT32),(UINT32)value);

 }

+#else

+VOID    WriteSysIOReg32  (PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

+{

+}

 #endif

 // ATI Registers Memory Mapped Access

@@ -257,6 +305,24 @@ VOID	WriteIndReg32(PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

     CailWriteATIRegister(pWorkingTableData->pDeviceData->CAIL,*(UINT16*)(pWorkingTableData->IndirectIOTablePointer+1),pWorkingTableData->IndirectData );

 }

+#else

+UINT32	ReadReg32 (PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

+{

+}

+

+VOID	WriteReg32(PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

+{

+}

+

+

+VOID	ReadIndReg32 (PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

+{

+}

+

+VOID	WriteIndReg32(PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

+{

+}

+

 #endif

 // ATI Registers IO Mapped Access

@@ -271,8 +337,17 @@ VOID	WriteRegIO(PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

 {

       //  return CailWriteATIRegister(pWorkingTableData->pDeviceData->CAIL,pWorkingTableData->Index,pWorkingTableData->DestData32 );

 }

+#else

+UINT32	ReadRegIO (PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

+{

+    return 0;

+}

+VOID	WriteRegIO(PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

+{

+}

 #endif

+#if !defined(__sparc__)

 // access to Frame buffer, dummy function, need more information to implement it  

 UINT32	ReadFrameBuffer32 (PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

 {

@@ -286,6 +361,15 @@ VOID	WriteFrameBuffer32(PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

     CailWriteFBData(pWorkingTableData->pDeviceData->CAIL,(pWorkingTableData->Index <<2), pWorkingTableData->DestData32);

 }

+#else

+UINT32	ReadFrameBuffer32 (PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

+{

+}

+

+VOID	WriteFrameBuffer32(PARSER_TEMP_DATA STACK_BASED * pWorkingTableData)

+{

+}

+#endif /* __sparc__ */

 VOID *AllocateMemory(DEVICE_DATA *pDeviceData , UINT16 MemSize)

diff --git a/src/AtomBios/includes/CD_Structs.h b/src/AtomBios/includes/CD_Structs.h

index c43f81d..f61232a 100644

--- a/src/AtomBios/includes/CD_Structs.h

+++ b/src/AtomBios/includes/CD_Structs.h

@@ -375,7 +375,7 @@ typedef UINT8	COMMAND_TYPE_OPCODE_ONLY;

 typedef UINT8  COMMAND_HEADER_POINTER;

-#if (PARSER_TYPE==BIOS_TYPE_PARSER)

+#if (!defined(__sparc__) && (PARSER_TYPE==BIOS_TYPE_PARSER)) 

 typedef struct _DEVICE_DATA	{

     UINT32	STACK_BASED		*pParameterSpace;

diff --git a/src/AtomBios/includes/CD_binding.h b/src/AtomBios/includes/CD_binding.h

index 7b021d3..b74b5db 100644

--- a/src/AtomBios/includes/CD_binding.h

+++ b/src/AtomBios/includes/CD_binding.h

@@ -36,7 +36,11 @@

 #define USE_SWITCH_COMMAND			1

 #define	DRIVER_TYPE_PARSER		0x48

+#if !defined(__sparc__)

 #define PARSER_TYPE DRIVER_TYPE_PARSER

+#else

+#define PARSER_TYPE 0

+#endif /* __sparc__ */

 #define AllocateWorkSpace(x,y)      AllocateMemory(pDeviceData,y)

 #define FreeWorkSpace(x,y)          ReleaseMemory(x,y)

diff --git a/src/Makefile.am b/src/Makefile.am

index a146df3..7411677 100644

--- a/src/Makefile.am

+++ b/src/Makefile.am

@@ -27,8 +27,6 @@

 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.

 if DRI

-ATIMISC_DRI_SRCS = atidri.c

-R128_DRI_SRCS = r128_dri.c

 RADEON_DRI_SRCS = radeon_dri.c

 endif

@@ -64,52 +62,17 @@ XMODE_SRCS=\

         modes/xf86Rotate.c \

         modes/xf86DiDGA.c

-if ATIMISC_CPIO

-ATIMISC_CPIO_SOURCES = ativga.c ativgaio.c atibank.c atiwonder.c atiwonderio.c

-endif

-

-if ATIMISC_DGA

-ATIMISC_DGA_SOURCES = atidga.c

-endif

-

 if USE_EXA

-ATIMISC_EXA_SOURCES = atimach64exa.c

 RADEON_EXA_SOURCES = radeon_exa.c

 endif

-AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @XMODES_CFLAGS@ -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS -DATOM_BIOS -DATOM_BIOS_PARSER -DFGL_LINUX -DDRIVER_PARSER

+AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @XMODES_CFLAGS@ -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS -DATOM_BIOS -DATOM_BIOS_PARSER -DDRIVER_PARSER

 INCLUDES = -I$(srcdir)/AtomBios/includes

-ati_drv_la_LTLIBRARIES = ati_drv.la

-ati_drv_la_LDFLAGS = -module -avoid-version

-ati_drv_ladir = @moduledir@/drivers

-ati_drv_la_SOURCES = \

-	ati.c atimodule.c

-

-mach64_drv_la_LTLIBRARIES = mach64_drv.la

-mach64_drv_la_LDFLAGS = -module -avoid-version

-mach64_drv_ladir = @moduledir@/drivers

-mach64_drv_la_SOURCES = \

-	atibus.c atichip.c atiprobe.c atividmem.c \

-	atiadjust.c atiaudio.c aticlock.c aticonfig.c aticonsole.c \

-	atidac.c atidecoder.c atidsp.c atii2c.c \

-	atilock.c atimach64.c atimach64accel.c atimach64cursor.c \

-	atimach64i2c.c atimach64io.c atimach64xv.c atimode.c atipreinit.c \

-	atiprint.c atirgb514.c atiscreen.c atituner.c atiutil.c ativalid.c \

-	atiload.c atimisc.c atimach64probe.c $(ATIMISC_CPIO_SOURCES) \

-	$(ATIMISC_DGA_SOURCES) $(ATIMISC_DRI_SRCS) $(ATIMISC_EXA_SOURCES)

-

-r128_drv_la_LTLIBRARIES = r128_drv.la

-r128_drv_la_LDFLAGS = -module -avoid-version

-r128_drv_ladir = @moduledir@/drivers

-r128_drv_la_SOURCES = \

-	r128_accel.c r128_cursor.c r128_dga.c r128_driver.c \

-	r128_video.c r128_misc.c r128_probe.c $(R128_DRI_SRCS)

-

-radeon_drv_la_LTLIBRARIES = radeon_drv.la

-radeon_drv_la_LDFLAGS = -module -avoid-version

-radeon_drv_ladir = @moduledir@/drivers

-radeon_drv_la_SOURCES = \

+efb_drv_la_LTLIBRARIES = efb_drv.la

+efb_drv_la_LDFLAGS = -module -avoid-version

+efb_drv_ladir = @moduledir@/drivers

+efb_drv_la_SOURCES = efb_driver.c \

 	radeon_accel.c radeon_cursor.c radeon_dga.c \

 	radeon_driver.c radeon_video.c radeon_bios.c radeon_mm_i2c.c \

 	radeon_vip.c radeon_misc.c radeon_probe.c \

@@ -119,31 +82,10 @@ radeon_drv_la_SOURCES = \

 	$(RADEON_DRI_SRCS) $(RADEON_EXA_SOURCES) atombios_output.c atombios_crtc.c

 if XMODES

-radeon_drv_la_SOURCES += \

+efb_drv_la_SOURCES += \

 	$(XMODE_SRCS)

 endif

-theatre_detect_drv_la_LTLIBRARIES = theatre_detect_drv.la

-theatre_detect_drv_la_LDFLAGS = -module -avoid-version

-theatre_detect_drv_ladir = @moduledir@/multimedia

-theatre_detect_drv_la_SOURCES = \

-	theatre_detect.c theatre_detect_module.c

-

-theatre_drv_la_LTLIBRARIES = theatre_drv.la

-theatre_drv_la_LDFLAGS = -module -avoid-version

-theatre_drv_ladir = @moduledir@/multimedia

-

-theatre_drv_la_SOURCES = \

-	theatre.c theatre_module.c

-

-theatre200_drv_la_LTLIBRARIES = theatre200_drv.la

-theatre200_drv_la_LDFLAGS = -module -avoid-version

-theatre200_drv_ladir = @moduledir@/multimedia

-theatre200_drv_la_CFLAGS = \

-	$(AM_CFLAGS) -DMICROC_DIR=\"$(theatre200_drv_ladir)\"

-theatre200_drv_la_SOURCES = \

-	theatre200.c theatre200_module.c

-

 EXTRA_DIST = \

 	$(XMODE_SRCS) \

 	atimach64render.c \

diff --git a/src/ati.c b/src/ati.c

index b3f07ca..084b27f 100644

--- a/src/ati.c

+++ b/src/ati.c

@@ -68,7 +68,12 @@

 /* names duplicated from version headers */

 #define MACH64_DRIVER_NAME  "mach64"

 #define R128_DRIVER_NAME    "r128"

+

+#if defined(__sparc__)

+#define RADEON_DRIVER_NAME  "efb"

+#else

 #define RADEON_DRIVER_NAME  "radeon"

+#endif /* __sparc__ */

 enum

 {

diff --git a/src/aticonsole.c b/src/aticonsole.c

index 8efe897..aa3905a 100644

--- a/src/aticonsole.c

+++ b/src/aticonsole.c

@@ -514,6 +514,20 @@ ATIEnterGraphics

     ATIPtr      pATI

 )

 {

+    unsigned int PciReg;

+    pciConfigPtr           pPCI;

+    pciVideoPtr            pVideo, *xf86PciVideoInfo = xf86GetPciVideoInfo();

+

+    pVideo = xf86PciVideoInfo[pScreenInfo->scrnIndex];

+    pPCI = pVideo->thisCard;

+/*

+* Possibly fix block I/O indicator in PCI configuration space.

+*/

+    PciReg = pciReadLong(pPCI->tag, PCI_REG_USERCONFIG);

+    if (!(PciReg & 0x00000004U))

+		pciWriteLong(pPCI->tag, PCI_REG_USERCONFIG, PciReg | 

+				0x00000004U);

+

     /* Map apertures */

     if (!ATIMapApertures(pScreenInfo->scrnIndex, pATI))

         return FALSE;

diff --git a/src/radeon.h b/src/radeon.h

index 7d63f28..ddb779e 100644

--- a/src/radeon.h

+++ b/src/radeon.h

@@ -167,7 +167,15 @@ typedef enum {

     OPTION_TVDAC_LOAD_DETECT,

     OPTION_FORCE_TVOUT,

     OPTION_TVSTD,

-    OPTION_IGNORE_LID_STATUS

+    OPTION_IGNORE_LID_STATUS,

+#if defined(__sparc__)

+    OPTION_DUAL_DISPLAY,

+    OPTION_DUAL_DISPLAY_VERTICAL,

+    OPTION_STREAM_XOFFSET,

+    OPTION_STREAM_YOFFSET,

+    OPTION_OUTPUTS,

+    OPTION_DISABLE_RANDR,

+#endif

 } RADEONOpts;

@@ -734,6 +742,12 @@ typedef struct {

     Bool              r600_shadow_fb;

     void *fb_shadow;

+

+#if defined(__sparc__)

+    char *deviceName;

+    int  fd;

+#endif /* __sparc__ */

+

 } RADEONInfoRec, *RADEONInfoPtr;

 #define RADEONWaitForFifo(pScrn, entries)				\

@@ -1182,4 +1196,8 @@ static __inline__ int radeon_timedout(const struct timeval *endtime)

         now.tv_usec > endtime->tv_usec : now.tv_sec > endtime->tv_sec;

 }

+#if defined(__sparc__)

+#include "efb.h"

+#endif /* __sparc__ */

+

 #endif /* _RADEON_H_ */

diff --git a/src/radeon_accel.c b/src/radeon_accel.c

index 8b2f167..b581719 100644

--- a/src/radeon_accel.c

+++ b/src/radeon_accel.c

@@ -280,7 +280,11 @@ void RADEONEngineReset(ScrnInfoPtr pScrn)

 	INREG(RADEON_RBBM_SOFT_RESET);

     }

+#if !defined(__sparc__)

+    // soft reset the HDP causes system panic on some SPARC machines

     OUTREG(RADEON_HOST_PATH_CNTL, host_path_cntl | RADEON_HDP_SOFT_RESET);

+#endif

+

     INREG(RADEON_HOST_PATH_CNTL);

     OUTREG(RADEON_HOST_PATH_CNTL, host_path_cntl);

diff --git a/src/radeon_accelfuncs.c b/src/radeon_accelfuncs.c

index e3b37c1..52856ec 100644

--- a/src/radeon_accelfuncs.c

+++ b/src/radeon_accelfuncs.c

@@ -723,7 +723,11 @@ FUNC_NAME(RADEONSetupForScanlineCPUToScreenColorExpandFill)(ScrnInfoPtr pScrn,

 #else

     BEGIN_ACCEL(5);

+#if !defined(__sparc__)

     OUT_ACCEL_REG(RADEON_RBBM_GUICNTL,       RADEON_HOST_DATA_SWAP_NONE);

+#else

+    OUT_ACCEL_REG(RADEON_RBBM_GUICNTL,       RADEON_HOST_DATA_SWAP_32BIT);

+#endif

 #endif

     OUT_ACCEL_REG(RADEON_DP_GUI_MASTER_CNTL, info->dp_gui_master_cntl_clip);

     OUT_ACCEL_REG(RADEON_DP_WRITE_MASK,      planemask);

diff --git a/src/radeon_atombios.h b/src/radeon_atombios.h

index 9cb279e..ba1b462 100644

--- a/src/radeon_atombios.h

+++ b/src/radeon_atombios.h

@@ -245,9 +245,13 @@ typedef struct _atomBiosHandle {

     unsigned int BIOSImageSize;

 } atomBiosHandleRec;

-# endif

-

 extern Bool

 RADEONATOMGetTVTimings(ScrnInfoPtr pScrn, int index, SET_CRTC_TIMING_PARAMETERS_PS_ALLOCATION *crtc_timing, int32_t *pixel_clock);

+#else

+

+extern Bool

+RADEONATOMGetTVTimings(ScrnInfoPtr pScrn, int index, void *crtc_timing, int32_t *pixel_clock);

+

+#endif

 #endif /*  RHD_ATOMBIOS_H_ */

diff --git a/src/radeon_common.h b/src/radeon_common.h

index 467addf..c081088 100644

--- a/src/radeon_common.h

+++ b/src/radeon_common.h

@@ -73,6 +73,7 @@

 #define DRM_RADEON_SETPARAM               0x19

 #define DRM_RADEON_SURF_ALLOC             0x1a

 #define DRM_RADEON_SURF_FREE              0x1b

+#define DRM_RADEON_GET_PCICONFIG          0x1c

 #define DRM_RADEON_MAX_DRM_COMMAND_INDEX  0x39

diff --git a/src/radeon_commonfuncs.c b/src/radeon_commonfuncs.c

index 8c4b598..2ff5bcb 100644

--- a/src/radeon_commonfuncs.c

+++ b/src/radeon_commonfuncs.c

@@ -285,12 +285,34 @@ void FUNC_NAME(RADEONWaitForIdle)(ScrnInfoPtr pScrn)

     RADEONWaitForFifoFunction(pScrn, 64);

     for (;;) {

+

+	/* execute a tight loop to wait for idle. If timeout, then

+	   execute a slower loop for half a second. If then timeout,

+	   reset the engine.

+         */

 	for (i = 0; i < RADEON_TIMEOUT; i++) {

 	    if (!(INREG(RADEON_RBBM_STATUS) & RADEON_RBBM_ACTIVE)) {

 		RADEONEngineFlush(pScrn);

 		return;

 	    }

 	}

+

+#ifdef __sparc__

+	{

+            hrtime_t limit;

+            limit = gethrtime() + (hrtime_t)1000000000; /* 1000 ms from now */

+            while (((unsigned int)(INREG(RADEON_RBBM_STATUS)) & RADEON_RBBM_ACTIVE) 

+			&& (gethrtime() < limit)) {

+                    yield();

+	    }

+	}

+

+	if (!(INREG(RADEON_RBBM_STATUS) & RADEON_RBBM_ACTIVE)) {

+	    RADEONEngineFlush(pScrn);

+	    return;

+	}

+#endif /* __sparc__ */

+

 	xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,

 		       "Idle timed out: %u entries, stat=0x%08x\n",

 		       (unsigned int)INREG(RADEON_RBBM_STATUS) & RADEON_RBBM_FIFOCNT_MASK,