Commit e8652867 authored by Anatolij Gustschin's avatar Anatolij Gustschin
Browse files

video: mb862xx: fix coding style and remove dead code


Signed-off-by: default avatarAnatolij Gustschin <agust@denx.de>
parent bfadb17f
......@@ -37,6 +37,7 @@
#if defined(CONFIG_POST)
#include <post.h>
#endif
/*
* Graphic Device
*/
......@@ -65,74 +66,73 @@ unsigned int fr_div[] = { 0x00000f00, 0x00000900, 0x00000500 };
#define rd_io in32r
#define wr_io out32r
#else
#define rd_io(addr) in_be32((volatile unsigned*)(addr))
#define wr_io(addr,val) out_be32((volatile unsigned*)(addr), (val))
#define rd_io(addr) in_be32((volatile unsigned *)(addr))
#define wr_io(addr, val) out_be32((volatile unsigned *)(addr), (val))
#endif
#define HOST_RD_REG(off) rd_io((pGD->frameAdrs + 0x01fc0000 + (off)))
#define HOST_WR_REG(off, val) wr_io((pGD->frameAdrs + 0x01fc0000 + (off)), (val))
#define DISP_RD_REG(off) rd_io((pGD->frameAdrs + 0x01fd0000 + (off)))
#define DISP_WR_REG(off, val) wr_io((pGD->frameAdrs + 0x01fd0000 + (off)), (val))
#define DE_RD_REG(off) rd_io((pGD->dprBase + (off)))
#define DE_WR_REG(off, val) wr_io((pGD->dprBase + (off)), (val))
#define HOST_RD_REG(off) rd_io((dev->frameAdrs + 0x01fc0000 + (off)))
#define HOST_WR_REG(off, val) wr_io((dev->frameAdrs + 0x01fc0000 + (off)), \
(val))
#define DISP_RD_REG(off) rd_io((dev->frameAdrs + 0x01fd0000 + (off)))
#define DISP_WR_REG(off, val) wr_io((dev->frameAdrs + 0x01fd0000 + (off)), \
(val))
#define DE_RD_REG(off) rd_io((dev->dprBase + (off)))
#define DE_WR_REG(off, val) wr_io((dev->dprBase + (off)), (val))
#if defined(CONFIG_VIDEO_CORALP)
#define DE_WR_FIFO(val) wr_io((pGD->dprBase + (0x8400)), (val))
#define DE_WR_FIFO(val) wr_io((dev->dprBase + (0x8400)), (val))
#else
#define DE_WR_FIFO(val) wr_io((pGD->dprBase + (0x04a0)), (val))
#define DE_WR_FIFO(val) wr_io((dev->dprBase + (0x04a0)), (val))
#endif
#define L0PAL_RD_REG(idx, val) rd_io((pGD->frameAdrs + 0x01fd0400 + ((idx)<<2)))
#define L0PAL_WR_REG(idx, val) wr_io((pGD->frameAdrs + 0x01fd0400 + ((idx)<<2)), (val))
#define L1PAL_RD_REG(idx, val) rd_io((pGD->frameAdrs + 0x01fd0800 + ((idx)<<2)))
#define L1PAL_WR_REG(idx, val) wr_io((pGD->frameAdrs + 0x01fd0800 + ((idx)<<2)), (val))
#define L2PAL_RD_REG(idx, val) rd_io((pGD->frameAdrs + 0x01fd1000 + ((idx)<<2)))
#define L2PAL_WR_REG(idx, val) wr_io((pGD->frameAdrs + 0x01fd1000 + ((idx)<<2)), (val))
#define L3PAL_RD_REG(idx, val) rd_io((pGD->frameAdrs + 0x01fd1400 + ((idx)<<2)))
#define L3PAL_WR_REG(idx, val) wr_io((pGD->frameAdrs + 0x01fd1400 + ((idx)<<2)), (val))
#define L0PAL_WR_REG(idx, val) wr_io((dev->frameAdrs + 0x01fd0400 + \
((idx) << 2)), (val))
static void gdc_sw_reset(void)
static void gdc_sw_reset (void)
{
GraphicDevice *pGD = (GraphicDevice *)&mb862xx;
GraphicDevice *dev = &mb862xx;
HOST_WR_REG (0x002c, 0x00000001);
udelay (500);
video_hw_init ();
}
static void de_wait(void)
static void de_wait (void)
{
GraphicDevice *pGD = (GraphicDevice *)&mb862xx;
GraphicDevice *dev = &mb862xx;
int lc = 0x10000;
/* Sync with software writes to framebuffer,
try to reset if engine locked */
/*
* Sync with software writes to framebuffer,
* try to reset if engine locked
*/
while (DE_RD_REG (0x0400) & 0x00000131)
if (lc-- < 0) {
gdc_sw_reset ();
printf ("gdc reset done after drawing engine lock...\n");
printf ("gdc reset done after drawing engine lock.\n");
break;
}
}
static void de_wait_slots(int slots)
static void de_wait_slots (int slots)
{
GraphicDevice *pGD = (GraphicDevice *)&mb862xx;
GraphicDevice *dev = &mb862xx;
int lc = 0x10000;
/* Wait for free fifo slots */
while (DE_RD_REG (0x0408) < slots)
if (lc-- < 0) {
gdc_sw_reset ();
printf ("gdc reset done after drawing engine lock...\n");
printf ("gdc reset done after drawing engine lock.\n");
break;
}
}
#if !defined(CONFIG_VIDEO_CORALP)
static void board_disp_init(void)
static void board_disp_init (void)
{
GraphicDevice *pGD = (GraphicDevice *)&mb862xx;
GraphicDevice *dev = &mb862xx;
const gdc_regs *regs = board_get_regs ();
while (regs->index) {
......@@ -147,69 +147,69 @@ static void board_disp_init(void)
*/
static void de_init (void)
{
GraphicDevice *pGD = (GraphicDevice *)&mb862xx;
int cf = (pGD->gdfBytesPP == 1) ? 0x0000 : 0x8000;
GraphicDevice *dev = &mb862xx;
int cf = (dev->gdfBytesPP == 1) ? 0x0000 : 0x8000;
pGD->dprBase = pGD->frameAdrs + 0x01ff0000;
dev->dprBase = dev->frameAdrs + 0x01ff0000;
/* Setup mode and fbbase, xres, fg, bg */
de_wait_slots (2);
DE_WR_FIFO (0xf1010108);
DE_WR_FIFO (cf | 0x0300);
DE_WR_REG (0x0440, 0x0000);
DE_WR_REG (0x0444, pGD->winSizeX);
DE_WR_REG (0x0444, dev->winSizeX);
DE_WR_REG (0x0480, 0x0000);
DE_WR_REG (0x0484, 0x0000);
/* Reset clipping */
DE_WR_REG (0x0454, 0x0000);
DE_WR_REG (0x0458, pGD->winSizeX);
DE_WR_REG (0x0458, dev->winSizeX);
DE_WR_REG (0x045c, 0x0000);
DE_WR_REG (0x0460, pGD->winSizeY);
DE_WR_REG (0x0460, dev->winSizeY);
/* Clear framebuffer using drawing engine */
de_wait_slots (3);
DE_WR_FIFO (0x09410000);
DE_WR_FIFO (0x00000000);
DE_WR_FIFO (pGD->winSizeY<<16 | pGD->winSizeX);
DE_WR_FIFO (dev->winSizeY << 16 | dev->winSizeX);
/* sync with SW access to framebuffer */
de_wait ();
}
#if defined(CONFIG_VIDEO_CORALP)
unsigned int pci_video_init(void)
unsigned int pci_video_init (void)
{
GraphicDevice *pGD = (GraphicDevice *)&mb862xx;
GraphicDevice *dev = &mb862xx;
pci_dev_t devbusfn;
if ((devbusfn = pci_find_devices(supported, 0)) < 0)
{
if ((devbusfn = pci_find_devices (supported, 0)) < 0) {
printf ("PCI video controller not found!\n");
return 0;
}
/* PCI setup */
pci_write_config_dword (devbusfn, PCI_COMMAND, (PCI_COMMAND_MEMORY | PCI_COMMAND_IO));
pci_read_config_dword (devbusfn, PCI_BASE_ADDRESS_0, &pGD->frameAdrs);
pGD->frameAdrs = pci_mem_to_phys (devbusfn, pGD->frameAdrs);
pci_write_config_dword (devbusfn, PCI_COMMAND,
(PCI_COMMAND_MEMORY | PCI_COMMAND_IO));
pci_read_config_dword (devbusfn, PCI_BASE_ADDRESS_0, &dev->frameAdrs);
dev->frameAdrs = pci_mem_to_phys (devbusfn, dev->frameAdrs);
if (pGD->frameAdrs == 0) {
if (dev->frameAdrs == 0) {
printf ("PCI config: failed to get base address\n");
return 0;
}
pGD->pciBase = pGD->frameAdrs;
dev->pciBase = dev->frameAdrs;
/* Setup clocks and memory mode for Coral-P Eval. Board */
HOST_WR_REG (0x0038, 0x00090000);
udelay (200);
HOST_WR_REG (0xfffc, 0x11d7fa13);
udelay (100);
return pGD->frameAdrs;
return dev->frameAdrs;
}
unsigned int card_init (void)
{
GraphicDevice *pGD = (GraphicDevice *)&mb862xx;
GraphicDevice *dev = &mb862xx;
unsigned int cf, videomode, div = 0;
unsigned long t1, hsync, vsync;
char *penv;
......@@ -217,11 +217,10 @@ unsigned int card_init (void)
struct ctfb_res_modes *res_mode;
struct ctfb_res_modes var_mode;
memset (pGD, 0, sizeof (GraphicDevice));
memset (dev, 0, sizeof (GraphicDevice));
if (!pci_video_init ()) {
if (!pci_video_init ())
return 0;
}
printf ("CoralP\n");
......@@ -229,7 +228,7 @@ unsigned int card_init (void)
videomode = 0x310;
/* get video mode via environment */
if ((penv = getenv ("videomode")) != NULL) {
/* deceide if it is a string */
/* decide if it is a string */
if (penv[0] <= '9') {
videomode = (int) simple_strtoul (penv, NULL, 16);
tmp = 1;
......@@ -237,28 +236,28 @@ unsigned int card_init (void)
} else {
tmp = 1;
}
if (tmp) {
/* parameter are vesa modes */
/* search params */
/* parameter are vesa modes, search params */
for (i = 0; i < VESA_MODES_COUNT; i++) {
if (vesa_modes[i].vesanr == videomode)
break;
}
if (i == VESA_MODES_COUNT) {
printf ("\tno VESA Mode found, switching to mode 0x%x \n", videomode);
printf ("\tno VESA Mode found, fallback to mode 0x%x\n",
videomode);
i = 0;
}
res_mode =
(struct ctfb_res_modes *) &res_mode_init[vesa_modes[i].resindex];
res_mode = (struct ctfb_res_modes *)
&res_mode_init[vesa_modes[i].resindex];
if (vesa_modes[i].resindex > 2) {
printf ("\tUnsupported resolution, switching to default\n");
printf ("\tUnsupported resolution, using default\n");
bpp = vesa_modes[1].bits_per_pixel;
div = fr_div[1];
}
bpp = vesa_modes[i].bits_per_pixel;
div = fr_div[vesa_modes[i].resindex];
} else {
res_mode = (struct ctfb_res_modes *) &var_mode;
bpp = video_get_params (res_mode, penv);
}
......@@ -276,85 +275,94 @@ unsigned int card_init (void)
vsync = 1000000000L / t1;
/* fill in Graphic device struct */
sprintf (pGD->modeIdent, "%dx%dx%d %ldkHz %ldHz", res_mode->xres,
sprintf (dev->modeIdent, "%dx%dx%d %ldkHz %ldHz", res_mode->xres,
res_mode->yres, bpp, (hsync / 1000), (vsync / 1000));
printf ("\t%s\n", pGD->modeIdent);
pGD->winSizeX = res_mode->xres;
pGD->winSizeY = res_mode->yres;
pGD->memSize = VIDEO_MEM_SIZE;
printf ("\t%s\n", dev->modeIdent);
dev->winSizeX = res_mode->xres;
dev->winSizeY = res_mode->yres;
dev->memSize = VIDEO_MEM_SIZE;
switch (bpp) {
case 8:
pGD->gdfIndex = GDF__8BIT_INDEX;
pGD->gdfBytesPP = 1;
dev->gdfIndex = GDF__8BIT_INDEX;
dev->gdfBytesPP = 1;
break;
case 15:
case 16:
pGD->gdfIndex = GDF_15BIT_555RGB;
pGD->gdfBytesPP = 2;
dev->gdfIndex = GDF_15BIT_555RGB;
dev->gdfBytesPP = 2;
break;
default:
printf ("\t%d bpp configured, but only 8,15 and 16 supported.\n", bpp);
printf ("\t%d bpp configured, but only 8,15 and 16 supported\n",
bpp);
printf ("\tSwitching back to 15bpp\n");
pGD->gdfIndex = GDF_15BIT_555RGB;
pGD->gdfBytesPP = 2;
dev->gdfIndex = GDF_15BIT_555RGB;
dev->gdfBytesPP = 2;
}
/* Setup dot clock (internal pll, division rate) */
DISP_WR_REG (0x0100, div);
/* L0 init */
cf = (pGD->gdfBytesPP == 1) ? 0x00000000 : 0x80000000;
DISP_WR_REG (0x0020, ((pGD->winSizeX * pGD->gdfBytesPP)/64)<<16 |
(pGD->winSizeY-1) |
cf);
cf = (dev->gdfBytesPP == 1) ? 0x00000000 : 0x80000000;
DISP_WR_REG (0x0020, ((dev->winSizeX * dev->gdfBytesPP) / 64) << 16 |
(dev->winSizeY - 1) | cf);
DISP_WR_REG (0x0024, 0x00000000);
DISP_WR_REG (0x0028, 0x00000000);
DISP_WR_REG (0x002c, 0x00000000);
DISP_WR_REG (0x0110, 0x00000000);
DISP_WR_REG (0x0114, 0x00000000);
DISP_WR_REG (0x0118, (pGD->winSizeY-1)<<16 | pGD->winSizeX);
DISP_WR_REG (0x0118, (dev->winSizeY - 1) << 16 | dev->winSizeX);
/* Display timing init */
DISP_WR_REG (0x0004, (pGD->winSizeX+res_mode->left_margin+res_mode->right_margin+res_mode->hsync_len-1)<<16);
DISP_WR_REG (0x0008, (pGD->winSizeX-1) << 16 | (pGD->winSizeX-1));
DISP_WR_REG (0x000c, (res_mode->vsync_len-1)<<24|(res_mode->hsync_len-1)<<16|(pGD->winSizeX+res_mode->right_margin-1));
DISP_WR_REG (0x0010, (pGD->winSizeY+res_mode->lower_margin+res_mode->upper_margin+res_mode->vsync_len-1)<<16);
DISP_WR_REG (0x0014, (pGD->winSizeY-1) << 16 | (pGD->winSizeY+res_mode->lower_margin-1));
DISP_WR_REG (0x0004, (dev->winSizeX +
res_mode->left_margin +
res_mode->right_margin +
res_mode->hsync_len - 1) << 16);
DISP_WR_REG (0x0008, (dev->winSizeX - 1) << 16 | (dev->winSizeX - 1));
DISP_WR_REG (0x000c, (res_mode->vsync_len - 1) << 24 |
(res_mode->hsync_len - 1) << 16 |
(dev->winSizeX + res_mode->right_margin - 1));
DISP_WR_REG (0x0010, (dev->winSizeY + res_mode->lower_margin +
res_mode->upper_margin +
res_mode->vsync_len - 1) << 16);
DISP_WR_REG (0x0014, (dev->winSizeY-1) << 16 |
(dev->winSizeY + res_mode->lower_margin - 1));
DISP_WR_REG (0x0018, 0x00000000);
DISP_WR_REG (0x001c, pGD->winSizeY << 16 | pGD->winSizeX);
DISP_WR_REG (0x001c, dev->winSizeY << 16 | dev->winSizeX);
/* Display enable, L0 layer */
DISP_WR_REG (0x0100, 0x80010000 | div);
return pGD->frameAdrs;
return dev->frameAdrs;
}
#endif
void *video_hw_init (void)
{
GraphicDevice *pGD = (GraphicDevice *)&mb862xx;
GraphicDevice *dev = &mb862xx;
printf ("Video: Fujitsu ");
memset (pGD, 0, sizeof (GraphicDevice));
memset (dev, 0, sizeof (GraphicDevice));
#if defined(CONFIG_VIDEO_CORALP)
if (card_init () == 0) {
return (NULL);
}
if (card_init () == 0)
return NULL;
#else
/* Preliminary init of the onboard graphic controller,
retrieve base address */
if ((pGD->frameAdrs = board_video_init ()) == 0) {
/*
* Preliminary init of the onboard graphic controller,
* retrieve base address
*/
if ((dev->frameAdrs = board_video_init ()) == 0) {
printf ("Controller not found!\n");
return (NULL);
return NULL;
} else
printf("Lime\n");
printf ("Lime\n");
#endif
de_init ();
#if !defined(CONFIG_VIDEO_CORALP)
board_disp_init();
board_disp_init ();
#endif
#if (defined(CONFIG_LWMON5) || \
......@@ -363,15 +371,16 @@ void *video_hw_init (void)
board_backlight_switch (1);
#endif
return pGD;
return dev;
}
/*
* Set a RGB color in the LUT
*/
void video_set_lut (unsigned int index, unsigned char r, unsigned char g, unsigned char b)
void video_set_lut (unsigned int index, unsigned char r,
unsigned char g, unsigned char b)
{
GraphicDevice *pGD = (GraphicDevice *)&mb862xx;
GraphicDevice *dev = &mb862xx;
L0PAL_WR_REG (index, (r << 16) | (g << 8) | (b));
}
......@@ -379,10 +388,11 @@ void video_set_lut (unsigned int index, unsigned char r, unsigned char g, unsign
/*
* Drawing engine Fill and BitBlt screen region
*/
void video_hw_rectfill (unsigned int bpp, unsigned int dst_x, unsigned int dst_y,
unsigned int dim_x, unsigned int dim_y, unsigned int color)
void video_hw_rectfill (unsigned int bpp, unsigned int dst_x,
unsigned int dst_y, unsigned int dim_x,
unsigned int dim_y, unsigned int color)
{
GraphicDevice *pGD = (GraphicDevice *)&mb862xx;
GraphicDevice *dev = &mb862xx;
de_wait_slots (3);
DE_WR_REG (0x0480, color);
......@@ -392,11 +402,12 @@ void video_hw_rectfill (unsigned int bpp, unsigned int dst_x, unsigned int dst_y
de_wait ();
}
void video_hw_bitblt (unsigned int bpp, unsigned int src_x, unsigned int src_y,
unsigned int dst_x, unsigned int dst_y, unsigned int width,
void video_hw_bitblt (unsigned int bpp, unsigned int src_x,
unsigned int src_y, unsigned int dst_x,
unsigned int dst_y, unsigned int width,
unsigned int height)
{
GraphicDevice *pGD = (GraphicDevice *)&mb862xx;
GraphicDevice *dev = &mb862xx;
unsigned int ctrl = 0x0d000000L;
if (src_x >= dst_x && src_y >= dst_y)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment