From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [git pull] drm tree for 4.2 Date: Mon, 29 Jun 2015 17:50:09 +0300 Message-ID: <87381ay3fi.fsf@intel.com> References: <1435581800.3453.27.camel@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1435581800.3453.27.camel@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Ander Conselvan De Oliveira , Linus Torvalds Cc: Dave Airlie , Daniel Vetter , intel-gfx , Linux Kernel Mailing List , DRI mailing list List-Id: dri-devel@lists.freedesktop.org T24gTW9uLCAyOSBKdW4gMjAxNSwgQW5kZXIgQ29uc2VsdmFuIERlIE9saXZlaXJhIDxjb25zZWx2 YW4yQGdtYWlsLmNvbT4gd3JvdGU6Cj4gT24gRnJpLCAyMDE1LTA2LTI2IGF0IDE0OjQzIC0wNzAw LCBMaW51cyBUb3J2YWxkcyB3cm90ZToKPj4gT24gVGh1LCBKdW4gMjUsIDIwMTUgYXQgNjowMCBQ TSwgRGF2ZSBBaXJsaWUgPGFpcmxpZWRAbGludXguaWU+IHdyb3RlOgo+PiA+Cj4+ID4gVGhpcyBp cyB0aGUgbWFpbiBkcm0gcHVsbCByZXF1ZXN0IGZvciB2NC4yLgo+PiAKPj4gSXQgc2VlbXMgdG8g d29yayBvayBmb3IgbWUsIGJ1dCBpdCBjYXVzZXMgcXVpdGUgYSBmZXcgbmV3IHdhcm5pbmdzIG9u Cj4+IG15IFNvbnkgVkFJTyBQcm8gbGFwdG9wLiBJdCdzIChvbmNlIG1vcmUpIGEgcmVndWxhciBp NS00MjAwVSBDUFUgKGFrYQo+PiBIYXN3ZWxsLCBha2EgNHRoIGdlbiBJbnRlbCBDb3JlIGk1KQo+ PiAKPj4gTW9zdCBvZiB0aGVtIGFyZSBpbiBjaGVja19jcnRjX3N0YXRlKCksIGFuZCBJIGN1cnJl bnRseSBoYXZlIDE4IG9mCj4+IHRoZXNlIGluIG15IGxvZzoKPj4gCj4+ICAgW2RybTpjaGVja19j cnRjX3N0YXRlIFtpOTE1XV0gKkVSUk9SKiBtaXNtYXRjaCBpbgo+PiBkcGxsX2h3X3N0YXRlLndy cGxsIChleHBlY3RlZCAweDkwMjgwMjAyLCBmb3VuZCAweDAwMDAwMDAwKQo+PiAgIFdBUk5JTkc6 IENQVTogMCBQSUQ6IDExNSBhdAo+PiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmM6MTIzMTkKPj4gY2hlY2tfY3J0Y19zdGF0ZSsweDhiZS8weGY2MCBbaTkxNV0oKQo+PiAgIHBp cGUgc3RhdGUgZG9lc24ndCBtYXRjaCEKPj4gCj4+IGJ1dCB0aGVyZSdzIGEgZmV3IG90aGVycyB0 b286Cj4+IAo+PiAgIFdBUk5JTkc6IENQVTogMyBQSUQ6IDE4NzEgYXQKPj4gZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jOjEzNjIgaHN3X2Rpc2FibGVfaXBzKzB4MzQvMHgxNjAK Pj4gW2k5MTVdKCkKPj4gICBwbGFuZSBBIGFzc2VydGlvbiBmYWlsdXJlIChleHBlY3RlZCBvbiwg Y3VycmVudCBvZmYpCj4+IAo+PiAgIFdBUk5JTkc6IENQVTogMyBQSUQ6IDE4NzEgYXQgZHJpdmVy cy9ncHUvZHJtL2RybV9pcnEuYzoxMTYyCj4+IGRybV93YWl0X29uZV92YmxhbmsrMHgxNDgvMHgx YTAgW2RybV0oKQo+PiAgIHZibGFuayBub3QgYXZhaWxhYmxlIG9uIGNydGMgMCwgcmV0PS0yMgo+ PiAKPj4gYW5kIHRoZSBiYWNrdHJhY2VzIGFyZW4ndCBhbGwgdGhhdCBpbnRlcmVzdGluZywgYnV0 IEknbSBhdHRhY2hpbmcgdGhlCj4+IGNsZWFuZWQtdXAgZG1lc2csIGR1cGxpY2F0ZSBjYWxsY2hh aW5zIGFuZCBhbGwuCj4KPiBQbGVhc2UgcHJvdmlkZSBhIGZ1bGwgZG1lc2cgd2l0aCBkcm0uZGVi dWc9MHgxZiBpbiB0aGUga2VybmVsIGNvbW1hbmQKPiBsaW5lLgoKQW5kZXIsIEkgdGhpbmsgSSB3 YXMgYWJsZSB0byByZXByb2R1Y2UgdGhpcyBvbiB0aGUgQkRXIE5VQyBoZXJlLiBCaXNlY3QKcG9p bnRzIGF0Li4uCgpjb21taXQgZGQzY2Q3NGFjZjEyNzIzMDQ1YTY0ZjFmMmM2Mjk4YWM3YjM0YTVk NQpBdXRob3I6IEFuZGVyIENvbnNlbHZhbiBkZSBPbGl2ZWlyYSA8YW5kZXIuY29uc2VsdmFuLmRl Lm9saXZlaXJhQGludGVsLmNvbT4KRGF0ZTogICBGcmkgTWF5IDE1IDEzOjM0OjI5IDIwMTUgKzAz MDAKCiAgICBkcm0vaTkxNTogRG9uJ3Qgb3ZlcndyaXRlIChlKURQIFBMTCBzZWxlY3Rpb24gb24g U0tMCiAgICAKICAgIEluIHRoZSBmb2xsb3dpbmcgY29tbWl0LCB0aGUgcGxhY2Ugd2hlcmUgdGhl IGNvbnRlbnRzIG9mIGRwbGxfaHdfc3RhdGUKICAgIGluIGNydGNfc3RhdGUgd2hlcmUgemVyb2Vk IHdhcyBjaGFuZ2VkLiBQcmlvciB0byB0aGF0IGNvbW1pdCwgaXQKICAgIGhhcHBlbmVkIHdoZW4g dGhlIG5ldyBzdGF0ZSB3YXMgYWxsb2NhdGVkLCBidXQgbm93IHRoYXQgaGFwcGVucyBqdXN0CiAg ICBiZWZvcmUgdGhlIGNhbGwgdGhlIC5jcnRjX2NvbXB1dGVfY2xvY2soKSBob29rLiBUaGUgRFAg Y29kZSBmb3IgU0tMLAogICAgaG93ZXZlciwgc2V0cyB1cCB0aGUgKHByaXZhdGUpIFBMTCBpbiB0 aGUgZW5jb2RlciBjb21wdXRlIGNvbmZpZwogICAgZnVuY3Rpb24gdGhhdCBoYXMgYWxyZWFkeSBy dW4gYnkgdGhlIHRpbWUgdGhhdCBtZW1zZXQoKSBpcyByZWFjaGVkLAogICAgY2F1c2luZyB0aGUg cHJldmlvdXMgdmFsdWUgdG8gYmUgbG9zdC4KICAgIAogICAgVGhpcyBwYXRjaCBmaXhlcyB0aGUg aXNzdWUgYnkgbW92aW5nIHRoZSBtZW1zZXQoKSBkb3duIHRoZSBjYWxsIGNoYWluLAogICAgc28g dGhhdCBpdCBpcyBvbmx5IGNhbGxlZCBpZiB0aGUgdmFsdWVzIGluIGRwbGxfaHdfc3RhdGUgYXJl IGdvaW5nIHRvIGJlCiAgICB1cGRhdGVkLgogICAgCiAgICBjb21taXQgNDk3OGNjOTNkOWFjMjQw YjQzNWNlNjA0MzFhZWYyNDIzOWI0YzI3MAogICAgQXV0aG9yOiBBbmRlciBDb25zZWx2YW4gZGUg T2xpdmVpcmEgPGFuZGVyLmNvbnNlbHZhbi5kZS5vbGl2ZWlyYUBpbnRlbC5jb20+CiAgICBEYXRl OiAgIFR1ZSBBcHIgMjEgMTc6MTM6MjEgMjAxNSArMDMwMAogICAgCiAgICAgICAgZHJtL2k5MTU6 IFByZXNlcnZlIHNoYXJlZCBEUExMIGluZm9ybWF0aW9uIGluIG5ldyBwaXBlX2NvbmZpZwogICAg CiAgICBCdWd6aWxsYTogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTA0NjIKICAgIFNpZ25lZC1vZmYtYnk6IEFuZGVyIENvbnNlbHZhbiBkZSBPbGl2ZWlyYSA8 YW5kZXIuY29uc2VsdmFuLmRlLm9saXZlaXJhQGludGVsLmNvbT4KICAgIFJldmlld2VkLWJ5OiBE YW1pZW4gTGVzcGlhdSA8ZGFtaWVuLmxlc3BpYXVAaW50ZWwuY29tPgogICAgUmVwb3J0ZWQtYW5k LXRlc3RlZC1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGxpbnV4LmludGVsLmNv bT4KICAgIFNpZ25lZC1vZmYtYnk6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwu Y2g+CgpUaGlzIGRvZXNuJ3QgcmV2ZXJ0IGNsZWFubHkgb24gTGludXMnIG1hc3RlciwgYW5kIEkg ZGlkbid0IGhhdmUgdGhlIHRpbWUKdG8gbG9vayBkZWVwZXIgcmlnaHQgbm93LiBIb3dldmVyIEkg Y29uZmlybWVkIHRoYXQgdGhpcyBjb21taXQgZmFpbHMgYW5kCml0cyBwYXJlbnQgZG9lc24ndC4K CgpCUiwKSmFuaS4KCgotLSAKSmFuaSBOaWt1bGEsIEludGVsIE9wZW4gU291cmNlIFRlY2hub2xv Z3kgQ2VudGVyCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752993AbbF2Orp (ORCPT ); Mon, 29 Jun 2015 10:47:45 -0400 Received: from mga14.intel.com ([192.55.52.115]:22003 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752154AbbF2Orj (ORCPT ); Mon, 29 Jun 2015 10:47:39 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,699,1427785200"; d="scan'208";a="752543481" From: Jani Nikula To: Ander Conselvan De Oliveira , Linus Torvalds Cc: Dave Airlie , Daniel Vetter , intel-gfx , Linux Kernel Mailing List , DRI mailing list Subject: Re: [git pull] drm tree for 4.2 In-Reply-To: <1435581800.3453.27.camel@gmail.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <1435581800.3453.27.camel@gmail.com> User-Agent: Notmuch/0.19+112~g77230b0 (http://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) Date: Mon, 29 Jun 2015 17:50:09 +0300 Message-ID: <87381ay3fi.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 29 Jun 2015, Ander Conselvan De Oliveira wrote: > On Fri, 2015-06-26 at 14:43 -0700, Linus Torvalds wrote: >> On Thu, Jun 25, 2015 at 6:00 PM, Dave Airlie wrote: >> > >> > This is the main drm pull request for v4.2. >> >> It seems to work ok for me, but it causes quite a few new warnings on >> my Sony VAIO Pro laptop. It's (once more) a regular i5-4200U CPU (aka >> Haswell, aka 4th gen Intel Core i5) >> >> Most of them are in check_crtc_state(), and I currently have 18 of >> these in my log: >> >> [drm:check_crtc_state [i915]] *ERROR* mismatch in >> dpll_hw_state.wrpll (expected 0x90280202, found 0x00000000) >> WARNING: CPU: 0 PID: 115 at >> drivers/gpu/drm/i915/intel_display.c:12319 >> check_crtc_state+0x8be/0xf60 [i915]() >> pipe state doesn't match! >> >> but there's a few others too: >> >> WARNING: CPU: 3 PID: 1871 at >> drivers/gpu/drm/i915/intel_display.c:1362 hsw_disable_ips+0x34/0x160 >> [i915]() >> plane A assertion failure (expected on, current off) >> >> WARNING: CPU: 3 PID: 1871 at drivers/gpu/drm/drm_irq.c:1162 >> drm_wait_one_vblank+0x148/0x1a0 [drm]() >> vblank not available on crtc 0, ret=-22 >> >> and the backtraces aren't all that interesting, but I'm attaching the >> cleaned-up dmesg, duplicate callchains and all. > > Please provide a full dmesg with drm.debug=0x1f in the kernel command > line. Ander, I think I was able to reproduce this on the BDW NUC here. Bisect points at... commit dd3cd74acf12723045a64f1f2c6298ac7b34a5d5 Author: Ander Conselvan de Oliveira Date: Fri May 15 13:34:29 2015 +0300 drm/i915: Don't overwrite (e)DP PLL selection on SKL In the following commit, the place where the contents of dpll_hw_state in crtc_state where zeroed was changed. Prior to that commit, it happened when the new state was allocated, but now that happens just before the call the .crtc_compute_clock() hook. The DP code for SKL, however, sets up the (private) PLL in the encoder compute config function that has already run by the time that memset() is reached, causing the previous value to be lost. This patch fixes the issue by moving the memset() down the call chain, so that it is only called if the values in dpll_hw_state are going to be updated. commit 4978cc93d9ac240b435ce60431aef24239b4c270 Author: Ander Conselvan de Oliveira Date: Tue Apr 21 17:13:21 2015 +0300 drm/i915: Preserve shared DPLL information in new pipe_config Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90462 Signed-off-by: Ander Conselvan de Oliveira Reviewed-by: Damien Lespiau Reported-and-tested-by: Tvrtko Ursulin Signed-off-by: Daniel Vetter This doesn't revert cleanly on Linus' master, and I didn't have the time to look deeper right now. However I confirmed that this commit fails and its parent doesn't. BR, Jani. -- Jani Nikula, Intel Open Source Technology Center