Firebee/BaS_gcc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added radeon_vid.c

Browse Source
This commit is contained in:
Markus Fröschle
2013-12-28 08:19:57 +00:00
parent c2816ba549
commit 25971f0aef
7 changed files with 2842 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@@ -107,6 +107,7 @@ CSRCS= \
video.c \ video.c \
\ \
radeon_base.c \ radeon_base.c \
radeon_vid.c \
radeon_accel.c \ radeon_accel.c \
radeon_cursor.c \ radeon_cursor.c \
\ \

4
bas.lk.in
View File

@@ -79,6 +79,10 @@ SECTIONS
OBJDIR/video.o OBJDIR/video.o
OBJDIR/videl.o OBJDIR/videl.o
OBJDIR/radeon_base.o
OBJDIR/radeon_accel.o
OBJDIR/radeon_cursor.o
OBJDIR/xhdi_sd.o(.text) OBJDIR/xhdi_sd.o(.text)
OBJDIR/xhdi_interface.o(.text) OBJDIR/xhdi_interface.o(.text)
OBJDIR/xhdi_vec.o(.text) OBJDIR/xhdi_vec.o(.text)

53
include/radeonfb.h
View File

@@ -1,7 +1,6 @@
#ifndef __RADEONFB_H__ #ifndef __RADEONFB_H__
#define __RADEONFB_H__ #define __RADEONFB_H__
//#include "config.h"
#include <bas_string.h> #include <bas_string.h>
#include "pci.h" #include "pci.h"
#include "mod_devicetable.h" #include "mod_devicetable.h"
@@ -13,16 +12,6 @@
//#include "radeon_theatre.h" //#include "radeon_theatre.h"
#include "radeon_reg.h" #include "radeon_reg.h"
#ifndef point32_ter
#define point32_ter void*
#endif
#ifndef FALSE
#define FALSE 0
#endif
#ifndef TRUE
#define TRUE 1
#endif
/* Buffer are aligned on 4096 byte boundaries */ /* Buffer are aligned on 4096 byte boundaries */
#define RADEON_BUFFER_ALIGN 0x00000fff #define RADEON_BUFFER_ALIGN 0x00000fff
@@ -488,12 +477,12 @@ extern uint32_t __INPLL(struct radeonfb_info *rinfo, uint32_t addr);
extern void __OUTPLL(struct radeonfb_info *rinfo, uint32_t index, uint32_t val); extern void __OUTPLL(struct radeonfb_info *rinfo, uint32_t index, uint32_t val);
extern void __OUTPLLP(struct radeonfb_info *rinfo, uint32_t index, uint32_t val, uint32_t mask); extern void __OUTPLLP(struct radeonfb_info *rinfo, uint32_t index, uint32_t val, uint32_t mask);
#define INREG8(addr) *((uint8_t *)(rinfo->mmio_base+addr)) #define INREG8(addr) *((uint8_t *)(rinfo->mmio_base + addr))
#define INREG16(addr) swpw(*(uint16_t *)(rinfo->mmio_base+addr)) #define INREG16(addr) swpw(*(uint16_t *)(rinfo->mmio_base + addr))
#define INREG(addr) swpl(*(uint32_t *)(rinfo->mmio_base+addr)) #define INREG(addr) swpl(*(uint32_t *)(rinfo->mmio_base + addr))
#define OUTREG8(addr,val) (*((uint8_t *)(rinfo->mmio_base+addr)) = val) #define OUTREG8(addr,val) (*((uint8_t *)(rinfo->mmio_base + addr)) = val)
#define OUTREG16(addr,val) (*((uint16_t *)(rinfo->mmio_base+addr)) = swpw(val)) #define OUTREG16(addr,val) (*((uint16_t *)(rinfo->mmio_base + addr)) = swpw(val))
#define OUTREG(addr,val) (*((uint32_t *)(rinfo->mmio_base+addr)) = swpl(val)) #define OUTREG(addr,val) (*((uint32_t *)(rinfo->mmio_base + addr)) = swpl(val))
extern int32_t *tab_funcs_pci; extern int32_t *tab_funcs_pci;
#define BIOS_IN8(v) (* ((uint8_t *) rinfo->bios_seg_phys + v)) #define BIOS_IN8(v) (* ((uint8_t *) rinfo->bios_seg_phys + v))
@@ -575,24 +564,22 @@ extern void RADEONVIP_reset(struct radeonfb_info *rinfo);
/* Accel functions */ /* Accel functions */
extern void RADEONWaitForFifoFunction(struct radeonfb_info *rinfo, int32_t entries); extern void radeon_wait_for_fifo_function(struct radeonfb_info *rinfo, int entries);
extern void RADEONEngineFlush(struct radeonfb_info *rinfo); extern void radeon_engine_flush(struct radeonfb_info *rinfo);
extern void RADEONEngineReset(struct radeonfb_info *rinfo); extern void radeon_engine_reset(struct radeonfb_info *rinfo);
extern void RADEONEngineRestore(struct radeonfb_info *rinfo); extern void radeon_engine_restore(struct radeonfb_info *rinfo);
extern void RADEONEngineInit(struct radeonfb_info *rinfo); extern void radeon_engine_init(struct radeonfb_info *rinfo);
extern void RADEONWaitForIdleMMIO(struct radeonfb_info *rinfo); extern void radeon_wait_for_idle_mmio(struct radeonfb_info *rinfo);
#define RADEONWaitForFifo(rinfo, entries) \ #define radeon_engine_idle() radeon_wait_for_idle_mmio(rinfo)
do { \
if(rinfo->fifo_slots < entries) \
RADEONWaitForFifoFunction(rinfo, entries); \
rinfo->fifo_slots -= entries; \
} while(0)
#define radeon_engine_flush(rinfo) RADEONEngineFlush(rinfo) #define radeon_wait_for_fifo(rinfo, entries) \
#define radeonfb_engine_reset(rinfo) RADEONEngineReset(rinfo) do \
#define radeonfb_engine_init(rinfo) RADEONEngineInit(rinfo) { \
#define radeon_engine_idle() RADEONWaitForIdleMMIO(rinfo) if (rinfo->fifo_slots < entries) \
radeon_wait_for_fifo_function(rinfo, entries); \
rinfo->fifo_slots -= entries; \
} while (0)
static inline int radeonfb_sync(struct fb_info *info) static inline int radeonfb_sync(struct fb_info *info)
{ {

27
radeon/radeon_accel.c
View File

@@ -91,7 +91,7 @@ static struct {
#define ACCEL_MMIO #define ACCEL_MMIO
#define ACCEL_PREAMBLE() #define ACCEL_PREAMBLE()
#define BEGIN_ACCEL(n) RADEONWaitForFifo(rinfo, (n)) #define BEGIN_ACCEL(n) radeon_wait_for_fifo(rinfo, (n))
#define OUT_ACCEL_REG(reg, val) OUTREG(reg, val) #define OUT_ACCEL_REG(reg, val) OUTREG(reg, val)
#define FINISH_ACCEL() #define FINISH_ACCEL()
@@ -101,23 +101,23 @@ static struct {
* drained, the Pixel Cache is flushed, and the engine is idle. This is * drained, the Pixel Cache is flushed, and the engine is idle. This is
* a standard "sync" function that will make the hardware "quiescent". * a standard "sync" function that will make the hardware "quiescent".
*/ */
void RADEONWaitForIdleMMIO(struct radeonfb_info *rinfo) void radeon_wait_for_idle_mmio(struct radeonfb_info *rinfo)
{ {
int i = 0; int i = 0;
/* Wait for the engine to go idle */ /* Wait for the engine to go idle */
RADEONWaitForFifoFunction(rinfo, 64); radeon_wait_for_fifo_function(rinfo, 64);
while(1) while(1)
{ {
for(i = 0; i < RADEON_TIMEOUT; i++) for(i = 0; i < RADEON_TIMEOUT; i++)
{ {
if (!(INREG(RBBM_STATUS) & RBBM_ACTIVE)) if (!(INREG(RBBM_STATUS) & RBBM_ACTIVE))
{ {
RADEONEngineFlush(rinfo); radeon_engine_flush(rinfo);
return; return;
} }
} }
RADEONEngineReset(rinfo); radeon_engine_reset(rinfo);
RADEONEngineRestore(rinfo); radeon_engine_restore(rinfo);
} }
} }
@@ -223,7 +223,7 @@ void radeon_subsequent_solid_two_point_line_mmio(struct fb_info *info,
/* TODO: Check bounds -- RADEON only has 14 bits */ /* TODO: Check bounds -- RADEON only has 14 bits */
if (!(flags & OMIT_LAST)) if (!(flags & OMIT_LAST))
RADEONSubsequentSolidHorVertLineMMIO(info, xb, yb, 1, DEGREES_0); radeon_subsequent_solid_hor_vert_line_mmio(info, xb, yb, 1, DEGREES_0);
#ifdef RADEON_TILING #ifdef RADEON_TILING
BEGIN_ACCEL(3); BEGIN_ACCEL(3);
OUT_ACCEL_REG(DST_PITCH_OFFSET, rinfo->dst_pitch_offset OUT_ACCEL_REG(DST_PITCH_OFFSET, rinfo->dst_pitch_offset
@@ -405,7 +405,7 @@ void radeon_setup_for_screen_to_screen_copy_mmio(struct fb_info *info,
} }
/* Subsequent XAA screen-to-screen copy */ /* Subsequent XAA screen-to-screen copy */
void radeon_subsequent_screen_to_screen_copy(struct fb_info *info, int xa, int ya, int xb, int yb, int w, int h) void radeon_subsequent_screen_to_screen_copy_mmio(struct fb_info *info, int xa, int ya, int xb, int yb, int w, int h)
{ {
struct radeonfb_info *rinfo = info->par; struct radeonfb_info *rinfo = info->par;
@@ -853,7 +853,7 @@ void RADEONChangeSurfaces(struct fb_info *info)
/* The FIFO has 64 slots. This routines waits until at least `entries' /* The FIFO has 64 slots. This routines waits until at least `entries'
* of these slots are empty. * of these slots are empty.
*/ */
void radeon_wait_for_fifo_(struct radeonfb_info *rinfo, int entries) void radeon_wait_for_fifo_function(struct radeonfb_info *rinfo, int entries)
{ {
int i; int i;
while(1) while(1)
@@ -888,7 +888,8 @@ void radeon_engine_reset(struct radeonfb_info *rinfo)
unsigned long mclk_cntl; unsigned long mclk_cntl;
unsigned long rbbm_soft_reset; unsigned long rbbm_soft_reset;
unsigned long host_path_cntl; unsigned long host_path_cntl;
RADEONEngineFlush(rinfo);
radeon_engine_flush(rinfo);
clock_cntl_index = INREG(CLOCK_CNTL_INDEX); clock_cntl_index = INREG(CLOCK_CNTL_INDEX);
/* Some ASICs have bugs with dynamic-on feature, which are /* Some ASICs have bugs with dynamic-on feature, which are
* ASIC-version dependent, so we force all blocks on for now * ASIC-version dependent, so we force all blocks on for now
@@ -986,7 +987,7 @@ void radeon_engine_restore(struct radeonfb_info *rinfo)
OUTREG(DP_SRC_FRGD_CLR, 0xffffffff); OUTREG(DP_SRC_FRGD_CLR, 0xffffffff);
OUTREG(DP_SRC_BKGD_CLR, 0x00000000); OUTREG(DP_SRC_BKGD_CLR, 0x00000000);
OUTREG(DP_WRITE_MSK, 0xffffffff); OUTREG(DP_WRITE_MSK, 0xffffffff);
RADEONWaitForIdleMMIO(rinfo); radeon_wait_for_idle_mmio(rinfo);
} }
/* Initialize the acceleration hardware */ /* Initialize the acceleration hardware */
@@ -994,13 +995,13 @@ void radeon_engine_init(struct radeonfb_info *rinfo)
{ {
unsigned long temp; unsigned long temp;
OUTREG(RB3D_CNTL, 0); OUTREG(RB3D_CNTL, 0);
RADEONEngineReset(rinfo); radeon_engine_reset(rinfo);
temp = radeon_get_dstbpp(rinfo->depth); temp = radeon_get_dstbpp(rinfo->depth);
#ifdef RADEON_TILING #ifdef RADEON_TILING
rinfo->dp_gui_master_cntl = ((temp << GMC_DST_DATATYPE_SHIFT) | GMC_CLR_CMP_CNTL_DIS | GMC_DST_PITCH_OFFSET_CNTL); rinfo->dp_gui_master_cntl = ((temp << GMC_DST_DATATYPE_SHIFT) | GMC_CLR_CMP_CNTL_DIS | GMC_DST_PITCH_OFFSET_CNTL);
#else #else
rinfo->dp_gui_master_cntl = ((temp << GMC_DST_DATATYPE_SHIFT) | GMC_CLR_CMP_CNTL_DIS); rinfo->dp_gui_master_cntl = ((temp << GMC_DST_DATATYPE_SHIFT) | GMC_CLR_CMP_CNTL_DIS);
#endif #endif
RADEONEngineRestore(rinfo); radeon_engine_restore(rinfo);
} }

134
radeon/radeon_base.c
View File

@@ -227,7 +227,6 @@ static reg_val common_regs[] = {
{ CAP1_TRIG_CNTL, 0 }, { CAP1_TRIG_CNTL, 0 },
}; };
#define rinfo ((struct radeonfb_info *)info_fvdi->par)
static uint32_t inreg(uint32_t addr) static uint32_t inreg(uint32_t addr)
{ {
@@ -515,12 +514,12 @@ static int radeon_probe_pll_params(struct radeonfb_info *rinfo)
dbg("radeonfb: radeon_probe_pll_params hz 0x%x\r\n", (int32_t) hz); dbg("radeonfb: radeon_probe_pll_params hz 0x%x\r\n", (int32_t) hz);
hTotal = ((INREG(CRTC_H_TOTAL_DISP) & 0x1ff) + 1) * 8; hTotal = ((INREG(CRTC_H_TOTAL_DISP) & 0x1ff) + 1) * 8;
vTotal = ((INREG(CRTC_V_TOTAL_DISP) & 0x3ff) + 1); vTotal = ((INREG(CRTC_V_TOTAL_DISP) & 0x3ff) + 1);
DPRINTVAL(" hTotal ",hTotal); dbg("hTotal=0x%x\r\n", hTotal);
DPRINTVAL(" vTotal ",vTotal); dbg("vTotal=0x%x\r\n", vTotal);
vclk = (double)hTotal * (double)vTotal * hz; vclk = (double) hTotal * (double) vTotal * hz;
DPRINTVAL(" vclk ", (int32_t)vclk); dbg("vclk=0x%x\r\n", (int) vclk);
DPRINT("\r\n");
switch((INPLL(PPLL_REF_DIV) & 0x30000) >> 16) switch ((INPLL(PPLL_REF_DIV) & 0x30000) >> 16)
{ {
case 1: case 1:
n = ((INPLL(M_SPLL_REF_FB_DIV) >> 16) & 0xff); n = ((INPLL(M_SPLL_REF_FB_DIV) >> 16) & 0xff);
@@ -578,8 +577,7 @@ static int radeon_probe_pll_params(struct radeonfb_info *rinfo)
xtal = 2950; xtal = 2950;
else else
{ {
DPRINTVAL("radeonfb: xtal calculation failed: ",xtal); dbg("radeonfb: xtal calculation failed: %0x%x\r\n", xtal);
DPRINT("\r\n");
return -1; /* error */ return -1; /* error */
} }
tmp = INPLL(M_SPLL_REF_FB_DIV); tmp = INPLL(M_SPLL_REF_FB_DIV);
@@ -608,7 +606,8 @@ static void radeon_get_pllinfo(struct radeonfb_info *rinfo)
* incomplete, however. It does provide ppll_max and _min values * incomplete, however. It does provide ppll_max and _min values
* even for most other methods, however. * even for most other methods, however.
*/ */
DPRINT("radeonfb: radeon_get_pllinfo\r\n"); dbg("radeonfb: radeon_get_pllinfo\r\n");
switch(rinfo->chipset) switch(rinfo->chipset)
{ {
case PCI_DEVICE_ID_ATI_RADEON_QW: case PCI_DEVICE_ID_ATI_RADEON_QW:
@@ -685,7 +684,7 @@ static void radeon_get_pllinfo(struct radeonfb_info *rinfo)
rinfo->pll.ppll_min = BIOS_IN32(pll_info_block + 0x12); rinfo->pll.ppll_min = BIOS_IN32(pll_info_block + 0x12);
rinfo->pll.ppll_max = BIOS_IN32(pll_info_block + 0x16); rinfo->pll.ppll_max = BIOS_IN32(pll_info_block + 0x16);
#endif #endif
DPRINT("radeonfb: Retreived PLL infos from BIOS\r\n"); dbg("radeonfb: Retreived PLL infos from BIOS\r\n");
goto found; goto found;
} }
/* /*
@@ -694,13 +693,13 @@ static void radeon_get_pllinfo(struct radeonfb_info *rinfo)
*/ */
if (radeon_probe_pll_params(rinfo) == 0) if (radeon_probe_pll_params(rinfo) == 0)
{ {
DPRINT("radeonfb: Retreived PLL infos from registers\r\n"); dbg("radeonfb: Retreived PLL infos from registers\r\n");
goto found; goto found;
} }
/* /*
* Fall back to already-set defaults... * Fall back to already-set defaults...
*/ */
DPRINT("radeonfb: Used default PLL infos\r\n"); dbg("radeonfb: Used default PLL infos\r\n");
found: found:
/* /*
* Some methods fail to retreive SCLK and MCLK values, we apply default * Some methods fail to retreive SCLK and MCLK values, we apply default
@@ -711,14 +710,10 @@ found:
rinfo->pll.mclk = 20000; rinfo->pll.mclk = 20000;
if (rinfo->pll.sclk == 0) if (rinfo->pll.sclk == 0)
rinfo->pll.sclk = 20000; rinfo->pll.sclk = 20000;
DPRINTVAL("radeonfb: Reference=",rinfo->pll.ref_clk / 100); dbg("radeonfb: Reference=0x%x\r\n", rinfo->pll.ref_clk / 100);
DPRINTVAL(" MHz (RefDiv=",rinfo->pll.ref_div); dbg("MHz (RefDiv=0x%x) Memory=0x%x MHz\r\n", rinfo->pll.ref_div, rinfo->pll.mclk / 100);
DPRINTVAL(") Memory=",rinfo->pll.mclk / 100); dbg("System=0x%x MHz\r\n", rinfo->pll.sclk / 100);
DPRINTVAL(" Mhz, System=",rinfo->pll.sclk / 100); dbg("radeonfb: PLL min 0x%x, max 0x%x\r\n", rinfo->pll.ppll_min, rinfo->pll.ppll_max);
DPRINT(" MHz\r\n");
DPRINTVAL("radeonfb: PLL min ",rinfo->pll.ppll_min);
DPRINTVAL(" max ", rinfo->pll.ppll_max);
DPRINT("\r\n");
} }
static int var_to_depth(const struct fb_var_screeninfo *var) static int var_to_depth(const struct fb_var_screeninfo *var)
@@ -734,14 +729,12 @@ int radeonfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
struct fb_var_screeninfo v; struct fb_var_screeninfo v;
int nom, den; int nom, den;
uint32_t pitch; uint32_t pitch;
// DPRINT("radeonfb: radeonfb_check_var\r\n"); dbg("radeonfb: radeonfb_check_var\r\n");
/* clocks over 135 MHz have heat isues with DVI on RV100 */ /* clocks over 135 MHz have heat isues with DVI on RV100 */
if ((rinfo->mon1_type == MT_DFP) && (rinfo->family == CHIP_FAMILY_RV100) && ((100000000 / var->pixclock) > 13500)) if ((rinfo->mon1_type == MT_DFP) && (rinfo->family == CHIP_FAMILY_RV100) && ((100000000 / var->pixclock) > 13500))
{ {
DPRINTVAL("radeonfb: mode ",var->xres); dbg("radeonfb: mode %d x %d x %d",var->xres, var->yres, var->bits_per_pixel);
DPRINTVAL("x",var->yres); dbg(" rejected, RV100 DVI clock over 135 MHz\r\n");
DPRINTVAL("x",var->bits_per_pixel);
DPRINT(" rejected, RV100 DVI clock over 135 MHz\r\n");
return -1; //-EINVAL; return -1; //-EINVAL;
} }
@@ -817,10 +810,8 @@ int radeonfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
v.transp.length = 8; v.transp.length = 8;
break; break;
default: default:
DPRINTVAL("radeonfb: mode ",var->xres); dbg("radeonfb: mode %d x %d x %d rejected, color depth invalid\r\n ",
DPRINTVAL("x",var->yres); var->xres, var->yres, var->bits_per_pixel);
DPRINTVAL("x",var->bits_per_pixel);
DPRINT(" rejected, color depth invalid\r\n");
return -1; //-EINVAL; return -1; //-EINVAL;
} }
@@ -872,6 +863,8 @@ int radeonfb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info)
return 0; return 0;
} }
short mirror;
int radeonfb_ioctl(unsigned int cmd, unsigned long arg, struct fb_info *info) int radeonfb_ioctl(unsigned int cmd, unsigned long arg, struct fb_info *info)
{ {
struct radeonfb_info *rinfo = info->par; struct radeonfb_info *rinfo = info->par;
@@ -888,6 +881,7 @@ int radeonfb_ioctl(unsigned int cmd, unsigned long arg, struct fb_info *info)
if (!rinfo->is_mobility) if (!rinfo->is_mobility)
return -1; //-EINVAL; return -1; //-EINVAL;
radeon_fifo_wait(rinfo, 2); radeon_fifo_wait(rinfo, 2);
if (value & 0x01) if (value & 0x01)
{ {
tmp = INREG(LVDS_GEN_CNTL); tmp = INREG(LVDS_GEN_CNTL);
@@ -896,7 +890,7 @@ int radeonfb_ioctl(unsigned int cmd, unsigned long arg, struct fb_info *info)
else else
{ {
tmp = INREG(LVDS_GEN_CNTL); tmp = INREG(LVDS_GEN_CNTL);
tmp &= ~(LVDS_ON | LVDS_BLON); tmp &= ~(LVDS_ON | LVDS_BLON);
} }
OUTREG(LVDS_GEN_CNTL, tmp); OUTREG(LVDS_GEN_CNTL, tmp);
if (value & 0x02) if (value & 0x02)
@@ -937,7 +931,7 @@ int32_t radeon_screen_blank(struct radeonfb_info *rinfo, int32_t blank, int32_t
if (rinfo->lock_blank) if (rinfo->lock_blank)
return 0; return 0;
DPRINT("radeonfb: radeon_screen_blank\r\n"); dbg("radeonfb: radeon_screen_blank\r\n");
radeon_engine_idle(); radeon_engine_idle();
val = INREG(CRTC_EXT_CNTL); val = INREG(CRTC_EXT_CNTL);
val &= ~(CRTC_DISPLAY_DIS | CRTC_HSYNC_DIS | CRTC_VSYNC_DIS); val &= ~(CRTC_DISPLAY_DIS | CRTC_HSYNC_DIS | CRTC_VSYNC_DIS);
@@ -1152,7 +1146,7 @@ static void radeon_save_state(struct radeonfb_info *rinfo, struct radeon_regs *s
static void radeon_write_pll_regs(struct radeonfb_info *rinfo, struct radeon_regs *mode) static void radeon_write_pll_regs(struct radeonfb_info *rinfo, struct radeon_regs *mode)
{ {
int i; int i;
DPRINT("radeonfb: radeon_write_pll_regs\r\n"); dbg("radeonfb: radeon_write_pll_regs\r\n");
radeon_fifo_wait(rinfo, 20); radeon_fifo_wait(rinfo, 20);
#if 0 #if 0
/* Workaround from XFree */ /* Workaround from XFree */
@@ -1342,7 +1336,7 @@ void radeon_write_mode(struct radeonfb_info *rinfo, struct radeon_regs *mode, in
{ {
int i; int i;
int primary_mon = PRIMARY_MONITOR(rinfo); int primary_mon = PRIMARY_MONITOR(rinfo);
DPRINT("radeonfb: radeon_write_mode\r\n"); dbg("radeonfb: radeon_write_mode\r\n");
if (!regs_only) if (!regs_only)
radeon_screen_blank(rinfo, FB_BLANK_NORMAL, 0); radeon_screen_blank(rinfo, FB_BLANK_NORMAL, 0);
radeon_fifo_wait(rinfo, 31); radeon_fifo_wait(rinfo, 31);
@@ -1535,7 +1529,7 @@ int radeonfb_set_par(struct fb_info *info)
/* We always want engine to be idle on a mode switch, even /* We always want engine to be idle on a mode switch, even
* if we won't actually change the mode * if we won't actually change the mode
*/ */
DPRINT("radeonfb: radeonfb_set_par\r\n"); dbg("radeonfb: radeonfb_set_par\r\n");
radeon_engine_idle(); radeon_engine_idle();
hSyncStart = mode->xres + mode->right_margin; hSyncStart = mode->xres + mode->right_margin;
hSyncEnd = hSyncStart + mode->hsync_len; hSyncEnd = hSyncStart + mode->hsync_len;
@@ -1763,7 +1757,7 @@ int radeonfb_set_par(struct fb_info *info)
#if 0 #if 0
if (debug) if (debug)
{ {
DPRINT("Press a key for write the video mode...\r\n"); dbg("Press a key for write the video mode...\r\n");
Bconin(2); Bconin(2);
} }
#endif #endif
@@ -1847,8 +1841,7 @@ static int radeon_set_fbinfo(struct radeonfb_info *rinfo)
info->screen_size = MAX_MAPPED_VRAM; info->screen_size = MAX_MAPPED_VRAM;
else if (info->screen_size > MIN_MAPPED_VRAM) else if (info->screen_size > MIN_MAPPED_VRAM)
info->screen_size = MIN_MAPPED_VRAM; info->screen_size = MIN_MAPPED_VRAM;
DPRINTVALHEX("radeonfb: radeon_set_fbinfo: screen_size ",info->screen_size); dbg("radeonfb: radeon_set_fbinfo: screen_size %lx\r\n", info->screen_size);
DPRINT("\r\n");
/* Fill fix common fields */ /* Fill fix common fields */
memcpy(info->fix.id, rinfo->name, sizeof(info->fix.id)); memcpy(info->fix.id, rinfo->name, sizeof(info->fix.id));
info->fix.smem_start = rinfo->fb_base_phys; info->fix.smem_start = rinfo->fb_base_phys;
@@ -1945,30 +1938,28 @@ static void radeon_identify_vram(struct radeonfb_info *rinfo)
/* This may not be correct, as some cards can have half of channel disabled /* This may not be correct, as some cards can have half of channel disabled
* ToDo: identify these cases * ToDo: identify these cases
*/ */
DPRINT("radeonfb: "); dbg("radeonfb:");
switch(rinfo->family) switch(rinfo->family)
{ {
case CHIP_FAMILY_LEGACY: DPRINT("LEGACY"); break; case CHIP_FAMILY_LEGACY: dbg("LEGACY"); break;
case CHIP_FAMILY_RADEON: DPRINT("RADEON"); break; case CHIP_FAMILY_RADEON: dbg("RADEON"); break;
case CHIP_FAMILY_RV100: DPRINT("RV100"); break; case CHIP_FAMILY_RV100: dbg("RV100"); break;
case CHIP_FAMILY_RS100: DPRINT("RS100"); break; case CHIP_FAMILY_RS100: dbg("RS100"); break;
case CHIP_FAMILY_RV200: DPRINT("RV200"); break; case CHIP_FAMILY_RV200: dbg("RV200"); break;
case CHIP_FAMILY_RS200: DPRINT("RS200"); break; case CHIP_FAMILY_RS200: dbg("RS200"); break;
case CHIP_FAMILY_R200: DPRINT("R200"); break; case CHIP_FAMILY_R200: dbg("R200"); break;
case CHIP_FAMILY_RV250: DPRINT("RV250"); break; case CHIP_FAMILY_RV250: dbg("RV250"); break;
case CHIP_FAMILY_RS300: DPRINT("RS300"); break; case CHIP_FAMILY_RS300: dbg("RS300"); break;
case CHIP_FAMILY_RV280: DPRINT("RV280"); break; case CHIP_FAMILY_RV280: dbg("RV280"); break;
case CHIP_FAMILY_R300: DPRINT("R300"); break; case CHIP_FAMILY_R300: dbg("R300"); break;
case CHIP_FAMILY_R350: DPRINT("R350"); break; case CHIP_FAMILY_R350: dbg("R350"); break;
case CHIP_FAMILY_RV350: DPRINT("RV350"); break; case CHIP_FAMILY_RV350: dbg("RV350"); break;
case CHIP_FAMILY_RV380: DPRINT("RV380"); break; case CHIP_FAMILY_RV380: dbg("RV380"); break;
case CHIP_FAMILY_R420: DPRINT("R420"); break; case CHIP_FAMILY_R420: dbg("R420"); break;
default: DPRINT("UNKNOW"); break; default: dbg("UNKNOW"); break;
} }
DPRINTVAL(" found ",rinfo->video_ram / 1024); dbg(" found %d", rinfo->video_ram / 1024);
DPRINT("KB of "); dbg("KB of %s %d bits wide video RAM\r\n", rinfo->vram_ddr ? "DDR " : "SDRAM ", rinfo->vram_width);
DPRINTVAL(rinfo->vram_ddr ? "DDR " : "SDRAM ",rinfo->vram_width);
DPRINT(" bits wide videoram\r\n");
} }
int32_t radeonfb_pci_register(int32_t handle, const struct pci_device_id *ent) int32_t radeonfb_pci_register(int32_t handle, const struct pci_device_id *ent)
@@ -1977,7 +1968,7 @@ int32_t radeonfb_pci_register(int32_t handle, const struct pci_device_id *ent)
struct radeonfb_info *rinfo; struct radeonfb_info *rinfo;
struct pci_rd *pci_rsc_desc; struct pci_rd *pci_rsc_desc;
info_fvdi = info = framebuffer_alloc(sizeof(struct radeonfb_info)); info = framebuffer_alloc(sizeof(struct radeonfb_info));
if (!info) if (!info)
return -1; // -ENOMEM; return -1; // -ENOMEM;
rinfo = info->par; rinfo = info->par;
@@ -1992,7 +1983,7 @@ int32_t radeonfb_pci_register(int32_t handle, const struct pci_device_id *ent)
rinfo->is_IGP = (ent->driver_data & CHIP_IS_IGP) != 0; rinfo->is_IGP = (ent->driver_data & CHIP_IS_IGP) != 0;
/* Set base addrs */ /* Set base addrs */
DPRINT("radeonfb: radeonfb_pci_register: Set base addrs\r\n"); dbg("radeonfb: radeonfb_pci_register: Set base addrs\r\n");
rinfo->fb_base_phys = rinfo->mmio_base_phys = rinfo->io_base_phys = 0xFFFFFFFF; rinfo->fb_base_phys = rinfo->mmio_base_phys = rinfo->io_base_phys = 0xFFFFFFFF;
rinfo->mapped_vram = 0; rinfo->mapped_vram = 0;
rinfo->mmio_base = rinfo->io_base = NULL; rinfo->mmio_base = rinfo->io_base = NULL;
@@ -2004,11 +1995,10 @@ int32_t radeonfb_pci_register(int32_t handle, const struct pci_device_id *ent)
uint16_t flags; uint16_t flags;
do do
{ {
DPRINTVALHEX("radeonfb: flags ", pci_rsc_desc->flags); dbg("radeonfb: flags %x", pci_rsc_desc->flags);
DPRINTVALHEX(" start ", pci_rsc_desc->start); dbg(" start %x", pci_rsc_desc->start);
DPRINTVALHEX(" offset ", pci_rsc_desc->offset); dbg(" offset %x", pci_rsc_desc->offset);
DPRINTVALHEX(" length ", pci_rsc_desc->length); dbg(" length %x\r\n", pci_rsc_desc->length);
DPRINT("\r\n");
if (!(pci_rsc_desc->flags & FLG_IO)) if (!(pci_rsc_desc->flags & FLG_IO))
{ {
if ((rinfo->fb_base_phys == 0xFFFFFFFF) && (pci_rsc_desc->length >= 0x100000)) if ((rinfo->fb_base_phys == 0xFFFFFFFF) && (pci_rsc_desc->length >= 0x100000))
@@ -2020,12 +2010,12 @@ int32_t radeonfb_pci_register(int32_t handle, const struct pci_device_id *ent)
if ((pci_rsc_desc->flags & FLG_ENDMASK) == ORD_MOTOROLA) if ((pci_rsc_desc->flags & FLG_ENDMASK) == ORD_MOTOROLA)
{ {
rinfo->big_endian = 0; /* host bridge make swapping intel -> motorola */ rinfo->big_endian = 0; /* host bridge make swapping intel -> motorola */
DPRINT("radeonfb: host bridge is big endian\r\n"); dbg("radeonfb: host bridge is big endian\r\n");
} }
else else
{ {
rinfo->big_endian = 1; /* radeon make swapping intel -> motorola */ rinfo->big_endian = 1; /* radeon make swapping intel -> motorola */
DPRINT("radeonfb: host bridge is little endian\r\n"); dbg("radeonfb: host bridge is little endian\r\n");
} }
} }
else if ((pci_rsc_desc->length >= RADEON_REGSIZE) else if ((pci_rsc_desc->length >= RADEON_REGSIZE)
@@ -2063,16 +2053,16 @@ int32_t radeonfb_pci_register(int32_t handle, const struct pci_device_id *ent)
flags = pci_rsc_desc->flags; flags = pci_rsc_desc->flags;
pci_rsc_desc = (struct pci_rd *)((uint32_t)pci_rsc_desc->next + (uint32_t)pci_rsc_desc); pci_rsc_desc = (struct pci_rd *)((uint32_t)pci_rsc_desc->next + (uint32_t)pci_rsc_desc);
} }
while(!(flags & FLG_LAST)); while (!(flags & FLG_LAST));
} }
else else
DPRINT("radeonfb: radeonfb_pci_register: get_resource error\r\n"); dbg("radeonfb: radeonfb_pci_register: get_resource error\r\n");
/* map the regions */ /* map the regions */
DPRINT("radeonfb: radeonfb_pci_register: map the regions\r\n"); dbg("radeonfb: radeonfb_pci_register: map the regions\r\n");
if (rinfo->mmio_base == NULL) if (rinfo->mmio_base == NULL)
{ {
DPRINT("radeonfb: cannot map MMIO\r\n"); dbg("radeonfb: cannot map MMIO\r\n");
framebuffer_release(info); framebuffer_release(info);
return -2; //(-EIO); return -2; //(-EIO);
} }

23
radeon/radeon_cursor.c
View File

@@ -46,6 +46,14 @@
#include "radeonfb.h" #include "radeonfb.h"
#define DBG_RADEON
#ifdef DBG_RADEON
#define dbg(format, arg...) do { xprintf("DEBUG: " format, ##arg); } while (0)
#else
#define dbg(format, arg...) do { ; } while (0)
#endif /* DBG_RADEON */
#define CURSOR_WIDTH 64 #define CURSOR_WIDTH 64
#define CURSOR_HEIGHT 64 #define CURSOR_HEIGHT 64
@@ -293,20 +301,23 @@ long radeon_cursor_init(struct fb_info *info)
{ {
struct radeonfb_info *rinfo = info->par; struct radeonfb_info *rinfo = info->par;
int size_bytes = CURSOR_WIDTH * 4 * CURSOR_HEIGHT; int size_bytes = CURSOR_WIDTH * 4 * CURSOR_HEIGHT;
unsigned long fbarea = offscreen_alloc(rinfo->info, size_bytes+256); unsigned long fbarea = offscreen_alloc(rinfo->info, size_bytes + 256);
// DPRINTVALHEX("radeonfb: RADEONCursorInit: fbarea ",fbarea);
dbg("radeonfb: %s: fbarea: %p\r\n", __FUNCTION__, fbarea);
if(!fbarea) if(!fbarea)
rinfo->cursor_start = 0; rinfo->cursor_start = 0;
else else
{ {
unsigned short data[16], mask[16]; unsigned short data[16], mask[16];
memset(data, 0, sizeof(data)); memset(data, 0, sizeof(data));
memset(mask, 0, sizeof(data)); memset(mask, 0, sizeof(data));
rinfo->cursor_start = RADEON_ALIGN(fbarea - (unsigned long)rinfo->fb_base, 256); rinfo->cursor_start = RADEON_ALIGN(fbarea - (unsigned long) rinfo->fb_base, 256);
rinfo->cursor_end = rinfo->cursor_start + size_bytes; rinfo->cursor_end = rinfo->cursor_start + size_bytes;
radeon_load_cursor_image(info, mask, data, 1); radeon_load_cursor_image(info, mask, data, 1);
} }
// DPRINTVALHEX(" cursor_start ",rinfo->cursor_start); dbg("radeonfb: %s cursor_start: %p\r\n", rinfo->cursor_start);
// DPRINT("\r\n");
return(rinfo->cursor_start ? fbarea : 0); return (rinfo->cursor_start ? fbarea : 0);
} }

2724
radeon/radeon_vid.c Normal file
View File

File diff suppressed because it is too large Load Diff