From mboxrd@z Thu Jan  1 00:00:00 1970
From: Lukas Wunner <lukas@wunner.de>
Subject: [PATCH v6 3/4] drm/i915: Fix failure paths around
 initial fbdev allocation
Date: Tue, 30 Jun 2015 10:06:27 +0100
Message-ID: <4a4f691ea23a9a3f84afc47928c81e681cfd6fc7.1445771693.git.lukas@wunner.de>
References: <20151015173423.GK26517@intel.com>
 <cover.1445771693.git.lukas@wunner.de>
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 mailout2.hostsharing.net (mailout2.hostsharing.net
 [83.223.90.233])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 584BC6E27F
 for <intel-gfx@lists.freedesktop.org>; Sun, 25 Oct 2015 06:59:36 -0700 (PDT)
In-Reply-To: <cover.1445771693.git.lukas@wunner.de>
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

RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCldlIGhhZCB0
d28gZmFpbHVyZSBtb2RlcyBoZXJlOgoKMS4KRGVhZGxvY2sgaW4gaW50ZWxmYl9hbGxvYyBmYWls
dXJlIHBhdGggd2hlcmUgaXQgY2FsbHMKZHJtX2ZyYW1lYnVmZmVyX3JlbW92ZSwgd2hpY2ggZ3Jh
YnMgdGhlIHN0cnVjdCBtdXRleCBhbmQgaW50ZWxmYl9jcmVhdGUKKGNhbGxlciBvZiBpbnRlbGZi
X2FsbG9jKSB3YXMgYWxyZWFkeSBob2xkaW5nIGl0LgoKMi4KRGVhZGxvY2sgaW4gaW50ZWxmYl9j
cmVhdGUgZmFpbHVyZSBwYXRoIHdoZXJlIGl0IGNhbGxzCmRybV9mcmFtZWJ1ZmZlcl91bnJlZmVy
ZW5jZSwgd2hpY2ggZ3JhYnMgdGhlIHN0cnVjdCBtdXRleCBhbmQKaW50ZWxmYl9jcmVhdGUgd2Fz
IGFscmVhZHkgaG9sZGluZyBpdC4KCltDaHJpcyBXaWxzb24gb24gd2h5IHN0cnVjdF9tdXRleCBu
ZWVkcyB0byBiZSBsb2NrZWQgaW4gdGhlIHNlY29uZCBoYWxmCm9mIGludGVsZmJfY3JlYXRlOiAi
dGhlcmUgaXMgYSBidWcgaGVyZSB3aGVyZSB3ZSBkb24ndCB0YWtlIGFuIGV4cGxpY2l0CnBpbiBv
biB0aGUgVk1BIHdlIHNldHVwIGZvciB0aGUgZmJkZXYgd2hpY2ggcmVxdWlyZXMgdGhlIGxvY2su
Il0KCnYyOgogICAqIFJlZm9ybWF0IGNvbW1pdCBtc2cgdG8gNzIgY2hhcnMuIChMdWthcyBXdW5u
ZXIpCiAgICogQWRkIHRoaXJkIGZhaWx1cmUgbW9kZS4gKEx1a2FzIFd1bm5lcikKCnY1OgogICAq
IFJlYmFzZSBvbiBkcm0taW50ZWwtbmlnaHRseSAyMDE1eS0wOW0tMDFkLTA5aC0wNm0tMDhzIFVU
QywKICAgICByZXBocmFzZSBjb21taXQgbWVzc2FnZS4gKEphbmkgTmljdWxhKQoKdjY6CiAgICog
SW4gaW50ZWxmYl9hbGxvYywgaWYgX19pbnRlbF9mcmFtZWJ1ZmZlcl9jcmVhdGUgZmFpbGVkLAog
ICAgIGZiIHdpbGwgYmUgYW4gRVJSX1BUUiwgdGh1cyBub3QgbnVsbC4gU28gaW4gdGhlIGZhaWx1
cmUKICAgICBwYXRoIHdlIG5lZWQgdG8gY2hlY2sgZm9yIElTX0VSUl9PUl9OVUxMIHRvIGF2b2lk
IGNhbGxpbmcKICAgICBkcm1fZnJhbWVidWZmZXJfcmVtb3ZlIG9uIHRoZSBFUlJfUFRSLiAoTHVr
YXMgV3VubmVyKQogICAqIFNpbmNlIHRoaXMgaXMgaW5pdCBjb2RlIGEgZHJtX2ZyYW1lYnVmZmVy
X3VucmVmZXJlbmNlIHNob3VsZAogICAgIGJlIGFsbCB3ZSBuZWVkLiBkcm1fZnJhbWVidWZmZXJf
cmVtb3ZlIGlzIGZvciBmcmFtZWJ1ZmZlcnMKICAgICB0aGF0IHVzZXJzcGFjZSBoYXMgY3JlYXRl
ZCAtIGFuZCBpcyBnZXR0aW5nIHNvbWV3aGF0CiAgICAgZGVmZWF0dXJlZC4gKERhbmllbCBWZXR0
ZXIpCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwu
Y29tPgpGaXhlczogNjBhNWNhMDE1ZmZkICgiZHJtL2k5MTU6IEFkZCBsb2NraW5nIGFyb3VuZAog
ICAgZnJhbWVidWZmZXJfcmVmZXJlbmNlcy0tIikKUmVwb3J0ZWQtYnk6IEx1a2FzIFd1bm5lciA8
bHVrYXNAd3VubmVyLmRlPgpbTHVrYXM6IENyZWF0ZSB2MyArIHY0ICsgdjUgKyB2NiBiYXNlZCBv
biBUdnJ0a28ncyB2Ml0KU2lnbmVkLW9mZi1ieTogTHVrYXMgV3VubmVyIDxsdWthc0B3dW5uZXIu
ZGU+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KQ2M6IFZpbGxl
IFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9n
cHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYuYyB8IDIwICsrKysrKysrKysrKy0tLS0tLS0tCiAxIGZp
bGUgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg
YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfZmJkZXYuYwppbmRleCBlYzgyYjUxLi4xMjU5N2I1IDEwMDY0NAotLS0gYS9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX2ZiZGV2LmMKQEAgLTExOSw3ICsxMTksNyBAQCBzdGF0aWMgaW50IGludGVsZmJfYWxs
b2Moc3RydWN0IGRybV9mYl9oZWxwZXIgKmhlbHBlciwKIHsKIAlzdHJ1Y3QgaW50ZWxfZmJkZXYg
KmlmYmRldiA9CiAJCWNvbnRhaW5lcl9vZihoZWxwZXIsIHN0cnVjdCBpbnRlbF9mYmRldiwgaGVs
cGVyKTsKLQlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYjsKKwlzdHJ1Y3QgZHJtX2ZyYW1lYnVm
ZmVyICpmYiA9IE5VTEw7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGhlbHBlci0+ZGV2Owog
CXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIAlzdHJ1
Y3QgZHJtX21vZGVfZmJfY21kMiBtb2RlX2NtZCA9IHt9OwpAQCAtMTM4LDYgKzEzOCw4IEBAIHN0
YXRpYyBpbnQgaW50ZWxmYl9hbGxvYyhzdHJ1Y3QgZHJtX2ZiX2hlbHBlciAqaGVscGVyLAogCW1v
ZGVfY21kLnBpeGVsX2Zvcm1hdCA9IGRybV9tb2RlX2xlZ2FjeV9mYl9mb3JtYXQoc2l6ZXMtPnN1
cmZhY2VfYnBwLAogCQkJCQkJCSAgc2l6ZXMtPnN1cmZhY2VfZGVwdGgpOwogCisJbXV0ZXhfbG9j
aygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOworCiAJc2l6ZSA9IG1vZGVfY21kLnBpdGNoZXNbMF0gKiBt
b2RlX2NtZC5oZWlnaHQ7CiAJc2l6ZSA9IFBBR0VfQUxJR04oc2l6ZSk7CiAKQEAgLTE2NSwxNiAr
MTY3LDE5IEBAIHN0YXRpYyBpbnQgaW50ZWxmYl9hbGxvYyhzdHJ1Y3QgZHJtX2ZiX2hlbHBlciAq
aGVscGVyLAogCXJldCA9IGludGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKE5VTEwsIGZiLCBOVUxM
LCBOVUxMLCBOVUxMKTsKIAlpZiAocmV0KSB7CiAJCURSTV9FUlJPUigiZmFpbGVkIHRvIHBpbiBv
Ymo6ICVkXG4iLCByZXQpOwotCQlnb3RvIG91dF9mYjsKKwkJZ290byBvdXQ7CiAJfQogCisJbXV0
ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CisKIAlpZmJkZXYtPmZiID0gdG9faW50ZWxf
ZnJhbWVidWZmZXIoZmIpOwogCiAJcmV0dXJuIDA7CiAKLW91dF9mYjoKLQlkcm1fZnJhbWVidWZm
ZXJfcmVtb3ZlKGZiKTsKIG91dDoKKwltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsK
KwlpZiAoIUlTX0VSUl9PUl9OVUxMKGZiKSkKKwkJZHJtX2ZyYW1lYnVmZmVyX3VucmVmZXJlbmNl
KGZiKTsKIAlyZXR1cm4gcmV0OwogfQogCkBAIC0xOTIsOCArMTk3LDYgQEAgc3RhdGljIGludCBp
bnRlbGZiX2NyZWF0ZShzdHJ1Y3QgZHJtX2ZiX2hlbHBlciAqaGVscGVyLAogCWludCBzaXplLCBy
ZXQ7CiAJYm9vbCBwcmVhbGxvYyA9IGZhbHNlOwogCi0JbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3Rf
bXV0ZXgpOwotCiAJaWYgKGludGVsX2ZiICYmCiAJICAgIChzaXplcy0+ZmJfd2lkdGggPiBpbnRl
bF9mYi0+YmFzZS53aWR0aCB8fAogCSAgICAgc2l6ZXMtPmZiX2hlaWdodCA+IGludGVsX2ZiLT5i
YXNlLmhlaWdodCkpIHsKQEAgLTIwOCw3ICsyMTEsNyBAQCBzdGF0aWMgaW50IGludGVsZmJfY3Jl
YXRlKHN0cnVjdCBkcm1fZmJfaGVscGVyICpoZWxwZXIsCiAJCURSTV9ERUJVR19LTVMoIm5vIEJJ
T1MgZmIsIGFsbG9jYXRpbmcgYSBuZXcgb25lXG4iKTsKIAkJcmV0ID0gaW50ZWxmYl9hbGxvYyho
ZWxwZXIsIHNpemVzKTsKIAkJaWYgKHJldCkKLQkJCWdvdG8gb3V0X3VubG9jazsKKwkJCXJldHVy
biByZXQ7CiAJCWludGVsX2ZiID0gaWZiZGV2LT5mYjsKIAl9IGVsc2UgewogCQlEUk1fREVCVUdf
S01TKCJyZS11c2luZyBCSU9TIGZiXG4iKTsKQEAgLTIyMCw2ICsyMjMsOCBAQCBzdGF0aWMgaW50
IGludGVsZmJfY3JlYXRlKHN0cnVjdCBkcm1fZmJfaGVscGVyICpoZWxwZXIsCiAJb2JqID0gaW50
ZWxfZmItPm9iajsKIAlzaXplID0gb2JqLT5iYXNlLnNpemU7CiAKKwltdXRleF9sb2NrKCZkZXYt
PnN0cnVjdF9tdXRleCk7CisKIAlpbmZvID0gZHJtX2ZiX2hlbHBlcl9hbGxvY19mYmkoaGVscGVy
KTsKIAlpZiAoSVNfRVJSKGluZm8pKSB7CiAJCXJldCA9IFBUUl9FUlIoaW5mbyk7CkBAIC0yODEs
NyArMjg2LDYgQEAgb3V0X2Rlc3Ryb3lfZmJpOgogb3V0X3VucGluOgogCWk5MTVfZ2VtX29iamVj
dF9nZ3R0X3VucGluKG9iaik7CiAJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2UoJm9iai0+YmFz
ZSk7Ci1vdXRfdW5sb2NrOgogCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCXJl
dHVybiByZXQ7CiB9Ci0tIAoxLjguNS4yIChBcHBsZSBHaXQtNDgpCgpfX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu
dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9y
Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=