The patch titled
rivafb/nvidiafb: race between register_framebuffer and *_bl_init
has been added to the -mm tree. Its filename is
rivafb-nvidiafb-race-between-register_framebuffer-and-_bl_init.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: rivafb/nvidiafb: race between register_framebuffer and *_bl_init
From: Guido Guenther <agx@xxxxxxxxxxx>
Since we now use the generic backlight infrastructure, I think we need to
call rivafb_bl_init before calling register_framebuffer since otherwise
rivafb_bl_init might race with the framebuffer layer already opening the
device and setting up the video mode. In this case we might end up with a
not yet fully intialized backlight (info->bl_dev still NULL) when calling
riva_bl_set_power via rivafb_set_par/rivafb_load_video_mode and the kernel
dies without any further notice during boot.
This fixes booting current git on a PB 6,1. In this case radeonfb/atyfb
would be affected too - I can fix that too but don't have any hardware to
test this on.
Cc: "Antonino A. Daplas" <adaplas@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/video/nvidia/nvidia.c | 5 ++---
drivers/video/riva/fbdev.c | 7 +++----
2 files changed, 5 insertions(+), 7 deletions(-)
diff -puN drivers/video/nvidia/nvidia.c~rivafb-nvidiafb-race-between-register_framebuffer-and-_bl_init drivers/video/nvidia/nvidia.c
--- a/drivers/video/nvidia/nvidia.c~rivafb-nvidiafb-race-between-register_framebuffer-and-_bl_init
+++ a/drivers/video/nvidia/nvidia.c
@@ -1300,20 +1300,19 @@ static int __devinit nvidiafb_probe(stru
nvidia_save_vga(par, &par->SavedReg);
+ pci_set_drvdata(pd, info);
+ nvidia_bl_init(par);
if (register_framebuffer(info) < 0) {
printk(KERN_ERR PFX "error registering nVidia framebuffer\n");
goto err_out_iounmap_fb;
}
- pci_set_drvdata(pd, info);
printk(KERN_INFO PFX
"PCI nVidia %s framebuffer (%dMB @ 0x%lX)\n",
info->fix.id,
par->FbMapSize / (1024 * 1024), info->fix.smem_start);
- nvidia_bl_init(par);
-
NVTRACE_LEAVE();
return 0;
diff -puN drivers/video/riva/fbdev.c~rivafb-nvidiafb-race-between-register_framebuffer-and-_bl_init drivers/video/riva/fbdev.c
--- a/drivers/video/riva/fbdev.c~rivafb-nvidiafb-race-between-register_framebuffer-and-_bl_init
+++ a/drivers/video/riva/fbdev.c
@@ -2132,6 +2132,9 @@ static int __devinit rivafb_probe(struct
fb_destroy_modedb(info->monspecs.modedb);
info->monspecs.modedb = NULL;
+
+ pci_set_drvdata(pd, info);
+ riva_bl_init(info->par);
ret = register_framebuffer(info);
if (ret < 0) {
printk(KERN_ERR PFX
@@ -2139,8 +2142,6 @@ static int __devinit rivafb_probe(struct
goto err_iounmap_screen_base;
}
- pci_set_drvdata(pd, info);
-
printk(KERN_INFO PFX
"PCI nVidia %s framebuffer ver %s (%dMB @ 0x%lX)\n",
info->fix.id,
@@ -2148,8 +2149,6 @@ static int __devinit rivafb_probe(struct
info->fix.smem_len / (1024 * 1024),
info->fix.smem_start);
- riva_bl_init(info->par);
-
NVTRACE_LEAVE();
return 0;
_
Patches currently in -mm which might be from agx@xxxxxxxxxxx are
rivafb-nvidiafb-race-between-register_framebuffer-and-_bl_init.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
