lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lxfb: create GP/DC/VP/FP-specific handlers rather than using readl/writel

Browse Source 
This creates read_gp/write_gp, read_dc/write_dc, read_vp/write_vp, and
read_fp/write_fp for reading and updating those registers.  Note that we don't
follow the 'DF' naming; those will be renamed to VP shortly.

Signed-off-by: Andres Salomon <dilinger@debian.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: Jordan Crouse <jordan.crouse@amd.com>
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:24 -07:00
committed by Linus Torvalds
parent 3888d4639e
commit 9286361bea
3 changed files with 116 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/video/geode/lxfb.h
View File

@@ -188,4 +188,47 @@ void lx_set_palette_reg(struct fb_info *, unsigned int, unsigned int,
#define GP_BS_BLT_BUSY (1 << 0) #define GP_BS_BLT_BUSY (1 << 0)
#define GP_BS_CB_EMPTY (1 << 4) #define GP_BS_CB_EMPTY (1 << 4)
/* register access functions */
static inline uint32_t read_gp(struct lxfb_par *par, int reg)
{
return readl(par->gp_regs + reg);
}
static inline void write_gp(struct lxfb_par *par, int reg, uint32_t val)
{
writel(val, par->gp_regs + reg);
}
static inline uint32_t read_dc(struct lxfb_par *par, int reg)
{
return readl(par->dc_regs + reg);
}
static inline void write_dc(struct lxfb_par *par, int reg, uint32_t val)
{
writel(val, par->dc_regs + reg);
}
static inline uint32_t read_vp(struct lxfb_par *par, int reg)
{
return readl(par->df_regs + reg);
}
static inline void write_vp(struct lxfb_par *par, int reg, uint32_t val)
{
writel(val, par->df_regs + reg);
}
static inline uint32_t read_fp(struct lxfb_par *par, int reg)
{
return readl(par->df_regs + reg);
}
static inline void write_fp(struct lxfb_par *par, int reg, uint32_t val)
{
writel(val, par->df_regs + reg);
}
#endif #endif

9
drivers/video/geode/lxfb_core.c
View File

@@ -366,12 +366,9 @@ static int __init lxfb_map_video_memory(struct fb_info *info,
if (par->df_regs == NULL) if (par->df_regs == NULL)
return ret; return ret;
writel(DC_UNLOCK_CODE, par->dc_regs + DC_UNLOCK); write_dc(par, DC_UNLOCK, DC_UNLOCK_CODE);
write_dc(par, DC_PHY_MEM_OFFSET, info->fix.smem_start & 0xFF000000);
writel(info->fix.smem_start & 0xFF000000, write_dc(par, DC_UNLOCK, 0);
par->dc_regs + DC_PHY_MEM_OFFSET);
writel(0, par->dc_regs + DC_UNLOCK);
dev_info(&dev->dev, "%d KB of video memory at 0x%lx\n", dev_info(&dev->dev, "%d KB of video memory at 0x%lx\n",
info->fix.smem_len / 1024, info->fix.smem_start); info->fix.smem_len / 1024, info->fix.smem_start);

151
drivers/video/geode/lxfb_ops.c
View File

@@ -210,49 +210,48 @@ static void lx_graphics_disable(struct fb_info *info)
/* Note: This assumes that the video is in a quitet state */ /* Note: This assumes that the video is in a quitet state */
writel(0, par->df_regs + DF_ALPHA_CONTROL_1); write_vp(par, DF_ALPHA_CONTROL_1, 0);
writel(0, par->df_regs + DF_ALPHA_CONTROL_1 + 32); write_vp(par, DF_ALPHA_CONTROL_1 + 32, 0);
writel(0, par->df_regs + DF_ALPHA_CONTROL_1 + 64); write_vp(par, DF_ALPHA_CONTROL_1 + 64, 0);
/* Turn off the VGA and video enable */ /* Turn off the VGA and video enable */
val = readl (par->dc_regs + DC_GENERAL_CFG) & val = read_dc(par, DC_GENERAL_CFG) & ~(DC_GCFG_VGAE | DC_GCFG_VIDE);
~(DC_GCFG_VGAE | DC_GCFG_VIDE);
writel(val, par->dc_regs + DC_GENERAL_CFG); write_dc(par, DC_GENERAL_CFG, val);
val = readl(par->df_regs + DF_VIDEO_CFG) & ~DF_VCFG_VID_EN; val = read_vp(par, DF_VIDEO_CFG) & ~DF_VCFG_VID_EN;
writel(val, par->df_regs + DF_VIDEO_CFG); write_vp(par, DF_VIDEO_CFG, val);
writel( DC_IRQ_MASK | DC_VSYNC_IRQ_MASK | write_dc(par, DC_IRQ, DC_IRQ_MASK | DC_VSYNC_IRQ_MASK | DC_IRQ_STATUS |
DC_IRQ_STATUS | DC_VSYNC_IRQ_STATUS, DC_VSYNC_IRQ_STATUS);
par->dc_regs + DC_IRQ);
val = readl(par->dc_regs + DC_GENLCK_CTRL) & ~DC_GENLCK_ENABLE; val = read_dc(par, DC_GENLCK_CTRL) & ~DC_GENLCK_ENABLE;
writel(val, par->dc_regs + DC_GENLCK_CTRL); write_dc(par, DC_GENLCK_CTRL, val);
val = readl(par->dc_regs + DC_COLOR_KEY) & ~DC_CLR_KEY_ENABLE; val = read_dc(par, DC_COLOR_KEY) & ~DC_CLR_KEY_ENABLE;
writel(val & ~DC_CLR_KEY_ENABLE, par->dc_regs + DC_COLOR_KEY); write_dc(par, DC_COLOR_KEY, val & ~DC_CLR_KEY_ENABLE);
/* We don't actually blank the panel, due to the long latency /* We don't actually blank the panel, due to the long latency
involved with bringing it back */ involved with bringing it back */
val = readl(par->df_regs + DF_MISC) | DF_MISC_DAC_PWRDN; val = read_vp(par, DF_MISC) | DF_MISC_DAC_PWRDN;
writel(val, par->df_regs + DF_MISC); write_vp(par, DF_MISC, val);
/* Turn off the display */ /* Turn off the display */
val = readl(par->df_regs + DF_DISPLAY_CFG); val = read_vp(par, DF_DISPLAY_CFG);
writel(val & ~(DF_DCFG_CRT_EN | DF_DCFG_HSYNC_EN | DF_DCFG_VSYNC_EN | write_vp(par, DF_DISPLAY_CFG, val &
DF_DCFG_DAC_BL_EN), par->df_regs + DF_DISPLAY_CFG); ~(DF_DCFG_CRT_EN | DF_DCFG_HSYNC_EN |
DF_DCFG_VSYNC_EN | DF_DCFG_DAC_BL_EN));
gcfg = readl(par->dc_regs + DC_GENERAL_CFG); gcfg = read_dc(par, DC_GENERAL_CFG);
gcfg &= ~(DC_GCFG_CMPE | DC_GCFG_DECE); gcfg &= ~(DC_GCFG_CMPE | DC_GCFG_DECE);
writel(gcfg, par->dc_regs + DC_GENERAL_CFG); write_dc(par, DC_GENERAL_CFG, gcfg);
/* Turn off the TGEN */ /* Turn off the TGEN */
val = readl(par->dc_regs + DC_DISPLAY_CFG); val = read_dc(par, DC_DISPLAY_CFG);
val &= ~DC_DCFG_TGEN; val &= ~DC_DCFG_TGEN;
writel(val, par->dc_regs + DC_DISPLAY_CFG); write_dc(par, DC_DISPLAY_CFG, val);
/* Wait 1000 usecs to ensure that the TGEN is clear */ /* Wait 1000 usecs to ensure that the TGEN is clear */
udelay(1000); udelay(1000);
@@ -260,12 +259,12 @@ static void lx_graphics_disable(struct fb_info *info)
/* Turn off the FIFO loader */ /* Turn off the FIFO loader */
gcfg &= ~DC_GCFG_DFLE; gcfg &= ~DC_GCFG_DFLE;
writel(gcfg, par->dc_regs + DC_GENERAL_CFG); write_dc(par, DC_GENERAL_CFG, gcfg);
/* Lastly, wait for the GP to go idle */ /* Lastly, wait for the GP to go idle */
do { do {
val = readl(par->gp_regs + GP_BLT_STATUS); val = read_gp(par, GP_BLT_STATUS);
} while ((val & GP_BS_BLT_BUSY) || !(val & GP_BS_CB_EMPTY)); } while ((val & GP_BS_BLT_BUSY) || !(val & GP_BS_CB_EMPTY));
} }
@@ -275,11 +274,11 @@ static void lx_graphics_enable(struct fb_info *info)
u32 temp, config; u32 temp, config;
/* Set the video request register */ /* Set the video request register */
writel(0, par->df_regs + DF_VIDEO_REQUEST); write_vp(par, DF_VIDEO_REQUEST, 0);
/* Set up the polarities */ /* Set up the polarities */
config = readl(par->df_regs + DF_DISPLAY_CFG); config = read_vp(par, DF_DISPLAY_CFG);
config &= ~(DF_DCFG_CRT_SYNC_SKW_MASK | DF_DCFG_PWR_SEQ_DLY_MASK | config &= ~(DF_DCFG_CRT_SYNC_SKW_MASK | DF_DCFG_PWR_SEQ_DLY_MASK |
DF_DCFG_CRT_HSYNC_POL | DF_DCFG_CRT_VSYNC_POL); DF_DCFG_CRT_HSYNC_POL | DF_DCFG_CRT_VSYNC_POL);
@@ -296,12 +295,9 @@ static void lx_graphics_enable(struct fb_info *info)
if (par->output & OUTPUT_PANEL) { if (par->output & OUTPUT_PANEL) {
u32 msrlo, msrhi; u32 msrlo, msrhi;
writel(DF_DEFAULT_TFT_PMTIM1, write_fp(par, DF_PANEL_TIM1, DF_DEFAULT_TFT_PMTIM1);
par->df_regs + DF_PANEL_TIM1); write_fp(par, DF_PANEL_TIM2, DF_DEFAULT_TFT_PMTIM2);
writel(DF_DEFAULT_TFT_PMTIM2, write_fp(par, DF_DITHER_CONTROL, DF_DEFAULT_TFT_DITHCTL);
par->df_regs + DF_PANEL_TIM2);
writel(DF_DEFAULT_TFT_DITHCTL,
par->df_regs + DF_DITHER_CONTROL);
msrlo = DF_DEFAULT_TFT_PAD_SEL_LOW; msrlo = DF_DEFAULT_TFT_PAD_SEL_LOW;
msrhi = DF_DEFAULT_TFT_PAD_SEL_HIGH; msrhi = DF_DEFAULT_TFT_PAD_SEL_HIGH;
@@ -314,27 +310,24 @@ static void lx_graphics_enable(struct fb_info *info)
DF_DCFG_VSYNC_EN | DF_DCFG_DAC_BL_EN; DF_DCFG_VSYNC_EN | DF_DCFG_DAC_BL_EN;
} }
writel(config, par->df_regs + DF_DISPLAY_CFG); write_vp(par, DF_DISPLAY_CFG, config);
/* Turn the CRT dacs back on */ /* Turn the CRT dacs back on */
if (par->output & OUTPUT_CRT) { if (par->output & OUTPUT_CRT) {
temp = readl(par->df_regs + DF_MISC); temp = read_vp(par, DF_MISC);
temp &= ~(DF_MISC_DAC_PWRDN | DF_MISC_A_PWRDN); temp &= ~(DF_MISC_DAC_PWRDN | DF_MISC_A_PWRDN);
writel(temp, par->df_regs + DF_MISC); write_vp(par, DF_MISC, temp);
} }
/* Turn the panel on (if it isn't already) */ /* Turn the panel on (if it isn't already) */
if (par->output & OUTPUT_PANEL) { if (par->output & OUTPUT_PANEL) {
temp = readl(par->df_regs + DF_FP_PM); temp = read_fp(par, DF_FP_PM);
if (!(temp & 0x09)) if (!(temp & 0x09))
writel(temp | DF_FP_PM_P, par->df_regs + DF_FP_PM); write_fp(par, DF_FP_PM, temp | DF_FP_PM_P);
} }
temp = readl(par->df_regs + DF_MISC);
temp = readl(par->df_regs + DF_DISPLAY_CFG);
} }
unsigned int lx_framebuffer_size(void) unsigned int lx_framebuffer_size(void)
@@ -364,7 +357,7 @@ void lx_set_mode(struct fb_info *info)
int vactive, vblankstart, vsyncstart, vsyncend, vblankend, vtotal; int vactive, vblankstart, vsyncstart, vsyncend, vblankend, vtotal;
/* Unlock the DC registers */ /* Unlock the DC registers */
writel(DC_UNLOCK_CODE, par->dc_regs + DC_UNLOCK); write_dc(par, DC_UNLOCK, DC_UNLOCK_CODE);
lx_graphics_disable(info); lx_graphics_disable(info);
@@ -391,22 +384,22 @@ void lx_set_mode(struct fb_info *info)
/* Clear the various buffers */ /* Clear the various buffers */
/* FIXME: Adjust for panning here */ /* FIXME: Adjust for panning here */
writel(0, par->dc_regs + DC_FB_START); write_dc(par, DC_FB_START, 0);
writel(0, par->dc_regs + DC_CB_START); write_dc(par, DC_CB_START, 0);
writel(0, par->dc_regs + DC_CURSOR_START); write_dc(par, DC_CURSOR_START, 0);
/* FIXME: Add support for interlacing */ /* FIXME: Add support for interlacing */
/* FIXME: Add support for scaling */ /* FIXME: Add support for scaling */
val = readl(par->dc_regs + DC_GENLCK_CTRL); val = read_dc(par, DC_GENLCK_CTRL);
val &= ~(DC_GC_ALPHA_FLICK_ENABLE | val &= ~(DC_GC_ALPHA_FLICK_ENABLE |
DC_GC_FLICKER_FILTER_ENABLE | DC_GC_FLICKER_FILTER_MASK); DC_GC_FLICKER_FILTER_ENABLE | DC_GC_FLICKER_FILTER_MASK);
/* Default scaling params */ /* Default scaling params */
writel((0x4000 << 16) | 0x4000, par->dc_regs + DC_GFX_SCALE); write_dc(par, DC_GFX_SCALE, (0x4000 << 16) | 0x4000);
writel(0, par->dc_regs + DC_IRQ_FILT_CTL); write_dc(par, DC_IRQ_FILT_CTL, 0);
writel(val, par->dc_regs + DC_GENLCK_CTRL); write_dc(par, DC_GENLCK_CTRL, val);
/* FIXME: Support compression */ /* FIXME: Support compression */
@@ -422,15 +415,15 @@ void lx_set_mode(struct fb_info *info)
max = info->fix.line_length * info->var.yres; max = info->fix.line_length * info->var.yres;
max = (max + 0x3FF) & 0xFFFFFC00; max = (max + 0x3FF) & 0xFFFFFC00;
writel(max | DC_DV_TOP_ENABLE, par->dc_regs + DC_DV_TOP); write_dc(par, DC_DV_TOP, max | DC_DV_TOP_ENABLE);
val = readl(par->dc_regs + DC_DV_CTL) & ~DC_DV_LINE_SIZE_MASK; val = read_dc(par, DC_DV_CTL) & ~DC_DV_LINE_SIZE_MASK;
writel(val | dv, par->dc_regs + DC_DV_CTL); write_dc(par, DC_DV_CTL, val | dv);
size = info->var.xres * (info->var.bits_per_pixel >> 3); size = info->var.xres * (info->var.bits_per_pixel >> 3);
writel(info->fix.line_length >> 3, par->dc_regs + DC_GRAPHICS_PITCH); write_dc(par, DC_GRAPHICS_PITCH, info->fix.line_length >> 3);
writel((size + 7) >> 3, par->dc_regs + DC_LINE_SIZE); write_dc(par, DC_LINE_SIZE, (size + 7) >> 3);
/* Set default watermark values */ /* Set default watermark values */
@@ -487,35 +480,31 @@ void lx_set_mode(struct fb_info *info)
vblankend = vsyncend + info->var.upper_margin; vblankend = vsyncend + info->var.upper_margin;
vtotal = vblankend; vtotal = vblankend;
writel((hactive - 1) | ((htotal - 1) << 16), write_dc(par, DC_H_ACTIVE_TIMING, (hactive - 1) | ((htotal - 1) << 16));
par->dc_regs + DC_H_ACTIVE_TIMING); write_dc(par, DC_H_BLANK_TIMING,
writel((hblankstart - 1) | ((hblankend - 1) << 16), (hblankstart - 1) | ((hblankend - 1) << 16));
par->dc_regs + DC_H_BLANK_TIMING); write_dc(par, DC_H_SYNC_TIMING,
writel((hsyncstart - 1) | ((hsyncend - 1) << 16), (hsyncstart - 1) | ((hsyncend - 1) << 16));
par->dc_regs + DC_H_SYNC_TIMING);
writel((vactive - 1) | ((vtotal - 1) << 16), write_dc(par, DC_V_ACTIVE_TIMING, (vactive - 1) | ((vtotal - 1) << 16));
par->dc_regs + DC_V_ACTIVE_TIMING); write_dc(par, DC_V_BLANK_TIMING,
(vblankstart - 1) | ((vblankend - 1) << 16));
write_dc(par, DC_V_SYNC_TIMING,
(vsyncstart - 1) | ((vsyncend - 1) << 16));
writel((vblankstart - 1) | ((vblankend - 1) << 16), write_dc(par, DC_FB_ACTIVE,
par->dc_regs + DC_V_BLANK_TIMING); (info->var.xres - 1) << 16 | (info->var.yres - 1));
writel((vsyncstart - 1) | ((vsyncend - 1) << 16),
par->dc_regs + DC_V_SYNC_TIMING);
writel( (info->var.xres - 1) << 16 | (info->var.yres - 1),
par->dc_regs + DC_FB_ACTIVE);
/* And re-enable the graphics output */ /* And re-enable the graphics output */
lx_graphics_enable(info); lx_graphics_enable(info);
/* Write the two main configuration registers */ /* Write the two main configuration registers */
writel(dcfg, par->dc_regs + DC_DISPLAY_CFG); write_dc(par, DC_DISPLAY_CFG, dcfg);
writel(0, par->dc_regs + DC_ARB_CFG); write_dc(par, DC_ARB_CFG, 0);
writel(gcfg, par->dc_regs + DC_GENERAL_CFG); write_dc(par, DC_GENERAL_CFG, gcfg);
/* Lock the DC registers */ /* Lock the DC registers */
writel(0, par->dc_regs + DC_UNLOCK); write_dc(par, DC_UNLOCK, 0);
} }
void lx_set_palette_reg(struct fb_info *info, unsigned regno, void lx_set_palette_reg(struct fb_info *info, unsigned regno,
@@ -530,8 +519,8 @@ void lx_set_palette_reg(struct fb_info *info, unsigned regno,
val |= (green) & 0x00ff00; val |= (green) & 0x00ff00;
val |= (blue >> 8) & 0x0000ff; val |= (blue >> 8) & 0x0000ff;
writel(regno, par->dc_regs + DC_PAL_ADDRESS); write_dc(par, DC_PAL_ADDRESS, regno);
writel(val, par->dc_regs + DC_PAL_DATA); write_dc(par, DC_PAL_DATA, val);
} }
int lx_blank_display(struct fb_info *info, int blank_mode) int lx_blank_display(struct fb_info *info, int blank_mode)
@@ -561,7 +550,7 @@ int lx_blank_display(struct fb_info *info, int blank_mode)
return -EINVAL; return -EINVAL;
} }
dcfg = readl(par->df_regs + DF_DISPLAY_CFG); dcfg = read_vp(par, DF_DISPLAY_CFG);
dcfg &= ~(DF_DCFG_DAC_BL_EN dcfg &= ~(DF_DCFG_DAC_BL_EN
| DF_DCFG_HSYNC_EN | DF_DCFG_VSYNC_EN); | DF_DCFG_HSYNC_EN | DF_DCFG_VSYNC_EN);
if (!blank) if (!blank)
@@ -570,17 +559,17 @@ int lx_blank_display(struct fb_info *info, int blank_mode)
dcfg |= DF_DCFG_HSYNC_EN; dcfg |= DF_DCFG_HSYNC_EN;
if (vsync) if (vsync)
dcfg |= DF_DCFG_VSYNC_EN; dcfg |= DF_DCFG_VSYNC_EN;
writel(dcfg, par->df_regs + DF_DISPLAY_CFG); write_vp(par, DF_DISPLAY_CFG, dcfg);
/* Power on/off flat panel */ /* Power on/off flat panel */
if (par->output & OUTPUT_PANEL) { if (par->output & OUTPUT_PANEL) {
fp_pm = readl(par->df_regs + DF_FP_PM); fp_pm = read_fp(par, DF_FP_PM);
if (blank_mode == FB_BLANK_POWERDOWN) if (blank_mode == FB_BLANK_POWERDOWN)
fp_pm &= ~DF_FP_PM_P; fp_pm &= ~DF_FP_PM_P;
else else
fp_pm |= DF_FP_PM_P; fp_pm |= DF_FP_PM_P;
writel(fp_pm, par->df_regs + DF_FP_PM); write_fp(par, DF_FP_PM, fp_pm);
} }
return 0; return 0;