From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH] drm/i915: Protect fbdev across slow or failed initialisation Date: Wed, 30 Mar 2016 18:57:14 +0100 Message-ID: <1459360634-25516-1-git-send-email-chris@chris-wilson.co.uk> References: <56FC0ADA.6030802@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x233.google.com (mail-wm0-x233.google.com [IPv6:2a00:1450:400c:c09::233]) by gabe.freedesktop.org (Postfix) with ESMTPS id 104976E888 for ; Wed, 30 Mar 2016 17:57:23 +0000 (UTC) Received: by mail-wm0-x233.google.com with SMTP id 20so81797889wmh.1 for ; Wed, 30 Mar 2016 10:57:22 -0700 (PDT) In-Reply-To: <56FC0ADA.6030802@intel.com> 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, Gabriel Feceoru List-Id: intel-gfx@lists.freedesktop.org SWYgdGhlIGluaXRpYWxpc2F0aW9uIGZhaWxzLCB3ZSBtYXkgYmUgbGVmdCB3aXRoIGEgZGFuZ2xp bmcgcG9pbnRlciB3aXRoCmFuIGluY29tcGxldGUgZmJkZXYgc3RydWN0dXJlLiBIZXJlIHdlIHdh bnQgdG8gZGlzYWJsZSBpbnRlcm5hbCBjYWxscwppbnRvIGZiZGV2LiBTaW1pbGFybHksIHRoZSBp bml0aWFsaXNhdGlvbiBtYXkgYmUgc2xvdyBhbmQgd2UgaGF2ZW4ndCB5ZXQKZW5hYmxlZCB0aGUg ZmJkZXYgKGUuZy4gcXVpY2sgc3VzcGVuZCBvciBsYXN0LWNsb3NlIGJlZm9yZSB0aGUgYXN5bmMg aW5pdApjb21wbGV0ZXMpLgoKQnVnemlsbGE6IGh0dHBzOi8vYnVncy5mcmVlZGVza3RvcC5vcmcv c2hvd19idWcuY2dpP2lkPTkzNTgwClJlcG9ydGVkLWJ5OiAiTGksIFdlaW5hbiBaIiA8d2VpbmFu LnoubGlAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlz LXdpbHNvbi5jby51az4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jIHwg NDggKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk LCAzMCBpbnNlcnRpb25zKCspLCAxOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZmJkZXYuYwppbmRleCA1MWE1ZTM5ZTUyZjIuLjBiYWU5MTI2OGExMiAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9mYmRldi5jCkBAIC0xMTQsNiArMTE0LDI0IEBAIHN0YXRpYyBzdHJ1Y3QgZmJfb3Bz IGludGVsZmJfb3BzID0gewogCS5mYl9kZWJ1Z19sZWF2ZSA9IGRybV9mYl9oZWxwZXJfZGVidWdf bGVhdmUsCiB9OwogCitzdGF0aWMgc3RydWN0IGludGVsX2ZiZGV2ICppbnRlbF9mYmRldl9nZXRf aWZfYWN0aXZlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCit7CisJc3RydWN0IGRybV9pOTE1X2Rl dmljZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CisJc3RydWN0IGZiX2luZm8gKmluZm87CisK KwlpZiAoZGV2X3ByaXYtPmZiZGV2ID09IE5VTEwpCisJCXJldHVybiBOVUxMOworCisJaW5mbyA9 IGlmYmRldi0+aGVscGVyLmZiZGV2OworCWlmIChpbmZvLT5zY3JlZW5fYmFzZSA9PSBOVUxMKQor CQlyZXR1cm4gTlVMTDsKKworCWlmIChpbmZvLT5zdGF0ZSAhPSBGQklORk9fU1RBVEVfUlVOTklO RykKKwkJcmV0dXJuIE5VTEw7CisKKwlyZXR1cm4gZGV2X3ByaXYtPmZiZGV2OworfQorCiBzdGF0 aWMgaW50IGludGVsZmJfYWxsb2Moc3RydWN0IGRybV9mYl9oZWxwZXIgKmhlbHBlciwKIAkJCSBz dHJ1Y3QgZHJtX2ZiX2hlbHBlcl9zdXJmYWNlX3NpemUgKnNpemVzKQogewpAQCAtNzY0LDYgKzc4 Miw4IEBAIHZvaWQgaW50ZWxfZmJkZXZfc2V0X3N1c3BlbmQoc3RydWN0IGRybV9kZXZpY2UgKmRl diwgaW50IHN0YXRlLCBib29sIHN5bmNocm9ub3VzCiAJCXJldHVybjsKIAogCWluZm8gPSBpZmJk ZXYtPmhlbHBlci5mYmRldjsKKwlpZiAoaW5mby0+c2NyZWVuX2Jhc2UgPT0gTlVMTCkKKwkJcmV0 dXJuOwogCiAJaWYgKHN5bmNocm9ub3VzKSB7CiAJCS8qIEZsdXNoIGFueSBwZW5kaW5nIHdvcmsg dG8gdHVybiB0aGUgY29uc29sZSBvbiwgYW5kIHRoZW4KQEAgLTgwNSwzMiArODI1LDI0IEBAIHZv aWQgaW50ZWxfZmJkZXZfc2V0X3N1c3BlbmQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50IHN0 YXRlLCBib29sIHN5bmNocm9ub3VzCiAKIHZvaWQgaW50ZWxfZmJkZXZfb3V0cHV0X3BvbGxfY2hh bmdlZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CisJc3RydWN0IGludGVsX2ZiZGV2ICppZmJk ZXYgPSBpbnRlbF9mYmRldl9nZXRfaWZfYWN0aXZlKGRldik7CisKKwlpZiAoaWZiZGV2ID09IE5V TEwpCisJCXJldHVybjsKIAotCWFzeW5jX3N5bmNocm9uaXplX2Z1bGwoKTsKLQlpZiAoZGV2X3By aXYtPmZiZGV2KQotCQlkcm1fZmJfaGVscGVyX2hvdHBsdWdfZXZlbnQoJmRldl9wcml2LT5mYmRl di0+aGVscGVyKTsKKwlkcm1fZmJfaGVscGVyX2hvdHBsdWdfZXZlbnQoJmlmYmRldi0+aGVscGVy KTsKIH0KIAogdm9pZCBpbnRlbF9mYmRldl9yZXN0b3JlX21vZGUoc3RydWN0IGRybV9kZXZpY2Ug KmRldikKIHsKLQlpbnQgcmV0OwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IGRldi0+ZGV2X3ByaXZhdGU7Ci0Jc3RydWN0IGludGVsX2ZiZGV2ICppZmJkZXYgPSBkZXZfcHJp di0+ZmJkZXY7Ci0Jc3RydWN0IGRybV9mYl9oZWxwZXIgKmZiX2hlbHBlcjsKKwlzdHJ1Y3QgaW50 ZWxfZmJkZXYgKmlmYmRldiA9IGludGVsX2ZiZGV2X2dldF9pZl9hY3RpdmUoZGV2KTsKIAotCWFz eW5jX3N5bmNocm9uaXplX2Z1bGwoKTsKLQlpZiAoIWlmYmRldikKKwlpZiAoaWZiZGV2ID09IE5V TEwpCiAJCXJldHVybjsKIAotCWZiX2hlbHBlciA9ICZpZmJkZXYtPmhlbHBlcjsKLQotCXJldCA9 IGRybV9mYl9oZWxwZXJfcmVzdG9yZV9mYmRldl9tb2RlX3VubG9ja2VkKGZiX2hlbHBlcik7Ci0J aWYgKHJldCkgewotCQlEUk1fREVCVUcoImZhaWxlZCB0byByZXN0b3JlIGNydGMgbW9kZVxuIik7 Ci0JfSBlbHNlIHsKLQkJbXV0ZXhfbG9jaygmZmJfaGVscGVyLT5kZXYtPnN0cnVjdF9tdXRleCk7 CisJaWYgKGRybV9mYl9oZWxwZXJfcmVzdG9yZV9mYmRldl9tb2RlX3VubG9ja2VkKCZpZmJkZXYt PmhlbHBlcikgPT0gMCkgeworCQltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAJCWlu dGVsX2ZiX29ial9pbnZhbGlkYXRlKGlmYmRldi0+ZmItPm9iaiwgT1JJR0lOX0dUVCk7Ci0JCW11 dGV4X3VubG9jaygmZmJfaGVscGVyLT5kZXYtPnN0cnVjdF9tdXRleCk7CisJCW11dGV4X3VubG9j aygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCX0KIH0KLS0gCjIuOC4wLnJjMwoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==