From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH] drm/i915: Fix failure paths around initial fbdev allocation Date: Mon, 15 Jun 2015 11:49:52 +0100 Message-ID: <1434365392-19808-1-git-send-email-tvrtko.ursulin@linux.intel.com> 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 9EEB86E72A for ; Mon, 15 Jun 2015 03:50:04 -0700 (PDT) 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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCldlIGhhZCB0 d28gZmFpbHVyZSBtb2RlcyBoZXJlOgoKMS4KRGVhZGxvY2sgaW4gaW50ZWxmYl9hbGxvYyBmYWls dXJlIHBhdGggd2hlcmUgaXQgY2FsbHMgZHJtX2ZyYW1lYnVmZmVyX3JlbW92ZSwKd2hpY2ggZ3Jh YnMgdGhlIHN0cnVjdCBtdXRleCBhbmQgaW50ZWxmYl9jcmVhdGUgKGNhbGxlciBvZiBpbnRlbGZi X2FsbG9jKSB3YXMKYWxyZWFkeSBob2xkaW5nIGl0LgoKMi4KRG91YmxlIHVucmVmZXJlbmNlIG9u IHRoZSBvYmplY3QgaWYgX19pbnRlbF9mcmFtZWJ1ZmZlcl9jcmVhdGUgZmFpbHMgc2luY2UKYm90 aCBpdCBhbmQgdGhlIGNhbGxlciAoaW50ZWxmYl9hbGxvYykgZG8gdGhlIHVucmVmZXJlbmNlLgoK U2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4K Q2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpDYzogVmlsbGUgU3ly asOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9mYmRldi5jIHwgMjEgKysrKysrKysrKysrKy0tLS0tLS0tCiAxIGZpbGUg Y2hhbmdlZCwgMTMgaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZmJkZXYuYwppbmRleCA2MzcyY2ZjLi5iOTk4ZjY5IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2ZiZGV2LmMKQEAgLTE0MSw3ICsxNDEsNyBAQCBzdGF0aWMgaW50IGludGVsZmJfYWxsb2Mo c3RydWN0IGRybV9mYl9oZWxwZXIgKmhlbHBlciwKIHsKIAlzdHJ1Y3QgaW50ZWxfZmJkZXYgKmlm YmRldiA9CiAJCWNvbnRhaW5lcl9vZihoZWxwZXIsIHN0cnVjdCBpbnRlbF9mYmRldiwgaGVscGVy KTsKLQlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYjsKKwlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVy ICpmYiA9IE5VTEw7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGhlbHBlci0+ZGV2OwogCXN0 cnVjdCBkcm1fbW9kZV9mYl9jbWQyIG1vZGVfY21kID0ge307CiAJc3RydWN0IGRybV9pOTE1X2dl bV9vYmplY3QgKm9iajsKQEAgLTE1OSw2ICsxNTksOCBAQCBzdGF0aWMgaW50IGludGVsZmJfYWxs b2Moc3RydWN0IGRybV9mYl9oZWxwZXIgKmhlbHBlciwKIAltb2RlX2NtZC5waXhlbF9mb3JtYXQg PSBkcm1fbW9kZV9sZWdhY3lfZmJfZm9ybWF0KHNpemVzLT5zdXJmYWNlX2JwcCwKIAkJCQkJCQkg IHNpemVzLT5zdXJmYWNlX2RlcHRoKTsKIAorCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4 KTsKKwogCXNpemUgPSBtb2RlX2NtZC5waXRjaGVzWzBdICogbW9kZV9jbWQuaGVpZ2h0OwogCXNp emUgPSBQQUdFX0FMSUdOKHNpemUpOwogCW9iaiA9IGk5MTVfZ2VtX29iamVjdF9jcmVhdGVfc3Rv bGVuKGRldiwgc2l6ZSk7CkBAIC0xNzIsOCArMTc0LDkgQEAgc3RhdGljIGludCBpbnRlbGZiX2Fs bG9jKHN0cnVjdCBkcm1fZmJfaGVscGVyICpoZWxwZXIsCiAKIAlmYiA9IF9faW50ZWxfZnJhbWVi dWZmZXJfY3JlYXRlKGRldiwgJm1vZGVfY21kLCBvYmopOwogCWlmIChJU19FUlIoZmIpKSB7CisJ CS8qIERyb3BzIG9iamVjdCByZWZlcmVuY2Ugb24gZmFpbHVyZS4gKi8KIAkJcmV0ID0gUFRSX0VS UihmYik7Ci0JCWdvdG8gb3V0X3VucmVmOworCQlnb3RvIG91dDsKIAl9CiAKIAkvKiBGbHVzaCBl dmVyeXRoaW5nIG91dCwgd2UnbGwgYmUgZG9pbmcgR1RUIG9ubHkgZnJvbSBub3cgb24gKi8KQEAg LTE4MywxNSArMTg2LDE4IEBAIHN0YXRpYyBpbnQgaW50ZWxmYl9hbGxvYyhzdHJ1Y3QgZHJtX2Zi X2hlbHBlciAqaGVscGVyLAogCQlnb3RvIG91dF9mYjsKIAl9CiAKKwltdXRleF91bmxvY2soJmRl di0+c3RydWN0X211dGV4KTsKKwogCWlmYmRldi0+ZmIgPSB0b19pbnRlbF9mcmFtZWJ1ZmZlcihm Yik7CiAKIAlyZXR1cm4gMDsKIAogb3V0X2ZiOgotCWRybV9mcmFtZWJ1ZmZlcl9yZW1vdmUoZmIp Owotb3V0X3VucmVmOgogCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlKCZvYmotPmJhc2UpOwog b3V0OgorCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOworCWlmIChmYikKKwkJZHJt X2ZyYW1lYnVmZmVyX3JlbW92ZShmYik7CiAJcmV0dXJuIHJldDsKIH0KIApAQCAtMjA5LDggKzIx NSw2IEBAIHN0YXRpYyBpbnQgaW50ZWxmYl9jcmVhdGUoc3RydWN0IGRybV9mYl9oZWxwZXIgKmhl bHBlciwKIAlpbnQgc2l6ZSwgcmV0OwogCWJvb2wgcHJlYWxsb2MgPSBmYWxzZTsKIAotCW11dGV4 X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKLQogCWlmIChpbnRlbF9mYiAmJgogCSAgICAoc2l6 ZXMtPmZiX3dpZHRoID4gaW50ZWxfZmItPmJhc2Uud2lkdGggfHwKIAkgICAgIHNpemVzLT5mYl9o ZWlnaHQgPiBpbnRlbF9mYi0+YmFzZS5oZWlnaHQpKSB7CkBAIC0yMjUsNyArMjI5LDcgQEAgc3Rh dGljIGludCBpbnRlbGZiX2NyZWF0ZShzdHJ1Y3QgZHJtX2ZiX2hlbHBlciAqaGVscGVyLAogCQlE Uk1fREVCVUdfS01TKCJubyBCSU9TIGZiLCBhbGxvY2F0aW5nIGEgbmV3IG9uZVxuIik7CiAJCXJl dCA9IGludGVsZmJfYWxsb2MoaGVscGVyLCBzaXplcyk7CiAJCWlmIChyZXQpCi0JCQlnb3RvIG91 dF91bmxvY2s7CisJCQlyZXR1cm4gcmV0OwogCQlpbnRlbF9mYiA9IGlmYmRldi0+ZmI7CiAJfSBl bHNlIHsKIAkJRFJNX0RFQlVHX0tNUygicmUtdXNpbmcgQklPUyBmYlxuIik7CkBAIC0yMzcsNiAr MjQxLDggQEAgc3RhdGljIGludCBpbnRlbGZiX2NyZWF0ZShzdHJ1Y3QgZHJtX2ZiX2hlbHBlciAq aGVscGVyLAogCW9iaiA9IGludGVsX2ZiLT5vYmo7CiAJc2l6ZSA9IG9iai0+YmFzZS5zaXplOwog CisJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOworCiAJaW5mbyA9IGZyYW1lYnVmZmVy X2FsbG9jKDAsICZkZXYtPnBkZXYtPmRldik7CiAJaWYgKCFpbmZvKSB7CiAJCXJldCA9IC1FTk9N RU07CkBAIC0zMDcsNyArMzEzLDYgQEAgc3RhdGljIGludCBpbnRlbGZiX2NyZWF0ZShzdHJ1Y3Qg ZHJtX2ZiX2hlbHBlciAqaGVscGVyLAogb3V0X3VucGluOgogCWk5MTVfZ2VtX29iamVjdF9nZ3R0 X3VucGluKG9iaik7CiAJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2UoJm9iai0+YmFzZSk7Ci1v dXRfdW5sb2NrOgogCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCXJldHVybiBy ZXQ7CiB9Ci0tIAoyLjQuMgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK