From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Gordon Subject: [PATCH v2 2/2] drm/i915/guc: always reset GuC before loading firmware Date: Wed, 23 Mar 2016 17:05:46 +0000 Message-ID: <1458752746-14248-2-git-send-email-david.s.gordon@intel.com> References: <1458752746-14248-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 EECB86E8CC for ; Wed, 23 Mar 2016 17:05:58 +0000 (UTC) In-Reply-To: <1458752746-14248-1-git-send-email-david.s.gordon@intel.com> References: <56F19212.9000705@linux.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 QWZ0ZXIgYSBzdXNwZW5kLXJlc3VtZSBjeWNsZSwgdGhlIHJlc3VtZWQga2VybmVsIGhhcyBubyBp ZGVhIHdoYXQgdGhlCmJvb3RlZCBrZXJuZWwgbWF5IGhhdmUgZG9uZSB0byB0aGUgR3VDIGJlZm9y ZSByZXBsYWNpbmcgaXRzZWxmIHdpdGggdGhlCnJlc3VtZWQgaW1hZ2UuIEluIHBhcnRpY3VsYXIs IGl0IG1heSBoYXZlIGFscmVhZHkgbG9hZGVkIHRoZSBHdUMgd2l0aApmaXJtd2FyZSwgd2hpY2gg d2lsbCB0aGVuIGNhdXNlIHRoaXMga2VybmVsJ3MgYXR0ZW1wdCB0byAocmUpbG9hZCB0aGUKZmly bXdhcmUgdG8gZmFpbCAoR3VDIHByb2dyYW0gbWVtb3J5IGlzIHdyaXRlLW9uY2UhKS4gVGhlIHN5 bXB0b21zCihHdUMgZmlybXdhcmUgcmVsb2FkIGZhaWxzIGFmdGVyIGhpYmVybmF0aW9uKSBhcmUg ZnVydGhlciBkZXNjcmliZWQKaW4gdGhlIEJ1Z3ppbGxhIHJlZmVyZW5jZSBiZWxvdy4KClNvIGxl dCdzICphbHdheXMqIHJlc2V0IHRoZSBHdUMganVzdCBiZWZvcmUgKHJlKWxvYWRpbmcgdGhlIGZp cm13YXJlOwp0aGVuIHRoZSBoYXJkd2FyZSBzaG91bGQgdGhlbiBiZSBpbiBhIHdlbGwta25vd24g c3RhdGUsIGFuZCB3ZSBtYXkgZXZlbgphdm9pZCBzb21lIG9mIHRoZSBpc3N1ZXMgYXJpc2luZyBm cm9tIHVucHJlZGljdGFibGUgdGltaW5nLgoKQWxzbyBhZGRlZCBzb21lIG1vcmUgZmllbGRzICYg dmFsdWVzIHRvIHRoZSBkZWZpbml0aW9uIG9mIHRoZSBHVUNfU1RBVFVTCnJlZ2lzdGVyLCB3aGlj aCBpcyB0aGUga2V5IGRpYWdub3N0aWMgaW5kaWNhdG9yIGlmIHRoZSBHdUMgbG9hZCBmYWlscy4K ClNpZ25lZC1vZmYtYnk6IERhdmUgR29yZG9uIDxkYXZpZC5zLmdvcmRvbkBpbnRlbC5jb20+ClJl dmlld2VkLWJ5OiBBcnVuIFNpbHV2ZXJ5IDxhcnVuLnNpbHV2ZXJ5QGxpbnV4LmludGVsLmNvbT4K Q2M6IEFsZXggRGFpIDx5dS5kYWlAaW50ZWwuY29tPgpCdWd6aWxsYTogaHR0cHM6Ly9idWdzLmZy ZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQzOTAKCi0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9ndWNfcmVnLmggICAgIHwgMTIgKysrKysrKystLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jIHwgNDAgKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0t LS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDI5IGluc2VydGlvbnMoKyksIDIzIGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3JlZy5oIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfcmVnLmgKaW5kZXggOTRjZWVlNS4uODA3ODZkOSAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfcmVnLmgKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfcmVnLmgKQEAgLTI3LDEwICsyNywxMiBAQAogLyog RGVmaW5pdGlvbnMgb2YgR3VDIEgvVyByZWdpc3RlcnMsIGJpdHMsIGV0YyAqLwogCiAjZGVmaW5l IEdVQ19TVEFUVVMJCQlfTU1JTygweGMwMDApCi0jZGVmaW5lICAgR1NfTUlBX0lOX1JFU0VUCQko MSA8PCAwKQorI2RlZmluZSAgIEdTX1JFU0VUX1NISUZUCQkwCisjZGVmaW5lICAgR1NfTUlBX0lO X1JFU0VUCQkgICgweDAxIDw8IEdTX1JFU0VUX1NISUZUKQogI2RlZmluZSAgIEdTX0JPT1RST01f U0hJRlQJCTEKICNkZWZpbmUgICBHU19CT09UUk9NX01BU0sJCSAgKDB4N0YgPDwgR1NfQk9PVFJP TV9TSElGVCkKICNkZWZpbmUgICBHU19CT09UUk9NX1JTQV9GQUlMRUQJCSAgKDB4NTAgPDwgR1Nf Qk9PVFJPTV9TSElGVCkKKyNkZWZpbmUgICBHU19CT09UUk9NX0pVTVBfUEFTU0VECSAgKDB4NzYg PDwgR1NfQk9PVFJPTV9TSElGVCkKICNkZWZpbmUgICBHU19VS0VSTkVMX1NISUZUCQk4CiAjZGVm aW5lICAgR1NfVUtFUk5FTF9NQVNLCQkgICgweEZGIDw8IEdTX1VLRVJORUxfU0hJRlQpCiAjZGVm aW5lICAgR1NfVUtFUk5FTF9MQVBJQ19ET05FCQkgICgweDMwIDw8IEdTX1VLRVJORUxfU0hJRlQp CkBAIC0zOCw3ICs0MCwxMyBAQAogI2RlZmluZSAgIEdTX1VLRVJORUxfUkVBRFkJCSAgKDB4RjAg PDwgR1NfVUtFUk5FTF9TSElGVCkKICNkZWZpbmUgICBHU19NSUFfU0hJRlQJCQkxNgogI2RlZmlu ZSAgIEdTX01JQV9NQVNLCQkJICAoMHgwNyA8PCBHU19NSUFfU0hJRlQpCi0jZGVmaW5lICAgR1Nf TUlBX0NPUkVfU1RBVEUJCSAgKDEgPDwgR1NfTUlBX1NISUZUKQorI2RlZmluZSAgIEdTX01JQV9D T1JFX1NUQVRFCQkgICgweDAxIDw8IEdTX01JQV9TSElGVCkKKyNkZWZpbmUgICBHU19NSUFfSEFM VF9SRVFVRVNURUQJCSAgKDB4MDIgPDwgR1NfTUlBX1NISUZUKQorI2RlZmluZSAgIEdTX01JQV9J U1JfRU5UUlkJCSAgKDB4MDQgPDwgR1NfTUlBX1NISUZUKQorI2RlZmluZSAgIEdTX0FVVEhfU1RB VFVTX1NISUZUCQkzMAorI2RlZmluZSAgIEdTX0FVVEhfU1RBVFVTX01BU0sJCSAgKDB4MDMgPDwg R1NfQVVUSF9TVEFUVVNfU0hJRlQpCisjZGVmaW5lICAgR1NfQVVUSF9TVEFUVVNfQkFECQkgICgw eDAxIDw8IEdTX0FVVEhfU1RBVFVTX1NISUZUKQorI2RlZmluZSAgIEdTX0FVVEhfU1RBVFVTX0dP T0QJCSAgKDB4MDIgPDwgR1NfQVVUSF9TVEFUVVNfU0hJRlQpCiAKICNkZWZpbmUgU09GVF9TQ1JB VENIKG4pCQkJX01NSU8oMHhjMTgwICsgKG4pICogNCkKICNkZWZpbmUgU09GVF9TQ1JBVENIX0NP VU5UCQkxNgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRl ci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCmluZGV4IGEwN2My MjguLmE4NzU5MzYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19s b2FkZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKQEAg LTM4Nyw3ICszODcsNyBAQCBpbnQgaW50ZWxfZ3VjX3Vjb2RlX2xvYWQoc3RydWN0IGRybV9kZXZp Y2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRl dl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9ndWNfZncgKmd1Y19mdyA9ICZkZXZfcHJpdi0+Z3Vj Lmd1Y19mdzsKLQlpbnQgZXJyID0gMDsKKwlpbnQgcmV0cmllcywgZXJyID0gMDsKIAogCWlmICgh aTkxNS5lbmFibGVfZ3VjX3N1Ym1pc3Npb24pCiAJCXJldHVybiAwOwpAQCAtNDQxLDI5ICs0NDEs MjYgQEAgaW50IGludGVsX2d1Y191Y29kZV9sb2FkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJ ICogc3RlcHBpbmdzIGFsc28gc28gdGhpcyBpcyBleHRlbmRlZCBhcyB3ZWxsLgogCSAqLwogCS8q IFdhRW5hYmxlR3VDQm9vdEhhc2hDaGVja05vdFNldDpza2wsYnh0ICovCi0JZXJyID0gZ3VjX3Vj b2RlX3hmZXIoZGV2X3ByaXYpOwotCWlmIChlcnIpIHsKLQkJaW50IHJldHJpZXMgPSAzOwotCi0J CURSTV9FUlJPUigiR3VDIGZ3IGxvYWQgZmFpbGVkLCBlcnI9JWQsIGF0dGVtcHRpbmcgcmVzZXQg YW5kIHJldHJ5XG4iLCBlcnIpOwotCi0JCXdoaWxlIChyZXRyaWVzLS0pIHsKLQkJCWVyciA9IGk5 MTVfcmVzZXRfZ3VjKGRldl9wcml2KTsKLQkJCWlmIChlcnIpCi0JCQkJYnJlYWs7Ci0KLQkJCWVy ciA9IGd1Y191Y29kZV94ZmVyKGRldl9wcml2KTsKLQkJCWlmICghZXJyKSB7Ci0JCQkJRFJNX0RF QlVHX0RSSVZFUigiR3VDIGZ3IHJlbG9hZCBzdWNjZWVkZWQgYWZ0ZXIgcmVzZXRcbiIpOwotCQkJ CWJyZWFrOwotCQkJfQotCQkJRFJNX0RFQlVHX0RSSVZFUigiR3VDIGZ3IHJlbG9hZCByZXRyaWVz IGxlZnQ6ICVkXG4iLCByZXRyaWVzKTsKLQkJfQotCisJZm9yIChyZXRyaWVzID0gMzsgOyApIHsK KwkJLyoKKwkJICogQWx3YXlzIHJlc2V0IHRoZSBHdUMganVzdCBiZWZvcmUgKHJlKWxvYWRpbmcs IHNvCisJCSAqIHRoYXQgdGhlIHN0YXRlIGFuZCB0aW1pbmcgYXJlIGZhaXJseSBwcmVkaWN0YWJs ZQorCQkgKi8KKwkJZXJyID0gaTkxNV9yZXNldF9ndWMoZGV2X3ByaXYpOwogCQlpZiAoZXJyKSB7 Ci0JCQlEUk1fRVJST1IoIkd1QyBmdyByZWxvYWQgYXR0ZW1wdCBmYWlsZWQsIHJldD0lZFxuIiwg ZXJyKTsKKwkJCURSTV9FUlJPUigiR3VDIHJlc2V0IGZhaWxlZCwgZXJyICVkXG4iLCBlcnIpOwog CQkJZ290byBmYWlsOwogCQl9CisKKwkJZXJyID0gZ3VjX3Vjb2RlX3hmZXIoZGV2X3ByaXYpOwor CQlpZiAoIWVycikKKwkJCWJyZWFrOworCisJCWlmICgtLXJldHJpZXMgPT0gMCkKKwkJCWdvdG8g ZmFpbDsKKworCQlEUk1fSU5GTygiR3VDIGZ3IGxvYWQgZmFpbGVkLCBlcnIgJWQ7IHdpbGwgcmVz ZXQgYW5kICIKKwkJCSJyZXRyeSAlZCBtb3JlIHRpbWUocylcbiIsIGVyciwgcmV0cmllcyk7CiAJ fQogCiAJZ3VjX2Z3LT5ndWNfZndfbG9hZF9zdGF0dXMgPSBHVUNfRklSTVdBUkVfU1VDQ0VTUzsK QEAgLTQ4NSw2ICs0ODIsNyBAQCBpbnQgaW50ZWxfZ3VjX3Vjb2RlX2xvYWQoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKIAlyZXR1cm4gMDsKIAogZmFpbDoKKwlEUk1fRVJST1IoIkd1QyBmaXJtd2Fy ZSBsb2FkIGZhaWxlZCwgZXJyICVkXG4iLCBlcnIpOwogCWlmIChndWNfZnctPmd1Y19md19sb2Fk X3N0YXR1cyA9PSBHVUNfRklSTVdBUkVfUEVORElORykKIAkJZ3VjX2Z3LT5ndWNfZndfbG9hZF9z dGF0dXMgPSBHVUNfRklSTVdBUkVfRkFJTDsKIAotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=