Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 13467
b: refs/heads/master
c: 6d83b0b
h: refs/heads/master
i:
  13465: f22fdf8
  13463: c2b40b7
v: v3
  • Loading branch information
Antonino A. Daplas authored and Linus Torvalds committed Nov 9, 2005
1 parent 2c4d6db commit ea5767a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 64c7c8f88559624abdbe12b5da6502e8879f8d28
refs/heads/master: 6d83b0bb8e5efda28ce4a1abc78277f1d03e50e5
10 changes: 6 additions & 4 deletions trunk/drivers/video/savage/savagefb_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -1315,10 +1315,14 @@ static void savagefb_set_fix(struct fb_info *info)
info->fix.line_length = info->var.xres_virtual *
info->var.bits_per_pixel / 8;

if (info->var.bits_per_pixel == 8)
if (info->var.bits_per_pixel == 8) {
info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
else
info->fix.xpanstep = 4;
} else {
info->fix.visual = FB_VISUAL_TRUECOLOR;
info->fix.xpanstep = 2;
}

}

#if defined(CONFIG_FB_SAVAGE_ACCEL)
Expand Down Expand Up @@ -1363,7 +1367,6 @@ static int savagefb_set_par (struct fb_info *info)
par->minClock = 10000;

savagefb_set_par_int (par);
savagefb_update_start (par, var);
fb_set_cmap (&info->cmap, info);
savagefb_set_fix(info);
savagefb_set_clip(info);
Expand Down Expand Up @@ -1873,7 +1876,6 @@ static int __devinit savage_init_fb_info (struct fb_info *info,

info->fix.type = FB_TYPE_PACKED_PIXELS;
info->fix.type_aux = 0;
info->fix.xpanstep = 2;
info->fix.ypanstep = 1;
info->fix.ywrapstep = 0;
info->fix.accel = id->driver_data;
Expand Down

0 comments on commit ea5767a

Please sign in to comment.