Skip to content

Commit

Permalink
tridentfb: move global flat panel variable into structure
Browse files Browse the repository at this point in the history 
This patch moves flat panel indicator into tridentfb_par structure and removes
related global variables and macros.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
@Krzysztof-H @torvalds
Krzysztof-H authored and torvalds committed Jul 24, 2008
1 parent 122e8ad commit 6eed8e1
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 27 deletions.
44 changes: 23 additions & 21 deletions drivers/video/tridentfb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ struct tridentfb_par {
void __iomem *io_virt; /* iospace virtual memory address */
u32 pseudo_pal[16];
int chip_id;
int flatpanel;
};

static unsigned char eng_oper; /* engine operation... */
Expand All @@ -43,24 +44,22 @@ static struct fb_fix_screeninfo tridentfb_fix = {
.accel = FB_ACCEL_NONE,
};

static int displaytype;

/* defaults which are normally overriden by user values */

/* video mode */
static char *mode_option __devinitdata = "640x480";
static int bpp = 8;
static int bpp __devinitdata = 8;

static int noaccel;
static int noaccel __devinitdata;

static int center;
static int stretch;

static int fp;
static int crt;
static int fp __devinitdata;
static int crt __devinitdata;

static int memsize;
static int memdiff;
static int memsize __devinitdata;
static int memdiff __devinitdata;
static int nativex;

module_param(mode_option, charp, 0);
Expand All @@ -75,7 +74,9 @@ module_param(memsize, int, 0);
module_param(memdiff, int, 0);
module_param(nativex, int, 0);
module_param(fp, int, 0);
MODULE_PARM_DESC(fp, "Define if flatpanel is connected");
module_param(crt, int, 0);
MODULE_PARM_DESC(crt, "Define if CRT is connected");

static int is3Dchip(int id)
{
Expand Down Expand Up @@ -728,15 +729,15 @@ static void set_number_of_lines(struct tridentfb_par *par, int lines)

/*
* If we see that FP is active we assume we have one.
* Otherwise we have a CRT display.User can override.
* Otherwise we have a CRT display. User can override.
*/
static unsigned int __devinit get_displaytype(struct tridentfb_par *par)
static int __devinit is_flatpanel(struct tridentfb_par *par)
{
if (fp)
return DISPLAY_FP;
return 1;
if (crt || !iscyber(par->chip_id))
return DISPLAY_CRT;
return (read3CE(par, FPConfig) & 0x10) ? DISPLAY_FP : DISPLAY_CRT;
return 0;
return (read3CE(par, FPConfig) & 0x10) ? 1 : 0;
}

/* Try detecting the video memory size */
Expand Down Expand Up @@ -824,14 +825,15 @@ static unsigned int __devinit get_memsize(struct tridentfb_par *par)
static int tridentfb_check_var(struct fb_var_screeninfo *var,
struct fb_info *info)
{
struct tridentfb_par *par = info->par;
int bpp = var->bits_per_pixel;
debug("enter\n");

/* check color depth */
if (bpp == 24)
bpp = var->bits_per_pixel = 32;
/* check whether resolution fits on panel and in memory */
if (flatpanel && nativex && var->xres > nativex)
if (par->flatpanel && nativex && var->xres > nativex)
return -EINVAL;
if (var->xres * var->yres_virtual * bpp / 8 > info->fix.smem_len)
return -EINVAL;
Expand Down Expand Up @@ -928,7 +930,7 @@ static int tridentfb_set_par(struct fb_info *info)
crtc_unlock(par);
write3CE(par, CyberControl, 8);

if (flatpanel && var->xres < nativex) {
if (par->flatpanel && var->xres < nativex) {
/*
* on flat panels with native size larger
* than requested resolution decide whether
Expand Down Expand Up @@ -1097,7 +1099,7 @@ static int tridentfb_set_par(struct fb_info *info)
t_outb(par, tmp, 0x3C6);
t_inb(par, 0x3C8);

if (flatpanel)
if (par->flatpanel)
set_number_of_lines(par, info->var.yres);
set_lwidth(par, info->var.xres * bpp / (4 * 16));
info->fix.visual = (bpp == 8) ? FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_TRUECOLOR;
Expand Down Expand Up @@ -1153,7 +1155,7 @@ static int tridentfb_blank(int blank_mode, struct fb_info *info)
struct tridentfb_par *par = info->par;

debug("enter\n");
if (flatpanel)
if (par->flatpanel)
return 0;
t_outb(par, 0x04, 0x83C8); /* Read DPMS Control */
PMCont = t_inb(par, 0x83C6) & 0xFC;
Expand Down Expand Up @@ -1322,9 +1324,9 @@ static int __devinit trident_pci_probe(struct pci_dev *dev,
}

output("%s board found\n", pci_name(dev));
displaytype = get_displaytype(default_par);
default_par->flatpanel = is_flatpanel(default_par);

if (flatpanel)
if (default_par->flatpanel)
nativex = get_nativex(default_par);

info->fix = tridentfb_fix;
Expand Down Expand Up @@ -1441,9 +1443,9 @@ static int __init tridentfb_setup(char *options)
if (!strncmp(opt, "noaccel", 7))
noaccel = 1;
else if (!strncmp(opt, "fp", 2))
displaytype = DISPLAY_FP;
fp = 1;
else if (!strncmp(opt, "crt", 3))
displaytype = DISPLAY_CRT;
fp = 0;
else if (!strncmp(opt, "bpp=", 4))
bpp = simple_strtoul(opt + 4, NULL, 0);
else if (!strncmp(opt, "center", 6))
Expand Down
6 changes: 0 additions & 6 deletions include/video/trident.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,6 @@
#define LCD_CENTER 1
#define LCD_BIOS 2

/* display types */
#define DISPLAY_CRT 0
#define DISPLAY_FP 1

#define flatpanel (displaytype == DISPLAY_FP)

/* General Registers */
#define SPR 0x1F /* Software Programming Register (videoram) */

Expand Down

0 comments on commit 6eed8e1

Please sign in to comment.