Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757189AbZGFOlS (ORCPT ); Mon, 6 Jul 2009 10:41:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752428AbZGFOlE (ORCPT ); Mon, 6 Jul 2009 10:41:04 -0400 Received: from smtp239.poczta.interia.pl ([217.74.64.239]:40840 "EHLO smtp239.poczta.interia.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753479AbZGFOlD (ORCPT ); Mon, 6 Jul 2009 10:41:03 -0400 Date: Mon, 6 Jul 2009 16:50:36 +0200 From: Krzysztof Helt To: wuzhangjin@gmail.com Cc: Paul Mundt , Linus Torvalds , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mips@linux-mips.org, Krzysztof Helt , Peter Zijlstra , "Rafael J. Wysocki" , Andrew Morton , Ralf Baechle , ???? , zhangfx Subject: Re: [BUG] drivers/video/sis: deadlock introduced by "fbdev: add mutex for fb_mmap locking" Message-Id: <20090706165036.d21bfaaa.krzysztof.h1@poczta.fm> In-Reply-To: <1246842791.29532.2.camel@falcon> References: <1246785112.14240.34.camel@falcon> <20090705145203.GA8326@linux-sh.org> <20090705150134.GB8326@linux-sh.org> <20090705152557.GA10588@linux-sh.org> <20090705181808.93be24a9.krzysztof.h1@poczta.fm> <1246842791.29532.2.camel@falcon> X-Mailer: Sylpheed 2.4.3 (GTK+ 2.11.0; i686-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-EMID: 3ae2b138 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1767 Lines: 57 On Mon, 06 Jul 2009 09:13:11 +0800 Wu Zhangjin wrote: > Hi, > > > This patch also works for me, thanks! > > Regards, > Wu Zhangjin > Who should I send this patch to be included as a 2.6.31 regression fix? Regards, Krzysztof > > > > From: Krzysztof Helt > > > > Remove redundant call to the sisfb_get_fix() before sis frambuffer is registered. > > > > This fixes a problem with uninitialized the fb_info->mm_lock mutex. > > > > Signed-off-by: Krzysztof Helt > > --- > > > > diff -urp linux-ref/drivers/video/sis/sis_main.c linux-next/drivers/video/sis/sis_main.c > > --- linux-ref/drivers/video/sis/sis_main.c 2009-07-01 18:07:05.000000000 +0200 > > +++ linux-next/drivers/video/sis/sis_main.c 2009-07-05 17:20:33.000000000 +0200 > > @@ -6367,7 +6367,6 @@ error_3: vfree(ivideo->bios_abase); > > sis_fb_info->fix = ivideo->sisfb_fix; > > sis_fb_info->screen_base = ivideo->video_vbase + ivideo->video_offset; > > sis_fb_info->fbops = &sisfb_ops; > > - sisfb_get_fix(&sis_fb_info->fix, -1, sis_fb_info); > > sis_fb_info->pseudo_palette = ivideo->pseudo_palette; > > > > fb_alloc_cmap(&sis_fb_info->cmap, 256 , 0); > > > > > > > > ---------------------------------------------------------------------- > > Najlepsze OC i AC tylko w Ergo Hestia > > http://link.interia.pl/f222 > > > > ---------------------------------------------------------------------- Najlepsze OC i AC tylko w Ergo Hestia http://link.interia.pl/f222 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/