Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 33235
b: refs/heads/master
c: bb39e41
h: refs/heads/master
i:
  33233: e0347a4
  33231: 697604d
v: v3
  • Loading branch information
Rodolfo Giometti authored and Linus Torvalds committed Aug 6, 2006
1 parent 1613510 commit 9fce9f7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 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: fd2d54300369690500fc9b1bac9440d2ee81913a
refs/heads/master: bb39e419740435b7fbb0314e376ba468be7db67a
13 changes: 5 additions & 8 deletions trunk/drivers/video/au1100fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ int au1100fb_setmode(struct au1100fb_device *fbdev)

info->fix.visual = FB_VISUAL_TRUECOLOR;
info->fix.line_length = info->var.xres_virtual << 1; /* depth=16 */
}
}
} else {
/* mono */
info->fix.visual = FB_VISUAL_MONO10;
Expand All @@ -169,16 +169,11 @@ int au1100fb_setmode(struct au1100fb_device *fbdev)

/* Determine BPP mode and format */
fbdev->regs->lcd_control = fbdev->panel->control_base;

fbdev->regs->lcd_intenable = 0;
fbdev->regs->lcd_intstatus = 0;

fbdev->regs->lcd_horztiming = fbdev->panel->horztiming;

fbdev->regs->lcd_verttiming = fbdev->panel->verttiming;

fbdev->regs->lcd_clkcontrol = fbdev->panel->clkcontrol_base;

fbdev->regs->lcd_intenable = 0;
fbdev->regs->lcd_intstatus = 0;
fbdev->regs->lcd_dmaaddr0 = LCD_DMA_SA_N(fbdev->fb_phys);

if (panel_is_dual(fbdev->panel)) {
Expand Down Expand Up @@ -207,6 +202,8 @@ int au1100fb_setmode(struct au1100fb_device *fbdev)

/* Resume controller */
fbdev->regs->lcd_control |= LCD_CONTROL_GO;
mdelay(10);
au1100fb_fb_blank(VESA_NO_BLANKING, info);

return 0;
}
Expand Down

0 comments on commit 9fce9f7

Please sign in to comment.