patch-2.2.3 linux/drivers/video/pm2fb.c
Next file: linux/drivers/video/pm2fb.h
Previous file: linux/drivers/video/newport_con.c
Back to the patch index
Back to the overall index
- Lines: 1058
- Date:
Thu Feb 25 10:02:12 1999
- Orig file:
v2.2.2/linux/drivers/video/pm2fb.c
- Orig date:
Wed Jan 20 23:14:06 1999
diff -u --recursive --new-file v2.2.2/linux/drivers/video/pm2fb.c linux/drivers/video/pm2fb.c
@@ -3,7 +3,9 @@
* Copyright (c) 1998-1999 Ilario Nardinocchi (nardinoc@CS.UniBO.IT)
* Based on linux/drivers/video/skeletonfb.c by Geert Uytterhoeven.
* --------------------------------------------------------------------------
- * $Id: pm2fb.c,v 1.1.2.1 1999/01/12 19:53:02 geert Exp $
+ * $Id: pm2fb.c,v 1.163 1999/02/21 14:06:49 illo Exp $
+ * --------------------------------------------------------------------------
+ * TODO multiple boards support
* --------------------------------------------------------------------------
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file README.legal in the main directory of this archive
@@ -26,23 +28,27 @@
#include <linux/console.h>
#include <linux/init.h>
#include <linux/pci.h>
+#include <asm/system.h>
+#include <asm/io.h>
+#include <asm/uaccess.h>
#include <video/fbcon.h>
#include <video/fbcon-cfb8.h>
#include <video/fbcon-cfb16.h>
#include <video/fbcon-cfb24.h>
#include <video/fbcon-cfb32.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
#include "pm2fb.h"
-#ifdef CONFIG_FB_PM2_CVPPC
#include "cvisionppc.h"
-#endif
#if !defined(__LITTLE_ENDIAN) && !defined(__BIG_ENDIAN)
#error "The endianness of the target host has not been defined."
#endif
-#undef PM2FB_MASTER_DEBUG
+#if defined(CONFIG_FB_PM2_PCI) && !defined(CONFIG_PCI)
+#undef CONFIG_FB_PM2_PCI
+#warning "support for Permedia2 PCI boards with no generic PCI support!"
+#endif
+
+#define PM2FB_MASTER_DEBUG
#ifdef PM2FB_MASTER_DEBUG
#define DPRINTK(a,b...) printk("pm2fb: %s: " a, __FUNCTION__ , ## b)
#else
@@ -52,12 +58,20 @@
#define PICOS2KHZ(a) (1000000000UL/(a))
#define KHZ2PICOS(a) (1000000000UL/(a))
-#ifdef CONFIG_APUS
-#define MMAP(a,b) (unsigned char* )kernel_map((unsigned long )(a), \
- b, KERNELMAP_NOCACHE_SER, NULL)
-#else
-#define MMAP(a,b) ioremap(a, b)
-#endif
+/*
+ * The _DEFINITIVE_ memory mapping/unmapping functions.
+ * This is due to the fact that they're changing soooo often...
+ */
+#define MMAP(a,b) ioremap((u32 )(a), b)
+#define UNMAP(a,b) iounmap(a)
+
+/*
+ * The _DEFINITIVE_ memory i/o barrier functions.
+ * This is due to the fact that they're changing soooo often...
+ */
+#define DEFW() wmb()
+#define DEFR() rmb()
+#define DEFRW() mb()
#ifndef MIN
#define MIN(a,b) ((a)<(b)?(a):(b))
@@ -67,35 +81,33 @@
#define MAX(a,b) ((a)>(b)?(a):(b))
#endif
-#ifndef __powerpc__
-#define eieio()
-#endif
-
struct pm2fb_par {
- unsigned long pixclock; /* pixclock in KHz */
- unsigned long width; /* width of virtual screen */
- unsigned long height; /* height of virtual screen */
- unsigned long hsstart; /* horiz. sync start */
- unsigned long hsend; /* horiz. sync end */
- unsigned long hbend; /* horiz. blank end (also gate end) */
- unsigned long htotal; /* total width (w/ sync & blank) */
- unsigned long vsstart; /* vert. sync start */
- unsigned long vsend; /* vert. sync end */
- unsigned long vbend; /* vert. blank end */
- unsigned long vtotal; /* total height (w/ sync & blank) */
- unsigned long stride; /* screen stride */
- unsigned long base; /* screen base (xoffset+yoffset) */
- unsigned long depth; /* screen depth (8, 16, 24 or 32) */
- unsigned long video; /* video control (hsync,vsync) */
+ u32 pixclock; /* pixclock in KHz */
+ u32 width; /* width of virtual screen */
+ u32 height; /* height of virtual screen */
+ u32 hsstart; /* horiz. sync start */
+ u32 hsend; /* horiz. sync end */
+ u32 hbend; /* horiz. blank end (also gate end) */
+ u32 htotal; /* total width (w/ sync & blank) */
+ u32 vsstart; /* vert. sync start */
+ u32 vsend; /* vert. sync end */
+ u32 vbend; /* vert. blank end */
+ u32 vtotal; /* total height (w/ sync & blank) */
+ u32 stride; /* screen stride */
+ u32 base; /* screen base (xoffset+yoffset) */
+ u32 depth; /* screen depth (8, 16, 24 or 32) */
+ u32 video; /* video control (hsync,vsync) */
};
-#define OPTF_OLD_MEM 0x00000001
-#define OPTF_YPAN 0x00000002
+#define OPTF_OLD_MEM (1L<<0)
+#define OPTF_YPAN (1L<<1)
+#define OPTF_VIRTUAL (1L<<2)
static struct {
char font[40];
- unsigned long flags;
+ u32 flags;
struct pm2fb_par user_mode;
-} pm2fb_options;
+} pm2fb_options =
+ {"\0", 0L, {25174,640,480,4,28,40,199,9,11,45,524,80,0,8,121}};
static const struct {
char name[16];
@@ -164,6 +176,15 @@
{"\0", },
};
+#ifdef CONFIG_FB_PM2_PCI
+struct pm2pci_par {
+ u32 mem_config;
+ u32 mem_control;
+ u32 boot_address;
+ struct pci_dev* dev;
+};
+#endif
+
static const char permedia2_name[16]="Permedia2";
static struct pm2fb_info {
@@ -172,7 +193,7 @@
board_table[] below) */
struct {
unsigned char* fb_base; /* framebuffer memory base */
- unsigned long fb_size; /* framebuffer memory size */
+ u32 fb_size; /* framebuffer memory size */
unsigned char* rg_base; /* register memory base */
unsigned char* p_fb; /* physical address of frame buffer */
unsigned char* v_fb; /* virtual address of frame buffer */
@@ -186,10 +207,13 @@
#ifdef CONFIG_FB_PM2_CVPPC
struct cvppc_par cvppc; /* CVisionPPC data */
#endif
+#ifdef CONFIG_FB_PM2_PCI
+ struct pm2pci_par pci; /* Permedia2 PCI boards data */
+#endif
} board_par;
struct pm2fb_par current_par; /* displayed screen */
int current_par_valid;
- unsigned long memclock; /* memclock (set by the per-board
+ u32 memclock; /* memclock (set by the per-board
init routine) */
struct display disp;
struct {
@@ -216,6 +240,11 @@
static void cvppc_init(struct pm2fb_info*);
#endif
+#ifdef CONFIG_FB_PM2_PCI
+static int pm2pci_detect(struct pm2fb_info*);
+static void pm2pci_init(struct pm2fb_info*);
+#endif
+
/*
* Table of the supported Permedia2 based boards.
* Three hooks are defined for each board:
@@ -236,6 +265,9 @@
void (*cleanup)(struct pm2fb_info*);
char name[32];
} board_table[] = {
+#ifdef CONFIG_FB_PM2_PCI
+ { pm2pci_detect, pm2pci_init, NULL, "Permedia2 PCI board" },
+#endif
#ifdef CONFIG_FB_PM2_CVPPC
{ cvppc_detect, cvppc_init, NULL, "CVisionPPC/BVisionPPC" },
#endif
@@ -247,8 +279,8 @@
*/
#define PACKPP(p0,p1,p2) (((p2)<<6)|((p1)<<3)|(p0))
static const struct {
- unsigned short width;
- unsigned short pp;
+ u16 width;
+ u16 pp;
} pp_table[] = {
{ 32, PACKPP(1, 0, 0) }, { 64, PACKPP(1, 1, 0) },
{ 96, PACKPP(1, 1, 1) }, { 128, PACKPP(2, 1, 1) },
@@ -286,14 +318,14 @@
static int pm2fb_blank(int blank_mode, struct fb_info_gen* info);
static int pm2fb_pan_display(const struct fb_var_screeninfo* var,
struct fb_info_gen* info);
-static void pm2fb_dispsw(const void* par, struct display* disp,
+static void pm2fb_set_disp(const void* par, struct display* disp,
struct fb_info_gen* info);
static struct fbgen_hwswitch pm2fb_hwswitch={
pm2fb_detect, pm2fb_encode_fix, pm2fb_decode_var,
pm2fb_encode_var, pm2fb_get_par, pm2fb_set_par,
pm2fb_getcolreg, pm2fb_setcolreg, pm2fb_pan_display,
- pm2fb_blank, pm2fb_dispsw
+ pm2fb_blank, pm2fb_set_disp
};
static int pm2fb_open(struct fb_info* info, int user);
@@ -309,61 +341,61 @@
* Begin of Permedia2 specific functions
***************************************************************************/
-inline static unsigned long RD32(unsigned char* base, long off) {
+inline static u32 RD32(unsigned char* base, s32 off) {
- return *((volatile unsigned long* )(base+off));
+ return readl(base+off);
}
-inline static void WR32(unsigned char* base, long off, unsigned long v) {
+inline static void WR32(unsigned char* base, s32 off, u32 v) {
- *((volatile unsigned long* )(base+off))=v;
+ writel(v, base+off);
}
-inline static unsigned long pm2_RD(struct pm2fb_info* p, long off) {
+inline static u32 pm2_RD(struct pm2fb_info* p, s32 off) {
return RD32(p->regions.v_regs, off);
}
-inline static void pm2_WR(struct pm2fb_info* p, long off, unsigned long v) {
+inline static void pm2_WR(struct pm2fb_info* p, s32 off, u32 v) {
WR32(p->regions.v_regs, off, v);
}
-inline static unsigned long pm2_RDAC_RD(struct pm2fb_info* p, long idx) {
+inline static u32 pm2_RDAC_RD(struct pm2fb_info* p, s32 idx) {
pm2_WR(p, PM2R_RD_PALETTE_WRITE_ADDRESS, idx);
- eieio();
+ DEFRW();
return pm2_RD(p, PM2R_RD_INDEXED_DATA);
}
-inline static void pm2_RDAC_WR(struct pm2fb_info* p, long idx,
- unsigned long v) {
+inline static void pm2_RDAC_WR(struct pm2fb_info* p, s32 idx,
+ u32 v) {
pm2_WR(p, PM2R_RD_PALETTE_WRITE_ADDRESS, idx);
- eieio();
+ DEFW();
pm2_WR(p, PM2R_RD_INDEXED_DATA, v);
}
#ifdef CONFIG_FB_PM2_FIFO_DISCONNECT
#define WAIT_FIFO(p,a)
#else
-inline static void WAIT_FIFO(struct pm2fb_info* p, unsigned long a) {
+inline static void WAIT_FIFO(struct pm2fb_info* p, u32 a) {
while(pm2_RD(p, PM2R_IN_FIFO_SPACE)<a);
- eieio();
+ DEFRW();
}
#endif
-static unsigned long partprod(unsigned long xres) {
+static u32 partprod(u32 xres) {
int i;
for (i=0; pp_table[i].width && pp_table[i].width!=xres; i++);
if (!pp_table[i].width)
- DPRINTK("invalid width %lu\n", xres);
+ DPRINTK("invalid width %u\n", xres);
return pp_table[i].pp;
}
-static unsigned long to3264(unsigned long timing, int bpp, int is64) {
+static u32 to3264(u32 timing, int bpp, int is64) {
switch (bpp) {
case 8:
@@ -383,7 +415,7 @@
return timing;
}
-static unsigned long from3264(unsigned long timing, int bpp, int is64) {
+static u32 from3264(u32 timing, int bpp, int is64) {
switch (bpp) {
case 8:
@@ -403,14 +435,14 @@
return timing;
}
-static void mnp(unsigned long clk, unsigned char* mm, unsigned char* nn,
+static void mnp(u32 clk, unsigned char* mm, unsigned char* nn,
unsigned char* pp) {
unsigned char m;
unsigned char n;
unsigned char p;
- unsigned long f;
- long current;
- long delta=100000;
+ u32 f;
+ s32 curr;
+ s32 delta=100000;
*mm=*nn=*pp=0;
for (n=2; n<15; n++) {
@@ -418,9 +450,9 @@
f=PM2_REFERENCE_CLOCK*m/n;
if (f>=150000 && f<=300000) {
for (p=0; p<5; p++, f>>=1) {
- current=clk>f?clk-f:f-clk;
- if (current<delta) {
- delta=current;
+ curr=clk>f?clk-f:f-clk;
+ if (curr<delta) {
+ delta=curr;
*mm=m;
*nn=n;
*pp=p;
@@ -435,62 +467,75 @@
WAIT_FIFO(i, 1);
pm2_WR(i, PM2R_SYNC, 0);
- eieio();
+ DEFRW();
do {
while (pm2_RD(i, PM2R_OUT_FIFO_WORDS)==0);
- eieio();
+ DEFR();
} while (pm2_RD(i, PM2R_OUT_FIFO)!=PM2TAG(PM2R_SYNC));
}
-static void set_memclock(struct pm2fb_info* info, unsigned long clk) {
+static void set_memclock(struct pm2fb_info* info, u32 clk) {
int i;
unsigned char m, n, p;
mnp(clk, &m, &n, &p);
WAIT_FIFO(info, 5);
pm2_RDAC_WR(info, PM2I_RD_MEMORY_CLOCK_3, 6);
- eieio();
+ DEFW();
pm2_RDAC_WR(info, PM2I_RD_MEMORY_CLOCK_1, m);
pm2_RDAC_WR(info, PM2I_RD_MEMORY_CLOCK_2, n);
- eieio();
+ DEFW();
pm2_RDAC_WR(info, PM2I_RD_MEMORY_CLOCK_3, 8|p);
- eieio();
+ DEFW();
pm2_RDAC_RD(info, PM2I_RD_MEMORY_CLOCK_STATUS);
- eieio();
+ DEFR();
for (i=256; i &&
!(pm2_RD(info, PM2R_RD_INDEXED_DATA)&PM2F_PLL_LOCKED); i--);
}
-static void set_pixclock(struct pm2fb_info* info, unsigned long clk) {
+static void set_pixclock(struct pm2fb_info* info, u32 clk) {
int i;
unsigned char m, n, p;
mnp(clk, &m, &n, &p);
WAIT_FIFO(info, 5);
pm2_RDAC_WR(info, PM2I_RD_PIXEL_CLOCK_A3, 0);
- eieio();
+ DEFW();
pm2_RDAC_WR(info, PM2I_RD_PIXEL_CLOCK_A1, m);
pm2_RDAC_WR(info, PM2I_RD_PIXEL_CLOCK_A2, n);
- eieio();
+ DEFW();
pm2_RDAC_WR(info, PM2I_RD_PIXEL_CLOCK_A3, 8|p);
- eieio();
+ DEFW();
pm2_RDAC_RD(info, PM2I_RD_PIXEL_CLOCK_STATUS);
- eieio();
+ DEFR();
for (i=256; i &&
!(pm2_RD(info, PM2R_RD_INDEXED_DATA)&PM2F_PLL_LOCKED); i--);
}
+static void clear_palette(struct pm2fb_info* p) {
+ int i=256;
+
+ WAIT_FIFO(p, 1);
+ pm2_WR(p, PM2R_RD_PALETTE_WRITE_ADDRESS, 0);
+ DEFW();
+ while (i--) {
+ WAIT_FIFO(p, 3);
+ pm2_WR(p, PM2R_RD_PALETTE_DATA, 0);
+ pm2_WR(p, PM2R_RD_PALETTE_DATA, 0);
+ pm2_WR(p, PM2R_RD_PALETTE_DATA, 0);
+ }
+}
+
static void set_color(struct pm2fb_info* p, unsigned char regno,
unsigned char r, unsigned char g, unsigned char b) {
WAIT_FIFO(p, 4);
- eieio();
pm2_WR(p, PM2R_RD_PALETTE_WRITE_ADDRESS, regno);
- eieio();
+ DEFW();
pm2_WR(p, PM2R_RD_PALETTE_DATA, r);
- eieio();
+ DEFW();
pm2_WR(p, PM2R_RD_PALETTE_DATA, g);
- eieio();
+ DEFW();
pm2_WR(p, PM2R_RD_PALETTE_DATA, b);
}
@@ -520,12 +565,13 @@
}
static void set_screen(struct pm2fb_info* i, struct pm2fb_par* p) {
- unsigned long clrmode=0;
- unsigned long txtmap=0;
- unsigned long xres;
+ u32 clrmode=0;
+ u32 txtmap=0;
+ u32 xres;
xres=(p->width+31)&~31;
set_aperture(i, p);
+ DEFRW();
WAIT_FIFO(i, 22);
pm2_RDAC_WR(i, PM2I_RD_COLOR_KEY_CONTROL, p->depth==8?0:
PM2F_COLOR_KEY_TEST_OFF);
@@ -565,7 +611,7 @@
pm2_WR(i, PM2R_VS_END, p->vsend);
pm2_WR(i, PM2R_VB_END, p->vbend);
pm2_WR(i, PM2R_SCREEN_STRIDE, p->stride);
- eieio();
+ DEFW();
pm2_WR(i, PM2R_SCREEN_BASE, p->base);
pm2_RDAC_WR(i, PM2I_RD_COLOR_MODE, PM2F_RD_COLOR_MODE_RGB|
PM2F_RD_GUI_ACTIVE|clrmode);
@@ -573,6 +619,63 @@
set_pixclock(i, p->pixclock);
};
+/*
+ * copy with packed pixels (8/16bpp only).
+ */
+static void pm2fb_pp_copy(struct pm2fb_info* i, s32 xsrc, s32 ysrc,
+ s32 x, s32 y, s32 w, s32 h) {
+ s32 scale=i->current_par.depth==8?2:1;
+ s32 offset;
+
+ if (!w || !h)
+ return;
+ WAIT_FIFO(i, 7);
+ pm2_WR(i, PM2R_CONFIG, PM2F_CONFIG_FB_WRITE_ENABLE|
+ PM2F_CONFIG_FB_PACKED_DATA|
+ PM2F_CONFIG_FB_READ_SOURCE_ENABLE);
+ pm2_WR(i, PM2R_FB_PIXEL_OFFSET, 0);
+ pm2_WR(i, PM2R_FB_SOURCE_DELTA, ((ysrc-y)&0xfff)<<16|
+ ((xsrc-x)&0xfff));
+ offset=(x&0x3)-(xsrc&0x3);
+ pm2_WR(i, PM2R_RECTANGLE_ORIGIN, (y<<16)|(x>>scale));
+ pm2_WR(i, PM2R_RECTANGLE_SIZE, (h<<16)|((w+7)>>scale));
+ pm2_WR(i, PM2R_PACKED_DATA_LIMITS, (offset<<29)|(x<<16)|(x+w));
+ DEFW();
+ pm2_WR(i, PM2R_RENDER, PM2F_RENDER_RECTANGLE|
+ (x<xsrc?PM2F_INCREASE_X:0)|
+ (y<ysrc?PM2F_INCREASE_Y:0));
+ wait_pm2(i);
+}
+
+/*
+ * block operation. copy=0: rectangle fill, copy=1: rectangle copy.
+ */
+static void pm2fb_block_op(struct pm2fb_info* i, int copy,
+ s32 xsrc, s32 ysrc,
+ s32 x, s32 y, s32 w, s32 h,
+ u32 color) {
+
+ if (!w || !h)
+ return;
+ WAIT_FIFO(i, 6);
+ pm2_WR(i, PM2R_CONFIG, PM2F_CONFIG_FB_WRITE_ENABLE|
+ PM2F_CONFIG_FB_READ_SOURCE_ENABLE);
+ pm2_WR(i, PM2R_FB_PIXEL_OFFSET, 0);
+ if (copy)
+ pm2_WR(i, PM2R_FB_SOURCE_DELTA, ((ysrc-y)&0xfff)<<16|
+ ((xsrc-x)&0xfff));
+ else
+ pm2_WR(i, PM2R_FB_BLOCK_COLOR, color);
+ pm2_WR(i, PM2R_RECTANGLE_ORIGIN, (y<<16)|x);
+ pm2_WR(i, PM2R_RECTANGLE_SIZE, (h<<16)|w);
+ DEFW();
+ pm2_WR(i, PM2R_RENDER, PM2F_RENDER_RECTANGLE|
+ (x<xsrc?PM2F_INCREASE_X:0)|
+ (y<ysrc?PM2F_INCREASE_Y:0)|
+ (copy?0:PM2F_RENDER_FASTFILL));
+ wait_pm2(i);
+}
+
/***************************************************************************
* Begin of generic initialization functions
***************************************************************************/
@@ -580,14 +683,14 @@
static void pm2fb_reset(struct pm2fb_info* p) {
pm2_WR(p, PM2R_RESET_STATUS, 0);
- eieio();
+ DEFRW();
while (pm2_RD(p, PM2R_RESET_STATUS)&PM2F_BEING_RESET);
- eieio();
+ DEFRW();
#ifdef CONFIG_FB_PM2_FIFO_DISCONNECT
DPRINTK("FIFO disconnect enabled\n");
pm2_WR(p, PM2R_FIFO_DISCON, 1);
+ DEFRW();
#endif
- eieio();
if (board_table[p->board].init)
board_table[p->board].init(p);
WAIT_FIFO(p, 48);
@@ -633,8 +736,9 @@
pm2_RDAC_WR(p, PM2I_RD_RED_KEY, 0);
pm2_RDAC_WR(p, PM2I_RD_GREEN_KEY, 0);
pm2_RDAC_WR(p, PM2I_RD_BLUE_KEY, 0);
- eieio();
- set_memclock(p, p->memclock);
+ clear_palette(p);
+ if (p->memclock)
+ set_memclock(p, p->memclock);
}
__initfunc(static int pm2fb_conf(struct pm2fb_info* p)) {
@@ -661,9 +765,12 @@
* Begin of per-board initialization functions
***************************************************************************/
+/*
+ * Phase5 CvisionPPC/BVisionPPC
+ */
#ifdef CONFIG_FB_PM2_CVPPC
static int cvppc_PCI_init(struct cvppc_par* p) {
- extern unsigned long powerup_PCI_present;
+ extern u32 powerup_PCI_present;
if (!powerup_PCI_present) {
DPRINTK("no PCI bridge detected\n");
@@ -683,14 +790,14 @@
return 0;
}
WR32(p->pci_bridge, CSPPC_BRIDGE_ENDIAN, CSPPCF_BRIDGE_BIG_ENDIAN);
- eieio();
+ DEFW();
if (pm2fb_options.flags & OPTF_OLD_MEM)
WR32(p->pci_config, PCI_CACHE_LINE_SIZE, 0xff00);
WR32(p->pci_config, PCI_BASE_ADDRESS_0, CVPPC_REGS_REGION);
WR32(p->pci_config, PCI_BASE_ADDRESS_1, CVPPC_FB_APERTURE_ONE);
WR32(p->pci_config, PCI_BASE_ADDRESS_2, CVPPC_FB_APERTURE_TWO);
WR32(p->pci_config, PCI_ROM_ADDRESS, CVPPC_ROM_ADDRESS);
- eieio();
+ DEFW();
WR32(p->pci_config, PCI_COMMAND, 0xef000000 |
PCI_COMMAND_IO |
PCI_COMMAND_MEMORY |
@@ -714,7 +821,7 @@
WAIT_FIFO(p, 3);
pm2_WR(p, PM2R_MEM_CONTROL, 0);
pm2_WR(p, PM2R_BOOT_ADDRESS, 0x30);
- eieio();
+ DEFW();
if (pm2fb_options.flags & OPTF_OLD_MEM)
pm2_WR(p, PM2R_MEM_CONFIG, CVPPC_MEM_CONFIG_OLD);
else
@@ -722,70 +829,100 @@
}
#endif /* CONFIG_FB_PM2_CVPPC */
-/***************************************************************************
- * Console hw acceleration
- ***************************************************************************/
-
/*
- * copy with packed pixels (8/16bpp only).
+ * Generic PCI detection routines
*/
-static void pm2fb_pp_copy(struct pm2fb_info* i, long xsrc, long ysrc,
- long x, long y, long w, long h) {
- long scale=i->current_par.depth==8?2:1;
- long offset;
-
- if (!w || !h)
- return;
- WAIT_FIFO(i, 7);
- pm2_WR(i, PM2R_CONFIG, PM2F_CONFIG_FB_WRITE_ENABLE|
- PM2F_CONFIG_FB_PACKED_DATA|
- PM2F_CONFIG_FB_READ_SOURCE_ENABLE);
- pm2_WR(i, PM2R_FB_PIXEL_OFFSET, 0);
- pm2_WR(i, PM2R_FB_SOURCE_DELTA, ((ysrc-y)&0xfff)<<16|
- ((xsrc-x)&0xfff));
- offset=(x&0x3)-(xsrc&0x3);
- pm2_WR(i, PM2R_RECTANGLE_ORIGIN, (y<<16)|(x>>scale));
- pm2_WR(i, PM2R_RECTANGLE_SIZE, (h<<16)|((w+7)>>scale));
- pm2_WR(i, PM2R_PACKED_DATA_LIMITS, (offset<<29)|(x<<16)|(x+w));
- eieio();
- pm2_WR(i, PM2R_RENDER, PM2F_RENDER_RECTANGLE|
- (x<xsrc?PM2F_INCREASE_X:0)|
- (y<ysrc?PM2F_INCREASE_Y:0));
- wait_pm2(i);
+#ifdef CONFIG_FB_PM2_PCI
+static int pm2pci_detect(struct pm2fb_info* p) {
+ struct pm2pci_par* pci=&p->board_par.pci;
+ unsigned char* m;
+
+ memset(pci, 0, sizeof(struct pm2pci_par));
+ if (!pci_present()) {
+ DPRINTK("no PCI bus found.\n");
+ return 0;
+ }
+ DPRINTK("scanning PCI bus for known chipsets...\n");
+ if ((pci->dev=pci_find_device(PCI_VENDOR_ID_TI,
+ PCI_DEVICE_ID_TI_TVP4020, NULL))) {
+ DPRINTK("... found Texas Instruments TVP4020\n");
+ }
+ if (!pci->dev) {
+ DPRINTK("no PCI board found.\n");
+ return 0;
+ }
+ DPRINTK("PCI board @%08lx %08lx %08lx rom %08lx\n",
+ pci->dev->base_address[0],
+ pci->dev->base_address[1],
+ pci->dev->base_address[2],
+ pci->dev->rom_address);
+#ifdef __sparc__
+ p->regions.rg_base=(unsigned char* )
+ __pa(pci->dev->base_address[0] & PCI_BASE_ADDRESS_MEM_MASK);
+ p->regions.fb_base=(unsigned char* )
+ __pa(pci->dev->base_address[1] & PCI_BASE_ADDRESS_MEM_MASK);
+#else
+ if (pm2fb_options.flags & OPTF_VIRTUAL) {
+ p->regions.rg_base=(unsigned char* )
+ __pa(pci->dev->base_address[0] & PCI_BASE_ADDRESS_MEM_MASK);
+ p->regions.fb_base=(unsigned char* )
+ __pa(pci->dev->base_address[1] & PCI_BASE_ADDRESS_MEM_MASK);
+ }
+ else {
+ p->regions.rg_base=(unsigned char* )
+ (pci->dev->base_address[0] & PCI_BASE_ADDRESS_MEM_MASK);
+ p->regions.fb_base=(unsigned char* )
+ (pci->dev->base_address[1] & PCI_BASE_ADDRESS_MEM_MASK);
+ }
+#endif
+#ifdef __BIG_ENDIAN
+ p->regions.rg_base += PM2_REGS_SIZE;
+#endif
+ if ((m=MMAP(p->regions.rg_base, PM2_REGS_SIZE))) {
+ pci->mem_control=RD32(m, PM2R_MEM_CONTROL);
+ pci->boot_address=RD32(m, PM2R_BOOT_ADDRESS);
+ pci->mem_config=RD32(m, PM2R_MEM_CONFIG);
+ switch (pci->mem_config & PM2F_MEM_CONFIG_RAM_MASK) {
+ case PM2F_MEM_BANKS_1:
+ p->regions.fb_size=0x200000;
+ break;
+ case PM2F_MEM_BANKS_2:
+ p->regions.fb_size=0x400000;
+ break;
+ case PM2F_MEM_BANKS_3:
+ p->regions.fb_size=0x600000;
+ break;
+ case PM2F_MEM_BANKS_4:
+ p->regions.fb_size=0x800000;
+ break;
+ }
+ p->memclock=CVPPC_MEMCLOCK;
+ UNMAP(m, PM2_REGS_SIZE);
+ return 1;
+ }
+ DPRINTK("MMAP() failed.\n");
+ return 0;
}
-/*
- * block operation. copy=0: rectangle fill, copy=1: rectangle copy.
- */
-static void pm2fb_block_op(struct pm2fb_info* i, int copy,
- long xsrc, long ysrc,
- long x, long y, long w, long h,
- unsigned long color) {
+static void pm2pci_init(struct pm2fb_info* p) {
+ struct pm2pci_par* pci=&p->board_par.pci;
- if (!w || !h)
- return;
- WAIT_FIFO(i, 6);
- pm2_WR(i, PM2R_CONFIG, PM2F_CONFIG_FB_WRITE_ENABLE|
- PM2F_CONFIG_FB_READ_SOURCE_ENABLE);
- pm2_WR(i, PM2R_FB_PIXEL_OFFSET, 0);
- if (copy)
- pm2_WR(i, PM2R_FB_SOURCE_DELTA, ((ysrc-y)&0xfff)<<16|
- ((xsrc-x)&0xfff));
- else
- pm2_WR(i, PM2R_FB_BLOCK_COLOR, color);
- pm2_WR(i, PM2R_RECTANGLE_ORIGIN, (y<<16)|x);
- pm2_WR(i, PM2R_RECTANGLE_SIZE, (h<<16)|w);
- eieio();
- pm2_WR(i, PM2R_RENDER, PM2F_RENDER_RECTANGLE|
- (x<xsrc?PM2F_INCREASE_X:0)|
- (y<ysrc?PM2F_INCREASE_Y:0)|
- (copy?0:PM2F_RENDER_FASTFILL));
- wait_pm2(i);
+ WAIT_FIFO(p, 3);
+ pm2_WR(p, PM2R_MEM_CONTROL, pci->mem_control);
+ pm2_WR(p, PM2R_BOOT_ADDRESS, pci->boot_address);
+ DEFW();
+ pm2_WR(p, PM2R_MEM_CONFIG, pci->mem_config);
}
+#endif /* CONFIG_FB_PM2_PCI */
+
+/***************************************************************************
+ * Console hw acceleration
+ ***************************************************************************/
+
static int pm2fb_blank(int blank_mode, struct fb_info_gen* info) {
struct pm2fb_info* i=(struct pm2fb_info* )info;
- unsigned long video;
+ u32 video;
if (!i->current_par_valid)
return 1;
@@ -871,7 +1008,7 @@
#ifdef FBCON_HAS_CFB8
static void pm2fb_clear8(struct vc_data* conp, struct display* p,
int sy, int sx, int height, int width) {
- unsigned long c;
+ u32 c;
sx=sx*fontwidth(p);
width=width*fontwidth(p);
@@ -886,9 +1023,9 @@
static void pm2fb_clear_margins8(struct vc_data* conp, struct display* p,
int bottom_only) {
- unsigned long c;
- unsigned long sx;
- unsigned long sy;
+ u32 c;
+ u32 sx;
+ u32 sy;
c=attr_bgcol_ec(p, conp);
c|=c<<8;
@@ -913,7 +1050,7 @@
#ifdef FBCON_HAS_CFB16
static void pm2fb_clear16(struct vc_data* conp, struct display* p,
int sy, int sx, int height, int width) {
- unsigned long c;
+ u32 c;
sx=sx*fontwidth(p);
width=width*fontwidth(p);
@@ -927,9 +1064,9 @@
static void pm2fb_clear_margins16(struct vc_data* conp, struct display* p,
int bottom_only) {
- unsigned long c;
- unsigned long sx;
- unsigned long sy;
+ u32 c;
+ u32 sx;
+ u32 sy;
c = ((u16 *)p->dispsw_data)[attr_bgcol_ec(p, conp)];
c|=c<<16;
@@ -957,7 +1094,7 @@
static void pm2fb_clear24(struct vc_data* conp, struct display* p,
int sy, int sx, int height, int width) {
struct pm2fb_info* i=(struct pm2fb_info* )p->fb_info;
- unsigned long c;
+ u32 c;
c=attr_bgcol_ec(p, conp);
if ( i->palette[c].red==i->palette[c].green &&
@@ -978,9 +1115,9 @@
static void pm2fb_clear_margins24(struct vc_data* conp, struct display* p,
int bottom_only) {
struct pm2fb_info* i=(struct pm2fb_info* )p->fb_info;
- unsigned long c;
- unsigned long sx;
- unsigned long sy;
+ u32 c;
+ u32 sx;
+ u32 sy;
c=attr_bgcol_ec(p, conp);
if ( i->palette[c].red==i->palette[c].green &&
@@ -1011,7 +1148,7 @@
#ifdef FBCON_HAS_CFB32
static void pm2fb_clear32(struct vc_data* conp, struct display* p,
int sy, int sx, int height, int width) {
- unsigned long c;
+ u32 c;
sx=sx*fontwidth(p);
width=width*fontwidth(p);
@@ -1024,9 +1161,9 @@
static void pm2fb_clear_margins32(struct vc_data* conp, struct display* p,
int bottom_only) {
- unsigned long c;
- unsigned long sx;
- unsigned long sy;
+ u32 c;
+ u32 sx;
+ u32 sy;
c = ((u32 *)p->dispsw_data)[attr_bgcol_ec(p, conp)];
sx=conp->vc_cols*fontwidth(p);
@@ -1065,18 +1202,55 @@
fix->accel=FB_ACCEL_3DLABS_PERMEDIA2;
fix->type=FB_TYPE_PACKED_PIXELS;
fix->visual=p->depth==8?FB_VISUAL_PSEUDOCOLOR:FB_VISUAL_TRUECOLOR;
- fix->line_length=0;
+ if (i->current_par_valid)
+ fix->line_length=i->current_par.width*(i->current_par.depth/8);
+ else
+ fix->line_length=0;
fix->xpanstep=p->depth==24?8:64/p->depth;
fix->ypanstep=1;
fix->ywrapstep=0;
return 0;
}
+#ifdef PM2FB_MASTER_DEBUG
+static void pm2fb_display_var(const struct fb_var_screeninfo* var) {
+
+ printk( KERN_DEBUG
+"- struct fb_var_screeninfo ---------------------------------------------------\n");
+ printk( KERN_DEBUG
+ "resolution: %ux%ux%u (virtual %ux%u+%u+%u)\n",
+ var->xres, var->yres, var->bits_per_pixel,
+ var->xres_virtual, var->yres_virtual,
+ var->xoffset, var->yoffset);
+ printk( KERN_DEBUG
+ "color: %c%c "
+ "R(%u,%u,%u), G(%u,%u,%u), B(%u,%u,%u), T(%u,%u,%u)\n",
+ var->grayscale?'G':'C', var->nonstd?'N':'S',
+ var->red.offset, var->red.length, var->red.msb_right,
+ var->green.offset, var->green.length, var->green.msb_right,
+ var->blue.offset, var->blue.length, var->blue.msb_right,
+ var->transp.offset, var->transp.length,
+ var->transp.msb_right);
+ printk( KERN_DEBUG
+ "timings: %ups (%u,%u)-(%u,%u)+%u+%u\n",
+ var->pixclock,
+ var->left_margin, var->upper_margin, var->right_margin,
+ var->lower_margin, var->hsync_len, var->vsync_len);
+ printk( KERN_DEBUG
+ "activate %08x accel_flags %08x sync %08x vmode %08x\n",
+ var->activate, var->accel_flags, var->sync, var->vmode);
+ printk( KERN_DEBUG
+"------------------------------------------------------------------------------\n");
+}
+
+#define pm2fb_decode_var pm2fb_wrapped_decode_var
+#endif
+
static int pm2fb_decode_var(const struct fb_var_screeninfo* var,
void* par, struct fb_info_gen* info) {
struct pm2fb_info* i=(struct pm2fb_info* )info;
struct pm2fb_par p;
- unsigned long xres;
+ u32 xres;
int data64;
memset(&p, 0, sizeof(struct pm2fb_par));
@@ -1086,39 +1260,39 @@
p.depth=p.depth>32?32:p.depth;
data64=p.depth>8;
xres=(var->xres+31)&~31;
- if (p.width==~(0L))
- p.width=xres;
- if (p.height==~(0L))
- p.height=var->yres;
if (p.width<xres+var->xoffset)
p.width=xres+var->xoffset;
if (p.height<var->yres+var->yoffset)
p.height=var->yres+var->yoffset;
if (!partprod(xres)) {
- DPRINTK("width not supported: %lu\n", xres);
+ DPRINTK("width not supported: %u\n", xres);
return -EINVAL;
}
if (p.width>2047) {
- DPRINTK("virtual width not supported: %lu\n", p.width);
+ DPRINTK("virtual width not supported: %u\n", p.width);
return -EINVAL;
}
if (var->yres<200) {
- DPRINTK("height not supported: %lu\n",
- (unsigned long )var->yres);
+ DPRINTK("height not supported: %u\n",
+ (u32 )var->yres);
return -EINVAL;
}
if (p.height<200 || p.height>2047) {
- DPRINTK("virtual height not supported: %lu\n", p.height);
+ DPRINTK("virtual height not supported: %u\n", p.height);
+ return -EINVAL;
+ }
+ if (p.depth>32) {
+ DPRINTK("depth not supported: %u\n", p.depth);
return -EINVAL;
}
if (p.width*p.height*p.depth/8>i->regions.fb_size) {
- DPRINTK("no memory for screen (%lux%lux%lu)\n",
- xres, p.height, p.depth);
+ DPRINTK("no memory for screen (%ux%ux%u)\n",
+ p.width, p.height, p.depth);
return -EINVAL;
}
p.pixclock=PICOS2KHZ(var->pixclock);
if (p.pixclock>PM2_MAX_PIXCLOCK) {
- DPRINTK("pixclock too high (%luKHz)\n", p.pixclock);
+ DPRINTK("pixclock too high (%uKHz)\n", p.pixclock);
return -EINVAL;
}
p.hsstart=to3264(var->right_margin, p.depth, data64);
@@ -1153,11 +1327,24 @@
return 0;
}
+#ifdef PM2FB_MASTER_DEBUG
+#undef pm2fb_decode_var
+
+static int pm2fb_decode_var(const struct fb_var_screeninfo* var,
+ void* par, struct fb_info_gen* info) {
+ int result;
+
+ result=pm2fb_wrapped_decode_var(var, par, info);
+ pm2fb_display_var(var);
+ return result;
+}
+#endif
+
static int pm2fb_encode_var(struct fb_var_screeninfo* var,
const void* par, struct fb_info_gen* info) {
struct pm2fb_par* p=(struct pm2fb_par* )par;
struct fb_var_screeninfo v;
- unsigned long base;
+ u32 base;
memset(&v, 0, sizeof(struct fb_var_screeninfo));
v.xres_virtual=p->width;
@@ -1266,9 +1453,9 @@
return;
}
}
+ set_screen(i, p);
i->current_par=*p;
i->current_par_valid=1;
- set_screen(i, &i->current_par);
}
static int pm2fb_getcolreg(unsigned regno,
@@ -1322,7 +1509,7 @@
break;
#endif
default:
- DPRINTK("bad depth %lu\n",
+ DPRINTK("bad depth %u\n",
i->current_par.depth);
break;
}
@@ -1338,14 +1525,15 @@
return regno>255;
}
-static void pm2fb_dispsw(const void* par, struct display* disp,
+static void pm2fb_set_disp(const void* par, struct display* disp,
struct fb_info_gen* info) {
struct pm2fb_info* i=(struct pm2fb_info* )info;
- unsigned long flags;
- unsigned long depth;
+ u32 flags;
+ u32 depth;
save_flags(flags);
cli();
+ disp->screen_base=i->regions.v_fb;
switch (depth=((struct pm2fb_par* )par)->depth) {
#ifdef FBCON_HAS_CFB8
case 8:
@@ -1408,6 +1596,7 @@
memset(&fb_info, 0, sizeof(fb_info));
if (!pm2fb_conf(&fb_info))
return;
+ pm2fb_reset(&fb_info);
fb_info.disp.scrollmode=SCROLL_YNOMOVE;
fb_info.gen.parsize=sizeof(struct pm2fb_par);
fb_info.gen.fbhw=&pm2fb_hwswitch;
@@ -1420,19 +1609,18 @@
fb_info.gen.info.updatevar=&fbgen_update_var;
fb_info.gen.info.blank=&fbgen_blank;
fbgen_get_var(&fb_info.disp.var, -1, &fb_info.gen.info);
- if (fbgen_do_set_var(&fb_info.disp.var, 1, &fb_info.gen)<0)
- return;
+ fbgen_do_set_var(&fb_info.disp.var, 1, &fb_info.gen);
fbgen_set_disp(-1, &fb_info.gen);
fbgen_install_cmap(0, &fb_info.gen);
if (register_framebuffer(&fb_info.gen.info)<0) {
printk("pm2fb: unable to register.\n");
return;
}
- printk("fb%d: %s (%s), using %ldK of video memory.\n",
+ printk("fb%d: %s (%s), using %uK of video memory.\n",
GET_FB_IDX(fb_info.gen.info.node),
board_table[fb_info.board].name,
permedia2_name,
- (unsigned long )(fb_info.regions.fb_size>>10));
+ (u32 )(fb_info.regions.fb_size>>10));
MOD_INC_USE_COUNT;
}
@@ -1455,9 +1643,6 @@
__initfunc(void pm2fb_setup(char* options, int* ints)) {
char* next;
- memset(&pm2fb_options, 0, sizeof(pm2fb_options));
- memcpy(&pm2fb_options.user_mode, &user_mode[0].par,
- sizeof(pm2fb_options.user_mode));
while (options) {
if ((next=strchr(options, ',')))
*(next++)='\0';
@@ -1469,6 +1654,8 @@
pm2fb_options.flags |= OPTF_YPAN;
else if (!strcmp(options, "oldmem"))
pm2fb_options.flags |= OPTF_OLD_MEM;
+ else if (!strcmp(options, "virtual"))
+ pm2fb_options.flags |= OPTF_VIRTUAL;
options=next;
}
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)