Skip to content

L
linux
Commit 3318bb5e authored by Michel von Czettritz's avatar Michel von Czettritz Committed by Greg Kroah-Hartman
Browse files
Options

staging: sm750: 80 characters per line 

This patch inserts line breaks to make lines fit into 80 characters and increase readability.
Signed-off-by: default avatarMichel von Czettritz <michel.von.czettritz@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4bd9503d
Show whitespace changes
Inline Side-by-side
Showing with 72 additions and 38 deletions
drivers/staging/sm750fb/sm750.c
View file @ 3318bb5e
...@@ -60,54 +60,66 @@ static char *g_option = NULL; ...@@ -60,54 +60,66 @@ static char *g_option = NULL;
static const struct fb_videomode lynx750_ext[] = { static const struct fb_videomode lynx750_ext[] = {
/* 1024x600-60 VESA [1.71:1] */ /* 1024x600-60 VESA [1.71:1] */
{NULL, 60, 1024, 600, 20423, 144, 40, 18, 1, 104, 3, {NULL, 60, 1024, 600, 20423, 144, 40, 18, 1, 104, 3,
FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED}, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
FB_VMODE_NONINTERLACED},
/* 1024x600-70 VESA */ /* 1024x600-70 VESA */
{NULL, 70, 1024, 600, 17211, 152, 48, 21, 1, 104, 3, {NULL, 70, 1024, 600, 17211, 152, 48, 21, 1, 104, 3,
FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED}, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
FB_VMODE_NONINTERLACED},
/* 1024x600-75 VESA */ /* 1024x600-75 VESA */
{NULL, 75, 1024, 600, 15822, 160, 56, 23, 1, 104, 3, {NULL, 75, 1024, 600, 15822, 160, 56, 23, 1, 104, 3,
FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED}, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
FB_VMODE_NONINTERLACED},
/* 1024x600-85 VESA */ /* 1024x600-85 VESA */
{NULL, 85, 1024, 600, 13730, 168, 56, 26, 1, 112, 3, {NULL, 85, 1024, 600, 13730, 168, 56, 26, 1, 112, 3,
FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED}, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
FB_VMODE_NONINTERLACED},
/* 720x480 */ /* 720x480 */
{NULL, 60, 720, 480, 37427, 88, 16, 13, 1, 72, 3, {NULL, 60, 720, 480, 37427, 88, 16, 13, 1, 72, 3,
FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED}, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
FB_VMODE_NONINTERLACED},
/* 1280x720 [1.78:1] */ /* 1280x720 [1.78:1] */
{NULL, 60, 1280, 720, 13426, 162, 86, 22, 1, 136, 3, {NULL, 60, 1280, 720, 13426, 162, 86, 22, 1, 136, 3,
FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED}, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
FB_VMODE_NONINTERLACED},
/* 1280x768@60 */ /* 1280x768@60 */
{NULL, 60, 1280, 768, 12579, 192, 64, 20, 3, 128, 7, {NULL, 60, 1280, 768, 12579, 192, 64, 20, 3, 128, 7,
FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,FB_VMODE_NONINTERLACED}, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
FB_VMODE_NONINTERLACED},
{NULL, 60, 1360, 768, 11804, 208, 64, 23, 1, 144, 3, {NULL, 60, 1360, 768, 11804, 208, 64, 23, 1, 144, 3,
FB_SYNC_HOR_HIGH_ACT|FB_VMODE_NONINTERLACED}, FB_SYNC_HOR_HIGH_ACT|FB_VMODE_NONINTERLACED},
/* 1360 x 768 [1.77083:1] */ /* 1360 x 768 [1.77083:1] */
{NULL, 60, 1360, 768, 11804, 208, 64, 23, 1, 144, 3, {NULL, 60, 1360, 768, 11804, 208, 64, 23, 1, 144, 3,
FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED}, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
FB_VMODE_NONINTERLACED},
/* 1368 x 768 [1.78:1] */ /* 1368 x 768 [1.78:1] */
{NULL, 60, 1368, 768, 11647, 216, 72, 23, 1, 144, 3, {NULL, 60, 1368, 768, 11647, 216, 72, 23, 1, 144, 3,
FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED}, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
FB_VMODE_NONINTERLACED},
/* 1440 x 900 [16:10] */ /* 1440 x 900 [16:10] */
{NULL, 60, 1440, 900, 9392, 232, 80, 28, 1, 152, 3, {NULL, 60, 1440, 900, 9392, 232, 80, 28, 1, 152, 3,
FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED}, FB_SYNC_VERT_HIGH_ACT,
FB_VMODE_NONINTERLACED},
/* 1440x960 [15:10] */ /* 1440x960 [15:10] */
{NULL, 60, 1440, 960, 8733, 240, 88, 30, 1, 152, 3, {NULL, 60, 1440, 960, 8733, 240, 88, 30, 1, 152, 3,
FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED}, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
FB_VMODE_NONINTERLACED},
/* 1920x1080 [16:9] */ /* 1920x1080 [16:9] */
{NULL, 60, 1920, 1080, 6734, 148, 88, 41, 1, 44, 3, {NULL, 60, 1920, 1080, 6734, 148, 88, 41, 1, 44, 3,
FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED}, FB_SYNC_VERT_HIGH_ACT,
FB_VMODE_NONINTERLACED},
}; };
...@@ -132,12 +144,14 @@ static int lynxfb_ops_cursor(struct fb_info *info, struct fb_cursor *fbcursor) ...@@ -132,12 +144,14 @@ static int lynxfb_ops_cursor(struct fb_info *info, struct fb_cursor *fbcursor)
cursor->disable(cursor); cursor->disable(cursor);
if (fbcursor->set & FB_CUR_SETSIZE) if (fbcursor->set & FB_CUR_SETSIZE)
cursor->setSize(cursor, fbcursor->image.width, fbcursor->image.height); cursor->setSize(cursor,
fbcursor->image.width,
fbcursor->image.height);
if (fbcursor->set & FB_CUR_SETPOS) { if (fbcursor->set & FB_CUR_SETPOS)
cursor->setPos(cursor, fbcursor->image.dx - info->var.xoffset, cursor->setPos(cursor,
fbcursor->image.dx - info->var.xoffset,
fbcursor->image.dy - info->var.yoffset); fbcursor->image.dy - info->var.yoffset);
}
if (fbcursor->set & FB_CUR_SETCMAP) { if (fbcursor->set & FB_CUR_SETCMAP) {
/* get the 16bit color of kernel means */ /* get the 16bit color of kernel means */
...@@ -167,7 +181,8 @@ static int lynxfb_ops_cursor(struct fb_info *info, struct fb_cursor *fbcursor) ...@@ -167,7 +181,8 @@ static int lynxfb_ops_cursor(struct fb_info *info, struct fb_cursor *fbcursor)
return 0; return 0;
} }
static void lynxfb_ops_fillrect(struct fb_info *info, const struct fb_fillrect *region) static void lynxfb_ops_fillrect(struct fb_info *info,
const struct fb_fillrect *region)
{ {
struct lynxfb_par *par; struct lynxfb_par *par;
struct lynx_share *share; struct lynx_share *share;
...@@ -205,7 +220,8 @@ static void lynxfb_ops_fillrect(struct fb_info *info, const struct fb_fillrect * ...@@ -205,7 +220,8 @@ static void lynxfb_ops_fillrect(struct fb_info *info, const struct fb_fillrect *
spin_unlock(&share->slock); spin_unlock(&share->slock);
} }
static void lynxfb_ops_copyarea(struct fb_info *info, const struct fb_copyarea *region) static void lynxfb_ops_copyarea(struct fb_info *info,
const struct fb_copyarea *region)
{ {
struct lynxfb_par *par; struct lynxfb_par *par;
struct lynx_share *share; struct lynx_share *share;
...@@ -235,7 +251,8 @@ static void lynxfb_ops_copyarea(struct fb_info *info, const struct fb_copyarea * ...@@ -235,7 +251,8 @@ static void lynxfb_ops_copyarea(struct fb_info *info, const struct fb_copyarea *
spin_unlock(&share->slock); spin_unlock(&share->slock);
} }
static void lynxfb_ops_imageblit(struct fb_info *info, const struct fb_image *image) static void lynxfb_ops_imageblit(struct fb_info *info,
const struct fb_image *image)
{ {
unsigned int base, pitch, Bpp; unsigned int base, pitch, Bpp;
unsigned int fgcol, bgcol; unsigned int fgcol, bgcol;
...@@ -381,7 +398,8 @@ static int lynxfb_ops_set_par(struct fb_info *info) ...@@ -381,7 +398,8 @@ static int lynxfb_ops_set_par(struct fb_info *info)
return ret; return ret;
} }
static inline unsigned int chan_to_field(unsigned int chan, struct fb_bitfield *bf) static inline unsigned int chan_to_field(unsigned int chan,
struct fb_bitfield *bf)
{ {
chan &= 0xffff; chan &= 0xffff;
chan >>= 16 - bf->length; chan >>= 16 - bf->length;
...@@ -508,7 +526,8 @@ static int lynxfb_resume(struct pci_dev *pdev) ...@@ -508,7 +526,8 @@ static int lynxfb_resume(struct pci_dev *pdev)
} }
#endif #endif
static int lynxfb_ops_check_var(struct fb_var_screeninfo *var, struct fb_info *info) static int lynxfb_ops_check_var(struct fb_var_screeninfo *var,
struct fb_info *info)
{ {
struct lynxfb_par *par; struct lynxfb_par *par;
struct lynxfb_crtc *crtc; struct lynxfb_crtc *crtc;
...@@ -582,7 +601,7 @@ static int lynxfb_ops_check_var(struct fb_var_screeninfo *var, struct fb_info *i ...@@ -582,7 +601,7 @@ static int lynxfb_ops_check_var(struct fb_var_screeninfo *var, struct fb_info *i
var->height = var->width = -1; var->height = var->width = -1;
var->accel_flags = 0;/* FB_ACCELF_TEXT; */ var->accel_flags = 0;/* FB_ACCELF_TEXT; */
/* check if current fb's video memory big enought to hold the onscreen */ /* check if current fb's video memory big enought to hold the onscreen*/
request = var->xres_virtual * (var->bits_per_pixel >> 3); request = var->xres_virtual * (var->bits_per_pixel >> 3);
/* defaulty crtc->channel go with par->index */ /* defaulty crtc->channel go with par->index */
...@@ -623,7 +642,8 @@ static int lynxfb_ops_setcolreg(unsigned regno, unsigned red, ...@@ -623,7 +642,8 @@ static int lynxfb_ops_setcolreg(unsigned regno, unsigned red,
if (info->var.grayscale) if (info->var.grayscale)
red = green = blue = (red * 77 + green * 151 + blue * 28) >> 8; red = green = blue = (red * 77 + green * 151 + blue * 28) >> 8;
if (var->bits_per_pixel == 8 && info->fix.visual == FB_VISUAL_PSEUDOCOLOR) { if (var->bits_per_pixel == 8 &&
info->fix.visual == FB_VISUAL_PSEUDOCOLOR) {
red >>= 8; red >>= 8;
green >>= 8; green >>= 8;
blue >>= 8; blue >>= 8;
...@@ -865,7 +885,9 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index) ...@@ -865,7 +885,9 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index)
} else if (ret == 4) { } else if (ret == 4) {
pr_warn("fall back to any valid mode\n"); pr_warn("fall back to any valid mode\n");
} else { } else {
pr_warn("ret = %d,fb_find_mode failed,with %s\n", ret, mdb_desc[i]); pr_warn("ret = %d,fb_find_mode failed,with %s\n",
ret,
mdb_desc[i]);
} }
} }
...@@ -879,8 +901,14 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index) ...@@ -879,8 +901,14 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index)
xoffset=%d\n\ xoffset=%d\n\
yoffset=%d\n\ yoffset=%d\n\
bits_per_pixel=%d\n \ bits_per_pixel=%d\n \
...\n", var->xres, var->yres, var->xres_virtual, var->yres_virtual, ...\n",
var->xoffset, var->yoffset, var->bits_per_pixel); var->xres,
var->yres,
var->xres_virtual,
var->yres_virtual,
var->xoffset,
var->yoffset,
var->bits_per_pixel);
/* set par */ /* set par */
par->info = info; par->info = info;
...@@ -1026,7 +1054,9 @@ static void sm750fb_setup(struct lynx_share *share, char *src) ...@@ -1026,7 +1054,9 @@ static void sm750fb_setup(struct lynx_share *share, char *src)
} }
} }
#ifdef CAP_EXPANSION #ifdef CAP_EXPANSION
if (getExpRes(exp_res, &spec_share->state.xLCD, &spec_share->state.yLCD)) { if (getExpRes(exp_res,
&spec_share->state.xLCD,
&spec_share->state.yLCD)) {
/* seems exp_res is not valid */ /* seems exp_res is not valid */
spec_share->state.xLCD = spec_share->state.yLCD = 0; spec_share->state.xLCD = spec_share->state.yLCD = 0;
} }
...@@ -1100,8 +1130,8 @@ static int lynxfb_pci_probe(struct pci_dev *pdev, ...@@ -1100,8 +1130,8 @@ static int lynxfb_pci_probe(struct pci_dev *pdev,
if (!share->accel_off) { if (!share->accel_off) {
/* hook deInit and 2d routines, notes that below hw_xxx /* hook deInit and 2d routines, notes that below hw_xxx
* routine can work on most of lynx chips * routine can work on most of lynx chips
* if some chip need specific function,please hook it in smXXX_set_drv * if some chip need specific function,
* routine */ * please hook it in smXXX_set_drv routine */
share->accel.de_init = hw_de_init; share->accel.de_init = hw_de_init;
share->accel.de_fillrect = hw_fillrect; share->accel.de_fillrect = hw_fillrect;
share->accel.de_copyarea = hw_copyarea; share->accel.de_copyarea = hw_copyarea;
...@@ -1177,7 +1207,9 @@ static int lynxfb_pci_probe(struct pci_dev *pdev, ...@@ -1177,7 +1207,9 @@ static int lynxfb_pci_probe(struct pci_dev *pdev,
pr_info("Ready to register framebuffer #%d.\n", fbidx); pr_info("Ready to register framebuffer #%d.\n", fbidx);
errno = register_framebuffer(info[fbidx]); errno = register_framebuffer(info[fbidx]);
if (errno < 0) { if (errno < 0) {
pr_err("Failed to register fb_info #%d. err %d\n", fbidx, errno); pr_err("Failed to register fb_info #%d. err %d\n",
fbidx,
errno);
if (fbidx == 0) if (fbidx == 0)
goto err_register0; goto err_register0;
else else
...@@ -1235,7 +1267,9 @@ static void __exit lynxfb_pci_remove(struct pci_dev *pdev) ...@@ -1235,7 +1267,9 @@ static void __exit lynxfb_pci_remove(struct pci_dev *pdev)
} }
#ifdef CONFIG_MTRR #ifdef CONFIG_MTRR
if (share->mtrr.vram_added) if (share->mtrr.vram_added)
mtrr_del(share->mtrr.vram, share->vidmem_start, share->vidmem_size); mtrr_del(share->mtrr.vram,
share->vidmem_start,
share->vidmem_size);
#endif #endif
iounmap(share->pvReg); iounmap(share->pvReg);
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7