From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH v6] drm/i915: Tune down init error message due to failure injection Date: Fri, 18 Mar 2016 10:46:10 +0200 Message-ID: <1458290770-15480-1-git-send-email-imre.deak@intel.com> References: <1458283837-11936-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id A39D06EB7C for ; Fri, 18 Mar 2016 08:46:12 +0000 (UTC) In-Reply-To: <1458283837-11936-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 dWVudCAiKkVSUk9SKgpmYWlsZWQgdG8gaW5pdCBtb2Rlc2V0IiBlcnJvciBtZXNzYWdlIHdpbGwg bWFrZSBhdXRvbWF0ZWQgdGVzdHMgKENJKQpyZXBvcnQgdGhpcyBldmVudCBhcyBhIGJyZWFrYWdl IGV2ZW4gdGhvdWdoIHRoZSBldmVudCBpcyBleHBlY3RlZC4gVG8KZml4IHRoaXMgcHJpbnQgdGhl IGVycm9yIG1lc3NhZ2Ugd2l0aCBkZWJ1ZyBsb2cgbGV2ZWwgaW4gdGhpcyBjYXNlLgoKV2hpbGUg YXQgaXQgcHJpbnQgdGhlIGVycm9yIG1lc3NhZ2UgZm9yIGFueSBpbml0IGZhaWx1cmUgYW5kIGNo YW5nZSBpdAp0bwoiIiIKRGV2aWNlIGluaXRpYWxpemF0aW9uIGZhaWxlZCAoZXJybm8pClBsZWFz ZSBmaWxlIGEgYnVnIGF0IGh0dHBzOi8vYnVncy5mcmVlZGVza3RvcC5vcmcvZW50ZXJfYnVnLmNn aT9wcm9kdWN0PURSSQphZ2FpbnN0IERSTS9JbnRlbCBwcm92aWRpbmcgdGhlIGRtZXNnIGxvZyBi eSBib290aW5nIHdpdGggZHJtLmRlYnVnPTB4ZgoiIiIKYW5kIGV4cG9ydCBhIGhlbHBlciBwcmlu dGluZyBlcnJvciBtZXNzYWdlcyB1c2luZyB0aGlzIHNhbWUgZm9ybWF0LgpBIGZvbGxvdy11cCBw YXRjaCB3aWxsIGNvbnZlcnQgYWxsIHVzZXMgb2YgRFJNX0VSUk9SIHJlcG9ydGluZyBhIHVzZXIK ZmFjaW5nIHByb2JsZW0gdG8gdXNlIHRoaXMgbmV3IGhlbHBlciBpbnN0ZWFkLgoKdjI6Ci0gSW5j bHVkZSB0aGUgcHJvYmxlbWF0aWMgZXJyb3IgbWVzc2FnZSBpbiB0aGUgY29tbWl0IGxvZywgYWRk IGEKICByZXF1ZXN0IHRvIGZpbGUgYW4gZmRvIGJ1ZyB0byB0aGUgbWVzc2FnZSAoQ2hyaXMpCnYz OgotIEluY2x1ZGUgdGhlIG5ldyBlcnJvciBtZXNzYWdlIHRvbyBpbiB0aGUgY29tbWl0IGxvZywg bWFrZSB0aGUKICBmZG8gbGluayBtb3JlIHByZWNpc2UgYW5kIHByaW50IHBhcnQgb2YgdGhlIG1l c3NhZ2Ugd2l0aCBpbmZvIGxvZwogIGxldmVsIChDaHJpcykKdjQ6IChDaHJpcykKLSBVc2UgZGV2 X3ByaW50ayBpbnN0ZWFkIG9mIERSTV9FUlJPUi9JTkZPIGFuZCB1c2UgTk9USUNFIGluc3RlYWQg b2YKICBJTkZPIGxvZ2xldmVsCi0gRXhwb3J0IGEgaGVscGVyIGZvciBwcmludGluZyB1c2VyIGZh Y2luZyBlcnJvciBtZXNzYWdlcwp2NToKLSBLZWVwIHRoZSBEUk1fRVJST1IgbWVzc2FnZSBwcmVm aXggdXNlZCBieSBwaWdsaXQtaWd0L0NJIHRvIGZpbHRlcgogIHJlbGV2YW50IGRtZXNnIGxpbmVz Ci0gVXNlIGRldl9ub3RpY2UoKSwgaW5zdGVhZCBvZiBkZXZfcHJpbnRrKEtFUk5fTk9USUNFLC4u LikKdjY6Ci0gUHJpbnQgdGhlIGZkbyBidWcgbGluayBvbmx5IG9uY2UgKENocmlzKQoKQ0M6IENo cmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpTaWduZWQtb2ZmLWJ5OiBJbXJl IERlYWsgPGltcmUuZGVha0BpbnRlbC5jb20+ClJldml3ZWQtYnk6IENocmlzIFdpbHNvbiA8Y2hy aXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1h LmMgfCA1MSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCB8ICA3ICsrKysrKwogMiBmaWxlcyBjaGFuZ2VkLCA1 MyBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZG1hLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jCmlu ZGV4IDY4NTkyYjAuLjE0N2E1NGUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZG1hLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYwpAQCAtNjYsNiAr NjYsNDcgQEAgYm9vbCBfX2k5MTVfaW5qZWN0X2xvYWRfZmFpbHVyZShjb25zdCBjaGFyICpmdW5j LCBpbnQgbGluZSkKIAlyZXR1cm4gZmFsc2U7CiB9CiAKKyNkZWZpbmUgRkRPX0JVR19VUkwgImh0 dHBzOi8vYnVncy5mcmVlZGVza3RvcC5vcmcvZW50ZXJfYnVnLmNnaT9wcm9kdWN0PURSSSIKKyNk ZWZpbmUgRkRPX0JVR19NU0cgIlBsZWFzZSBmaWxlIGEgYnVnIGF0ICIgRkRPX0JVR19VUkwgIiBh Z2FpbnN0IERSTS9JbnRlbCAiIFwKKwkJICAgICJwcm92aWRpbmcgdGhlIGRtZXNnIGxvZyBieSBi b290aW5nIHdpdGggZHJtLmRlYnVnPTB4ZiIKKwordm9pZAorX19pOTE1X3ByaW50ayhzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGNvbnN0IGNoYXIgKmxldmVsLAorCSAgICAgIGNv bnN0IGNoYXIgKmZtdCwgLi4uKQoreworCXN0YXRpYyBib29sIHNob3duX2J1Z19vbmNlOworCXN0 cnVjdCBkZXZpY2UgKmRldiA9IGRldl9wcml2LT5kZXYtPmRldjsKKwlib29sIGlzX2Vycm9yID0g bGV2ZWxbMV0gPD0gS0VSTl9FUlJbMV07CisJc3RydWN0IHZhX2Zvcm1hdCB2YWY7CisJdmFfbGlz dCBhcmdzOworCisJdmFfc3RhcnQoYXJncywgZm10KTsKKworCXZhZi5mbXQgPSBmbXQ7CisJdmFm LnZhID0gJmFyZ3M7CisKKwlkZXZfcHJpbnRrKGxldmVsLCBkZXYsICJbIiBEUk1fTkFNRSAiOiVw c10gJXBWIiwKKwkJICAgX19idWlsdGluX3JldHVybl9hZGRyZXNzKDApLCAmdmFmKTsKKworCWlm IChpc19lcnJvciAmJiAhc2hvd25fYnVnX29uY2UpIHsKKwkJZGV2X25vdGljZShkZXYsICIlcyIs IEZET19CVUdfTVNHKTsKKwkJc2hvd25fYnVnX29uY2UgPSB0cnVlOworCX0KKworCXZhX2VuZChh cmdzKTsKK30KKworc3RhdGljIGJvb2wgaTkxNV9lcnJvcl9pbmplY3RlZChzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCit7CisJcmV0dXJuIGk5MTUuaW5qZWN0X2xvYWRfZmFpbHVy ZSAmJgorCSAgICAgICBpOTE1X2xvYWRfZmFpbF9jb3VudCA9PSBpOTE1LmluamVjdF9sb2FkX2Zh aWx1cmU7Cit9CisKKyNkZWZpbmUgaTkxNV9sb2FkX2Vycm9yKGRldl9wcml2LCBmbXQsIC4uLikJ CQkJICAgICBcCisJX19pOTE1X3ByaW50ayhkZXZfcHJpdiwJCQkJCQkgICAgIFwKKwkJICAgICAg aTkxNV9lcnJvcl9pbmplY3RlZChkZXZfcHJpdikgPyBLRVJOX0RFQlVHIDogS0VSTl9FUlIsIFwK KwkJICAgICAgZm10LCAjI19fVkFfQVJHU19fKQorCiBzdGF0aWMgaW50IGk5MTVfZ2V0cGFyYW0o c3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAkJCSBzdHJ1Y3QgZHJtX2ZpbGUg KmZpbGVfcHJpdikKIHsKQEAgLTk3Miw4ICsxMDEzLDYgQEAgc3RhdGljIGludCBpOTE1X2RyaXZl cl9pbml0X2Vhcmx5KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAlpZiAoaTkx NV9pbmplY3RfbG9hZF9mYWlsdXJlKCkpCiAJCXJldHVybiAtRU5PREVWOwogCi0JZGV2X3ByaXYt PmRldiA9IGRldjsKLQogCS8qIFNldHVwIHRoZSB3cml0ZS1vbmNlICJjb25zdGFudCIgZGV2aWNl IGluZm8gKi8KIAlkZXZpY2VfaW5mbyA9IChzdHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8gKikmZGV2 X3ByaXYtPmluZm87CiAJbWVtY3B5KGRldmljZV9pbmZvLCBpbmZvLCBzaXplb2YoZGV2X3ByaXYt PmluZm8pKTsKQEAgLTEzMDMsNiArMTM0Miw4IEBAIGludCBpOTE1X2RyaXZlcl9sb2FkKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIGxvbmcgZmxhZ3MpCiAJCXJldHVybiAtRU5PTUVN OwogCiAJZGV2LT5kZXZfcHJpdmF0ZSA9IGRldl9wcml2OworCS8qIE11c3QgYmUgc2V0IGJlZm9y ZSBjYWxsaW5nIF9faTkxNV9wcmludGsgKi8KKwlkZXZfcHJpdi0+ZGV2ID0gZGV2OwogCiAJcmV0 ID0gaTkxNV9kcml2ZXJfaW5pdF9lYXJseShkZXZfcHJpdiwgZGV2LAogCQkJCSAgICAgKHN0cnVj dCBpbnRlbF9kZXZpY2VfaW5mbyAqKWZsYWdzKTsKQEAgLTEzMzIsMTAgKzEzNzMsOCBAQCBpbnQg aTkxNV9kcml2ZXJfbG9hZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1bnNpZ25lZCBsb25nIGZs YWdzKQogCX0KIAogCXJldCA9IGk5MTVfbG9hZF9tb2Rlc2V0X2luaXQoZGV2KTsKLQlpZiAocmV0 IDwgMCkgewotCQlEUk1fRVJST1IoImZhaWxlZCB0byBpbml0IG1vZGVzZXRcbiIpOworCWlmIChy ZXQgPCAwKQogCQlnb3RvIG91dF9jbGVhbnVwX3ZibGFuazsKLQl9CiAKIAlpOTE1X2RyaXZlcl9y ZWdpc3RlcihkZXZfcHJpdik7CiAKQEAgLTEzNTcsNiArMTM5Niw4IEBAIG91dF9ydW50aW1lX3Bt X3B1dDoKIG91dF9mcmVlX3ByaXY6CiAJa2ZyZWUoZGV2X3ByaXYpOwogCisJaTkxNV9sb2FkX2Vy cm9yKGRldl9wcml2LCAiRGV2aWNlIGluaXRpYWxpemF0aW9uIGZhaWxlZCAoJWQpXG4iLCByZXQp OworCiAJcmV0dXJuIHJldDsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggMDBjNDFh NC4uZTNiMDE5YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0yNjk2LDYgKzI2OTYsMTMg QEAgZXh0ZXJuIGludCBpOTE1X3N1c3BlbmRfc3dpdGNoZXJvbyhzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LCBwbV9tZXNzYWdlX3Qgc3RhdGUpOwogZXh0ZXJuIGludCBpOTE1X3Jlc3VtZV9zd2l0Y2hl cm9vKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogCiAvKiBpOTE1X2RtYS5jICovCit2b2lkIF9f cHJpbnRmKDMsIDQpCitfX2k5MTVfcHJpbnRrKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiwgY29uc3QgY2hhciAqbGV2ZWwsCisJICAgICAgY29uc3QgY2hhciAqZm10LCAuLi4pOwor CisjZGVmaW5lIGk5MTVfcmVwb3J0X2Vycm9yKGRldl9wcml2LCBmbXQsIC4uLikJCQkJICAgXAor CV9faTkxNV9wcmludGsoZGV2X3ByaXYsIEtFUk5fRVJSLCBmbXQsICMjX19WQV9BUkdTX18pCisK IGV4dGVybiBpbnQgaTkxNV9kcml2ZXJfbG9hZChzdHJ1Y3QgZHJtX2RldmljZSAqLCB1bnNpZ25l ZCBsb25nIGZsYWdzKTsKIGV4dGVybiBpbnQgaTkxNV9kcml2ZXJfdW5sb2FkKHN0cnVjdCBkcm1f ZGV2aWNlICopOwogZXh0ZXJuIGludCBpOTE1X2RyaXZlcl9vcGVuKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSk7Ci0tIAoyLjUuMAoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJ bnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==