From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH v5] drm/i915: Tune down init error message due to failure injection Date: Fri, 18 Mar 2016 08:50:37 +0200 Message-ID: <1458283837-11936-1-git-send-email-imre.deak@intel.com> References: <1458263346-21741-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 2DA936EB54 for ; Fri, 18 Mar 2016 06:50:40 +0000 (UTC) In-Reply-To: <1458263346-21741-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 LikKCkNDOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KU2lnbmVkLW9m Zi1ieTogSW1yZSBEZWFrIDxpbXJlLmRlYWtAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZG1hLmMgfCA0OCArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KystLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCB8ICA3ICsrKysrKwogMiBm aWxlcyBjaGFuZ2VkLCA1MCBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2RtYS5jCmluZGV4IDY4NTkyYjAuLjA5NmRjMzUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZG1hLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k bWEuYwpAQCAtNjYsNiArNjYsNDQgQEAgYm9vbCBfX2k5MTVfaW5qZWN0X2xvYWRfZmFpbHVyZShj b25zdCBjaGFyICpmdW5jLCBpbnQgbGluZSkKIAlyZXR1cm4gZmFsc2U7CiB9CiAKKyNkZWZpbmUg RkRPX0JVR19VUkwgImh0dHBzOi8vYnVncy5mcmVlZGVza3RvcC5vcmcvZW50ZXJfYnVnLmNnaT9w cm9kdWN0PURSSSIKKyNkZWZpbmUgRkRPX0JVR19NU0cgIlBsZWFzZSBmaWxlIGEgYnVnIGF0ICIg RkRPX0JVR19VUkwgIiBhZ2FpbnN0IERSTS9JbnRlbCAiIFwKKwkJICAgICJwcm92aWRpbmcgdGhl IGRtZXNnIGxvZyBieSBib290aW5nIHdpdGggZHJtLmRlYnVnPTB4ZiIKKwordm9pZAorX19pOTE1 X3ByaW50ayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGNvbnN0IGNoYXIgKmxl dmVsLAorCSAgICAgIGNvbnN0IGNoYXIgKmZtdCwgLi4uKQoreworCXN0cnVjdCBkZXZpY2UgKmRl diA9IGRldl9wcml2LT5kZXYtPmRldjsKKwlib29sIGlzX2Vycm9yID0gbGV2ZWxbMV0gPD0gS0VS Tl9FUlJbMV07CisJc3RydWN0IHZhX2Zvcm1hdCB2YWY7CisJdmFfbGlzdCBhcmdzOworCisJdmFf c3RhcnQoYXJncywgZm10KTsKKworCXZhZi5mbXQgPSBmbXQ7CisJdmFmLnZhID0gJmFyZ3M7CisK KwlkZXZfcHJpbnRrKGxldmVsLCBkZXYsICJbIiBEUk1fTkFNRSAiOiVwc10gJXBWIiwKKwkJICAg X19idWlsdGluX3JldHVybl9hZGRyZXNzKDApLCAmdmFmKTsKKworCWlmIChpc19lcnJvcikKKwkJ ZGV2X25vdGljZShkZXYsICIlcyIsIEZET19CVUdfTVNHKTsKKworCXZhX2VuZChhcmdzKTsKK30K Kworc3RhdGljIGJvb2wgaTkxNV9lcnJvcl9pbmplY3RlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYpCit7CisJcmV0dXJuIGk5MTUuaW5qZWN0X2xvYWRfZmFpbHVyZSAmJgorCSAg ICAgICBpOTE1X2xvYWRfZmFpbF9jb3VudCA9PSBpOTE1LmluamVjdF9sb2FkX2ZhaWx1cmU7Cit9 CisKKyNkZWZpbmUgaTkxNV9sb2FkX2Vycm9yKGRldl9wcml2LCBmbXQsIC4uLikJCQkJICAgICBc CisJX19pOTE1X3ByaW50ayhkZXZfcHJpdiwJCQkJCQkgICAgIFwKKwkJICAgICAgaTkxNV9lcnJv cl9pbmplY3RlZChkZXZfcHJpdikgPyBLRVJOX0RFQlVHIDogS0VSTl9FUlIsIFwKKwkJICAgICAg Zm10LCAjI19fVkFfQVJHU19fKQorCiBzdGF0aWMgaW50IGk5MTVfZ2V0cGFyYW0oc3RydWN0IGRy bV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAkJCSBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJp dikKIHsKQEAgLTk3Miw4ICsxMDEwLDYgQEAgc3RhdGljIGludCBpOTE1X2RyaXZlcl9pbml0X2Vh cmx5KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAlpZiAoaTkxNV9pbmplY3Rf bG9hZF9mYWlsdXJlKCkpCiAJCXJldHVybiAtRU5PREVWOwogCi0JZGV2X3ByaXYtPmRldiA9IGRl djsKLQogCS8qIFNldHVwIHRoZSB3cml0ZS1vbmNlICJjb25zdGFudCIgZGV2aWNlIGluZm8gKi8K IAlkZXZpY2VfaW5mbyA9IChzdHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8gKikmZGV2X3ByaXYtPmlu Zm87CiAJbWVtY3B5KGRldmljZV9pbmZvLCBpbmZvLCBzaXplb2YoZGV2X3ByaXYtPmluZm8pKTsK QEAgLTEzMDMsNiArMTMzOSw4IEBAIGludCBpOTE1X2RyaXZlcl9sb2FkKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsIHVuc2lnbmVkIGxvbmcgZmxhZ3MpCiAJCXJldHVybiAtRU5PTUVNOwogCiAJZGV2 LT5kZXZfcHJpdmF0ZSA9IGRldl9wcml2OworCS8qIE11c3QgYmUgc2V0IGJlZm9yZSBjYWxsaW5n IF9faTkxNV9wcmludGsgKi8KKwlkZXZfcHJpdi0+ZGV2ID0gZGV2OwogCiAJcmV0ID0gaTkxNV9k cml2ZXJfaW5pdF9lYXJseShkZXZfcHJpdiwgZGV2LAogCQkJCSAgICAgKHN0cnVjdCBpbnRlbF9k ZXZpY2VfaW5mbyAqKWZsYWdzKTsKQEAgLTEzMzIsMTAgKzEzNzAsOCBAQCBpbnQgaTkxNV9kcml2 ZXJfbG9hZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1bnNpZ25lZCBsb25nIGZsYWdzKQogCX0K IAogCXJldCA9IGk5MTVfbG9hZF9tb2Rlc2V0X2luaXQoZGV2KTsKLQlpZiAocmV0IDwgMCkgewot CQlEUk1fRVJST1IoImZhaWxlZCB0byBpbml0IG1vZGVzZXRcbiIpOworCWlmIChyZXQgPCAwKQog CQlnb3RvIG91dF9jbGVhbnVwX3ZibGFuazsKLQl9CiAKIAlpOTE1X2RyaXZlcl9yZWdpc3Rlcihk ZXZfcHJpdik7CiAKQEAgLTEzNTcsNiArMTM5Myw4IEBAIG91dF9ydW50aW1lX3BtX3B1dDoKIG91 dF9mcmVlX3ByaXY6CiAJa2ZyZWUoZGV2X3ByaXYpOwogCisJaTkxNV9sb2FkX2Vycm9yKGRldl9w cml2LCAiRGV2aWNlIGluaXRpYWxpemF0aW9uIGZhaWxlZCAoJWQpXG4iLCByZXQpOworCiAJcmV0 dXJuIHJldDsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggMDBjNDFhNC4uZTNiMDE5 YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0yNjk2LDYgKzI2OTYsMTMgQEAgZXh0ZXJu IGludCBpOTE1X3N1c3BlbmRfc3dpdGNoZXJvbyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBwbV9t ZXNzYWdlX3Qgc3RhdGUpOwogZXh0ZXJuIGludCBpOTE1X3Jlc3VtZV9zd2l0Y2hlcm9vKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpOwogCiAvKiBpOTE1X2RtYS5jICovCit2b2lkIF9fcHJpbnRmKDMs IDQpCitfX2k5MTVfcHJpbnRrKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgY29u c3QgY2hhciAqbGV2ZWwsCisJICAgICAgY29uc3QgY2hhciAqZm10LCAuLi4pOworCisjZGVmaW5l IGk5MTVfcmVwb3J0X2Vycm9yKGRldl9wcml2LCBmbXQsIC4uLikJCQkJICAgXAorCV9faTkxNV9w cmludGsoZGV2X3ByaXYsIEtFUk5fRVJSLCBmbXQsICMjX19WQV9BUkdTX18pCisKIGV4dGVybiBp bnQgaTkxNV9kcml2ZXJfbG9hZChzdHJ1Y3QgZHJtX2RldmljZSAqLCB1bnNpZ25lZCBsb25nIGZs YWdzKTsKIGV4dGVybiBpbnQgaTkxNV9kcml2ZXJfdW5sb2FkKHN0cnVjdCBkcm1fZGV2aWNlICop OwogZXh0ZXJuIGludCBpOTE1X2RyaXZlcl9vcGVuKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0 cnVjdCBkcm1fZmlsZSAqZmlsZSk7Ci0tIAoyLjUuMAoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==