From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: git pull] drm for v4.1-rc1 Date: Sun, 7 Jun 2015 02:52:48 +0300 Message-ID: <20150606235248.GZ5176@intel.com> References: <20150605231821.6c740f67@mir> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 4EA456E142 for ; Sat, 6 Jun 2015 16:53:02 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20150605231821.6c740f67@mir> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Stefan Lippers-Hollmann Cc: Ander Conselvan de Oliveira , Nicolas Kalkhof , Daniel Vetter , linux-kernel@vger.kernel.org, DRI mailing list , Jani Nikula , torvalds@linux-foundation.org List-Id: dri-devel@lists.freedesktop.org T24gRnJpLCBKdW4gMDUsIDIwMTUgYXQgMTE6MTg6MjFQTSArMDIwMCwgU3RlZmFuIExpcHBlcnMt SG9sbG1hbm4gd3JvdGU6Cj4gSGkKPiAKPiBPbiAyMDE1LTA0LTIwLCBEYXZlIEFpcmxpZSB3cm90 ZToKPiBbLi4uXQo+ID4gVGhlIGZvbGxvd2luZyBjaGFuZ2VzIHNpbmNlIGNvbW1pdCAwOWQ1MTYw MmNmODRhMTI2NDk0NjcxMWRkNGVhMGRkZGJhYzU5OWExOgo+ID4gCj4gPiAgIE1lcmdlIGJyYW5j aCAndHVyYm9zdGF0JyBvZiBnaXQ6Ly9naXQua2VybmVsLm9yZy9wdWIvc2NtL2xpbnV4L2tlcm5l bC9naXQvbGVuYi9saW51eCAoMjAxNS0wNC0xOSAxNDozMTo0MSAtMDcwMCkKPiA+IAo+ID4gYXJl IGF2YWlsYWJsZSBpbiB0aGUgZ2l0IHJlcG9zaXRvcnkgYXQ6Cj4gPiAKPiA+ICAgZ2l0Oi8vcGVv cGxlLmZyZWVkZXNrdG9wLm9yZy9+YWlybGllZC9saW51eCBkcm0tbmV4dC1tZXJnZWQKPiA+IAo+ ID4gZm9yIHlvdSB0byBmZXRjaCBjaGFuZ2VzIHVwIHRvIDJjMzNjZTAwOWNhMjM4OWRiZjA1MzVk MDY3MjIxNGQwOTczOGUzNWU6Cj4gPiAKPiA+ICAgTWVyZ2UgTGludXMgbWFzdGVyIGludG8gZHJt LW5leHQgKDIwMTUtMDQtMjAgMTM6MDU6MjAgKzEwMDApCj4gWy4uLl0KPiA+IEFuZGVyIENvbnNl bHZhbiBkZSBPbGl2ZWlyYSAoMjgpOgo+IFsuLi5dCj4gPiAgICAgICBkcm0vaTkxNTogQWxsb2Nh dGUgY29ubmVjdG9yIHN0YXRlIHRvZ2V0aGVyIHdpdGggdGhlIGNvbm5lY3RvcnMKPiBbLi4uXQo+ IAo+IFRoaXMgY29tbWl0IGludHJvZHVjZXMgYSByZWdyZXNzaW9uIHJlbGF0aXZlIHRvIHY0LjAg b24gYW4gSW50ZWwgCj4gRDk0NUdDTEYyIG1haW5ib2FyZFsxXSAoQXRvbSAzMzApIHdpdGggSW50 ZWwgODI5NDVHL0daIG9uYm9hcmQgZ3JhcGhpY3MgCj4gdXNpbmcgaXRzIChvbmx5LSkgVkdBIGNv bm5lY3RvciBmb3IgbWUuCj4gCj4gdjQuMS1yYzYtNTItZ2ZmMjVlYTg6Cj4gWyAgIDEzLjI2NTY5 OV0gQlVHOiB1bmFibGUgdG8gaGFuZGxlIGtlcm5lbCBOVUxMIHBvaW50ZXIgZGVyZWZlcmVuY2Ug YXQgMDAwMDAwMDAwMDAwMDAxMAo+IFsgICAxMy4yNjU3MjNdIElQOiBbPGZmZmZmZmZmYTA1NTZm MDE+XSBpbnRlbF9tb2Rlc2V0X3VwZGF0ZV9jb25uZWN0b3JfYXRvbWljX3N0YXRlKzB4NjEvMHg5 MCBbaTkxNV0KCkhtbS4gU21lbGxzIGxpa2UgYSBjb25uZWN0b3Igd2l0aCBhIE5VTEwgc3RhdGUg cG9pbnRlciwgYW5kIHRoZSBiYWQKY29tbWl0IHRvdWNoZWQgZXhhY3RseSB0aGUgcGFydCB0aGF0 IHNldHMgaXQgdXAuIEkgY2FuJ3QgaW1tZWRpYXRlbHkKc3BvdCBhbnkgcGxhY2Ugd2hlcmUgd2Un ZCBmb3JnZXQgdG8gc2V0IGl0IHVwIHRob3VnaC4KCkNhbiB5b3UgdHJ5IHdpdGggc29tZXRoaW5n IGxpa2UgdGhpcyBzbyB3ZSdkIGF0IGxlYXN0IGZpbmQgb3V0IHdoaWNoCmNvbm5lY3RvcihzKSBp cy9hcmUgYXQgZmF1bHQgaGVyZT8KCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2Ny dGMuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fY3J0Yy5jCmluZGV4IDMwMDdiNDQuLmMxMGY0MjMg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fY3J0Yy5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9kcm1fY3J0Yy5jCkBAIC05MTgsNiArOTE4LDggQEAgaW50IGRybV9jb25uZWN0b3JfaW5p dChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCiAJY29ubmVjdG9yLT5kZWJ1Z2ZzX2VudHJ5ID0g TlVMTDsKIAorCVdBUk4oMSwgImNvbm5lY3RvciA9ICVwXG4iLCBjb25uZWN0b3IpOworCiBvdXRf cHV0OgogCWlmIChyZXQpCiAJCWRybV9tb2RlX29iamVjdF9wdXQoZGV2LCAmY29ubmVjdG9yLT5i YXNlKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBkMGYzY2JjLi5kZDhj ZWQ3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xMDMzMiw2ICsxMDMz MiwxMCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9tb2Rlc2V0X3VwZGF0ZV9jb25uZWN0b3JfYXRvbWlj X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJc3RydWN0IGludGVsX2Nvbm5lY3RvciAq Y29ubmVjdG9yOwogCiAJZm9yX2VhY2hfaW50ZWxfY29ubmVjdG9yKGRldiwgY29ubmVjdG9yKSB7 CisJCWlmIChXQVJOKCFjb25uZWN0b3ItPmJhc2Uuc3RhdGUsCisJCQkgImNvbm5lY3RvciA9ICVw XG4iLCAmY29ubmVjdG9yLT5iYXNlKSkKKwkJCWNvbnRpbnVlOworCiAJCWlmIChjb25uZWN0b3It PmJhc2UuZW5jb2RlcikgewogCQkJY29ubmVjdG9yLT5iYXNlLnN0YXRlLT5iZXN0X2VuY29kZXIg PQogCQkJCWNvbm5lY3Rvci0+YmFzZS5lbmNvZGVyOwotLSAKMi4zLjYKCi0tIApWaWxsZSBTeXJq w6Rsw6QKSW50ZWwgT1RDCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRl dmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 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 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