From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lukas Wunner Subject: [PATCH v2 1/2] drm/i915: Fix oops caused by fbdev initialization failure Date: Thu, 5 Nov 2015 10:42:40 +0100 Message-ID: References: <20151030182305.GQ16848@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mailout2.hostsharing.net (mailout2.hostsharing.net [83.223.90.233]) by gabe.freedesktop.org (Postfix) with ESMTPS id D4E006E0F2 for ; Sun, 8 Nov 2015 08:18:23 -0800 (PST) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org aW50ZWxmYl9jcmVhdGUoKSBpcyBjYWxsZWQgb25jZSBvbiBkcml2ZXIgaW5pdGlhbGl6YXRpb24u IElmIGl0IGZhaWxzLAppZmJkZXYtPmhlbHBlci5mYmRldiwgaWZiZGV2LT5mYiBvciBpZmJkZXYt PmZiLT5vYmogbWF5IGJlIE5VTEwuCgppbnRlbF9mYmRldl9kZXN0cm95KCkgaXMgY2FsbGVkIG9u IGRyaXZlciB1bmxvYWQgYW5kIGRlcmVmZXJlbmNlcwppZmJkZXYtPmZiLgoKaW50ZWxfZmJkZXZf c2V0X3N1c3BlbmQoKSBpcyBjYWxsZWQgb24gc3VzcGVuZC9yZXN1bWUgYW5kIGRlcmVmZXJlbmNl cwppZmJkZXYtPmhlbHBlci5mYmRldiBhbmQgaWZiZGV2LT5mYi0+b2JqLgoKaW50ZWxfZmJkZXZf b3V0cHV0X3BvbGxfY2hhbmdlZCgpIGlzIGNhbGxlZCBvbiBob3RwbHVnIGV2ZW50cyBhbmQgY2Fs bHMKZHJtX2ZiX2hlbHBlcl9ob3RwbHVnX2V2ZW50KCkuIElmIGlmYmRldi0+aGVscGVyLmZiIGlz IE5VTEwgaXQgd2lsbApzaWduYWwgYSBkZWxheWVkX2hvdHBsdWcgYWQgaW5maW5pdHVtOyBpZiBp dCBpcyBub3QgTlVMTCBpdCB3aWxsIGNhbGwKZHJtX2ZiX2hlbHBlcl9zZXRfcGFyKCkgd2hpY2gg ZGVyZWZlcmVuY2VzIGlmYmRldi0+aGVscGVyLmZiZGV2LgoKaW50ZWxfZmJkZXZfcmVzdG9yZV9t b2RlKCkgaXMgY2FsbGVkIG9uIGxhc3RjbG9zZSBhbmQgZGVyZWZlcmVuY2VzCmlmYmRldi0+ZmIt Pm9iai4gSXQgYWxzbyBjYWxscyBfX2RybV9hdG9taWNfaGVscGVyX3NldF9jb25maWcoKSB3aGlj aApXQVJOcyBpZiBpZmJkZXYtPmZiIGlzIE5VTEwsIGFuZCBkcm1fZmJfaGVscGVyX3NldF9wYXIo KSB3aGljaApkZXJlZmVyZW5jZXMgaWZiZGV2LT5oZWxwZXIuZmJkZXYuCgppOTE1X2dlbV9mcmFt ZWJ1ZmZlcl9pbmZvKCkgaXMgY2FsbGVkIG9uIGFjY2VzcyB0byBkZWJ1Z2ZzIGZpbGUKImk5MTVf Z2VtX2ZyYW1lYnVmZmVyIiBhbmQgZGVyZWZlcmVuY2VzIGlmYmRldiwgaWZiZGV2LT5oZWxwZXIu ZmIKYW5kIGlmYmRldi0+aGVscGVyLmZiLT5vYmouCgppbnRlbF9jb25uZWN0b3JfYWRkX3RvX2Zi ZGV2KCkgLyBpbnRlbF9jb25uZWN0b3JfcmVtb3ZlX2Zyb21fZmJkZXYoKQphcmUgY2FsbGVkIHdo ZW4gcmVnaXN0ZXJpbmcgLyB1bnJlZ2lzdGVyaW5nIGFuIG1zdCBjb25uZWN0b3IgYW5kCmRlcmVm ZXJlbmNlIGlmYmRldi4KCkJhc2ljYWxseSBpZiBmYmRldiBjcmVhdGlvbiBmYWlscywgd2UgZW5k IHVwIHdpdGggYW4gaWZiZGV2IHRoYXQncwpvbmx5IHBhcnRpYWxseSBpbml0aWFsaXplZCBhbmQg dGhlIGRyaXZlciB3aWxsIG9vcHMgb24gdW5sb2FkLAp0aGUgbmV4dCBzdXNwZW5kL3Jlc3VtZSBj eWNsZSwgaG90cGx1ZyBldmVudHMsIHdoZW4gWDExIGlzIHN0b3BwZWQKb3Igd2hlbiBhY2Nlc3Np bmcgZGVidWdmcyBmaWxlICJpOTE1X2dlbV9mcmFtZWJ1ZmZlciIuCgpBZnRlciB0aGUgZmJkZXYg d2FzIGRlc3Ryb3llZCB3aXRoIGludGVsX2ZiZGV2X2ZpbmkoKSwgdGhlIGRyaXZlcgp3aWxsIG9v cHMgb24gbXN0IGhvdHBsdWcgZXZlbnRzLgoKRml4IGl0LgoKU2lnbmVkLW9mZi1ieTogTHVrYXMg V3VubmVyIDxsdWthc0B3dW5uZXIuZGU+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k ZWJ1Z2ZzLmMgfCAyNCArKysrKysrKysrKysrLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2RwX21zdC5jIHwgMTAgKysrKysrKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZmJkZXYuYyAgfCAxNiArKysrKysrKysrLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDMx IGluc2VydGlvbnMoKyksIDE5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1 Z2ZzLmMKaW5kZXggNTY1OWQ0Yy4uMTc4MjFjZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1 Z2ZzLmMKQEAgLTE4NzcsMTcgKzE4NzcsMTkgQEAgc3RhdGljIGludCBpOTE1X2dlbV9mcmFtZWJ1 ZmZlcl9pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqZGF0YSkKIAlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCiAJaWZiZGV2ID0gZGV2 X3ByaXYtPmZiZGV2OwotCWZiID0gdG9faW50ZWxfZnJhbWVidWZmZXIoaWZiZGV2LT5oZWxwZXIu ZmIpOwotCi0Jc2VxX3ByaW50ZihtLCAiZmJjb24gc2l6ZTogJWQgeCAlZCwgZGVwdGggJWQsICVk IGJwcCwgbW9kaWZpZXIgMHglbGx4LCByZWZjb3VudCAlZCwgb2JqICIsCi0JCSAgIGZiLT5iYXNl LndpZHRoLAotCQkgICBmYi0+YmFzZS5oZWlnaHQsCi0JCSAgIGZiLT5iYXNlLmRlcHRoLAotCQkg ICBmYi0+YmFzZS5iaXRzX3Blcl9waXhlbCwKLQkJICAgZmItPmJhc2UubW9kaWZpZXJbMF0sCi0J CSAgIGF0b21pY19yZWFkKCZmYi0+YmFzZS5yZWZjb3VudC5yZWZjb3VudCkpOwotCWRlc2NyaWJl X29iaihtLCBmYi0+b2JqKTsKLQlzZXFfcHV0YyhtLCAnXG4nKTsKKwlpZiAoaWZiZGV2ICYmIGlm YmRldi0+aGVscGVyLmZiICYmIGlmYmRldi0+ZmItPm9iaikgeworCQlmYiA9IHRvX2ludGVsX2Zy YW1lYnVmZmVyKGlmYmRldi0+aGVscGVyLmZiKTsKKworCQlzZXFfcHJpbnRmKG0sICJmYmNvbiBz aXplOiAlZCB4ICVkLCBkZXB0aCAlZCwgJWQgYnBwLCBtb2RpZmllciAweCVsbHgsIHJlZmNvdW50 ICVkLCBvYmogIiwKKwkJCSAgIGZiLT5iYXNlLndpZHRoLAorCQkJICAgZmItPmJhc2UuaGVpZ2h0 LAorCQkJICAgZmItPmJhc2UuZGVwdGgsCisJCQkgICBmYi0+YmFzZS5iaXRzX3Blcl9waXhlbCwK KwkJCSAgIGZiLT5iYXNlLm1vZGlmaWVyWzBdLAorCQkJICAgYXRvbWljX3JlYWQoJmZiLT5iYXNl LnJlZmNvdW50LnJlZmNvdW50KSk7CisJCWRlc2NyaWJlX29iaihtLCBmYi0+b2JqKTsKKwkJc2Vx X3B1dGMobSwgJ1xuJyk7CisJfQogI2VuZGlmCiAKIAltdXRleF9sb2NrKCZkZXYtPm1vZGVfY29u ZmlnLmZiX2xvY2spOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBf bXN0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcF9tc3QuYwppbmRleCAwNjM5Mjc1 Li43MzUzNjhlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcF9tc3Qu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcF9tc3QuYwpAQCAtNDE0LDcgKzQx NCwxMCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9jb25uZWN0b3JfYWRkX3RvX2ZiZGV2KHN0cnVjdCBp bnRlbF9jb25uZWN0b3IgKmNvbm5lY3RvcikKIHsKICNpZmRlZiBDT05GSUdfRFJNX0ZCREVWX0VN VUxBVElPTgogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoY29u bmVjdG9yLT5iYXNlLmRldik7Ci0JZHJtX2ZiX2hlbHBlcl9hZGRfb25lX2Nvbm5lY3RvcigmZGV2 X3ByaXYtPmZiZGV2LT5oZWxwZXIsICZjb25uZWN0b3ItPmJhc2UpOworCisJaWYgKGRldl9wcml2 LT5mYmRldikKKwkJZHJtX2ZiX2hlbHBlcl9hZGRfb25lX2Nvbm5lY3RvcigmZGV2X3ByaXYtPmZi ZGV2LT5oZWxwZXIsCisJCQkJCQkmY29ubmVjdG9yLT5iYXNlKTsKICNlbmRpZgogfQogCkBAIC00 MjIsNyArNDI1LDEwIEBAIHN0YXRpYyB2b2lkIGludGVsX2Nvbm5lY3Rvcl9yZW1vdmVfZnJvbV9m YmRldihzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICpjb25uZWN0b3IpCiB7CiAjaWZkZWYgQ09ORklH X0RSTV9GQkRFVl9FTVVMQVRJT04KIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSB0b19pOTE1KGNvbm5lY3Rvci0+YmFzZS5kZXYpOwotCWRybV9mYl9oZWxwZXJfcmVtb3ZlX29u ZV9jb25uZWN0b3IoJmRldl9wcml2LT5mYmRldi0+aGVscGVyLCAmY29ubmVjdG9yLT5iYXNlKTsK KworCWlmIChkZXZfcHJpdi0+ZmJkZXYpCisJCWRybV9mYl9oZWxwZXJfcmVtb3ZlX29uZV9jb25u ZWN0b3IoJmRldl9wcml2LT5mYmRldi0+aGVscGVyLAorCQkJCQkJICAgJmNvbm5lY3Rvci0+YmFz ZSk7CiAjZW5kaWYKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZmJkZXYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMKaW5kZXggZGI4MmFk NC4uMDU0ODRiYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jCkBAIC01MjksOCArNTI5 LDEwIEBAIHN0YXRpYyB2b2lkIGludGVsX2ZiZGV2X2Rlc3Ryb3koc3RydWN0IGRybV9kZXZpY2Ug KmRldiwKIAogCWRybV9mYl9oZWxwZXJfZmluaSgmaWZiZGV2LT5oZWxwZXIpOwogCi0JZHJtX2Zy YW1lYnVmZmVyX3VucmVnaXN0ZXJfcHJpdmF0ZSgmaWZiZGV2LT5mYi0+YmFzZSk7Ci0JZHJtX2Zy YW1lYnVmZmVyX3JlbW92ZSgmaWZiZGV2LT5mYi0+YmFzZSk7CisJaWYgKGlmYmRldi0+ZmIpIHsK KwkJZHJtX2ZyYW1lYnVmZmVyX3VucmVnaXN0ZXJfcHJpdmF0ZSgmaWZiZGV2LT5mYi0+YmFzZSk7 CisJCWRybV9mcmFtZWJ1ZmZlcl9yZW1vdmUoJmlmYmRldi0+ZmItPmJhc2UpOworCX0KIH0KIAog LyoKQEAgLTczNCw3ICs3MzYsNyBAQCB2b2lkIGludGVsX2ZiZGV2X3NldF9zdXNwZW5kKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsIGludCBzdGF0ZSwgYm9vbCBzeW5jaHJvbm91cwogCXN0cnVjdCBp bnRlbF9mYmRldiAqaWZiZGV2ID0gZGV2X3ByaXYtPmZiZGV2OwogCXN0cnVjdCBmYl9pbmZvICpp bmZvOwogCi0JaWYgKCFpZmJkZXYpCisJaWYgKCFpZmJkZXYgfHwgIWlmYmRldi0+ZmIgfHwgIWlm YmRldi0+ZmItPm9iaiB8fCAhaWZiZGV2LT5oZWxwZXIuZmJkZXYpCiAJCXJldHVybjsKIAogCWlu Zm8gPSBpZmJkZXYtPmhlbHBlci5mYmRldjsKQEAgLTc4MCw4ICs3ODIsMTAgQEAgdm9pZCBpbnRl bF9mYmRldl9zZXRfc3VzcGVuZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgc3RhdGUsIGJv b2wgc3luY2hyb25vdXMKIHZvaWQgaW50ZWxfZmJkZXZfb3V0cHV0X3BvbGxfY2hhbmdlZChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diA9IGRldi0+ZGV2X3ByaXZhdGU7Ci0JaWYgKGRldl9wcml2LT5mYmRldikKLQkJZHJtX2ZiX2hl bHBlcl9ob3RwbHVnX2V2ZW50KCZkZXZfcHJpdi0+ZmJkZXYtPmhlbHBlcik7CisJc3RydWN0IGlu dGVsX2ZiZGV2ICppZmJkZXYgPSBkZXZfcHJpdi0+ZmJkZXY7CisKKwlpZiAoaWZiZGV2ICYmIGlm YmRldi0+ZmIgJiYgaWZiZGV2LT5mYi0+b2JqICYmIGlmYmRldi0+aGVscGVyLmZiZGV2KQorCQlk cm1fZmJfaGVscGVyX2hvdHBsdWdfZXZlbnQoJmlmYmRldi0+aGVscGVyKTsKIH0KIAogdm9pZCBp bnRlbF9mYmRldl9yZXN0b3JlX21vZGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKQEAgLTc5MSw3 ICs3OTUsNyBAQCB2b2lkIGludGVsX2ZiZGV2X3Jlc3RvcmVfbW9kZShzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogCXN0cnVjdCBpbnRlbF9mYmRldiAqaWZiZGV2ID0gZGV2X3ByaXYtPmZiZGV2Owog CXN0cnVjdCBkcm1fZmJfaGVscGVyICpmYl9oZWxwZXI7CiAKLQlpZiAoIWlmYmRldikKKwlpZiAo IWlmYmRldiB8fCAhaWZiZGV2LT5mYiB8fCAhaWZiZGV2LT5mYi0+b2JqIHx8ICFpZmJkZXYtPmhl bHBlci5mYmRldikKIAkJcmV0dXJuOwogCiAJZmJfaGVscGVyID0gJmlmYmRldi0+aGVscGVyOwot LSAKMS44LjUuMiAoQXBwbGUgR2l0LTQ4KQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK