2009-07-07 19:57:17

by Krzysztof Helt

[permalink] [raw]
Subject: matroxfb: fix regression with uninitalized fb_info->mm_lock mutex

From: Krzysztof Helt <[email protected]>

Remove redundant call to the matroxfb_update_fix() before matrox frambuffer
is registered.

This fixes a problem with uninitialized the fb_info->mm_lock mutex introduced
by the commit 537a1bf059f " fbdev: add mutex for fb_mmap locking"

Signed-off-by: Krzysztof Helt <[email protected]>

---

This one I have been able to test. It fixed regression with the mm_lock mutex.

It may not fix regression for a second head. I will investigate this issue.

diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
index 76bc51b..721a87d 100644
--- a/drivers/video/matrox/matroxfb_base.c
+++ b/drivers/video/matrox/matroxfb_base.c
@@ -1876,7 +1876,6 @@ static int initMatrox2(WPMINFO struct board* b){
}
matroxfb_init_fix(PMINFO2);
ACCESS_FBINFO(fbcon.screen_base) = vaddr_va(ACCESS_FBINFO(video.vbase));
- matroxfb_update_fix(PMINFO2);
/* Normalize values (namely yres_virtual) */
matroxfb_check_var(&vesafb_defined, &ACCESS_FBINFO(fbcon));
/* And put it into "current" var. Do NOT program hardware yet, or we'll not take over

----------------------------------------------------------------------
Promocja ubezpieczen komunikacyjnych Ergo Hestia. Sprawdz!
http://link.interia.pl/f222f