This commit is contained in:
Markus Fröschle
2016-11-13 20:53:40 +00:00
parent 1b40985e21
commit 379b0f5b60
3 changed files with 115 additions and 111 deletions

View File

@@ -85,7 +85,6 @@ SECTIONS
#if (FORMAT_ELF == 1) #if (FORMAT_ELF == 1)
OBJDIR/libgcc_helper.o(.text) OBJDIR/libgcc_helper.o(.text)
#endif #endif
OBJDIR/printf_helper.o(.text)
OBJDIR/cache.o(.text) OBJDIR/cache.o(.text)
OBJDIR/dma.o(.text) OBJDIR/dma.o(.text)
OBJDIR/MCD_dmaApi.o(.text) OBJDIR/MCD_dmaApi.o(.text)

View File

@@ -72,7 +72,7 @@
/* /*
* do a longword read from addr and byteswap the result * do a longword read from addr and byteswap the result
*/ */
inline uint32_t readl(volatile uint32_t *addr) static inline uint32_t readl(volatile uint32_t *addr)
{ {
uint32_t res; uint32_t res;
@@ -85,7 +85,7 @@ inline uint32_t readl(volatile uint32_t *addr)
/* /*
* byteswap value and write it to address * byteswap value and write it to address
*/ */
inline void writel(uint32_t value, uint32_t *address) static inline void writel(uint32_t value, uint32_t *address)
{ {
// dbg("writing %08x to %08x\r\n", value, address); // dbg("writing %08x to %08x\r\n", value, address);
* (volatile uint32_t *) address = swpl(value); * (volatile uint32_t *) address = swpl(value);

View File

@@ -537,8 +537,9 @@ static int radeon_probe_pll_params(struct radeonfb_info *rinfo)
hz = US_TO_TIMER(1000000.0) / (double)(start_tv - stop_tv); hz = US_TO_TIMER(1000000.0) / (double)(start_tv - stop_tv);
dbg("hz %d\r\n", (int32_t) hz); dbg("hz %d\r\n", (int32_t) hz);
OUTREG(CRTC_H_TOTAL_DISP, 640 / 8 - 1);
OUTREG(CRTC_V_TOTAL_DISP, 480 - 1); // OUTREG(CRTC_H_TOTAL_DISP, 640 / 8 - 1);
// OUTREG(CRTC_V_TOTAL_DISP, 480 - 1);
dbg("h_total=%d vtotal=%d\r\n", INREG(CRTC_H_TOTAL_DISP), INREG(CRTC_V_TOTAL_DISP)); dbg("h_total=%d vtotal=%d\r\n", INREG(CRTC_H_TOTAL_DISP), INREG(CRTC_V_TOTAL_DISP));
hTotal = ((INREG(CRTC_H_TOTAL_DISP) & 0x1ff) + 1) * 8; hTotal = ((INREG(CRTC_H_TOTAL_DISP) & 0x1ff) + 1) * 8;
@@ -2338,7 +2339,9 @@ int32_t radeonfb_pci_register(int32_t handle, const struct pci_device_id *ent)
dbg("map the BIOS ROM\r\n"); dbg("map the BIOS ROM\r\n");
radeon_map_ROM(rinfo); radeon_map_ROM(rinfo);
/* Run VGA BIOS */ /*
* Run VGA BIOS
*/
if ((rinfo->bios_seg != NULL)) if ((rinfo->bios_seg != NULL))
{ {
dbg("run VGA BIOS\r\n"); dbg("run VGA BIOS\r\n");
@@ -2354,7 +2357,8 @@ int32_t radeonfb_pci_register(int32_t handle, const struct pci_device_id *ent)
OUTREG(MC_FB_LOCATION, 0x7fff0000); OUTREG(MC_FB_LOCATION, 0x7fff0000);
rinfo->fb_local_base = 0; rinfo->fb_local_base = 0;
/* Fixup the display base addresses & engine offsets while we /*
* Fixup the display base addresses & engine offsets while we
* are at it as well * are at it as well
*/ */
OUTREG(DISPLAY_BASE_ADDR, 0); OUTREG(DISPLAY_BASE_ADDR, 0);
@@ -2419,6 +2423,7 @@ int32_t radeonfb_pci_register(int32_t handle, const struct pci_device_id *ent)
dbg("install VBL timer\r\n"); dbg("install VBL timer\r\n");
rinfo->lvds_timer = 0; rinfo->lvds_timer = 0;
#ifndef DRIVER_IN_ROM #ifndef DRIVER_IN_ROM
install_vbl_timer(radeon_timer_func, 1); /* remove old vector */ install_vbl_timer(radeon_timer_func, 1); /* remove old vector */
#else #else