From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lukas Wunner Subject: [PATCH v5 1/2] drm/i915: Fix failure paths around initial fbdev allocation Date: Tue, 30 Jun 2015 10:06:27 +0100 Message-ID: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mailout3.hostsharing.net (mailout3.hostsharing.net [176.9.242.54]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2F10F7A19E for ; Fri, 4 Sep 2015 07:00:56 -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 Cc: Jani Nikula List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCldlIGhhZCB0 d28gZmFpbHVyZSBtb2RlcyBoZXJlOgoKMS4KRGVhZGxvY2sgaW4gaW50ZWxmYl9hbGxvYyBmYWls dXJlIHBhdGggd2hlcmUgaXQgY2FsbHMKZHJtX2ZyYW1lYnVmZmVyX3JlbW92ZSwgd2hpY2ggZ3Jh YnMgdGhlIHN0cnVjdCBtdXRleCBhbmQgaW50ZWxmYl9jcmVhdGUKKGNhbGxlciBvZiBpbnRlbGZi X2FsbG9jKSB3YXMgYWxyZWFkeSBob2xkaW5nIGl0LgoKMi4KRGVhZGxvY2sgaW4gaW50ZWxmYl9j cmVhdGUgZmFpbHVyZSBwYXRoIHdoZXJlIGl0IGNhbGxzCmRybV9mcmFtZWJ1ZmZlcl91bnJlZmVy ZW5jZSwgd2hpY2ggZ3JhYnMgdGhlIHN0cnVjdCBtdXRleCBhbmQKaW50ZWxmYl9jcmVhdGUgd2Fz IGFscmVhZHkgaG9sZGluZyBpdC4KCnYyOgogICAqIFJlZm9ybWF0IGNvbW1pdCBtc2cgdG8gNzIg Y2hhcnMuIChMdWthcyBXdW5uZXIpCiAgICogQWRkIHRoaXJkIGZhaWx1cmUgbW9kZS4gKEx1a2Fz IFd1bm5lcikKCnYzOgogICAqIE9uIGZiIGFsbG9jIGZhaWx1cmUsIHVucmVmIGdlbSBvYmplY3Qg d2hlcmUgaXQgZ2V0cyByZWZlZCwKICAgICBmaXggZG91YmxlIHVucmVmIGluIHNlcGFyYXRlIGNv bW1pdC4gKFZpbGxlIFN5cmrDpGzDpCkKCnY0OgogICAqIExvY2sgc3RydWN0IG11dGV4IG9uIHVu cmVmLiAoQ2hyaXMgV2lsc29uKQoKdjU6CiAgICogUmViYXNlIG9uIGRybS1pbnRlbC1uaWdodGx5 IDIwMTV5LTA5bS0wNGQtMDhoLTE5bS0zNXMgVVRDLAogICAgIHJlcGhyYXNlIGNvbW1pdCBtZXNz YWdlLiAoSmFuaSBOaWN1bGEpCgpUZXN0ZWQtYnk6IFBpZXJyZSBNb3JlYXUgPHBpZXJyZS5tb3Jy b3dAZnJlZS5mcj4KICAgIFtNQlAgIDUsMyAyMDA5ICBudmlkaWEgOTQwME0gKyA5NjAwTSBHVCAg IHByZS1yZXRpbmFdClRlc3RlZC1ieTogUGF1bCBIb3JkaWllbmtvIDxwdnQuZ29yZEBnbWFpbC5j b20+CiAgICBbTUJQICA2LDIgMjAxMCAgaW50ZWwgSUxLICsgbnZpZGlhIEdUMjE2ICBwcmUtcmV0 aW5hXQpUZXN0ZWQtYnk6IFdpbGxpYW0gQnJvd24gPHdpbGxpYW1AYmxhY2toYXRzLm5ldC5hdT4K ICAgIFtNQlAgIDgsMiAyMDExICBpbnRlbCBTTkIgKyBhbWQgdHVya3MgICAgIHByZS1yZXRpbmFd ClRlc3RlZC1ieTogTHVrYXMgV3VubmVyIDxsdWthc0B3dW5uZXIuZGU+CiAgICBbTUJQICA5LDEg MjAxMiAgaW50ZWwgSVZCICsgbnZpZGlhIEdLMTA3ICBwcmUtcmV0aW5hXQpUZXN0ZWQtYnk6IEJy dW5vIEJpZXJiYXVtZXIgPGJydW5vQGJpZXJiYXVtZXIubmV0PgogICAgW01CUCAxMSwzIDIwMTMg IGludGVsIEhTVyArIG52aWRpYSBHSzEwNyAgcmV0aW5hXQoKU2lnbmVkLW9mZi1ieTogVHZydGtv IFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KRml4ZXM6IDYwYTVjYTAxNWZmZCAo ImRybS9pOTE1OiBBZGQgbG9ja2luZyBhcm91bmQKICAgIGZyYW1lYnVmZmVyX3JlZmVyZW5jZXMt LSIpClJlcG9ydGVkLWJ5OiBMdWthcyBXdW5uZXIgPGx1a2FzQHd1bm5lci5kZT4KW0x1a2FzOiBD cmVhdGUgdjMgKyB2NCArIHY1IGJhc2VkIG9uIFR2cnRrbydzIHYyXQpTaWduZWQtb2ZmLWJ5OiBM dWthcyBXdW5uZXIgPGx1a2FzQHd1bm5lci5kZT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hy aXMtd2lsc29uLmNvLnVrPgpDYzogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4 LmludGVsLmNvbT4KQ2M6IEphbmkgTmlrdWxhIDxqYW5pLm5pa3VsYUBpbnRlbC5jb20+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYuYyB8IDIwICsrKysrKysrKysrKy0tLS0t LS0tCiAxIGZpbGUgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYuYwppbmRleCA5NjQ3NmQ3Li5lZWUzMzA2IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMKQEAgLTExOSw3ICsxMTksNyBAQCBzdGF0aWMgaW50IGlu dGVsZmJfYWxsb2Moc3RydWN0IGRybV9mYl9oZWxwZXIgKmhlbHBlciwKIHsKIAlzdHJ1Y3QgaW50 ZWxfZmJkZXYgKmlmYmRldiA9CiAJCWNvbnRhaW5lcl9vZihoZWxwZXIsIHN0cnVjdCBpbnRlbF9m YmRldiwgaGVscGVyKTsKLQlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYjsKKwlzdHJ1Y3QgZHJt X2ZyYW1lYnVmZmVyICpmYiA9IE5VTEw7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGhlbHBl ci0+ZGV2OwogCXN0cnVjdCBkcm1fbW9kZV9mYl9jbWQyIG1vZGVfY21kID0ge307CiAJc3RydWN0 IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iajsKQEAgLTEzNyw2ICsxMzcsOCBAQCBzdGF0aWMgaW50 IGludGVsZmJfYWxsb2Moc3RydWN0IGRybV9mYl9oZWxwZXIgKmhlbHBlciwKIAltb2RlX2NtZC5w aXhlbF9mb3JtYXQgPSBkcm1fbW9kZV9sZWdhY3lfZmJfZm9ybWF0KHNpemVzLT5zdXJmYWNlX2Jw cCwKIAkJCQkJCQkgIHNpemVzLT5zdXJmYWNlX2RlcHRoKTsKIAorCW11dGV4X2xvY2soJmRldi0+ c3RydWN0X211dGV4KTsKKwogCXNpemUgPSBtb2RlX2NtZC5waXRjaGVzWzBdICogbW9kZV9jbWQu aGVpZ2h0OwogCXNpemUgPSBQQUdFX0FMSUdOKHNpemUpOwogCW9iaiA9IGk5MTVfZ2VtX29iamVj dF9jcmVhdGVfc3RvbGVuKGRldiwgc2l6ZSk7CkBAIC0xNTgsMTggKzE2MCwyMSBAQCBzdGF0aWMg aW50IGludGVsZmJfYWxsb2Moc3RydWN0IGRybV9mYl9oZWxwZXIgKmhlbHBlciwKIAlyZXQgPSBp bnRlbF9waW5fYW5kX2ZlbmNlX2ZiX29iaihOVUxMLCBmYiwgTlVMTCwgTlVMTCwgTlVMTCk7CiAJ aWYgKHJldCkgewogCQlEUk1fRVJST1IoImZhaWxlZCB0byBwaW4gb2JqOiAlZFxuIiwgcmV0KTsK LQkJZ290byBvdXRfZmI7CisJCWdvdG8gb3V0X3VucmVmOwogCX0KIAorCW11dGV4X3VubG9jaygm ZGV2LT5zdHJ1Y3RfbXV0ZXgpOworCiAJaWZiZGV2LT5mYiA9IHRvX2ludGVsX2ZyYW1lYnVmZmVy KGZiKTsKIAogCXJldHVybiAwOwogCi1vdXRfZmI6Ci0JZHJtX2ZyYW1lYnVmZmVyX3JlbW92ZShm Yik7CiBvdXRfdW5yZWY6CiAJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2UoJm9iai0+YmFzZSk7 CiBvdXQ6CisJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CisJaWYgKGZiKQorCQlk cm1fZnJhbWVidWZmZXJfcmVtb3ZlKGZiKTsKIAlyZXR1cm4gcmV0OwogfQogCkBAIC0xODcsOCAr MTkyLDYgQEAgc3RhdGljIGludCBpbnRlbGZiX2NyZWF0ZShzdHJ1Y3QgZHJtX2ZiX2hlbHBlciAq aGVscGVyLAogCWludCBzaXplLCByZXQ7CiAJYm9vbCBwcmVhbGxvYyA9IGZhbHNlOwogCi0JbXV0 ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCiAJaWYgKGludGVsX2ZiICYmCiAJICAgIChz aXplcy0+ZmJfd2lkdGggPiBpbnRlbF9mYi0+YmFzZS53aWR0aCB8fAogCSAgICAgc2l6ZXMtPmZi X2hlaWdodCA+IGludGVsX2ZiLT5iYXNlLmhlaWdodCkpIHsKQEAgLTIwMyw3ICsyMDYsNyBAQCBz dGF0aWMgaW50IGludGVsZmJfY3JlYXRlKHN0cnVjdCBkcm1fZmJfaGVscGVyICpoZWxwZXIsCiAJ CURSTV9ERUJVR19LTVMoIm5vIEJJT1MgZmIsIGFsbG9jYXRpbmcgYSBuZXcgb25lXG4iKTsKIAkJ cmV0ID0gaW50ZWxmYl9hbGxvYyhoZWxwZXIsIHNpemVzKTsKIAkJaWYgKHJldCkKLQkJCWdvdG8g b3V0X3VubG9jazsKKwkJCXJldHVybiByZXQ7CiAJCWludGVsX2ZiID0gaWZiZGV2LT5mYjsKIAl9 IGVsc2UgewogCQlEUk1fREVCVUdfS01TKCJyZS11c2luZyBCSU9TIGZiXG4iKTsKQEAgLTIxNSw2 ICsyMTgsOCBAQCBzdGF0aWMgaW50IGludGVsZmJfY3JlYXRlKHN0cnVjdCBkcm1fZmJfaGVscGVy ICpoZWxwZXIsCiAJb2JqID0gaW50ZWxfZmItPm9iajsKIAlzaXplID0gb2JqLT5iYXNlLnNpemU7 CiAKKwltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CisKIAlpbmZvID0gZHJtX2ZiX2hl bHBlcl9hbGxvY19mYmkoaGVscGVyKTsKIAlpZiAoSVNfRVJSKGluZm8pKSB7CiAJCXJldCA9IFBU Ul9FUlIoaW5mbyk7CkBAIC0yNzYsNyArMjgxLDYgQEAgb3V0X2Rlc3Ryb3lfZmJpOgogb3V0X3Vu cGluOgogCWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKG9iaik7CiAJZHJtX2dlbV9vYmplY3Rf dW5yZWZlcmVuY2UoJm9iai0+YmFzZSk7Ci1vdXRfdW5sb2NrOgogCW11dGV4X3VubG9jaygmZGV2 LT5zdHJ1Y3RfbXV0ZXgpOwogCXJldHVybiByZXQ7CiB9Ci0tIAoyLjEuMAoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK