Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932658AbbFFXxN (ORCPT ); Sat, 6 Jun 2015 19:53:13 -0400 Received: from mga02.intel.com ([134.134.136.20]:4812 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753014AbbFFXxE (ORCPT ); Sat, 6 Jun 2015 19:53:04 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,565,1427785200"; d="scan'208";a="742389816" Date: Sun, 7 Jun 2015 02:52:48 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Stefan Lippers-Hollmann Cc: Dave Airlie , Ander Conselvan de Oliveira , Nicolas Kalkhof , Jani Nikula , Daniel Vetter , linux-kernel@vger.kernel.org, DRI mailing list , torvalds@linux-foundation.org Subject: Re: git pull] drm for v4.1-rc1 Message-ID: <20150606235248.GZ5176@intel.com> References: <20150605231821.6c740f67@mir> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20150605231821.6c740f67@mir> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2710 Lines: 76 On Fri, Jun 05, 2015 at 11:18:21PM +0200, Stefan Lippers-Hollmann wrote: > Hi > > On 2015-04-20, Dave Airlie wrote: > [...] > > The following changes since commit 09d51602cf84a1264946711dd4ea0dddbac599a1: > > > > Merge branch 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux (2015-04-19 14:31:41 -0700) > > > > are available in the git repository at: > > > > git://people.freedesktop.org/~airlied/linux drm-next-merged > > > > for you to fetch changes up to 2c33ce009ca2389dbf0535d0672214d09738e35e: > > > > Merge Linus master into drm-next (2015-04-20 13:05:20 +1000) > [...] > > Ander Conselvan de Oliveira (28): > [...] > > drm/i915: Allocate connector state together with the connectors > [...] > > This commit introduces a regression relative to v4.0 on an Intel > D945GCLF2 mainboard[1] (Atom 330) with Intel 82945G/GZ onboard graphics > using its (only-) VGA connector for me. > > v4.1-rc6-52-gff25ea8: > [ 13.265699] BUG: unable to handle kernel NULL pointer dereference at 0000000000000010 > [ 13.265723] IP: [] intel_modeset_update_connector_atomic_state+0x61/0x90 [i915] Hmm. Smells like a connector with a NULL state pointer, and the bad commit touched exactly the part that sets it up. I can't immediately spot any place where we'd forget to set it up though. Can you try with something like this so we'd at least find out which connector(s) is/are at fault here? diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 3007b44..c10f423 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -918,6 +918,8 @@ int drm_connector_init(struct drm_device *dev, connector->debugfs_entry = NULL; + WARN(1, "connector = %p\n", connector); + out_put: if (ret) drm_mode_object_put(dev, &connector->base); diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index d0f3cbc..dd8ced7 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -10332,6 +10332,10 @@ static void intel_modeset_update_connector_atomic_state(struct drm_device *dev) struct intel_connector *connector; for_each_intel_connector(dev, connector) { + if (WARN(!connector->base.state, + "connector = %p\n", &connector->base)) + continue; + if (connector->base.encoder) { connector->base.state->best_encoder = connector->base.encoder; -- 2.3.6 -- Ville Syrj?l? Intel OTC -- 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/