From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH v4] drm/i915: Tune down init error message due to failure injection Date: Fri, 18 Mar 2016 03:09:06 +0200 Message-ID: <1458263346-21741-1-git-send-email-imre.deak@intel.com> References: <1458232599-20677-1-git-send-email-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 518DE6E073 for ; Fri, 18 Mar 2016 01:09:08 +0000 (UTC) In-Reply-To: <1458232599-20677-1-git-send-email-imre.deak@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 List-Id: intel-gfx@lists.freedesktop.org QXRtLCBpbiBjYXNlIGZhaWx1cmUgaW5qZWN0aW9uIGZvcmNlcyBhbiBlcnJvciB0aGUgc3Vic2Vx dWVudAoiKkVSUk9SKiBmYWlsZWQgdG8gaW5pdCBtb2Rlc2V0IiBlcnJvciBtZXNzYWdlIHdpbGwg bWFrZSBhdXRvbWF0ZWQKdGVzdHMgKENJKSByZXBvcnQgdGhpcyBldmVudCBhcyBhIGJyZWFrYWdl IGV2ZW4gdGhvdWdoIHRoZSBldmVudCBpcwpleHBlY3RlZC4gVG8gZml4IHRoaXMgcHJpbnQgdGhl IGVycm9yIG1lc3NhZ2Ugd2l0aCBkZWJ1ZyBsb2cgbGV2ZWwKaW4gdGhpcyBjYXNlLgoKV2hpbGUg YXQgaXQgcHJpbnQgdGhlIGVycm9yIG1lc3NhZ2UgZm9yIGFueSBpbml0IGZhaWx1cmUgYW5kIGNo YW5nZSBpdAp0bwoiIiIKKkVSUk9SKiBEZXZpY2UgaW5pdGlhbGl6YXRpb24gZmFpbGVkIChlcnJu bykKUGxlYXNlIGZpbGUgYSBidWcgYXQgaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9lbnRl cl9idWcuY2dpP3Byb2R1Y3Q9RFJJCmFnYWluc3QgRFJNL0ludGVsIHByb3ZpZGluZyB0aGUgZG1l c2cgbG9nIGJ5IGJvb3Rpbmcgd2l0aCBkcm0uZGVidWc9MHhmCiIiIgphbmQgZXhwb3J0IGEgaGVs cGVyIHByaW50aW5nIGVycm9yIG1lc3NhZ2VzIHVzaW5nIHRoaXMgc2FtZSBmb3JtYXQuCkEgZm9s bG93LXVwIHBhdGNoIHdpbGwgY29udmVydCBhbGwgdXNlcyBvZiBEUk1fRVJST1IgcmVwb3J0aW5n IGEgdXNlciBmYWNpbmcKcHJvYmxlbSB0byB1c2UgdGhpcyBuZXcgaGVscGVyIGluc3RlYWQuCgp2 MjoKLSBJbmNsdWRlIHRoZSBwcm9ibGVtYXRpYyBlcnJvciBtZXNzYWdlIGluIHRoZSBjb21taXQg bG9nLCBhZGQgYQogIHJlcXVlc3QgdG8gZmlsZSBhbiBmZG8gYnVnIHRvIHRoZSBtZXNzYWdlIChD aHJpcykKdjM6Ci0gSW5jbHVkZSB0aGUgbmV3IGVycm9yIG1lc3NhZ2UgdG9vIGluIHRoZSBjb21t aXQgbG9nLCBtYWtlIHRoZQogIGZkbyBsaW5rIG1vcmUgcHJlY2lzZSBhbmQgcHJpbnQgcGFydCBv ZiB0aGUgbWVzc2FnZSB3aXRoIGluZm8gbG9nCiAgbGV2ZWwgKENocmlzKQp2NDogKENocmlzKQot IFVzZSBkZXZfcHJpbnRrIGluc3RlYWQgb2YgRFJNX0VSUk9SL0lORk8gYW5kIHVzZSBOT1RJQ0Ug aW5zdGVhZCBvZgogIE5PVEUgbG9nbGV2ZWwKLSBFeHBvcnQgYSBoZWxwZXIgZm9yIHByaW50aW5n IHVzZXIgZmFjaW5nIGVycm9yIG1lc3NhZ2VzCgpDQzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJp cy13aWxzb24uY28udWs+ClNpZ25lZC1vZmYtYnk6IEltcmUgRGVhayA8aW1yZS5kZWFrQGludGVs LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jIHwgNTYgKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmggfCAgNiArKysrKwogMiBmaWxlcyBjaGFuZ2VkLCA1NyBpbnNlcnRpb25zKCspLCA1 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1h LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jCmluZGV4IDY4NTkyYjAuLjI0MTIw NmMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYwpAQCAtNjYsNiArNjYsNTIgQEAgYm9vbCBfX2k5 MTVfaW5qZWN0X2xvYWRfZmFpbHVyZShjb25zdCBjaGFyICpmdW5jLCBpbnQgbGluZSkKIAlyZXR1 cm4gZmFsc2U7CiB9CiAKKyNkZWZpbmUgRkRPX0JVR19VUkwgImh0dHBzOi8vYnVncy5mcmVlZGVz a3RvcC5vcmcvZW50ZXJfYnVnLmNnaT9wcm9kdWN0PURSSSIKKyNkZWZpbmUgRkRPX0JVR19NU0cg IlBsZWFzZSBmaWxlIGEgYnVnIGF0ICIgRkRPX0JVR19VUkwgIiBhZ2FpbnN0IERSTS9JbnRlbCAi IFwKKwkJICAgICJwcm92aWRpbmcgdGhlIGRtZXNnIGxvZyBieSBib290aW5nIHdpdGggZHJtLmRl YnVnPTB4ZiIKKwordm9pZAorX19pOTE1X3ByaW50ayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYsIGNvbnN0IGNoYXIgKmxldmVsLAorCQljb25zdCBjaGFyICpmbXQsIC4uLikKK3sK KwlzdHJ1Y3QgZGV2aWNlICpkZXYgPSBkZXZfcHJpdi0+ZGV2LT5kZXY7CisJYm9vbCBpc19lcnJv ciA9IGxldmVsWzFdIDw9IEtFUk5fRVJSWzFdOworCXN0cnVjdCB2YV9mb3JtYXQgdmFmOworCXZh X2xpc3QgYXJnczsKKworCXZhX3N0YXJ0KGFyZ3MsIGZtdCk7CisKKwl2YWYuZm10ID0gZm10Owor CXZhZi52YSA9ICZhcmdzOworCisJZGV2X3ByaW50ayhsZXZlbCwgZGV2LCAiJXMlcFYiLCBpc19l cnJvciA/ICIqRVJST1IqICIgOiAiIiwgJnZhZik7CisJaWYgKGlzX2Vycm9yKQorCQlkZXZfcHJp bnRrKEtFUk5fTk9USUNFLCBkZXYsICIlcyIsIEZET19CVUdfTVNHKTsKKworCXZhX2VuZChhcmdz KTsKK30KKworc3RhdGljIHZvaWQgX19wcmludGYoMiwgMykKK2k5MTVfbG9hZF9lcnJvcihzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGNvbnN0IGNoYXIgKmZtdCwgLi4uKQorewor CXN0cnVjdCB2YV9mb3JtYXQgdmFmOworCXZhX2xpc3QgYXJnczsKKwlib29sIGZvcmNlZF9lcnJv cjsKKworCWZvcmNlZF9lcnJvciA9IGk5MTUuaW5qZWN0X2xvYWRfZmFpbHVyZSAmJgorCQkgICAg ICAgaTkxNV9sb2FkX2ZhaWxfY291bnQgPT0gaTkxNS5pbmplY3RfbG9hZF9mYWlsdXJlOworCisJ dmFfc3RhcnQoYXJncywgZm10KTsKKworCXZhZi5mbXQgPSBmbXQ7CisJdmFmLnZhID0gJmFyZ3M7 CisKKwlfX2k5MTVfcHJpbnRrKGRldl9wcml2LCBmb3JjZWRfZXJyb3IgPyBLRVJOX0RFQlVHIDog S0VSTl9FUlIsICIlcFYiLAorCQkgICAgICAmdmFmKTsKKworCXZhX2VuZChhcmdzKTsKK30KKwog c3RhdGljIGludCBpOTE1X2dldHBhcmFtKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRh dGEsCiAJCQkgc3RydWN0IGRybV9maWxlICpmaWxlX3ByaXYpCiB7CkBAIC05NzIsOCArMTAxOCw2 IEBAIHN0YXRpYyBpbnQgaTkxNV9kcml2ZXJfaW5pdF9lYXJseShzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsCiAJaWYgKGk5MTVfaW5qZWN0X2xvYWRfZmFpbHVyZSgpKQogCQlyZXR1 cm4gLUVOT0RFVjsKIAotCWRldl9wcml2LT5kZXYgPSBkZXY7Ci0KIAkvKiBTZXR1cCB0aGUgd3Jp dGUtb25jZSAiY29uc3RhbnQiIGRldmljZSBpbmZvICovCiAJZGV2aWNlX2luZm8gPSAoc3RydWN0 IGludGVsX2RldmljZV9pbmZvICopJmRldl9wcml2LT5pbmZvOwogCW1lbWNweShkZXZpY2VfaW5m bywgaW5mbywgc2l6ZW9mKGRldl9wcml2LT5pbmZvKSk7CkBAIC0xMzAzLDYgKzEzNDcsOCBAQCBp bnQgaTkxNV9kcml2ZXJfbG9hZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1bnNpZ25lZCBsb25n IGZsYWdzKQogCQlyZXR1cm4gLUVOT01FTTsKIAogCWRldi0+ZGV2X3ByaXZhdGUgPSBkZXZfcHJp djsKKwkvKiBNdXN0IGJlIHNldCBiZWZvcmUgY2FsbGluZyBfX2k5MTVfcHJpbnRrICovCisJZGV2 X3ByaXYtPmRldiA9IGRldjsKIAogCXJldCA9IGk5MTVfZHJpdmVyX2luaXRfZWFybHkoZGV2X3By aXYsIGRldiwKIAkJCQkgICAgIChzdHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8gKilmbGFncyk7CkBA IC0xMzMyLDEwICsxMzc4LDggQEAgaW50IGk5MTVfZHJpdmVyX2xvYWQoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwgdW5zaWduZWQgbG9uZyBmbGFncykKIAl9CiAKIAlyZXQgPSBpOTE1X2xvYWRfbW9k ZXNldF9pbml0KGRldik7Ci0JaWYgKHJldCA8IDApIHsKLQkJRFJNX0VSUk9SKCJmYWlsZWQgdG8g aW5pdCBtb2Rlc2V0XG4iKTsKKwlpZiAocmV0IDwgMCkKIAkJZ290byBvdXRfY2xlYW51cF92Ymxh bms7Ci0JfQogCiAJaTkxNV9kcml2ZXJfcmVnaXN0ZXIoZGV2X3ByaXYpOwogCkBAIC0xMzU3LDYg KzE0MDEsOCBAQCBvdXRfcnVudGltZV9wbV9wdXQ6CiBvdXRfZnJlZV9wcml2OgogCWtmcmVlKGRl dl9wcml2KTsKIAorCWk5MTVfbG9hZF9lcnJvcihkZXZfcHJpdiwgIkRldmljZSBpbml0aWFsaXph dGlvbiBmYWlsZWQgKCVkKVxuIiwgcmV0KTsKKwogCXJldHVybiByZXQ7CiB9CiAKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oCmluZGV4IDAwYzQxYTQuLmNhNzliMTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaApAQCAtMjY5Niw2ICsyNjk2LDEyIEBAIGV4dGVybiBpbnQgaTkxNV9zdXNwZW5kX3N3aXRj aGVyb28oc3RydWN0IGRybV9kZXZpY2UgKmRldiwgcG1fbWVzc2FnZV90IHN0YXRlKTsKIGV4dGVy biBpbnQgaTkxNV9yZXN1bWVfc3dpdGNoZXJvbyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIAog LyogaTkxNV9kbWEuYyAqLwordm9pZCBfX3ByaW50ZigzLCA0KQorX19pOTE1X3ByaW50ayhzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGNvbnN0IGNoYXIgKmxldmVsLAorCQljb25z dCBjaGFyICpmbXQsIC4uLik7CisjZGVmaW5lIGk5MTVfcmVwb3J0X2Vycm9yKGRldl9wcml2LCBm bXQsIC4uLikgXAorCV9faTkxNV9wcmludGsoZGV2X3ByaXYsIEtFUk5fRVJSLCBmbXQsICMjX19W QV9BUkdTX18pCisKIGV4dGVybiBpbnQgaTkxNV9kcml2ZXJfbG9hZChzdHJ1Y3QgZHJtX2Rldmlj ZSAqLCB1bnNpZ25lZCBsb25nIGZsYWdzKTsKIGV4dGVybiBpbnQgaTkxNV9kcml2ZXJfdW5sb2Fk KHN0cnVjdCBkcm1fZGV2aWNlICopOwogZXh0ZXJuIGludCBpOTE1X2RyaXZlcl9vcGVuKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSk7Ci0tIAoyLjUuMAoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==