From: Dave Gordon Subject: [PATCH v3 3/3] drm/i915/guc: revisit GuC loader message levels Date: Tue, 19 Jul 2016 17:36:41 +0100 Message-ID: <1468946201-16616-3-git-send-email-david.s.gordon@intel.com> References: <1468946201-16616-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 C869F6E6C9 for ; Tue, 19 Jul 2016 16:36:50 +0000 (UTC) In-Reply-To: <1468946201-16616-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 V0FSTigpLAphbmQgb25lIGVsaW1pbmF0ZWQgY29tcGxldGVseS4KCnYyOgogICAgZGlmZmVyZW50 IHBlcm11dGF0aW9uIG9mIGxldmVscyA6KQp2MzoKICAgIGNvbnZlcnQgYSBjb3VwbGUgb2YgInRo aXMgc2hvdWxkbid0IGhhcHBlbiIgbWVzc2FnZXMgdG8gV0FSTigpCiAgICBbVHZydGtvIFVyc3Vs aW5dLgoKU2lnbmVkLW9mZi1ieTogRGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNv bT4KUmV2aWV3ZWQtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jIHwgMzQgKysrKysr KysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTcgaW5zZXJ0aW9u cygrKSwgMTcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZ3VjX2xvYWRlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRl ci5jCmluZGV4IDYwNWM2OTYuLmE3OTAxYTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2d1Y19sb2FkZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9n dWNfbG9hZGVyLmMKQEAgLTE0MCwxMiArMTQwLDE0IEBAIHN0YXRpYyB1MzIgZ2V0X2d0dHlwZShz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAKIHN0YXRpYyB1MzIgZ2V0X2NvcmVf ZmFtaWx5KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKLQlzd2l0Y2ggKElO VEVMX0lORk8oZGV2X3ByaXYpLT5nZW4pIHsKKwl1MzIgZ2VuID0gSU5URUxfR0VOKGRldl9wcml2 KTsKKworCXN3aXRjaCAoZ2VuKSB7CiAJY2FzZSA5OgogCQlyZXR1cm4gR0ZYQ09SRV9GQU1JTFlf R0VOOTsKIAogCWRlZmF1bHQ6Ci0JCURSTV9FUlJPUigiR1VDOiB1bnN1cHBvcnRlZCBjb3JlIGZh bWlseVxuIik7CisJCVdBUk4oMSwgIkdFTiVkIGRvZXMgbm90IHN1cHBvcnQgR3VDIG9wZXJhdGlv biFcbiIsIGdlbik7CiAJCXJldHVybiBHRlhDT1JFX0ZBTUlMWV9VTktOT1dOOwogCX0KIH0KQEAg LTQzMyw3ICs0MzUsNyBAQCBpbnQgaW50ZWxfZ3VjX3NldHVwKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiAJCWdvdG8gZmFpbDsKIAl9IGVsc2UgaWYgKCpmd19wYXRoID09ICdcMCcpIHsKIAkJLyog RGV2aWNlIGhhcyBhIEd1QyBidXQgd2UgZG9uJ3Qga25vdyB3aGF0IGYvdyB0byBsb2FkPyAqLwot CQlEUk1fSU5GTygiTm8gR3VDIGZpcm13YXJlIGtub3duIGZvciB0aGlzIHBsYXRmb3JtXG4iKTsK KwkJV0FSTigxLCAiTm8gR3VDIGZpcm13YXJlIGtub3duIGZvciB0aGlzIHBsYXRmb3JtIVxuIik7 CiAJCWVyciA9IC1FTk9ERVY7CiAJCWdvdG8gZmFpbDsKIAl9CkBAIC00NzEsMTAgKzQ3Myw4IEBA IGludCBpbnRlbF9ndWNfc2V0dXAoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJICogdGhhdCB0 aGUgc3RhdGUgYW5kIHRpbWluZyBhcmUgZmFpcmx5IHByZWRpY3RhYmxlCiAJCSAqLwogCQllcnIg PSBpOTE1X3Jlc2V0X2d1YyhkZXZfcHJpdik7Ci0JCWlmIChlcnIpIHsKLQkJCURSTV9FUlJPUigi R3VDIHJlc2V0IGZhaWxlZDogJWRcbiIsIGVycik7CisJCWlmIChlcnIpCiAJCQlnb3RvIGZhaWw7 Ci0JCX0KIAogCQllcnIgPSBndWNfdWNvZGVfeGZlcihkZXZfcHJpdik7CiAJCWlmICghZXJyKQpA QCAtNTMyLDE1ICs1MzIsMTUgQEAgaW50IGludGVsX2d1Y19zZXR1cChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogCWVsc2UgaWYgKGVyciA9PSAwKQogCQlEUk1fSU5GTygiR3VDIGZpcm13YXJlIGxv YWQgc2tpcHBlZFxuIik7CiAJZWxzZSBpZiAocmV0ICE9IC1FSU8pCi0JCURSTV9JTkZPKCJHdUMg ZmlybXdhcmUgbG9hZCBmYWlsZWQ6ICVkXG4iLCBlcnIpOworCQlEUk1fTk9URSgiR3VDIGZpcm13 YXJlIGxvYWQgZmFpbGVkOiAlZFxuIiwgZXJyKTsKIAllbHNlCi0JCURSTV9FUlJPUigiR3VDIGZp cm13YXJlIGxvYWQgZmFpbGVkOiAlZFxuIiwgZXJyKTsKKwkJRFJNX1dBUk4oIkd1QyBmaXJtd2Fy ZSBsb2FkIGZhaWxlZDogJWRcbiIsIGVycik7CiAKIAlpZiAoaTkxNS5lbmFibGVfZ3VjX3N1Ym1p c3Npb24pIHsKIAkJaWYgKGZ3X3BhdGggPT0gTlVMTCkKIAkJCURSTV9JTkZPKCJHdUMgc3VibWlz c2lvbiB3aXRob3V0IGZpcm13YXJlIG5vdCBzdXBwb3J0ZWRcbiIpOwogCQlpZiAocmV0ID09IDAp Ci0JCQlEUk1fSU5GTygiRmFsbGluZyBiYWNrIGZyb20gR3VDIHN1Ym1pc3Npb24gdG8gZXhlY2xp c3QgbW9kZVxuIik7CisJCQlEUk1fTk9URSgiRmFsbGluZyBiYWNrIGZyb20gR3VDIHN1Ym1pc3Np b24gdG8gZXhlY2xpc3QgbW9kZVxuIik7CiAJCWVsc2UKIAkJCURSTV9FUlJPUigiR3VDIGluaXQg ZmFpbGVkOiAlZFxuIiwgcmV0KTsKIAl9CkBAIC01NzEsNyArNTcxLDcgQEAgc3RhdGljIHZvaWQg Z3VjX2Z3X2ZldGNoKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBpbnRlbF9ndWNfZncg Kmd1Y19mdykKIAogCS8qIENoZWNrIHRoZSBzaXplIG9mIHRoZSBibG9iIGJlZm9yZSBleGFtaW5p bmcgYnVmZmVyIGNvbnRlbnRzICovCiAJaWYgKGZ3LT5zaXplIDwgc2l6ZW9mKHN0cnVjdCBndWNf Y3NzX2hlYWRlcikpIHsKLQkJRFJNX0VSUk9SKCJGaXJtd2FyZSBoZWFkZXIgaXMgbWlzc2luZ1xu Iik7CisJCURSTV9OT1RFKCJGaXJtd2FyZSBoZWFkZXIgaXMgbWlzc2luZ1xuIik7CiAJCWdvdG8g ZmFpbDsKIAl9CiAKQEAgLTU4Myw3ICs1ODMsNyBAQCBzdGF0aWMgdm9pZCBndWNfZndfZmV0Y2go c3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGludGVsX2d1Y19mdyAqZ3VjX2Z3KQogCQlj c3MtPmtleV9zaXplX2R3IC0gY3NzLT5leHBvbmVudF9zaXplX2R3KSAqIHNpemVvZih1MzIpOwog CiAJaWYgKGd1Y19mdy0+aGVhZGVyX3NpemUgIT0gc2l6ZW9mKHN0cnVjdCBndWNfY3NzX2hlYWRl cikpIHsKLQkJRFJNX0VSUk9SKCJDU1MgaGVhZGVyIGRlZmluaXRpb24gbWlzbWF0Y2hcbiIpOwor CQlEUk1fTk9URSgiQ1NTIGhlYWRlciBkZWZpbml0aW9uIG1pc21hdGNoXG4iKTsKIAkJZ290byBm YWlsOwogCX0KIApAQCAtNTkzLDcgKzU5Myw3IEBAIHN0YXRpYyB2b2lkIGd1Y19md19mZXRjaChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgaW50ZWxfZ3VjX2Z3ICpndWNfZncpCiAKIAkv KiBub3cgUlNBICovCiAJaWYgKGNzcy0+a2V5X3NpemVfZHcgIT0gVU9TX1JTQV9TQ1JBVENIX01B WF9DT1VOVCkgewotCQlEUk1fRVJST1IoIlJTQSBrZXkgc2l6ZSBpcyBiYWRcbiIpOworCQlEUk1f Tk9URSgiUlNBIGtleSBzaXplIGlzIGJhZFxuIik7CiAJCWdvdG8gZmFpbDsKIAl9CiAJZ3VjX2Z3 LT5yc2Ffb2Zmc2V0ID0gZ3VjX2Z3LT51Y29kZV9vZmZzZXQgKyBndWNfZnctPnVjb2RlX3NpemU7 CkBAIC02MDIsMTQgKzYwMiwxNCBAQCBzdGF0aWMgdm9pZCBndWNfZndfZmV0Y2goc3RydWN0IGRy bV9kZXZpY2UgKmRldiwgc3RydWN0IGludGVsX2d1Y19mdyAqZ3VjX2Z3KQogCS8qIEF0IGxlYXN0 LCBpdCBzaG91bGQgaGF2ZSBoZWFkZXIsIHVDb2RlIGFuZCBSU0EuIFNpemUgb2YgYWxsIHRocmVl LiAqLwogCXNpemUgPSBndWNfZnctPmhlYWRlcl9zaXplICsgZ3VjX2Z3LT51Y29kZV9zaXplICsg Z3VjX2Z3LT5yc2Ffc2l6ZTsKIAlpZiAoZnctPnNpemUgPCBzaXplKSB7Ci0JCURSTV9FUlJPUigi TWlzc2luZyBmaXJtd2FyZSBjb21wb25lbnRzXG4iKTsKKwkJRFJNX05PVEUoIk1pc3NpbmcgZmly bXdhcmUgY29tcG9uZW50c1xuIik7CiAJCWdvdG8gZmFpbDsKIAl9CiAKIAkvKiBIZWFkZXIgYW5k IHVDb2RlIHdpbGwgYmUgbG9hZGVkIHRvIFdPUENNLiBTaXplIG9mIHRoZSB0d28uICovCiAJc2l6 ZSA9IGd1Y19mdy0+aGVhZGVyX3NpemUgKyBndWNfZnctPnVjb2RlX3NpemU7CiAJaWYgKHNpemUg PiBndWNfd29wY21fc2l6ZSh0b19pOTE1KGRldikpKSB7Ci0JCURSTV9FUlJPUigiRmlybXdhcmUg aXMgdG9vIGxhcmdlIHRvIGZpdCBpbiBXT1BDTVxuIik7CisJCURSTV9OT1RFKCJGaXJtd2FyZSBp cyB0b28gbGFyZ2UgdG8gZml0IGluIFdPUENNXG4iKTsKIAkJZ290byBmYWlsOwogCX0KIApAQCAt NjI0LDcgKzYyNCw3IEBAIHN0YXRpYyB2b2lkIGd1Y19md19mZXRjaChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LCBzdHJ1Y3QgaW50ZWxfZ3VjX2Z3ICpndWNfZncpCiAKIAlpZiAoZ3VjX2Z3LT5ndWNf ZndfbWFqb3JfZm91bmQgIT0gZ3VjX2Z3LT5ndWNfZndfbWFqb3Jfd2FudGVkIHx8CiAJICAgIGd1 Y19mdy0+Z3VjX2Z3X21pbm9yX2ZvdW5kIDwgZ3VjX2Z3LT5ndWNfZndfbWlub3Jfd2FudGVkKSB7 Ci0JCURSTV9FUlJPUigiR3VDIGZpcm13YXJlIHZlcnNpb24gJWQuJWQsIHJlcXVpcmVkICVkLiVk XG4iLAorCQlEUk1fTk9URSgiR3VDIGZpcm13YXJlIHZlcnNpb24gJWQuJWQsIHJlcXVpcmVkICVk LiVkXG4iLAogCQkJZ3VjX2Z3LT5ndWNfZndfbWFqb3JfZm91bmQsIGd1Y19mdy0+Z3VjX2Z3X21p bm9yX2ZvdW5kLAogCQkJZ3VjX2Z3LT5ndWNfZndfbWFqb3Jfd2FudGVkLCBndWNfZnctPmd1Y19m d19taW5vcl93YW50ZWQpOwogCQllcnIgPSAtRU5PRVhFQzsKQEAgLTY1NCwxMCArNjU0LDEwIEBA IHN0YXRpYyB2b2lkIGd1Y19md19mZXRjaChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3Qg aW50ZWxfZ3VjX2Z3ICpndWNfZncpCiAJcmV0dXJuOwogCiBmYWlsOgorCURSTV9XQVJOKCJGYWls ZWQgdG8gZmV0Y2ggdmFsaWQgR3VDIGZpcm13YXJlIGZyb20gJXMgKGVycm9yICVkKVxuIiwKKwkJ IGd1Y19mdy0+Z3VjX2Z3X3BhdGgsIGVycik7CiAJRFJNX0RFQlVHX0RSSVZFUigiR3VDIGZ3IGZl dGNoIHN0YXR1cyBGQUlMOyBlcnIgJWQsIGZ3ICVwLCBvYmogJXBcbiIsCiAJCWVyciwgZncsIGd1 Y19mdy0+Z3VjX2Z3X29iaik7Ci0JRFJNX0VSUk9SKCJGYWlsZWQgdG8gZmV0Y2ggR3VDIGZpcm13 YXJlIGZyb20gJXMgKGVycm9yICVkKVxuIiwKLQkJICBndWNfZnctPmd1Y19md19wYXRoLCBlcnIp OwogCiAJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCW9iaiA9IGd1Y19mdy0+Z3Vj X2Z3X29iajsKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK