# HG changeset patch # User alex # Date 1043087141 0 # Node ID 59b1bd7ccae1412cb0c87999644e6e71db5d5cfd # Parent 1d75a7ecf3b8d83413b6f1133293877380d30074 hack to get rage128 working on ppc-g3 diff -r 1d75a7ecf3b8 -r 59b1bd7ccae1 vidix/drivers/radeon_vid.c --- a/vidix/drivers/radeon_vid.c Mon Jan 20 10:46:32 2003 +0000 +++ b/vidix/drivers/radeon_vid.c Mon Jan 20 18:25:41 2003 +0000 @@ -194,7 +194,8 @@ DECLARE_VREG(IDCT_LEVELS), DECLARE_VREG(IDCT_AUTH_CONTROL), DECLARE_VREG(IDCT_AUTH), - DECLARE_VREG(IDCT_CONTROL) + DECLARE_VREG(IDCT_CONTROL), + DECLARE_VREG(CONFIG_CNTL) }; static void * radeon_mmio_base = 0; @@ -207,6 +208,11 @@ static uint32_t SAVED_OV0_VID_KEY_CLR = 0; static uint32_t SAVED_OV0_VID_KEY_MSK = 0; static uint32_t SAVED_OV0_KEY_CNTL = 0; +#if defined(RAGE128) && (WORDS_BIGENDIAN) +static uint32_t SAVED_CONFIG_CNTL = 0; +#define APER_0_BIG_ENDIAN_16BPP_SWAP (1<<0) +#define APER_0_BIG_ENDIAN_32BPP_SWAP (2<<0) +#endif #define GETREG(TYPE,PTR,OFFZ) (*((volatile TYPE*)((PTR)+(OFFZ)))) #define SETREG(TYPE,PTR,OFFZ,VAL) (*((volatile TYPE*)((PTR)+(OFFZ))))=VAL @@ -426,10 +432,10 @@ (pitch64 << 22)); radeon_fifo_wait(1); -//#if defined(__BIG_ENDIAN) #if defined(WORDS_BIGENDIAN) - OUTREGP(DP_DATATYPE, - HOST_BIG_ENDIAN_EN, ~HOST_BIG_ENDIAN_EN); +#ifdef RADEON + OUTREGP(DP_DATATYPE, HOST_BIG_ENDIAN_EN, ~HOST_BIG_ENDIAN_EN); +#endif #else OUTREGP(DP_DATATYPE, 0, ~HOST_BIG_ENDIAN_EN); #endif @@ -1060,6 +1066,19 @@ } #endif +/* XXX: hack, but it works for me (tm) */ +#if defined(RAGE128) && (WORDS_BIGENDIAN) + /* code from gatos */ + { + SAVED_CONFIG_CNTL = INREG(CONFIG_CNTL); + OUTREG(CONFIG_CNTL, SAVED_CONFIG_CNTL & + ~(APER_0_BIG_ENDIAN_16BPP_SWAP|APER_0_BIG_ENDIAN_32BPP_SWAP)); + +// printf("saved: %x, current: %x\n", SAVED_CONFIG_CNTL, +// INREG(CONFIG_CNTL)); + } +#endif + if(__verbose > 1) radeon_vid_dump_regs(); return 0; } @@ -1075,6 +1094,12 @@ OUTREG(OV0_KEY_CNTL, SAVED_OV0_KEY_CNTL); printf(RADEON_MSG" Restored overlay colorkey settings\n"); +#if defined(RAGE128) && (WORDS_BIGENDIAN) + OUTREG(CONFIG_CNTL, SAVED_CONFIG_CNTL); +// printf("saved: %x, restored: %x\n", SAVED_CONFIG_CNTL, +// INREG(CONFIG_CNTL)); +#endif + unmap_phys_mem(radeon_mem_base,radeon_ram_size); unmap_phys_mem(radeon_mmio_base,0xFFFF); }