From: Dave Gordon Subject: [CI-RESEND 3/3] drm/i915/guc: revisit GuC loader message levels Date: Tue, 19 Jul 2016 13:20:18 +0100 Message-ID: <1468930818-22085-3-git-send-email-david.s.gordon@intel.com> References: <1468930818-22085-1-git-send-email-david.s.gordon@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 934306E681 for ; Tue, 19 Jul 2016 12:20:24 +0000 (UTC) In-Reply-To: <1468930818-22085-1-git-send-email-david.s.gordon@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 U29tZSBkb3duZ3JhZGVkIGZyb20gRFJNX0VSUk9SKCkgdG8gRFJNX1dBUk4oKSBvciBEUk1fTk9U RSgpLAphIGZldyB1cGdyYWRlZCBmcm9tIERSTV9JTkZPKCkgdG8gRFJNX05PVEUoKSBvciBEUk1f V0FSTigpLAphbmQgb25lIGVsaW1pbmF0ZWQgY29tcGxldGVseS4KCnYyOiBkaWZmZXJlbnQgcGVy bXV0YXRpb24gb2YgbGV2ZWxzIDopCgpTaWduZWQtb2ZmLWJ5OiBEYXZlIEdvcmRvbiA8ZGF2aWQu cy5nb3Jkb25AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19s b2FkZXIuYyB8IDM0ICsrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNo YW5nZWQsIDE3IGluc2VydGlvbnMoKyksIDE3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2d1Y19sb2FkZXIuYwppbmRleCA2MDVjNjk2Li5hMmY0ZmE0IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCkBAIC0xNDAsMTIgKzE0MCwxNCBAQCBzdGF0 aWMgdTMyIGdldF9ndHR5cGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCiBz dGF0aWMgdTMyIGdldF9jb3JlX2ZhbWlseShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYpCiB7Ci0Jc3dpdGNoIChJTlRFTF9JTkZPKGRldl9wcml2KS0+Z2VuKSB7CisJdTMyIGdlbiA9 IElOVEVMX0dFTihkZXZfcHJpdik7CisKKwlzd2l0Y2ggKGdlbikgewogCWNhc2UgOToKIAkJcmV0 dXJuIEdGWENPUkVfRkFNSUxZX0dFTjk7CiAKIAlkZWZhdWx0OgotCQlEUk1fRVJST1IoIkdVQzog dW5zdXBwb3J0ZWQgY29yZSBmYW1pbHlcbiIpOworCQlEUk1fV0FSTigiR0VOJWQgZG9lcyBub3Qg c3VwcG9ydCBHdUMgb3BlcmF0aW9uXG4iLCBnZW4pOwogCQlyZXR1cm4gR0ZYQ09SRV9GQU1JTFlf VU5LTk9XTjsKIAl9CiB9CkBAIC00MzMsNyArNDM1LDcgQEAgaW50IGludGVsX2d1Y19zZXR1cChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlnb3RvIGZhaWw7CiAJfSBlbHNlIGlmICgqZndfcGF0 aCA9PSAnXDAnKSB7CiAJCS8qIERldmljZSBoYXMgYSBHdUMgYnV0IHdlIGRvbid0IGtub3cgd2hh dCBmL3cgdG8gbG9hZD8gKi8KLQkJRFJNX0lORk8oIk5vIEd1QyBmaXJtd2FyZSBrbm93biBmb3Ig dGhpcyBwbGF0Zm9ybVxuIik7CisJCURSTV9XQVJOKCJObyBHdUMgZmlybXdhcmUga25vd24gZm9y IHRoaXMgcGxhdGZvcm1cbiIpOwogCQllcnIgPSAtRU5PREVWOwogCQlnb3RvIGZhaWw7CiAJfQpA QCAtNDcxLDEwICs0NzMsOCBAQCBpbnQgaW50ZWxfZ3VjX3NldHVwKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCiAJCSAqIHRoYXQgdGhlIHN0YXRlIGFuZCB0aW1pbmcgYXJlIGZhaXJseSBwcmVkaWN0 YWJsZQogCQkgKi8KIAkJZXJyID0gaTkxNV9yZXNldF9ndWMoZGV2X3ByaXYpOwotCQlpZiAoZXJy KSB7Ci0JCQlEUk1fRVJST1IoIkd1QyByZXNldCBmYWlsZWQ6ICVkXG4iLCBlcnIpOworCQlpZiAo ZXJyKQogCQkJZ290byBmYWlsOwotCQl9CiAKIAkJZXJyID0gZ3VjX3Vjb2RlX3hmZXIoZGV2X3By aXYpOwogCQlpZiAoIWVycikKQEAgLTUzMiwxNSArNTMyLDE1IEBAIGludCBpbnRlbF9ndWNfc2V0 dXAoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAllbHNlIGlmIChlcnIgPT0gMCkKIAkJRFJNX0lO Rk8oIkd1QyBmaXJtd2FyZSBsb2FkIHNraXBwZWRcbiIpOwogCWVsc2UgaWYgKHJldCAhPSAtRUlP KQotCQlEUk1fSU5GTygiR3VDIGZpcm13YXJlIGxvYWQgZmFpbGVkOiAlZFxuIiwgZXJyKTsKKwkJ RFJNX05PVEUoIkd1QyBmaXJtd2FyZSBsb2FkIGZhaWxlZDogJWRcbiIsIGVycik7CiAJZWxzZQot CQlEUk1fRVJST1IoIkd1QyBmaXJtd2FyZSBsb2FkIGZhaWxlZDogJWRcbiIsIGVycik7CisJCURS TV9XQVJOKCJHdUMgZmlybXdhcmUgbG9hZCBmYWlsZWQ6ICVkXG4iLCBlcnIpOwogCiAJaWYgKGk5 MTUuZW5hYmxlX2d1Y19zdWJtaXNzaW9uKSB7CiAJCWlmIChmd19wYXRoID09IE5VTEwpCiAJCQlE Uk1fSU5GTygiR3VDIHN1Ym1pc3Npb24gd2l0aG91dCBmaXJtd2FyZSBub3Qgc3VwcG9ydGVkXG4i KTsKIAkJaWYgKHJldCA9PSAwKQotCQkJRFJNX0lORk8oIkZhbGxpbmcgYmFjayBmcm9tIEd1QyBz dWJtaXNzaW9uIHRvIGV4ZWNsaXN0IG1vZGVcbiIpOworCQkJRFJNX05PVEUoIkZhbGxpbmcgYmFj ayBmcm9tIEd1QyBzdWJtaXNzaW9uIHRvIGV4ZWNsaXN0IG1vZGVcbiIpOwogCQllbHNlCiAJCQlE Uk1fRVJST1IoIkd1QyBpbml0IGZhaWxlZDogJWRcbiIsIHJldCk7CiAJfQpAQCAtNTcxLDcgKzU3 MSw3IEBAIHN0YXRpYyB2b2lkIGd1Y19md19mZXRjaChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBz dHJ1Y3QgaW50ZWxfZ3VjX2Z3ICpndWNfZncpCiAKIAkvKiBDaGVjayB0aGUgc2l6ZSBvZiB0aGUg YmxvYiBiZWZvcmUgZXhhbWluaW5nIGJ1ZmZlciBjb250ZW50cyAqLwogCWlmIChmdy0+c2l6ZSA8 IHNpemVvZihzdHJ1Y3QgZ3VjX2Nzc19oZWFkZXIpKSB7Ci0JCURSTV9FUlJPUigiRmlybXdhcmUg aGVhZGVyIGlzIG1pc3NpbmdcbiIpOworCQlEUk1fTk9URSgiRmlybXdhcmUgaGVhZGVyIGlzIG1p c3NpbmdcbiIpOwogCQlnb3RvIGZhaWw7CiAJfQogCkBAIC01ODMsNyArNTgzLDcgQEAgc3RhdGlj IHZvaWQgZ3VjX2Z3X2ZldGNoKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBpbnRlbF9n dWNfZncgKmd1Y19mdykKIAkJY3NzLT5rZXlfc2l6ZV9kdyAtIGNzcy0+ZXhwb25lbnRfc2l6ZV9k dykgKiBzaXplb2YodTMyKTsKIAogCWlmIChndWNfZnctPmhlYWRlcl9zaXplICE9IHNpemVvZihz dHJ1Y3QgZ3VjX2Nzc19oZWFkZXIpKSB7Ci0JCURSTV9FUlJPUigiQ1NTIGhlYWRlciBkZWZpbml0 aW9uIG1pc21hdGNoXG4iKTsKKwkJRFJNX05PVEUoIkNTUyBoZWFkZXIgZGVmaW5pdGlvbiBtaXNt YXRjaFxuIik7CiAJCWdvdG8gZmFpbDsKIAl9CiAKQEAgLTU5Myw3ICs1OTMsNyBAQCBzdGF0aWMg dm9pZCBndWNfZndfZmV0Y2goc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGludGVsX2d1 Y19mdyAqZ3VjX2Z3KQogCiAJLyogbm93IFJTQSAqLwogCWlmIChjc3MtPmtleV9zaXplX2R3ICE9 IFVPU19SU0FfU0NSQVRDSF9NQVhfQ09VTlQpIHsKLQkJRFJNX0VSUk9SKCJSU0Ega2V5IHNpemUg aXMgYmFkXG4iKTsKKwkJRFJNX05PVEUoIlJTQSBrZXkgc2l6ZSBpcyBiYWRcbiIpOwogCQlnb3Rv IGZhaWw7CiAJfQogCWd1Y19mdy0+cnNhX29mZnNldCA9IGd1Y19mdy0+dWNvZGVfb2Zmc2V0ICsg Z3VjX2Z3LT51Y29kZV9zaXplOwpAQCAtNjAyLDE0ICs2MDIsMTQgQEAgc3RhdGljIHZvaWQgZ3Vj X2Z3X2ZldGNoKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBpbnRlbF9ndWNfZncgKmd1 Y19mdykKIAkvKiBBdCBsZWFzdCwgaXQgc2hvdWxkIGhhdmUgaGVhZGVyLCB1Q29kZSBhbmQgUlNB LiBTaXplIG9mIGFsbCB0aHJlZS4gKi8KIAlzaXplID0gZ3VjX2Z3LT5oZWFkZXJfc2l6ZSArIGd1 Y19mdy0+dWNvZGVfc2l6ZSArIGd1Y19mdy0+cnNhX3NpemU7CiAJaWYgKGZ3LT5zaXplIDwgc2l6 ZSkgewotCQlEUk1fRVJST1IoIk1pc3NpbmcgZmlybXdhcmUgY29tcG9uZW50c1xuIik7CisJCURS TV9OT1RFKCJNaXNzaW5nIGZpcm13YXJlIGNvbXBvbmVudHNcbiIpOwogCQlnb3RvIGZhaWw7CiAJ fQogCiAJLyogSGVhZGVyIGFuZCB1Q29kZSB3aWxsIGJlIGxvYWRlZCB0byBXT1BDTS4gU2l6ZSBv ZiB0aGUgdHdvLiAqLwogCXNpemUgPSBndWNfZnctPmhlYWRlcl9zaXplICsgZ3VjX2Z3LT51Y29k ZV9zaXplOwogCWlmIChzaXplID4gZ3VjX3dvcGNtX3NpemUodG9faTkxNShkZXYpKSkgewotCQlE Uk1fRVJST1IoIkZpcm13YXJlIGlzIHRvbyBsYXJnZSB0byBmaXQgaW4gV09QQ01cbiIpOworCQlE Uk1fTk9URSgiRmlybXdhcmUgaXMgdG9vIGxhcmdlIHRvIGZpdCBpbiBXT1BDTVxuIik7CiAJCWdv dG8gZmFpbDsKIAl9CiAKQEAgLTYyNCw3ICs2MjQsNyBAQCBzdGF0aWMgdm9pZCBndWNfZndfZmV0 Y2goc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGludGVsX2d1Y19mdyAqZ3VjX2Z3KQog CiAJaWYgKGd1Y19mdy0+Z3VjX2Z3X21ham9yX2ZvdW5kICE9IGd1Y19mdy0+Z3VjX2Z3X21ham9y X3dhbnRlZCB8fAogCSAgICBndWNfZnctPmd1Y19md19taW5vcl9mb3VuZCA8IGd1Y19mdy0+Z3Vj X2Z3X21pbm9yX3dhbnRlZCkgewotCQlEUk1fRVJST1IoIkd1QyBmaXJtd2FyZSB2ZXJzaW9uICVk LiVkLCByZXF1aXJlZCAlZC4lZFxuIiwKKwkJRFJNX05PVEUoIkd1QyBmaXJtd2FyZSB2ZXJzaW9u ICVkLiVkLCByZXF1aXJlZCAlZC4lZFxuIiwKIAkJCWd1Y19mdy0+Z3VjX2Z3X21ham9yX2ZvdW5k LCBndWNfZnctPmd1Y19md19taW5vcl9mb3VuZCwKIAkJCWd1Y19mdy0+Z3VjX2Z3X21ham9yX3dh bnRlZCwgZ3VjX2Z3LT5ndWNfZndfbWlub3Jfd2FudGVkKTsKIAkJZXJyID0gLUVOT0VYRUM7CkBA IC02NTQsMTAgKzY1NCwxMCBAQCBzdGF0aWMgdm9pZCBndWNfZndfZmV0Y2goc3RydWN0IGRybV9k ZXZpY2UgKmRldiwgc3RydWN0IGludGVsX2d1Y19mdyAqZ3VjX2Z3KQogCXJldHVybjsKIAogZmFp bDoKKwlEUk1fV0FSTigiRmFpbGVkIHRvIGZldGNoIHZhbGlkIEd1QyBmaXJtd2FyZSBmcm9tICVz IChlcnJvciAlZClcbiIsCisJCSBndWNfZnctPmd1Y19md19wYXRoLCBlcnIpOwogCURSTV9ERUJV R19EUklWRVIoIkd1QyBmdyBmZXRjaCBzdGF0dXMgRkFJTDsgZXJyICVkLCBmdyAlcCwgb2JqICVw XG4iLAogCQllcnIsIGZ3LCBndWNfZnctPmd1Y19md19vYmopOwotCURSTV9FUlJPUigiRmFpbGVk IHRvIGZldGNoIEd1QyBmaXJtd2FyZSBmcm9tICVzIChlcnJvciAlZClcbiIsCi0JCSAgZ3VjX2Z3 LT5ndWNfZndfcGF0aCwgZXJyKTsKIAogCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsK IAlvYmogPSBndWNfZnctPmd1Y19md19vYmo7Ci0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRl bC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==