dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

gxfb: stop sharing code with gx1fb

Browse source 
We want to stop sharing stuff with gx1fb; it makes little sense.  There were
fields in geodefb_par that weren't being used, there was little point to the
DC/VP ops callbacks, etc.  This implements the following:

  - Create gxfb_par (based on geodefb_par), place it in gxfb.h
  - Drop display_gx.h and video_gx.h.  The last few patches moved most
    stuff into gxfb.h anyways, so there was very little left.
  - Drop the geode_{dc,vid}_ops stuff.  Un-static functions, add
    declarations to gxfb.h.

Signed-off-by: Andres Salomon <dilinger@debian.org>
Cc: Jordan Crouse <jordan.crouse@amd.com>
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>
This commit is contained in:
Andres Salomon 2008-04-28 02:15:01 -07:00 committed by Linus Torvalds
parent 9f1277bd14
commit d1b4cc3ec5
6 changed files with 47 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/video/geode/display_gx.c
View file

@ -18,8 +18,6 @@
#include <asm/div64.h> #include <asm/div64.h>
#include <asm/delay.h> #include <asm/delay.h>
#include "geodefb.h"
#include "display_gx.h"
#include "gxfb.h" #include "gxfb.h"
unsigned int gx_frame_buffer_size(void) unsigned int gx_frame_buffer_size(void)
@ -43,9 +41,9 @@ int gx_line_delta(int xres, int bpp)
return (xres * (bpp >> 3) + 7) & ~0x7; return (xres * (bpp >> 3) + 7) & ~0x7;
} }
static void gx_set_mode(struct fb_info *info) void gx_set_mode(struct fb_info *info)
{ {
struct geodefb_par *par = info->par; struct gxfb_par *par = info->par;
u32 gcfg, dcfg; u32 gcfg, dcfg;
int hactive, hblankstart, hsyncstart, hsyncend, hblankend, htotal; int hactive, hblankstart, hsyncstart, hsyncend, hblankend, htotal;
int vactive, vblankstart, vsyncstart, vsyncend, vblankend, vtotal; int vactive, vblankstart, vsyncstart, vsyncend, vblankend, vtotal;
@ -69,7 +67,7 @@ static void gx_set_mode(struct fb_info *info)
write_dc(par, DC_GENERAL_CFG, gcfg); write_dc(par, DC_GENERAL_CFG, gcfg);
/* Setup DCLK and its divisor. */ /* Setup DCLK and its divisor. */
par->vid_ops->set_dclk(info); gx_set_dclk_frequency(info);
/* /*
* Setup new mode. * Setup new mode.
@ -147,16 +145,16 @@ static void gx_set_mode(struct fb_info *info)
write_dc(par, DC_DISPLAY_CFG, dcfg); write_dc(par, DC_DISPLAY_CFG, dcfg);
write_dc(par, DC_GENERAL_CFG, gcfg); write_dc(par, DC_GENERAL_CFG, gcfg);
par->vid_ops->configure_display(info); gx_configure_display(info);
/* Relock display controller registers */ /* Relock display controller registers */
write_dc(par, DC_UNLOCK, DC_UNLOCK_LOCK); write_dc(par, DC_UNLOCK, DC_UNLOCK_LOCK);
} }
static void gx_set_hw_palette_reg(struct fb_info *info, unsigned regno, void gx_set_hw_palette_reg(struct fb_info *info, unsigned regno,
unsigned red, unsigned green, unsigned blue) unsigned red, unsigned green, unsigned blue)
{ {
struct geodefb_par *par = info->par; struct gxfb_par *par = info->par;
int val; int val;
/* Hardware palette is in RGB 8-8-8 format. */ /* Hardware palette is in RGB 8-8-8 format. */
@ -167,8 +165,3 @@ static void gx_set_hw_palette_reg(struct fb_info *info, unsigned regno,
write_dc(par, DC_PAL_ADDRESS, regno); write_dc(par, DC_PAL_ADDRESS, regno);
write_dc(par, DC_PAL_DATA, val); write_dc(par, DC_PAL_DATA, val);
} }
struct geode_dc_ops gx_dc_ops = {
.set_mode = gx_set_mode,
.set_palette_reg = gx_set_hw_palette_reg,
};

19
drivers/video/geode/display_gx.h
View file

@ -1,19 +0,0 @@
/*
* Geode GX display controller
*
* Copyright (C) 2006 Arcom Control Systems Ltd.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*/
#ifndef __DISPLAY_GX_H__
#define __DISPLAY_GX_H__
unsigned int gx_frame_buffer_size(void);
int gx_line_delta(int xres, int bpp);
extern struct geode_dc_ops gx_dc_ops;
#endif /* !__DISPLAY_GX1_H__ */

31
drivers/video/geode/gxfb.h
View file

@ -1,7 +1,7 @@
/* /*
* Copyright (C) 2008 Andres Salomon <dilinger@debian.org> * Copyright (C) 2008 Andres Salomon <dilinger@debian.org>
* *
* Geode GX2 register tables * Geode GX2 header information
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -13,6 +13,23 @@
#include <linux/io.h> #include <linux/io.h>
struct gxfb_par {
int enable_crt;
void __iomem *dc_regs;
void __iomem *vid_regs;
};
unsigned int gx_frame_buffer_size(void);
int gx_line_delta(int xres, int bpp);
void gx_set_mode(struct fb_info *info);
void gx_set_hw_palette_reg(struct fb_info *info, unsigned regno,
unsigned red, unsigned green, unsigned blue);
void gx_set_dclk_frequency(struct fb_info *info);
void gx_configure_display(struct fb_info *info);
int gx_blank_display(struct fb_info *info, int blank_mode);
/* Display Controller registers (table 6-38 from the data book) */ /* Display Controller registers (table 6-38 from the data book) */
enum dc_registers { enum dc_registers {
DC_UNLOCK = 0, DC_UNLOCK = 0,
@ -221,33 +238,33 @@ enum fp_registers {
/* register access functions */ /* register access functions */
static inline uint32_t read_dc(struct geodefb_par *par, int reg) static inline uint32_t read_dc(struct gxfb_par *par, int reg)
{ {
return readl(par->dc_regs + 4*reg); return readl(par->dc_regs + 4*reg);
} }
static inline void write_dc(struct geodefb_par *par, int reg, uint32_t val) static inline void write_dc(struct gxfb_par *par, int reg, uint32_t val)
{ {
writel(val, par->dc_regs + 4*reg); writel(val, par->dc_regs + 4*reg);
} }
static inline uint32_t read_vp(struct geodefb_par *par, int reg) static inline uint32_t read_vp(struct gxfb_par *par, int reg)
{ {
return readl(par->vid_regs + 8*reg); return readl(par->vid_regs + 8*reg);
} }
static inline void write_vp(struct geodefb_par *par, int reg, uint32_t val) static inline void write_vp(struct gxfb_par *par, int reg, uint32_t val)
{ {
writel(val, par->vid_regs + 8*reg); writel(val, par->vid_regs + 8*reg);
} }
static inline uint32_t read_fp(struct geodefb_par *par, int reg) static inline uint32_t read_fp(struct gxfb_par *par, int reg)
{ {
return readl(par->vid_regs + 8*reg + VP_FP_START); return readl(par->vid_regs + 8*reg + VP_FP_START);
} }
static inline void write_fp(struct geodefb_par *par, int reg, uint32_t val) static inline void write_fp(struct gxfb_par *par, int reg, uint32_t val)
{ {
writel(val, par->vid_regs + 8*reg + VP_FP_START); writel(val, par->vid_regs + 8*reg + VP_FP_START);
} }

32
drivers/video/geode/gxfb_core.c
View file

@ -32,9 +32,6 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <asm/geode.h> #include <asm/geode.h>
#include "geodefb.h"
#include "display_gx.h"
#include "video_gx.h"
#include "gxfb.h" #include "gxfb.h"
static char *mode_option; static char *mode_option;
@ -142,8 +139,6 @@ static int gxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
static int gxfb_set_par(struct fb_info *info) static int gxfb_set_par(struct fb_info *info)
{ {
struct geodefb_par *par = info->par;
if (info->var.bits_per_pixel > 8) { if (info->var.bits_per_pixel > 8) {
info->fix.visual = FB_VISUAL_TRUECOLOR; info->fix.visual = FB_VISUAL_TRUECOLOR;
fb_dealloc_cmap(&info->cmap); fb_dealloc_cmap(&info->cmap);
@ -154,7 +149,7 @@ static int gxfb_set_par(struct fb_info *info)
info->fix.line_length = gx_line_delta(info->var.xres, info->var.bits_per_pixel); info->fix.line_length = gx_line_delta(info->var.xres, info->var.bits_per_pixel);
par->dc_ops->set_mode(info); gx_set_mode(info);
return 0; return 0;
} }
@ -170,8 +165,6 @@ static int gxfb_setcolreg(unsigned regno, unsigned red, unsigned green,
unsigned blue, unsigned transp, unsigned blue, unsigned transp,
struct fb_info *info) struct fb_info *info)
{ {
struct geodefb_par *par = info->par;
if (info->var.grayscale) { if (info->var.grayscale) {
/* grayscale = 0.30*R + 0.59*G + 0.11*B */ /* grayscale = 0.30*R + 0.59*G + 0.11*B */
red = green = blue = (red * 77 + green * 151 + blue * 28) >> 8; red = green = blue = (red * 77 + green * 151 + blue * 28) >> 8;
@ -194,7 +187,7 @@ static int gxfb_setcolreg(unsigned regno, unsigned red, unsigned green,
if (regno >= 256) if (regno >= 256)
return -EINVAL; return -EINVAL;
par->dc_ops->set_palette_reg(info, regno, red, green, blue); gx_set_hw_palette_reg(info, regno, red, green, blue);
} }
return 0; return 0;
@ -202,14 +195,12 @@ static int gxfb_setcolreg(unsigned regno, unsigned red, unsigned green,
static int gxfb_blank(int blank_mode, struct fb_info *info) static int gxfb_blank(int blank_mode, struct fb_info *info)
{ {
struct geodefb_par *par = info->par; return gx_blank_display(info, blank_mode);
return par->vid_ops->blank_display(info, blank_mode);
} }
static int __init gxfb_map_video_memory(struct fb_info *info, struct pci_dev *dev) static int __init gxfb_map_video_memory(struct fb_info *info, struct pci_dev *dev)
{ {
struct geodefb_par *par = info->par; struct gxfb_par *par = info->par;
int ret; int ret;
ret = pci_enable_device(dev); ret = pci_enable_device(dev);
@ -266,11 +257,12 @@ static struct fb_ops gxfb_ops = {
static struct fb_info * __init gxfb_init_fbinfo(struct device *dev) static struct fb_info * __init gxfb_init_fbinfo(struct device *dev)
{ {
struct geodefb_par *par; struct gxfb_par *par;
struct fb_info *info; struct fb_info *info;
/* Alloc enough space for the pseudo palette. */ /* Alloc enough space for the pseudo palette. */
info = framebuffer_alloc(sizeof(struct geodefb_par) + sizeof(u32) * 16, dev); info = framebuffer_alloc(sizeof(struct gxfb_par) + sizeof(u32) * 16,
dev);
if (!info) if (!info)
return NULL; return NULL;
@ -296,7 +288,7 @@ static struct fb_info * __init gxfb_init_fbinfo(struct device *dev)
info->flags = FBINFO_DEFAULT; info->flags = FBINFO_DEFAULT;
info->node = -1; info->node = -1;
info->pseudo_palette = (void *)par + sizeof(struct geodefb_par); info->pseudo_palette = (void *)par + sizeof(struct gxfb_par);
info->var.grayscale = 0; info->var.grayscale = 0;
@ -305,7 +297,7 @@ static struct fb_info * __init gxfb_init_fbinfo(struct device *dev)
static int __init gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id) static int __init gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
{ {
struct geodefb_par *par; struct gxfb_par *par;
struct fb_info *info; struct fb_info *info;
int ret; int ret;
unsigned long val; unsigned long val;
@ -315,10 +307,6 @@ static int __init gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *i
return -ENOMEM; return -ENOMEM;
par = info->par; par = info->par;
/* GX display controller and GX video device. */
par->dc_ops = &gx_dc_ops;
par->vid_ops = &gx_vid_ops;
if ((ret = gxfb_map_video_memory(info, pdev)) < 0) { if ((ret = gxfb_map_video_memory(info, pdev)) < 0) {
dev_err(&pdev->dev, "failed to map frame buffer or controller registers\n"); dev_err(&pdev->dev, "failed to map frame buffer or controller registers\n");
goto err; goto err;
@ -378,7 +366,7 @@ static int __init gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *i
static void gxfb_remove(struct pci_dev *pdev) static void gxfb_remove(struct pci_dev *pdev)
{ {
struct fb_info *info = pci_get_drvdata(pdev); struct fb_info *info = pci_get_drvdata(pdev);
struct geodefb_par *par = info->par; struct gxfb_par *par = info->par;
unregister_framebuffer(info); unregister_framebuffer(info);

20
drivers/video/geode/video_gx.c
View file

@ -18,8 +18,6 @@
#include <asm/msr.h> #include <asm/msr.h>
#include <asm/geode.h> #include <asm/geode.h>
#include "geodefb.h"
#include "video_gx.h"
#include "gxfb.h" #include "gxfb.h"
@ -119,7 +117,7 @@ static const struct gx_pll_entry gx_pll_table_14MHz[] = {
{ 4357, 0, 0x0000057D }, /* 229.5000 */ { 4357, 0, 0x0000057D }, /* 229.5000 */
}; };
static void gx_set_dclk_frequency(struct fb_info *info) void gx_set_dclk_frequency(struct fb_info *info)
{ {
const struct gx_pll_entry *pll_table; const struct gx_pll_entry *pll_table;
int pll_table_len; int pll_table_len;
@ -180,7 +178,7 @@ static void gx_set_dclk_frequency(struct fb_info *info)
static void static void
gx_configure_tft(struct fb_info *info) gx_configure_tft(struct fb_info *info)
{ {
struct geodefb_par *par = info->par; struct gxfb_par *par = info->par;
unsigned long val; unsigned long val;
unsigned long fp; unsigned long fp;
@ -235,9 +233,9 @@ gx_configure_tft(struct fb_info *info)
write_fp(par, FP_PM, fp); write_fp(par, FP_PM, fp);
} }
static void gx_configure_display(struct fb_info *info) void gx_configure_display(struct fb_info *info)
{ {
struct geodefb_par *par = info->par; struct gxfb_par *par = info->par;
u32 dcfg, misc; u32 dcfg, misc;
/* Write the display configuration */ /* Write the display configuration */
@ -297,9 +295,9 @@ static void gx_configure_display(struct fb_info *info)
gx_configure_tft(info); gx_configure_tft(info);
} }
static int gx_blank_display(struct fb_info *info, int blank_mode) int gx_blank_display(struct fb_info *info, int blank_mode)
{ {
struct geodefb_par *par = info->par; struct gxfb_par *par = info->par;
u32 dcfg, fp_pm; u32 dcfg, fp_pm;
int blank, hsync, vsync; int blank, hsync, vsync;
@ -347,9 +345,3 @@ static int gx_blank_display(struct fb_info *info, int blank_mode)
return 0; return 0;
} }
struct geode_vid_ops gx_vid_ops = {
.set_dclk = gx_set_dclk_frequency,
.configure_display = gx_configure_display,
.blank_display = gx_blank_display,
};

16
drivers/video/geode/video_gx.h
View file

@ -1,16 +0,0 @@
/*
* Geode GX video device
*
* Copyright (C) 2006 Arcom Control Systems Ltd.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*/
#ifndef __VIDEO_GX_H__
#define __VIDEO_GX_H__
extern struct geode_vid_ops gx_vid_ops;
#endif /* !__VIDEO_GX_H__ */