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

nvidiafb: ensure that CRTC registers are accessible

Browse Source 
- Ensure that CRTC registers are accessible by unlocking them on set_par(),
  otherwise i2c reading will fail.

- The function nvidia_vga_protect(), does not protect the VGA registers, but
  turns off the screen.  Rename it to nvidia_screen_off().

Signed-off-by: Antonino Daplas <adaplas@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Antonino A. Daplas
2007-05-08 00:38:23 -07:00
committed by Linus Torvalds
parent 0404384982
commit b9b2696de9
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/video/nvidia/nvidia.c
View File

@@ -200,7 +200,7 @@ static int nvidia_panel_tweak(struct nvidia_par *par,
return tweak; return tweak;
} }
static void nvidia_vga_protect(struct nvidia_par *par, int on) static void nvidia_screen_off(struct nvidia_par *par, int on)
{ {
unsigned char tmp; unsigned char tmp;
@@ -649,7 +649,7 @@ static int nvidiafb_set_par(struct fb_info *info)
NVLockUnlock(par, 0); NVLockUnlock(par, 0);
} }
nvidia_vga_protect(par, 1); nvidia_screen_off(par, 1);
nvidia_write_regs(par, &par->ModeReg); nvidia_write_regs(par, &par->ModeReg);
NVSetStartAddress(par, 0); NVSetStartAddress(par, 0);
@@ -687,7 +687,7 @@ static int nvidiafb_set_par(struct fb_info *info)
par->cursor_reset = 1; par->cursor_reset = 1;
nvidia_vga_protect(par, 0); nvidia_screen_off(par, 0);
#ifdef CONFIG_BOOTX_TEXT #ifdef CONFIG_BOOTX_TEXT
/* Update debug text engine */ /* Update debug text engine */
@@ -696,6 +696,7 @@ static int nvidiafb_set_par(struct fb_info *info)
info->var.bits_per_pixel, info->fix.line_length); info->var.bits_per_pixel, info->fix.line_length);
#endif #endif
NVLockUnlock(par, 0);
NVTRACE_LEAVE(); NVTRACE_LEAVE();
return 0; return 0;
} }