From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753346Ab1BGIw6 (ORCPT ); Mon, 7 Feb 2011 03:52:58 -0500 Received: from cantor.suse.de ([195.135.220.2]:39303 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753187Ab1BGIw4 (ORCPT ); Mon, 7 Feb 2011 03:52:56 -0500 Date: Mon, 07 Feb 2011 09:52:55 +0100 Message-ID: From: Takashi Iwai To: Jeff Chua Cc: Chris Wilson , Linus Torvalds , "Rafael J. Wysocki" , Len Brown , LKML Subject: Re: Commit 500f7147cf5bafd139056d521536b10c2bc2e154 breaks _resume_ In-Reply-To: References: <849307$bf0dak@azsmga001.ch.intel.com> User-Agent: Wanderlust/2.15.6 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.7 Emacs/23.2 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org At Mon, 7 Feb 2011 16:36:33 +0800, Jeff Chua wrote: > > On Mon, Feb 7, 2011 at 4:25 PM, Takashi Iwai wrote: > > At Mon, 7 Feb 2011 13:02:46 +0800, > > Jeff Chua wrote: > >> > >> On Mon, Feb 7, 2011 at 12:48 PM, Jeff Chua wrote: > >> > On Sun, Feb 6, 2011 at 11:27 PM, Chris Wilson wrote: > >> >> One last step: move contents of intel_crtc_reset() back to > >> >> intel_crtc_init() one by one. > >> >> > >> >> The active flag is my suspicion. I was thinking that we brought up the > >> >> outputs in a similar manner upon resume as upon initial boot. On > >> >> reflection, this is the not case. > >> >> > >> >> However, the first action we take inside modesetting is to disable the > >> >> outputs about to be reconfigured. So setting active should be the right > >> >> course of action so that cleanup any residual state from resume. > >> >> > >> >> So I am intrigued as to which line is the cause, and just where the > >> >> machine becomes unresponsive... > >> > > >> > It's this line causing the problem. > >> > > >> > intel_crtc->active = true; /* force the pipe off on setup_init_config */ > >> > > >> > > >> > When it's called before entering intel_crtc_reset(&intel_crtc->base), > >> > it works, but if called within the function, it doesn't work. Strange. > >> > Not sure whether is passing the correct value to to_intel_crtc(crtc)? > >> > >> I've added printk() below and the function returns a different value > >> of intel_crtc. > >> > >> > >> static void intel_crtc_reset(struct drm_crtc *crtc) > >> { > >>         struct intel_crtc *intel_crtc = to_intel_crtc(crtc); > >>         printk("intel_crtc %p\n", intel_crtc); ===> intel_crtc ffff8802349d1000 > >> > >> } > >> > >> printk("intel_crtc %p\n", intel_crtc); ===> intel_crtc ffff8802349d0000 > >> intel_crtc_reset(&intel_crtc->base); > > > > That's weird.  Since base is the first member, both intel_crtc and crtc > > must be identical. > > In case I'm messing something up, here's my intel_display.c Thanks, that looks good. What about other files? Did you change (especially intel_drv.h) from Linus git tree? I'll also check later to be sure (now I have no machine for testing). thanks, Takashi