From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lukas Wunner Subject: [PATCH v2 2/2] drm/i915: Tear down fbdev if initialization fails Date: Tue, 3 Nov 2015 08:00:33 +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 mailout3.hostsharing.net (mailout3.hostsharing.net [176.9.242.54]) by gabe.freedesktop.org (Postfix) with ESMTPS id 076066E60C for ; Sun, 8 Nov 2015 08:20:32 -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 Q3VycmVudGx5IGlmIGludGVsZmJfY3JlYXRlKCkgZXJyb3JzIG91dCwgaXQgdW5yZWZzIHRoZSBi byBldmVuIHRob3VnaAp0aGUgZmIgbm93IG93bnMgdGhhdCByZWZlcmVuY2UuIChTcG90dGVkIGJ5 IFZpbGxlIFN5cmrDpGzDpC4pIFdlIHNob3VsZAp1bnJlZiB0aGUgZmIgaW5zdGVhZCBvZiB0aGUg Ym8uCgpIb3dldmVyIHRoZSBmYiB3YXMgbm90IG5lY2Vzc2FyaWx5IGFsbG9jYXRlZCBieSBpbnRl bGZiX2NyZWF0ZSgpLAppdCBjb3VsZCBiZSBpbmhlcml0ZWQgZnJvbSBCSU9TICh0aGUgZmIgc3Ry dWN0IHdhcyB0aGVuIGFsbG9jYXRlZCBieQpkZXZfcHJpdi0+ZGlzcGxheS5nZXRfaW5pdGlhbF9w bGFuZV9jb25maWcoKSkgYW5kIGJlIGluIGFjdGl2ZSB1c2UgYnkKYSBjcnRjLiBJbiB0aGlzIGNh c2Ugd2Ugc2hvdWxkIGNhbGwgZHJtX2ZyYW1lYnVmZmVyX3JlbW92ZSgpIGluc3RlYWQKb2YgX3Vu cmVmZXJlbmNlKCkgdG8gYWxzbyBkaXNhYmxlIHRoZSBjcnRjLgoKRGFuaWVsIFZldHRlciBzdWdn ZXN0ZWQgdGhhdCAiZmJkZXYgdGVhcmRvd24gY29kZSB3aWxsIHRha2UgY2FyZSBvZiBpdC4KVGhl IGNvcnJlY3QgYXBwcm9hY2ggaXMgcHJvYmFibHkgdG8gbm90IHVucmVmIGFueXRoaW5nIGF0IGFs bCIuCgpCdXQgaWYgZmJkZXYgaW5pdGlhbGl6YXRpb24gZmFpbHMsIHRoZSBmYmRldiBpc24ndCB0 b3JuIGRvd24gYW5kCm9jY3VwaWVzIG1lbW9yeSBldmVuIHRob3VnaCBpdCdzIHVudXNhYmxlLiBU aGVyZWZvcmUgY2xvYmJlciBpdCBpbgppbnRlbF9mYmRldl9pbml0aWFsX2NvbmZpZygpLiAoQ3Vy cmVudGx5IHdlIGlnbm9yZSBhIG5lZ2F0aXZlIHJldHVybgp2YWx1ZSB0aGVyZS4pIFRoZSBpZGVh IGlzIHRoYXQgaWYgZmJkZXYgaW5pdGlhbGl6YXRpb24gZmFpbHMsIHRoZSBkcml2ZXIKYmVoYXZl cyBhcyBpZiBDT05GSUdfRFJNX0ZCREVWX0VNVUxBVElPTiB3YXNuJ3Qgc2V0LgoKQWxzbywgbG9n IGVycm9ycyBpbiBpbnRlbGZiX2NyZWF0ZSgpLgoKTW92ZSBhc3luY19zeW5jaHJvbml6ZV9mdWxs KCkgZnJvbSBpbnRlbF9mYmRldl9maW5pKCkgdG8gaXRzIHNvbGUgY2FsbGVyCmk5MTVfZHJpdmVy X3VubG9hZCgpIHRvIGF2b2lkIGRlYWRsb2NrIGlmIGZiZGV2IGluaXRpYWxpemF0aW9uIGZhaWxz LgoKdjI6IEluc3RlYWQgb2YgY2FsbGluZyBkcm1fZnJhbWVidWZmZXJfdW5yZWZlcmVuY2UoKSAo aWYgZmIgd2FzIG5vdAogICAgaW5oZXJpdGVkIGZyb20gQklPUyksIGNhbGwgaW50ZWxfZmJkZXZf ZmluaSgpLgoKQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+ClNpZ25l ZC1vZmYtYnk6IEx1a2FzIFd1bm5lciA8bHVrYXNAd3VubmVyLmRlPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZG1hLmMgICAgfCAxICsKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2ZiZGV2LmMgfCA5ICsrKysrLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA2IGluc2VydGlvbnMoKyks IDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k bWEuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMKaW5kZXggZmZjYjljNi4uNjhh YjUxZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jCkBAIC0xMTU0LDYgKzExNTQsNyBAQCBpbnQg aTkxNV9kcml2ZXJfdW5sb2FkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAlhY3BpX3ZpZGVv X3VucmVnaXN0ZXIoKTsKIAorCWFzeW5jX3N5bmNocm9uaXplX2Z1bGwoKTsKIAlpbnRlbF9mYmRl dl9maW5pKGRldik7CiAKIAlkcm1fdmJsYW5rX2NsZWFudXAoZGV2KTsKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9mYmRldi5jCmluZGV4IDA1NDg0YmEuLjI5Njk0NDcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZmJkZXYuYwpAQCAtMjI3LDYgKzIyNyw3IEBAIHN0YXRpYyBpbnQgaW50ZWxmYl9jcmVhdGUo c3RydWN0IGRybV9mYl9oZWxwZXIgKmhlbHBlciwKIAogCWluZm8gPSBkcm1fZmJfaGVscGVyX2Fs bG9jX2ZiaShoZWxwZXIpOwogCWlmIChJU19FUlIoaW5mbykpIHsKKwkJRFJNX0VSUk9SKCJGYWls ZWQgdG8gYWxsb2NhdGUgZmJfaW5mb1xuIik7CiAJCXJldCA9IFBUUl9FUlIoaW5mbyk7CiAJCWdv dG8gb3V0X3VucGluOwogCX0KQEAgLTI1Myw2ICsyNTQsNyBAQCBzdGF0aWMgaW50IGludGVsZmJf Y3JlYXRlKHN0cnVjdCBkcm1fZmJfaGVscGVyICpoZWxwZXIsCiAJCWlvcmVtYXBfd2MoZGV2X3By aXYtPmd0dC5tYXBwYWJsZV9iYXNlICsgaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KG9iaiksCiAJ CQkgICBzaXplKTsKIAlpZiAoIWluZm8tPnNjcmVlbl9iYXNlKSB7CisJCURSTV9FUlJPUigiRmFp bGVkIHRvIHJlbWFwIGZyYW1lYnVmZmVyIGludG8gdmlydHVhbCBtZW1vcnlcbiIpOwogCQlyZXQg PSAtRU5PU1BDOwogCQlnb3RvIG91dF9kZXN0cm95X2ZiaTsKIAl9CkBAIC0yODUsNyArMjg3LDYg QEAgb3V0X2Rlc3Ryb3lfZmJpOgogCWRybV9mYl9oZWxwZXJfcmVsZWFzZV9mYmkoaGVscGVyKTsK IG91dF91bnBpbjoKIAlpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBpbihvYmopOwotCWRybV9nZW1f b2JqZWN0X3VucmVmZXJlbmNlKCZvYmotPmJhc2UpOwogCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1 Y3RfbXV0ZXgpOwogCXJldHVybiByZXQ7CiB9CkBAIC03MTMsNyArNzE0LDkgQEAgdm9pZCBpbnRl bF9mYmRldl9pbml0aWFsX2NvbmZpZyh2b2lkICpkYXRhLCBhc3luY19jb29raWVfdCBjb29raWUp CiAJc3RydWN0IGludGVsX2ZiZGV2ICppZmJkZXYgPSBkZXZfcHJpdi0+ZmJkZXY7CiAKIAkvKiBE dWUgdG8gcGVjdWxpYXIgaW5pdCBvcmRlciB3cnQgdG8gaHBkIGhhbmRsaW5nIHRoaXMgaXMgc2Vw YXJhdGUuICovCi0JZHJtX2ZiX2hlbHBlcl9pbml0aWFsX2NvbmZpZygmaWZiZGV2LT5oZWxwZXIs IGlmYmRldi0+cHJlZmVycmVkX2JwcCk7CisJaWYgKGRybV9mYl9oZWxwZXJfaW5pdGlhbF9jb25m aWcoJmlmYmRldi0+aGVscGVyLAorCQkJCQkgaWZiZGV2LT5wcmVmZXJyZWRfYnBwKSkKKwkJaW50 ZWxfZmJkZXZfZmluaShkZXZfcHJpdi0+ZGV2KTsKIH0KIAogdm9pZCBpbnRlbF9mYmRldl9maW5p KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCkBAIC03MjMsOCArNzI2LDYgQEAgdm9pZCBpbnRlbF9m YmRldl9maW5pKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCXJldHVybjsKIAogCWZsdXNoX3dv cmsoJmRldl9wcml2LT5mYmRldl9zdXNwZW5kX3dvcmspOwotCi0JYXN5bmNfc3luY2hyb25pemVf ZnVsbCgpOwogCWludGVsX2ZiZGV2X2Rlc3Ryb3koZGV2LCBkZXZfcHJpdi0+ZmJkZXYpOwogCWtm cmVlKGRldl9wcml2LT5mYmRldik7CiAJZGV2X3ByaXYtPmZiZGV2ID0gTlVMTDsKLS0gCjEuOC41 LjIgKEFwcGxlIEdpdC00OCkKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==