Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754585Ab0AIAVS (ORCPT ); Fri, 8 Jan 2010 19:21:18 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754520Ab0AIAVS (ORCPT ); Fri, 8 Jan 2010 19:21:18 -0500 Received: from outbound-mail-150.bluehost.com ([67.222.38.40]:36530 "HELO outbound-mail-150.bluehost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1754382Ab0AIAVR (ORCPT ); Fri, 8 Jan 2010 19:21:17 -0500 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=virtuousgeek.org; h=Received:Date:From:Cc:Subject:Message-ID:In-Reply-To:References:X-Mailer:Mime-Version:Content-Type:Content-Transfer-Encoding:X-Identified-User; b=WvwSohnGiD0etiMfsrNEeIb56UhzqMDNxOFnVmlXJ256S26ncFX/PDu8VQBgw2WzJcB7cPIoDHSMYRa5uawspTTpHGG/lRd3PYnop7FtzbJTz2s3Jkqgdi3m5ZZIDvVL; Date: Fri, 8 Jan 2010 16:21:19 -0800 From: Jesse Barnes Cc: Linus Torvalds , "Rafael J. Wysocki" , Eric Anholt , Zhenyu Wang , LKML , pm list , dri-devel@lists.sourceforge.net Subject: Re: [PATCH] DRM / i915: Fix resume regression on MSI Wind U100 w/o KMS Message-ID: <20100108162119.55538b7e@jbarnes-piketon> In-Reply-To: <20100108160659.65ac0605@jbarnes-piketon> References: <201001090045.33784.rjw@sisk.pl> <20100108160659.65ac0605@jbarnes-piketon> X-Mailer: Claws Mail 3.7.2 (GTK+ 2.18.3; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Identified-User: {10642:box514.bluehost.com:virtuous:virtuousgeek.org} {sentby:smtp auth 75.111.28.251 authed with jbarnes@virtuousgeek.org} To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2490 Lines: 59 On Fri, 8 Jan 2010 16:06:59 -0800 Jesse Barnes wrote: > On Fri, 8 Jan 2010 16:01:46 -0800 (PST) > Linus Torvalds wrote: > > > > > > > On Sat, 9 Jan 2010, Rafael J. Wysocki wrote: > > > > > > From: Rafael J. Wysocki > > > > > > Commit cbda12d77ea590082edb6d30bd342a67ebc459e0 (drm/i915: > > > implement new pm ops for i915), among other things, removed > > > the .suspend and .resume pointers from the struct drm_driver > > > object in i915_drv.c, which broke resume without KMS on my MSI > > > Wind U100. > > > > > > Fix this by reverting that part of commit cbda12d77ea59. > > > > Hmm. I get the feeling that perhaps the of the drm_driver callbacks > > was very muchintentional, and that the code presumably wants to be > > called purely through the PCI layer, and not through the "drm class" > > logic at all? > > > > Your patch seems like it would always execute the silly class > > suspend even though we explicitly don't want to. And a much nicer > > fix would seem to register the thing properly as a PCI driver even > > if you don't then use KMS. > > > > So it looks to me like the problem is that drm_init() will register > > the driver as a real PCI driver only if > > > > driver->driver_features & DRIVER_MODESET > > > > and otherwise it does that very odd "stealth mode manual scanning" > > thing which doesn't register it as a proper PCI driver. > > > > So could we instead make that "disable KSM" _just_ disable the mode > > setting part, not disable the "I'm a real driver" part? > > Yeah, but that would be more invasive. In the KMS case the driver > (which is registered as PCI) does a lot of the initialization that the > core takes care of in the non-KMS case, and some of it happens later > at ioctl time. I'm afraid of that code since it seems like whenever > you change something obvious it subtly breaks an old userland. Hm, maybe it's not as bad as I was afraid it was... we already support i915.modeset=0 even on a KMS enabled driver, which should be fairly equivalent. Rafael, if you build i915 with KMS enabled but modeset=0 do you get the right suspend/resume behavior? -- Jesse Barnes, Intel Open Source Technology Center -- 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/