From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Gordon Subject: [PATCH v2 3/3] drm/i915/guc: revisit GuC loader message levels Date: Tue, 12 Jul 2016 19:45:46 +0100 Message-ID: <1468349146-28603-3-git-send-email-david.s.gordon@intel.com> References: <1468349146-28603-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: In-Reply-To: <1468349146-28603-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 Cc: David Airlie , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org U29tZSBkb3duZ3JhZGVkIGZyb20gRFJNX0VSUk9SKCkgdG8gRFJNX1dBUk4oKSBvciBEUk1fTk9U RSgpLAphIGZldyB1cGdyYWRlZCBmcm9tIERSTV9JTkZPKCkgdG8gRFJNX05PVEUoKSBvciBEUk1f V0FSTigpLAphbmQgb25lIGVsaW1pbmF0ZWQgY29tcGxldGVseS4gQSB0eXBpY2FsIGZhaWx1cmUg bW9kZSBtaWdodApub3cgbG9vayBsaWtlIHRoaXMgaW4gdGhlIGRtZXNnIGxvZzoKCltkcm1dIEZh aWxlZCB0byBmZXRjaCB2YWxpZCBHdUMgZmlybXdhcmUgZnJvbSBpOTE1L3NrbF9ndWNfdmVyNl8x LmJpbiAoZXJyb3IgLTIpCltkcm1dIEd1QyBmaXJtd2FyZSBsb2FkIGZhaWxlZDogLTUKW2RybV0g RmFsbGluZyBiYWNrIGZyb20gR3VDIHN1Ym1pc3Npb24gdG8gZXhlY2xpc3QgbW9kZQoKd2hpY2gg cHJvdmlkZXMgc3VmZmljaWVudCBub3RpY2UgdGhhdAoqIHRoZXJlIGlzIGEgcHJvYmxlbSB3aXRo IHRoZSBmaXJtd2FyZSBiaW5hcnkKKiBhbmQgY29uc2VxdWVudGx5IGxvYWRpbmcgdGhlIEd1QyBo YXMgZmFpbGVkCiogYW5kIHNvIHdlIGhhdmUgc2VsZWN0ZWQgdGhlIGZhbGxiYWNrIChleGVjbGlz dCkgbW9kZQp3aGlsZSBub3QgY2x1dHRlcmluZyB0aGUgbG9nIHdpdGggZGV2ZWxvcGVyLW9ubHkg ZGV0YWlscy4KCnYyOiBkaWZmZXJlbnQgcGVybXV0YXRpb24gb2YgbGV2ZWxzIDopCgpTaWduZWQt b2ZmLWJ5OiBEYXZlIEdvcmRvbiA8ZGF2aWQucy5nb3Jkb25AaW50ZWwuY29tPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYyB8IDM0ICsrKysrKysrKysrKysrKyst LS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE3IGluc2VydGlvbnMoKyksIDE3IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19s b2FkZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYwppbmRleCA2 MDVjNjk2Li5hMmY0ZmE0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9n dWNfbG9hZGVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5j CkBAIC0xNDAsMTIgKzE0MCwxNCBAQCBzdGF0aWMgdTMyIGdldF9ndHR5cGUoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQogCiBzdGF0aWMgdTMyIGdldF9jb3JlX2ZhbWlseShzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0Jc3dpdGNoIChJTlRFTF9JTkZPKGRl dl9wcml2KS0+Z2VuKSB7CisJdTMyIGdlbiA9IElOVEVMX0dFTihkZXZfcHJpdik7CisKKwlzd2l0 Y2ggKGdlbikgewogCWNhc2UgOToKIAkJcmV0dXJuIEdGWENPUkVfRkFNSUxZX0dFTjk7CiAKIAlk ZWZhdWx0OgotCQlEUk1fRVJST1IoIkdVQzogdW5zdXBwb3J0ZWQgY29yZSBmYW1pbHlcbiIpOwor CQlEUk1fV0FSTigiR0VOJWQgZG9lcyBub3Qgc3VwcG9ydCBHdUMgb3BlcmF0aW9uXG4iLCBnZW4p OwogCQlyZXR1cm4gR0ZYQ09SRV9GQU1JTFlfVU5LTk9XTjsKIAl9CiB9CkBAIC00MzMsNyArNDM1 LDcgQEAgaW50IGludGVsX2d1Y19zZXR1cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlnb3Rv IGZhaWw7CiAJfSBlbHNlIGlmICgqZndfcGF0aCA9PSAnXDAnKSB7CiAJCS8qIERldmljZSBoYXMg YSBHdUMgYnV0IHdlIGRvbid0IGtub3cgd2hhdCBmL3cgdG8gbG9hZD8gKi8KLQkJRFJNX0lORk8o Ik5vIEd1QyBmaXJtd2FyZSBrbm93biBmb3IgdGhpcyBwbGF0Zm9ybVxuIik7CisJCURSTV9XQVJO KCJObyBHdUMgZmlybXdhcmUga25vd24gZm9yIHRoaXMgcGxhdGZvcm1cbiIpOwogCQllcnIgPSAt RU5PREVWOwogCQlnb3RvIGZhaWw7CiAJfQpAQCAtNDcxLDEwICs0NzMsOCBAQCBpbnQgaW50ZWxf Z3VjX3NldHVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCSAqIHRoYXQgdGhlIHN0YXRlIGFu ZCB0aW1pbmcgYXJlIGZhaXJseSBwcmVkaWN0YWJsZQogCQkgKi8KIAkJZXJyID0gaTkxNV9yZXNl dF9ndWMoZGV2X3ByaXYpOwotCQlpZiAoZXJyKSB7Ci0JCQlEUk1fRVJST1IoIkd1QyByZXNldCBm YWlsZWQ6ICVkXG4iLCBlcnIpOworCQlpZiAoZXJyKQogCQkJZ290byBmYWlsOwotCQl9CiAKIAkJ ZXJyID0gZ3VjX3Vjb2RlX3hmZXIoZGV2X3ByaXYpOwogCQlpZiAoIWVycikKQEAgLTUzMiwxNSAr NTMyLDE1IEBAIGludCBpbnRlbF9ndWNfc2V0dXAoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAll bHNlIGlmIChlcnIgPT0gMCkKIAkJRFJNX0lORk8oIkd1QyBmaXJtd2FyZSBsb2FkIHNraXBwZWRc biIpOwogCWVsc2UgaWYgKHJldCAhPSAtRUlPKQotCQlEUk1fSU5GTygiR3VDIGZpcm13YXJlIGxv YWQgZmFpbGVkOiAlZFxuIiwgZXJyKTsKKwkJRFJNX05PVEUoIkd1QyBmaXJtd2FyZSBsb2FkIGZh aWxlZDogJWRcbiIsIGVycik7CiAJZWxzZQotCQlEUk1fRVJST1IoIkd1QyBmaXJtd2FyZSBsb2Fk IGZhaWxlZDogJWRcbiIsIGVycik7CisJCURSTV9XQVJOKCJHdUMgZmlybXdhcmUgbG9hZCBmYWls ZWQ6ICVkXG4iLCBlcnIpOwogCiAJaWYgKGk5MTUuZW5hYmxlX2d1Y19zdWJtaXNzaW9uKSB7CiAJ CWlmIChmd19wYXRoID09IE5VTEwpCiAJCQlEUk1fSU5GTygiR3VDIHN1Ym1pc3Npb24gd2l0aG91 dCBmaXJtd2FyZSBub3Qgc3VwcG9ydGVkXG4iKTsKIAkJaWYgKHJldCA9PSAwKQotCQkJRFJNX0lO Rk8oIkZhbGxpbmcgYmFjayBmcm9tIEd1QyBzdWJtaXNzaW9uIHRvIGV4ZWNsaXN0IG1vZGVcbiIp OworCQkJRFJNX05PVEUoIkZhbGxpbmcgYmFjayBmcm9tIEd1QyBzdWJtaXNzaW9uIHRvIGV4ZWNs aXN0IG1vZGVcbiIpOwogCQllbHNlCiAJCQlEUk1fRVJST1IoIkd1QyBpbml0IGZhaWxlZDogJWRc biIsIHJldCk7CiAJfQpAQCAtNTcxLDcgKzU3MSw3IEBAIHN0YXRpYyB2b2lkIGd1Y19md19mZXRj aChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgaW50ZWxfZ3VjX2Z3ICpndWNfZncpCiAK IAkvKiBDaGVjayB0aGUgc2l6ZSBvZiB0aGUgYmxvYiBiZWZvcmUgZXhhbWluaW5nIGJ1ZmZlciBj b250ZW50cyAqLwogCWlmIChmdy0+c2l6ZSA8IHNpemVvZihzdHJ1Y3QgZ3VjX2Nzc19oZWFkZXIp KSB7Ci0JCURSTV9FUlJPUigiRmlybXdhcmUgaGVhZGVyIGlzIG1pc3NpbmdcbiIpOworCQlEUk1f Tk9URSgiRmlybXdhcmUgaGVhZGVyIGlzIG1pc3NpbmdcbiIpOwogCQlnb3RvIGZhaWw7CiAJfQog CkBAIC01ODMsNyArNTgzLDcgQEAgc3RhdGljIHZvaWQgZ3VjX2Z3X2ZldGNoKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsIHN0cnVjdCBpbnRlbF9ndWNfZncgKmd1Y19mdykKIAkJY3NzLT5rZXlfc2l6 ZV9kdyAtIGNzcy0+ZXhwb25lbnRfc2l6ZV9kdykgKiBzaXplb2YodTMyKTsKIAogCWlmIChndWNf ZnctPmhlYWRlcl9zaXplICE9IHNpemVvZihzdHJ1Y3QgZ3VjX2Nzc19oZWFkZXIpKSB7Ci0JCURS TV9FUlJPUigiQ1NTIGhlYWRlciBkZWZpbml0aW9uIG1pc21hdGNoXG4iKTsKKwkJRFJNX05PVEUo IkNTUyBoZWFkZXIgZGVmaW5pdGlvbiBtaXNtYXRjaFxuIik7CiAJCWdvdG8gZmFpbDsKIAl9CiAK QEAgLTU5Myw3ICs1OTMsNyBAQCBzdGF0aWMgdm9pZCBndWNfZndfZmV0Y2goc3RydWN0IGRybV9k ZXZpY2UgKmRldiwgc3RydWN0IGludGVsX2d1Y19mdyAqZ3VjX2Z3KQogCiAJLyogbm93IFJTQSAq LwogCWlmIChjc3MtPmtleV9zaXplX2R3ICE9IFVPU19SU0FfU0NSQVRDSF9NQVhfQ09VTlQpIHsK LQkJRFJNX0VSUk9SKCJSU0Ega2V5IHNpemUgaXMgYmFkXG4iKTsKKwkJRFJNX05PVEUoIlJTQSBr ZXkgc2l6ZSBpcyBiYWRcbiIpOwogCQlnb3RvIGZhaWw7CiAJfQogCWd1Y19mdy0+cnNhX29mZnNl dCA9IGd1Y19mdy0+dWNvZGVfb2Zmc2V0ICsgZ3VjX2Z3LT51Y29kZV9zaXplOwpAQCAtNjAyLDE0 ICs2MDIsMTQgQEAgc3RhdGljIHZvaWQgZ3VjX2Z3X2ZldGNoKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsIHN0cnVjdCBpbnRlbF9ndWNfZncgKmd1Y19mdykKIAkvKiBBdCBsZWFzdCwgaXQgc2hvdWxk IGhhdmUgaGVhZGVyLCB1Q29kZSBhbmQgUlNBLiBTaXplIG9mIGFsbCB0aHJlZS4gKi8KIAlzaXpl ID0gZ3VjX2Z3LT5oZWFkZXJfc2l6ZSArIGd1Y19mdy0+dWNvZGVfc2l6ZSArIGd1Y19mdy0+cnNh X3NpemU7CiAJaWYgKGZ3LT5zaXplIDwgc2l6ZSkgewotCQlEUk1fRVJST1IoIk1pc3NpbmcgZmly bXdhcmUgY29tcG9uZW50c1xuIik7CisJCURSTV9OT1RFKCJNaXNzaW5nIGZpcm13YXJlIGNvbXBv bmVudHNcbiIpOwogCQlnb3RvIGZhaWw7CiAJfQogCiAJLyogSGVhZGVyIGFuZCB1Q29kZSB3aWxs IGJlIGxvYWRlZCB0byBXT1BDTS4gU2l6ZSBvZiB0aGUgdHdvLiAqLwogCXNpemUgPSBndWNfZnct PmhlYWRlcl9zaXplICsgZ3VjX2Z3LT51Y29kZV9zaXplOwogCWlmIChzaXplID4gZ3VjX3dvcGNt X3NpemUodG9faTkxNShkZXYpKSkgewotCQlEUk1fRVJST1IoIkZpcm13YXJlIGlzIHRvbyBsYXJn ZSB0byBmaXQgaW4gV09QQ01cbiIpOworCQlEUk1fTk9URSgiRmlybXdhcmUgaXMgdG9vIGxhcmdl IHRvIGZpdCBpbiBXT1BDTVxuIik7CiAJCWdvdG8gZmFpbDsKIAl9CiAKQEAgLTYyNCw3ICs2MjQs NyBAQCBzdGF0aWMgdm9pZCBndWNfZndfZmV0Y2goc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3Ry dWN0IGludGVsX2d1Y19mdyAqZ3VjX2Z3KQogCiAJaWYgKGd1Y19mdy0+Z3VjX2Z3X21ham9yX2Zv dW5kICE9IGd1Y19mdy0+Z3VjX2Z3X21ham9yX3dhbnRlZCB8fAogCSAgICBndWNfZnctPmd1Y19m d19taW5vcl9mb3VuZCA8IGd1Y19mdy0+Z3VjX2Z3X21pbm9yX3dhbnRlZCkgewotCQlEUk1fRVJS T1IoIkd1QyBmaXJtd2FyZSB2ZXJzaW9uICVkLiVkLCByZXF1aXJlZCAlZC4lZFxuIiwKKwkJRFJN X05PVEUoIkd1QyBmaXJtd2FyZSB2ZXJzaW9uICVkLiVkLCByZXF1aXJlZCAlZC4lZFxuIiwKIAkJ CWd1Y19mdy0+Z3VjX2Z3X21ham9yX2ZvdW5kLCBndWNfZnctPmd1Y19md19taW5vcl9mb3VuZCwK IAkJCWd1Y19mdy0+Z3VjX2Z3X21ham9yX3dhbnRlZCwgZ3VjX2Z3LT5ndWNfZndfbWlub3Jfd2Fu dGVkKTsKIAkJZXJyID0gLUVOT0VYRUM7CkBAIC02NTQsMTAgKzY1NCwxMCBAQCBzdGF0aWMgdm9p ZCBndWNfZndfZmV0Y2goc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGludGVsX2d1Y19m dyAqZ3VjX2Z3KQogCXJldHVybjsKIAogZmFpbDoKKwlEUk1fV0FSTigiRmFpbGVkIHRvIGZldGNo IHZhbGlkIEd1QyBmaXJtd2FyZSBmcm9tICVzIChlcnJvciAlZClcbiIsCisJCSBndWNfZnctPmd1 Y19md19wYXRoLCBlcnIpOwogCURSTV9ERUJVR19EUklWRVIoIkd1QyBmdyBmZXRjaCBzdGF0dXMg RkFJTDsgZXJyICVkLCBmdyAlcCwgb2JqICVwXG4iLAogCQllcnIsIGZ3LCBndWNfZnctPmd1Y19m d19vYmopOwotCURSTV9FUlJPUigiRmFpbGVkIHRvIGZldGNoIEd1QyBmaXJtd2FyZSBmcm9tICVz IChlcnJvciAlZClcbiIsCi0JCSAgZ3VjX2Z3LT5ndWNfZndfcGF0aCwgZXJyKTsKIAogCW11dGV4 X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKIAlvYmogPSBndWNfZnctPmd1Y19md19vYmo7Ci0t IAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==