Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 38044
b: refs/heads/master
c: 535a09a
h: refs/heads/master
v: v3
  • Loading branch information
Guido Guenther authored and Linus Torvalds committed Oct 3, 2006
1 parent e282ba9 commit ac9c1b4
Show file tree
Hide file tree
Showing 2 changed files with 5 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: 6bf1d73d7a512cfa791b7415742f71c80f6b8d7e
refs/heads/master: 535a09ad59286b7675ffbf8b51d8ecb001c44386
8 changes: 4 additions & 4 deletions trunk/drivers/video/riva/fbdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -393,8 +393,8 @@ static void riva_bl_init(struct riva_par *par)
mutex_lock(&info->bl_mutex);
info->bl_dev = bd;
fb_bl_default_curve(info, 0,
0x158 * FB_BACKLIGHT_MAX / MAX_LEVEL,
0x534 * FB_BACKLIGHT_MAX / MAX_LEVEL);
MIN_LEVEL * FB_BACKLIGHT_MAX / MAX_LEVEL,
FB_BACKLIGHT_MAX);
mutex_unlock(&info->bl_mutex);

down(&bd->sem);
Expand Down Expand Up @@ -784,7 +784,7 @@ static void riva_load_video_mode(struct fb_info *info)

NVTRACE_ENTER();
/* time to calculate */
rivafb_blank(1, info);
rivafb_blank(FB_BLANK_NORMAL, info);

bpp = info->var.bits_per_pixel;
if (bpp == 16 && info->var.green.length == 5)
Expand Down Expand Up @@ -917,7 +917,7 @@ static void riva_load_video_mode(struct fb_info *info)
par->current_state = newmode;
riva_load_state(par, &par->current_state);
par->riva.LockUnlock(&par->riva, 0); /* important for HW cursor */
rivafb_blank(0, info);
rivafb_blank(FB_BLANK_UNBLANK, info);
NVTRACE_LEAVE();
}

Expand Down

0 comments on commit ac9c1b4

Please sign in to comment.