From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Gordon Subject: [PATCH v5 3/4] drm/i915/guc: revisit GuC loader message levels Date: Fri, 26 Aug 2016 18:50:58 +0100 Message-ID: <1472233859-31837-4-git-send-email-david.s.gordon@intel.com> References: <1472233859-31837-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4B4C46EB42 for ; Fri, 26 Aug 2016 17:51:16 +0000 (UTC) In-Reply-To: <1472233859-31837-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 bXV0YXRpb24gb2YgbGV2ZWxzIDopCnYzOiBjb252ZXJ0IGEgY291cGxlIG9mICJ0aGlzIHNob3Vs ZG4ndCBoYXBwZW4iIG1lc3NhZ2VzIHRvIFdBUk4oKQoKU2lnbmVkLW9mZi1ieTogRGF2ZSBHb3Jk b24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IFR2cnRrbyBVcnN1bGlu IDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZ3VjX2xvYWRlci5jIHwgMzQgKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tCiAx IGZpbGUgY2hhbmdlZCwgMTcgaW5zZXJ0aW9ucygrKSwgMTcgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCmluZGV4IGU2N2Q4ZGUuLjg1MzkyOGYgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKQEAgLTE1MiwxMiArMTUyLDE0 IEBAIHN0YXRpYyB1MzIgZ2V0X2d0dHlwZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYpCiAKIHN0YXRpYyB1MzIgZ2V0X2NvcmVfZmFtaWx5KHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKIHsKLQlzd2l0Y2ggKElOVEVMX0lORk8oZGV2X3ByaXYpLT5nZW4pIHsKKwl1 MzIgZ2VuID0gSU5URUxfR0VOKGRldl9wcml2KTsKKworCXN3aXRjaCAoZ2VuKSB7CiAJY2FzZSA5 OgogCQlyZXR1cm4gR0ZYQ09SRV9GQU1JTFlfR0VOOTsKIAogCWRlZmF1bHQ6Ci0JCURSTV9FUlJP UigiR1VDOiB1bnN1cHBvcnRlZCBjb3JlIGZhbWlseVxuIik7CisJCVdBUk4oMSwgIkdFTiVkIGRv ZXMgbm90IHN1cHBvcnQgR3VDIG9wZXJhdGlvbiFcbiIsIGdlbik7CiAJCXJldHVybiBHRlhDT1JF X0ZBTUlMWV9VTktOT1dOOwogCX0KIH0KQEAgLTQ0Nyw3ICs0NDksNyBAQCBpbnQgaW50ZWxfZ3Vj X3NldHVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCWdvdG8gZmFpbDsKIAl9IGVsc2UgaWYg KCpmd19wYXRoID09ICdcMCcpIHsKIAkJLyogRGV2aWNlIGhhcyBhIEd1QyBidXQgd2UgZG9uJ3Qg a25vdyB3aGF0IGYvdyB0byBsb2FkPyAqLwotCQlEUk1fSU5GTygiTm8gR3VDIGZpcm13YXJlIGtu b3duIGZvciB0aGlzIHBsYXRmb3JtXG4iKTsKKwkJV0FSTigxLCAiTm8gR3VDIGZpcm13YXJlIGtu b3duIGZvciB0aGlzIHBsYXRmb3JtIVxuIik7CiAJCWVyciA9IC1FTk9ERVY7CiAJCWdvdG8gZmFp bDsKIAl9CkBAIC00ODUsMTAgKzQ4Nyw4IEBAIGludCBpbnRlbF9ndWNfc2V0dXAoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIAkJICogdGhhdCB0aGUgc3RhdGUgYW5kIHRpbWluZyBhcmUgZmFpcmx5 IHByZWRpY3RhYmxlCiAJCSAqLwogCQllcnIgPSBpOTE1X3Jlc2V0X2d1YyhkZXZfcHJpdik7Ci0J CWlmIChlcnIpIHsKLQkJCURSTV9FUlJPUigiR3VDIHJlc2V0IGZhaWxlZDogJWRcbiIsIGVycik7 CisJCWlmIChlcnIpCiAJCQlnb3RvIGZhaWw7Ci0JCX0KIAogCQllcnIgPSBndWNfdWNvZGVfeGZl cihkZXZfcHJpdik7CiAJCWlmICghZXJyKQpAQCAtNTQ2LDE1ICs1NDYsMTUgQEAgaW50IGludGVs X2d1Y19zZXR1cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWVsc2UgaWYgKGVyciA9PSAwKQog CQlEUk1fSU5GTygiR3VDIGZpcm13YXJlIGxvYWQgc2tpcHBlZFxuIik7CiAJZWxzZSBpZiAocmV0 ICE9IC1FSU8pCi0JCURSTV9JTkZPKCJHdUMgZmlybXdhcmUgbG9hZCBmYWlsZWQ6ICVkXG4iLCBl cnIpOworCQlEUk1fTk9URSgiR3VDIGZpcm13YXJlIGxvYWQgZmFpbGVkOiAlZFxuIiwgZXJyKTsK IAllbHNlCi0JCURSTV9FUlJPUigiR3VDIGZpcm13YXJlIGxvYWQgZmFpbGVkOiAlZFxuIiwgZXJy KTsKKwkJRFJNX1dBUk4oIkd1QyBmaXJtd2FyZSBsb2FkIGZhaWxlZDogJWRcbiIsIGVycik7CiAK IAlpZiAoaTkxNS5lbmFibGVfZ3VjX3N1Ym1pc3Npb24pIHsKIAkJaWYgKGZ3X3BhdGggPT0gTlVM TCkKIAkJCURSTV9JTkZPKCJHdUMgc3VibWlzc2lvbiB3aXRob3V0IGZpcm13YXJlIG5vdCBzdXBw b3J0ZWRcbiIpOwogCQlpZiAocmV0ID09IDApCi0JCQlEUk1fSU5GTygiRmFsbGluZyBiYWNrIGZy b20gR3VDIHN1Ym1pc3Npb24gdG8gZXhlY2xpc3QgbW9kZVxuIik7CisJCQlEUk1fTk9URSgiRmFs bGluZyBiYWNrIGZyb20gR3VDIHN1Ym1pc3Npb24gdG8gZXhlY2xpc3QgbW9kZVxuIik7CiAJCWVs c2UKIAkJCURSTV9FUlJPUigiR3VDIGluaXQgZmFpbGVkOiAlZFxuIiwgcmV0KTsKIAl9CkBAIC01 ODYsNyArNTg2LDcgQEAgc3RhdGljIHZvaWQgZ3VjX2Z3X2ZldGNoKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsIHN0cnVjdCBpbnRlbF9ndWNfZncgKmd1Y19mdykKIAogCS8qIENoZWNrIHRoZSBzaXpl IG9mIHRoZSBibG9iIGJlZm9yZSBleGFtaW5pbmcgYnVmZmVyIGNvbnRlbnRzICovCiAJaWYgKGZ3 LT5zaXplIDwgc2l6ZW9mKHN0cnVjdCBndWNfY3NzX2hlYWRlcikpIHsKLQkJRFJNX0VSUk9SKCJG aXJtd2FyZSBoZWFkZXIgaXMgbWlzc2luZ1xuIik7CisJCURSTV9OT1RFKCJGaXJtd2FyZSBoZWFk ZXIgaXMgbWlzc2luZ1xuIik7CiAJCWdvdG8gZmFpbDsKIAl9CiAKQEAgLTU5OCw3ICs1OTgsNyBA QCBzdGF0aWMgdm9pZCBndWNfZndfZmV0Y2goc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0 IGludGVsX2d1Y19mdyAqZ3VjX2Z3KQogCQljc3MtPmtleV9zaXplX2R3IC0gY3NzLT5leHBvbmVu dF9zaXplX2R3KSAqIHNpemVvZih1MzIpOwogCiAJaWYgKGd1Y19mdy0+aGVhZGVyX3NpemUgIT0g c2l6ZW9mKHN0cnVjdCBndWNfY3NzX2hlYWRlcikpIHsKLQkJRFJNX0VSUk9SKCJDU1MgaGVhZGVy IGRlZmluaXRpb24gbWlzbWF0Y2hcbiIpOworCQlEUk1fTk9URSgiQ1NTIGhlYWRlciBkZWZpbml0 aW9uIG1pc21hdGNoXG4iKTsKIAkJZ290byBmYWlsOwogCX0KIApAQCAtNjA4LDcgKzYwOCw3IEBA IHN0YXRpYyB2b2lkIGd1Y19md19mZXRjaChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3Qg aW50ZWxfZ3VjX2Z3ICpndWNfZncpCiAKIAkvKiBub3cgUlNBICovCiAJaWYgKGNzcy0+a2V5X3Np emVfZHcgIT0gVU9TX1JTQV9TQ1JBVENIX01BWF9DT1VOVCkgewotCQlEUk1fRVJST1IoIlJTQSBr ZXkgc2l6ZSBpcyBiYWRcbiIpOworCQlEUk1fTk9URSgiUlNBIGtleSBzaXplIGlzIGJhZFxuIik7 CiAJCWdvdG8gZmFpbDsKIAl9CiAJZ3VjX2Z3LT5yc2Ffb2Zmc2V0ID0gZ3VjX2Z3LT51Y29kZV9v ZmZzZXQgKyBndWNfZnctPnVjb2RlX3NpemU7CkBAIC02MTcsMTQgKzYxNywxNCBAQCBzdGF0aWMg dm9pZCBndWNfZndfZmV0Y2goc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGludGVsX2d1 Y19mdyAqZ3VjX2Z3KQogCS8qIEF0IGxlYXN0LCBpdCBzaG91bGQgaGF2ZSBoZWFkZXIsIHVDb2Rl IGFuZCBSU0EuIFNpemUgb2YgYWxsIHRocmVlLiAqLwogCXNpemUgPSBndWNfZnctPmhlYWRlcl9z aXplICsgZ3VjX2Z3LT51Y29kZV9zaXplICsgZ3VjX2Z3LT5yc2Ffc2l6ZTsKIAlpZiAoZnctPnNp emUgPCBzaXplKSB7Ci0JCURSTV9FUlJPUigiTWlzc2luZyBmaXJtd2FyZSBjb21wb25lbnRzXG4i KTsKKwkJRFJNX05PVEUoIk1pc3NpbmcgZmlybXdhcmUgY29tcG9uZW50c1xuIik7CiAJCWdvdG8g ZmFpbDsKIAl9CiAKIAkvKiBIZWFkZXIgYW5kIHVDb2RlIHdpbGwgYmUgbG9hZGVkIHRvIFdPUENN LiBTaXplIG9mIHRoZSB0d28uICovCiAJc2l6ZSA9IGd1Y19mdy0+aGVhZGVyX3NpemUgKyBndWNf ZnctPnVjb2RlX3NpemU7CiAJaWYgKHNpemUgPiBndWNfd29wY21fc2l6ZSh0b19pOTE1KGRldikp KSB7Ci0JCURSTV9FUlJPUigiRmlybXdhcmUgaXMgdG9vIGxhcmdlIHRvIGZpdCBpbiBXT1BDTVxu Iik7CisJCURSTV9OT1RFKCJGaXJtd2FyZSBpcyB0b28gbGFyZ2UgdG8gZml0IGluIFdPUENNXG4i KTsKIAkJZ290byBmYWlsOwogCX0KIApAQCAtNjM5LDcgKzYzOSw3IEBAIHN0YXRpYyB2b2lkIGd1 Y19md19mZXRjaChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgaW50ZWxfZ3VjX2Z3ICpn dWNfZncpCiAKIAlpZiAoZ3VjX2Z3LT5ndWNfZndfbWFqb3JfZm91bmQgIT0gZ3VjX2Z3LT5ndWNf ZndfbWFqb3Jfd2FudGVkIHx8CiAJICAgIGd1Y19mdy0+Z3VjX2Z3X21pbm9yX2ZvdW5kIDwgZ3Vj X2Z3LT5ndWNfZndfbWlub3Jfd2FudGVkKSB7Ci0JCURSTV9FUlJPUigiR3VDIGZpcm13YXJlIHZl cnNpb24gJWQuJWQsIHJlcXVpcmVkICVkLiVkXG4iLAorCQlEUk1fTk9URSgiR3VDIGZpcm13YXJl IHZlcnNpb24gJWQuJWQsIHJlcXVpcmVkICVkLiVkXG4iLAogCQkJZ3VjX2Z3LT5ndWNfZndfbWFq b3JfZm91bmQsIGd1Y19mdy0+Z3VjX2Z3X21pbm9yX2ZvdW5kLAogCQkJZ3VjX2Z3LT5ndWNfZndf bWFqb3Jfd2FudGVkLCBndWNfZnctPmd1Y19md19taW5vcl93YW50ZWQpOwogCQllcnIgPSAtRU5P RVhFQzsKQEAgLTY2OSwxMCArNjY5LDEwIEBAIHN0YXRpYyB2b2lkIGd1Y19md19mZXRjaChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgaW50ZWxfZ3VjX2Z3ICpndWNfZncpCiAJcmV0dXJu OwogCiBmYWlsOgorCURSTV9XQVJOKCJGYWlsZWQgdG8gZmV0Y2ggdmFsaWQgR3VDIGZpcm13YXJl IGZyb20gJXMgKGVycm9yICVkKVxuIiwKKwkJIGd1Y19mdy0+Z3VjX2Z3X3BhdGgsIGVycik7CiAJ RFJNX0RFQlVHX0RSSVZFUigiR3VDIGZ3IGZldGNoIHN0YXR1cyBGQUlMOyBlcnIgJWQsIGZ3ICVw LCBvYmogJXBcbiIsCiAJCWVyciwgZncsIGd1Y19mdy0+Z3VjX2Z3X29iaik7Ci0JRFJNX0VSUk9S KCJGYWlsZWQgdG8gZmV0Y2ggR3VDIGZpcm13YXJlIGZyb20gJXMgKGVycm9yICVkKVxuIiwKLQkJ ICBndWNfZnctPmd1Y19md19wYXRoLCBlcnIpOwogCiAJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3Rf bXV0ZXgpOwogCW9iaiA9IGd1Y19mdy0+Z3VjX2Z3X29iajsKLS0gCjEuOS4xCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK