From mboxrd@z Thu Jan  1 00:00:00 1970
From: Thomas Daniel <thomas.daniel@intel.com>
Subject: [PATCH] drm/i915: Fix startup failure in LRC mode after
	recent init changes
Date: Tue,  2 Dec 2014 12:50:48 +0000
Message-ID: <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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga11.intel.com (mga11.intel.com [192.55.52.93])
 by gabe.freedesktop.org (Postfix) with ESMTP id 6D6FD6E8B6
 for <intel-gfx@lists.freedesktop.org>; Tue,  2 Dec 2014 04:51:18 -0800 (PST)
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

QSBwcmV2aW91cyBjb21taXQgaW50cm9kdWNlZCBlbmdpbmUgaW5pdCBjaGFuZ2VzOgoKICAgIGNv
bW1pdCAzNzJlZTU5Njk5ZDkgKCJkcm0vaTkxNTogT25seSBpbml0IGVuZ2luZXMgb25jZSIpCgpU
aGlzIGJyb2tlIGV4ZWNsaXN0cyBhcyBpbnRlbF9scl9jb250ZXh0X3JlbmRlcl9zdGF0ZV9pbml0
IHdhcyB0cnlpbmcgdG8gZW1pdApjb21tYW5kcyB0byB0aGUgUkNTIGZvciB0aGUgZGVmYXVsdCBj
b250ZXh0IGJlZm9yZSB0aGUgcmluZy0+aW5pdF9odyB3YXMgY2FsbGVkLgoKTWFkZSBhIG5ldyBn
ZW44X2luaXRfcmNzX2NvbnRleHQgZnVuY3Rpb24gYW5kIGFzc2lnbiBpbiB0byByZW5kZXIgcmlu
Zwppbml0X2NvbnRleHQuICBNb3ZlZCBjYWxsIHRvIGludGVsX2xvZ2ljYWxfcmluZ193b3JrYXJv
dW5kc19lbWl0IGludG8KZ2VuOF9pbml0X3Jjc19jb250ZXh0IHRvIG1haW50YWluIHByZXZpb3Vz
IGZ1bmN0aW9uYWxpdHkuCgpNb3ZlZCBjYWxsIHRvIHJlbmRlcl9zdGF0ZV9pbml0IGZyb20gbHJf
Y29udGV4dF9kZWZlcnJlZF9jcmVhdGUgaW50bwpnZW44X2luaXRfcmNzX2NvbnRleHQsIGFuZCBt
b2RpZmllZCBkZWZlcnJlZF9jcmVhdGUgdG8gY2FsbCByaW5nLT5pbml0X2NvbnRleHQKZm9yIG5v
bi1kZWZhdWx0IGNvbnRleHRzLgoKTW9kaWZpZWQgaTkxNV9nZW1fY29udGV4dF9lbmFibGUgdG8g
Y2FsbCByaW5nLT5pbml0X2NvbnRleHQgZm9yIHRoZSBkZWZhdWx0CmNvbnRleHQuCgpTbyBpbml0
X2NvbnRleHQgd2lsbCBub3cgYWx3YXlzIGJlIGNhbGxlZCB3aGVuIHRoZSBodyBpcyByZWFkeSAt
IGluCmk5MTVfZ2VtX2NvbnRleHRfZW5hYmxlIGZvciB0aGUgZGVmYXVsdCBjb250ZXh0IGFuZCBp
biBscl9jb250ZXh0X2RlZmVycmVkX2NyZWF0ZQpmb3Igb3RoZXIgY29udGV4dHMuCgpTaWduZWQt
b2ZmLWJ5OiBUaG9tYXMgRGFuaWVsIDx0aG9tYXMuZGFuaWVsQGludGVsLmNvbT4KLS0tCiBkcml2
ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgfCAgIDI1ICsrKysrKysrKysrKysr
KysrKy0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAgICAgICB8ICAg
MzAgKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDM3IGlu
c2VydGlvbnMoKyksIDE4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt
X2NvbnRleHQuYwppbmRleCAzYzNhOWZmLi41Y2QyYjk3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aTkxNV9nZW1fY29udGV4dC5jCkBAIC00MDgsMTQgKzQwOCwyNSBAQCBpbnQgaTkxNV9nZW1fY29u
dGV4dF9lbmFibGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCiAJQlVHX09O
KCFkZXZfcHJpdi0+cmluZ1tSQ1NdLmRlZmF1bHRfY29udGV4dCk7CiAKLQlpZiAoaTkxNS5lbmFi
bGVfZXhlY2xpc3RzKQotCQlyZXR1cm4gMDsKKwlpZiAoaTkxNS5lbmFibGVfZXhlY2xpc3RzKSB7
CisJCWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYsIGkpIHsKKwkJCWlmIChyaW5nLT5pbml0
X2NvbnRleHQpIHsKKwkJCQlyZXQgPSByaW5nLT5pbml0X2NvbnRleHQocmluZywKKwkJCQkJCXJp
bmctPmRlZmF1bHRfY29udGV4dCk7CisJCQkJaWYgKHJldCkgeworCQkJCQlEUk1fRVJST1IoInJp
bmcgaW5pdCBjb250ZXh0OiAlZFxuIiwKKwkJCQkJCQlyZXQpOworCQkJCQlyZXR1cm4gcmV0Owor
CQkJCX0KKwkJCX0KKwkJfQogCi0JZm9yX2VhY2hfcmluZyhyaW5nLCBkZXZfcHJpdiwgaSkgewot
CQlyZXQgPSBpOTE1X3N3aXRjaF9jb250ZXh0KHJpbmcsIHJpbmctPmRlZmF1bHRfY29udGV4dCk7
Ci0JCWlmIChyZXQpCi0JCQlyZXR1cm4gcmV0OwotCX0KKwl9IGVsc2UKKwkJZm9yX2VhY2hfcmlu
ZyhyaW5nLCBkZXZfcHJpdiwgaSkgeworCQkJcmV0ID0gaTkxNV9zd2l0Y2hfY29udGV4dChyaW5n
LCByaW5nLT5kZWZhdWx0X2NvbnRleHQpOworCQkJaWYgKHJldCkKKwkJCQlyZXR1cm4gcmV0Owor
CQl9CiAKIAlyZXR1cm4gMDsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu
dGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggNGZmYjA4
Yy4uNzllZjQwYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMK
KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTEzMzYsNiArMTMzNiwx
OCBAQCBzdGF0aWMgaW50IGdlbjhfZW1pdF9yZXF1ZXN0KHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVy
ICpyaW5nYnVmKQogCXJldHVybiAwOwogfQogCitzdGF0aWMgaW50IGdlbjhfaW5pdF9yY3NfY29u
dGV4dChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAorCQkgICAgICAgc3RydWN0IGludGVs
X2NvbnRleHQgKmN0eCkKK3sKKwlpbnQgcmV0OworCisJcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5n
X3dvcmthcm91bmRzX2VtaXQocmluZywgY3R4KTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0Owor
CisJcmV0dXJuIGludGVsX2xyX2NvbnRleHRfcmVuZGVyX3N0YXRlX2luaXQocmluZywgY3R4KTsK
K30KKwogLyoqCiAgKiBpbnRlbF9sb2dpY2FsX3JpbmdfY2xlYW51cCgpIC0gZGVhbGxvY2F0ZSB0
aGUgRW5naW5lIENvbW1hbmQgU3RyZWFtZXIKICAqCkBAIC0xNDA5LDcgKzE0MjEsNyBAQCBzdGF0
aWMgaW50IGxvZ2ljYWxfcmVuZGVyX3JpbmdfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQog
CQlyaW5nLT5pcnFfa2VlcF9tYXNrIHw9IEdUX1JFTkRFUl9MM19QQVJJVFlfRVJST1JfSU5URVJS
VVBUOwogCiAJcmluZy0+aW5pdF9odyA9IGdlbjhfaW5pdF9yZW5kZXJfcmluZzsKLQlyaW5nLT5p
bml0X2NvbnRleHQgPSBpbnRlbF9sb2dpY2FsX3Jpbmdfd29ya2Fyb3VuZHNfZW1pdDsKKwlyaW5n
LT5pbml0X2NvbnRleHQgPSBnZW44X2luaXRfcmNzX2NvbnRleHQ7CiAJcmluZy0+Y2xlYW51cCA9
IGludGVsX2ZpbmlfcGlwZV9jb250cm9sOwogCXJpbmctPmdldF9zZXFubyA9IGdlbjhfZ2V0X3Nl
cW5vOwogCXJpbmctPnNldF9zZXFubyA9IGdlbjhfc2V0X3NlcW5vOwpAQCAtMTkwNSwyMSArMTkx
NywxNyBAQCBpbnQgaW50ZWxfbHJfY29udGV4dF9kZWZlcnJlZF9jcmVhdGUoc3RydWN0IGludGVs
X2NvbnRleHQgKmN0eCwKIAogCWlmIChjdHggPT0gcmluZy0+ZGVmYXVsdF9jb250ZXh0KQogCQls
cmNfc2V0dXBfaGFyZHdhcmVfc3RhdHVzX3BhZ2UocmluZywgY3R4X29iaik7Ci0KLQlpZiAocmlu
Zy0+aWQgPT0gUkNTICYmICFjdHgtPnJjc19pbml0aWFsaXplZCkgeworCWVsc2UgaWYgKHJpbmct
PmlkID09IFJDUyAmJiAhY3R4LT5yY3NfaW5pdGlhbGl6ZWQpIHsKIAkJaWYgKHJpbmctPmluaXRf
Y29udGV4dCkgewogCQkJcmV0ID0gcmluZy0+aW5pdF9jb250ZXh0KHJpbmcsIGN0eCk7Ci0JCQlp
ZiAocmV0KQorCQkJaWYgKHJldCkgewogCQkJCURSTV9FUlJPUigicmluZyBpbml0IGNvbnRleHQ6
ICVkXG4iLCByZXQpOworCQkJCWN0eC0+ZW5naW5lW3JpbmctPmlkXS5yaW5nYnVmID0gTlVMTDsK
KwkJCQljdHgtPmVuZ2luZVtyaW5nLT5pZF0uc3RhdGUgPSBOVUxMOworCQkJCWdvdG8gZXJyb3I7
CisJCQl9CiAJCX0KIAotCQlyZXQgPSBpbnRlbF9scl9jb250ZXh0X3JlbmRlcl9zdGF0ZV9pbml0
KHJpbmcsIGN0eCk7Ci0JCWlmIChyZXQpIHsKLQkJCURSTV9FUlJPUigiSW5pdCByZW5kZXIgc3Rh
dGUgZmFpbGVkOiAlZFxuIiwgcmV0KTsKLQkJCWN0eC0+ZW5naW5lW3JpbmctPmlkXS5yaW5nYnVm
ID0gTlVMTDsKLQkJCWN0eC0+ZW5naW5lW3JpbmctPmlkXS5zdGF0ZSA9IE5VTEw7Ci0JCQlnb3Rv
IGVycm9yOwotCQl9CiAJCWN0eC0+cmNzX2luaXRpYWxpemVkID0gdHJ1ZTsKIAl9CiAKLS0gCjEu
Ny45LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu
dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw
Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==