From: Daniel Vetter Subject: Re: [PATCH] drm/i915: Fix startup failure in LRC mode after recent init changes Date: Tue, 2 Dec 2014 15:44:34 +0100 Message-ID: <20141202144434.GT32117@phenom.ffwll.local> References: <1417524648-3834-1-git-send-email-thomas.daniel@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com [209.85.212.169]) by gabe.freedesktop.org (Postfix) with ESMTP id E90346E167 for ; Tue, 2 Dec 2014 06:44:05 -0800 (PST) Received: by mail-wi0-f169.google.com with SMTP id r20so29973771wiv.4 for ; Tue, 02 Dec 2014 06:44:05 -0800 (PST) Content-Disposition: inline In-Reply-To: <1417524648-3834-1-git-send-email-thomas.daniel@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Thomas Daniel Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gVHVlLCBEZWMgMDIsIDIwMTQgYXQgMTI6NTA6NDhQTSArMDAwMCwgVGhvbWFzIERhbmllbCB3 cm90ZToKPiBBIHByZXZpb3VzIGNvbW1pdCBpbnRyb2R1Y2VkIGVuZ2luZSBpbml0IGNoYW5nZXM6 Cj4gCj4gICAgIGNvbW1pdCAzNzJlZTU5Njk5ZDkgKCJkcm0vaTkxNTogT25seSBpbml0IGVuZ2lu ZXMgb25jZSIpCj4gCj4gVGhpcyBicm9rZSBleGVjbGlzdHMgYXMgaW50ZWxfbHJfY29udGV4dF9y ZW5kZXJfc3RhdGVfaW5pdCB3YXMgdHJ5aW5nIHRvIGVtaXQKPiBjb21tYW5kcyB0byB0aGUgUkNT IGZvciB0aGUgZGVmYXVsdCBjb250ZXh0IGJlZm9yZSB0aGUgcmluZy0+aW5pdF9odyB3YXMgY2Fs bGVkLgo+IAo+IE1hZGUgYSBuZXcgZ2VuOF9pbml0X3Jjc19jb250ZXh0IGZ1bmN0aW9uIGFuZCBh c3NpZ24gaW4gdG8gcmVuZGVyIHJpbmcKPiBpbml0X2NvbnRleHQuICBNb3ZlZCBjYWxsIHRvIGlu dGVsX2xvZ2ljYWxfcmluZ193b3JrYXJvdW5kc19lbWl0IGludG8KPiBnZW44X2luaXRfcmNzX2Nv bnRleHQgdG8gbWFpbnRhaW4gcHJldmlvdXMgZnVuY3Rpb25hbGl0eS4KPiAKPiBNb3ZlZCBjYWxs IHRvIHJlbmRlcl9zdGF0ZV9pbml0IGZyb20gbHJfY29udGV4dF9kZWZlcnJlZF9jcmVhdGUgaW50 bwo+IGdlbjhfaW5pdF9yY3NfY29udGV4dCwgYW5kIG1vZGlmaWVkIGRlZmVycmVkX2NyZWF0ZSB0 byBjYWxsIHJpbmctPmluaXRfY29udGV4dAo+IGZvciBub24tZGVmYXVsdCBjb250ZXh0cy4KPiAK PiBNb2RpZmllZCBpOTE1X2dlbV9jb250ZXh0X2VuYWJsZSB0byBjYWxsIHJpbmctPmluaXRfY29u dGV4dCBmb3IgdGhlIGRlZmF1bHQKPiBjb250ZXh0Lgo+IAo+IFNvIGluaXRfY29udGV4dCB3aWxs IG5vdyBhbHdheXMgYmUgY2FsbGVkIHdoZW4gdGhlIGh3IGlzIHJlYWR5IC0gaW4KPiBpOTE1X2dl bV9jb250ZXh0X2VuYWJsZSBmb3IgdGhlIGRlZmF1bHQgY29udGV4dCBhbmQgaW4gbHJfY29udGV4 dF9kZWZlcnJlZF9jcmVhdGUKPiBmb3Igb3RoZXIgY29udGV4dHMuCj4gCj4gU2lnbmVkLW9mZi1i eTogVGhvbWFzIERhbmllbCA8dGhvbWFzLmRhbmllbEBpbnRlbC5jb20+CgpPb3BzLCBzb3JyeSBm b3IgYnJlYWtpbmcgdGhpbmdzIEkgZGlkbid0IHJlYWxpemUgdGhhdCB3ZSBiYXNoIHRoaW5ncyBp bnRvCnRoZSBodyBpbiB0aGUgZGVmZXJyZWQgY3JlYXRlLiBTbyBtZXJnZWQgdGhpcyBwYXRjaCBy aWdodCBhd2F5IHRvIGdldCB0aGUKcmVncmVzc2lvbiBvdXQgb2YgdGhlIHdheS4KCkl0J3Mgbm90 IHF1aXRlIHRoZXJlIHlldCBmb3IgbHJjIGNvbnRleHQgaW5pdCB0aG91Z2guIEkgdGhpbmsgd2Ug bmVlZCB0bwotIHNwbGl0IGludGVsX2xyX2NvbnRleHRfZGVmZXJyZWRfY3JlYXRlIGludG8gX2Fs bG9jIGFuZCBfaW5pdCBmdW5jdGlvbnMuCi0gQ2FsbCB0aGUgX2FsbG9jIHBhcnQgZnJvbSBsb2dp Y2FsX3JpbmdfaW5pdCBpbml0ICh3aGljaCBpcyBvbmNlIGF0CiAgZHJpdmVyIGxvYWQgbm93KQot IG9ubHkgY2FsbCBfaW5pdCBmcm9tIC0+aW5pdF9jb250ZXh0Ci0gdGhlbiBtb3ZlIGFsbCB0aGUg ZGVmYXVsdCBjb250ZXh0IHNwZWNpYWwtY2FzZSBoYW5kbGluZyBvdXQgb2YgX2FsbG9jCiAgaW50 byBsb2dpY2FsX3JpbmdfaW5pdCAoaS5lLiB0aGUgcGlubmluZyBhbmQgc2ltaWxhciBzdHVmZikg YW5kIGludG8KICAtPmluaXRfaHcgKGxyYyBodyBzZXR1cCwgc3RhdHVzIHBhZ2UpLgotIFNodWZm bGUgdGhlIGNvZGUgaW4gaTkxNV9nZW1fY29udGV4dF9lbmFibGUgaW50byByaW5nLT5pbml0X2h3 CiAgZnVuY3Rpb25zLgoKSSB0aGluayB0aGlzIHdvdWxkIHJlZHVjZSB0aGUgY29uZnVzaW9uIHdl IGhhdmUgYSBsb3QgaGVyZS4gQW5kIGFsc28KcmVtb3ZlIGEgYnVuY2ggb2YgZXhlY2xpc3Qgc3Bl Y2lhbCBjYXNlcy4KClRob3VnaHRzPyBTaWduZWQgdXA/CgpDaGVlcnMsIERhbmllbAo+IC0tLQo+ ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgfCAgIDI1ICsrKysrKysr KysrKysrKysrKy0tLS0tLS0KPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAg ICAgIHwgICAzMCArKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0KPiAgMiBmaWxlcyBjaGFu Z2VkLCAzNyBpbnNlcnRpb25zKCspLCAxOCBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCj4gaW5kZXggM2MzYTlmZi4uNWNkMmI5NyAxMDA2NDQK PiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKPiArKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKPiBAQCAtNDA4LDE0ICs0MDgs MjUgQEAgaW50IGk5MTVfZ2VtX2NvbnRleHRfZW5hYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKPiAgCj4gIAlCVUdfT04oIWRldl9wcml2LT5yaW5nW1JDU10uZGVmYXVsdF9j b250ZXh0KTsKPiAgCj4gLQlpZiAoaTkxNS5lbmFibGVfZXhlY2xpc3RzKQo+IC0JCXJldHVybiAw Owo+ICsJaWYgKGk5MTUuZW5hYmxlX2V4ZWNsaXN0cykgewo+ICsJCWZvcl9lYWNoX3Jpbmcocmlu ZywgZGV2X3ByaXYsIGkpIHsKPiArCQkJaWYgKHJpbmctPmluaXRfY29udGV4dCkgewo+ICsJCQkJ cmV0ID0gcmluZy0+aW5pdF9jb250ZXh0KHJpbmcsCj4gKwkJCQkJCXJpbmctPmRlZmF1bHRfY29u dGV4dCk7Cj4gKwkJCQlpZiAocmV0KSB7Cj4gKwkJCQkJRFJNX0VSUk9SKCJyaW5nIGluaXQgY29u dGV4dDogJWRcbiIsCj4gKwkJCQkJCQlyZXQpOwo+ICsJCQkJCXJldHVybiByZXQ7Cj4gKwkJCQl9 Cj4gKwkJCX0KPiArCQl9Cj4gIAo+IC0JZm9yX2VhY2hfcmluZyhyaW5nLCBkZXZfcHJpdiwgaSkg ewo+IC0JCXJldCA9IGk5MTVfc3dpdGNoX2NvbnRleHQocmluZywgcmluZy0+ZGVmYXVsdF9jb250 ZXh0KTsKPiAtCQlpZiAocmV0KQo+IC0JCQlyZXR1cm4gcmV0Owo+IC0JfQo+ICsJfSBlbHNlCj4g KwkJZm9yX2VhY2hfcmluZyhyaW5nLCBkZXZfcHJpdiwgaSkgewo+ICsJCQlyZXQgPSBpOTE1X3N3 aXRjaF9jb250ZXh0KHJpbmcsIHJpbmctPmRlZmF1bHRfY29udGV4dCk7Cj4gKwkJCWlmIChyZXQp Cj4gKwkJCQlyZXR1cm4gcmV0Owo+ICsJCX0KPiAgCj4gIAlyZXR1cm4gMDsKPiAgfQo+IGRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2xyYy5jCj4gaW5kZXggNGZmYjA4Yy4uNzllZjQwYyAxMDA2NDQKPiAtLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2xyYy5jCj4gQEAgLTEzMzYsNiArMTMzNiwxOCBAQCBzdGF0aWMgaW50IGdl bjhfZW1pdF9yZXF1ZXN0KHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmKQo+ICAJcmV0 dXJuIDA7Cj4gIH0KPiAgCj4gK3N0YXRpYyBpbnQgZ2VuOF9pbml0X3Jjc19jb250ZXh0KHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCj4gKwkJICAgICAgIHN0cnVjdCBpbnRlbF9jb250ZXh0 ICpjdHgpCj4gK3sKPiArCWludCByZXQ7Cj4gKwo+ICsJcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5n X3dvcmthcm91bmRzX2VtaXQocmluZywgY3R4KTsKPiArCWlmIChyZXQpCj4gKwkJcmV0dXJuIHJl dDsKPiArCj4gKwlyZXR1cm4gaW50ZWxfbHJfY29udGV4dF9yZW5kZXJfc3RhdGVfaW5pdChyaW5n LCBjdHgpOwo+ICt9Cj4gKwo+ICAvKioKPiAgICogaW50ZWxfbG9naWNhbF9yaW5nX2NsZWFudXAo KSAtIGRlYWxsb2NhdGUgdGhlIEVuZ2luZSBDb21tYW5kIFN0cmVhbWVyCj4gICAqCj4gQEAgLTE0 MDksNyArMTQyMSw3IEBAIHN0YXRpYyBpbnQgbG9naWNhbF9yZW5kZXJfcmluZ19pbml0KHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCj4gIAkJcmluZy0+aXJxX2tlZXBfbWFzayB8PSBHVF9SRU5ERVJf TDNfUEFSSVRZX0VSUk9SX0lOVEVSUlVQVDsKPiAgCj4gIAlyaW5nLT5pbml0X2h3ID0gZ2VuOF9p bml0X3JlbmRlcl9yaW5nOwo+IC0JcmluZy0+aW5pdF9jb250ZXh0ID0gaW50ZWxfbG9naWNhbF9y aW5nX3dvcmthcm91bmRzX2VtaXQ7Cj4gKwlyaW5nLT5pbml0X2NvbnRleHQgPSBnZW44X2luaXRf cmNzX2NvbnRleHQ7Cj4gIAlyaW5nLT5jbGVhbnVwID0gaW50ZWxfZmluaV9waXBlX2NvbnRyb2w7 Cj4gIAlyaW5nLT5nZXRfc2Vxbm8gPSBnZW44X2dldF9zZXFubzsKPiAgCXJpbmctPnNldF9zZXFu byA9IGdlbjhfc2V0X3NlcW5vOwo+IEBAIC0xOTA1LDIxICsxOTE3LDE3IEBAIGludCBpbnRlbF9s cl9jb250ZXh0X2RlZmVycmVkX2NyZWF0ZShzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAo+ICAK PiAgCWlmIChjdHggPT0gcmluZy0+ZGVmYXVsdF9jb250ZXh0KQo+ICAJCWxyY19zZXR1cF9oYXJk d2FyZV9zdGF0dXNfcGFnZShyaW5nLCBjdHhfb2JqKTsKPiAtCj4gLQlpZiAocmluZy0+aWQgPT0g UkNTICYmICFjdHgtPnJjc19pbml0aWFsaXplZCkgewo+ICsJZWxzZSBpZiAocmluZy0+aWQgPT0g UkNTICYmICFjdHgtPnJjc19pbml0aWFsaXplZCkgewo+ICAJCWlmIChyaW5nLT5pbml0X2NvbnRl eHQpIHsKPiAgCQkJcmV0ID0gcmluZy0+aW5pdF9jb250ZXh0KHJpbmcsIGN0eCk7Cj4gLQkJCWlm IChyZXQpCj4gKwkJCWlmIChyZXQpIHsKPiAgCQkJCURSTV9FUlJPUigicmluZyBpbml0IGNvbnRl eHQ6ICVkXG4iLCByZXQpOwo+ICsJCQkJY3R4LT5lbmdpbmVbcmluZy0+aWRdLnJpbmdidWYgPSBO VUxMOwo+ICsJCQkJY3R4LT5lbmdpbmVbcmluZy0+aWRdLnN0YXRlID0gTlVMTDsKPiArCQkJCWdv dG8gZXJyb3I7Cj4gKwkJCX0KPiAgCQl9Cj4gIAo+IC0JCXJldCA9IGludGVsX2xyX2NvbnRleHRf cmVuZGVyX3N0YXRlX2luaXQocmluZywgY3R4KTsKPiAtCQlpZiAocmV0KSB7Cj4gLQkJCURSTV9F UlJPUigiSW5pdCByZW5kZXIgc3RhdGUgZmFpbGVkOiAlZFxuIiwgcmV0KTsKPiAtCQkJY3R4LT5l bmdpbmVbcmluZy0+aWRdLnJpbmdidWYgPSBOVUxMOwo+IC0JCQljdHgtPmVuZ2luZVtyaW5nLT5p ZF0uc3RhdGUgPSBOVUxMOwo+IC0JCQlnb3RvIGVycm9yOwo+IC0JCX0KPiAgCQljdHgtPnJjc19p bml0aWFsaXplZCA9IHRydWU7Cj4gIAl9Cj4gIAo+IC0tIAo+IDEuNy45LjUKPiAKPiBfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwo+IEludGVsLWdmeCBtYWls aW5nIGxpc3QKPiBJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4gaHR0cDovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAoKLS0gCkRhbmllbCBW ZXR0ZXIKU29mdHdhcmUgRW5naW5lZXIsIEludGVsIENvcnBvcmF0aW9uCis0MSAoMCkgNzkgMzY1 IDU3IDQ4IC0gaHR0cDovL2Jsb2cuZmZ3bGwuY2gKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK