From mboxrd@z Thu Jan  1 00:00:00 1970
From: Dave Gordon <david.s.gordon@intel.com>
Subject: [PATCH 2/7] drm/i915/guc: always reset GuC before
	loading firmware
Date: Mon, 21 Mar 2016 10:16:35 +0000
Message-ID: <1458555400-22859-3-git-send-email-david.s.gordon@intel.com>
References: <1458555400-22859-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga02.intel.com (mga02.intel.com [134.134.136.20])
 by gabe.freedesktop.org (Postfix) with ESMTP id 2DBCF6E28F
 for <intel-gfx@lists.freedesktop.org>; Mon, 21 Mar 2016 10:16:52 +0000 (UTC)
In-Reply-To: <1458555400-22859-1-git-send-email-david.s.gordon@intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

QWZ0ZXIgYSBzdXNwZW5kLXJlc3VtZSBjeWNsZSwgdGhlIHJlc3VtZWQga2VybmVsIGhhcyBubyBp
ZGVhIHdoYXQgdGhlCmJvb3RlZCBrZXJuZWwgbWF5IGhhdmUgZG9uZSB0byB0aGUgR3VDIGJlZm9y
ZSByZXBsYWNpbmcgaXRzZWxmIHdpdGggdGhlCnJlc3VtZWQgaW1hZ2UuIEluIHBhcnRpY3VsYXIs
IGl0IG1heSBoYXZlIGFscmVhZHkgbG9hZGVkIHRoZSBHdUMgd2l0aApmaXJtd2FyZSwgd2hpY2gg
d2lsbCB0aGVuIGNhdXNlIHRoaXMga2VybmVsJ3MgYXR0ZW1wdCB0byAocmUpbG9hZCB0aGUKZmly
bXdhcmUgdG8gZmFpbCAoR3VDIHByb2dyYW0gbWVtb3J5IGlzIHdyaXRlLW9uY2UhKS4KClNvIGhl
cmUgd2UgY2hvb3NlIHRvIGFsd2F5cyByZXNldCB0aGUgR3VDIGp1c3QgYmVmb3JlIChyZSlsb2Fk
aW5nIHRoZQpmaXJtd2FyZSwgc28gdGhlIGhhcmR3YXJlIHNob3VsZCB0aGVuIGJlIGluIGEgd2Vs
bC1rbm93biBzdGF0ZSwgYW5kIHdlCm1heSBldmVuIGF2b2lkIHNvbWUgb2YgdGhlIGlzc3VlcyBh
cmlzaW5nIGZyb20gdW5wcmVkaWN0YWJsZSB0aW1pbmcuCgpBbHNvIGFkZGVkIHNvbWUgbW9yZSBm
aWVsZHMgJiB2YWx1ZXMgdG8gdGhlIGRlZmluaXRpb24gb2YgdGhlIEdVQ19TVEFUVVMKcmVnaXN0
ZXIsIHdoaWNoIGlzIHRoZSBrZXkgZGlhZ25vc3RpYyBpbmRpY2F0b3IgaWYgdGhlIEd1QyBsb2Fk
IGZhaWxzLgoKU2lnbmVkLW9mZi1ieTogRGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVs
LmNvbT4KQ2M6IEFydW4gU2lsdXZlcnkgPGFydW4uc2lsdXZlcnlAbGludXguaW50ZWwuY29tPgpD
YzogQWxleCBEYWkgPHl1LmRhaUBpbnRlbC5jb20+CgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1
L2k5MTVfZ3VjX3JlZy5oICAgICB8IDEyICsrKysrKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX2d1Y19sb2FkZXIuYyB8IDQwICsrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0t
LQogMiBmaWxlcyBjaGFuZ2VkLCAyOSBpbnNlcnRpb25zKCspLCAyMyBkZWxldGlvbnMoLSkKCmRp
ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19yZWcuaCBiL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2k5MTVfZ3VjX3JlZy5oCmluZGV4IDk0Y2VlZTUuLjgwNzg2ZDkgMTAwNjQ0
Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3JlZy5oCisrKyBiL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2k5MTVfZ3VjX3JlZy5oCkBAIC0yNywxMCArMjcsMTIgQEAKIC8qIERlZmlu
aXRpb25zIG9mIEd1QyBIL1cgcmVnaXN0ZXJzLCBiaXRzLCBldGMgKi8KIAogI2RlZmluZSBHVUNf
U1RBVFVTCQkJX01NSU8oMHhjMDAwKQotI2RlZmluZSAgIEdTX01JQV9JTl9SRVNFVAkJKDEgPDwg
MCkKKyNkZWZpbmUgICBHU19SRVNFVF9TSElGVAkJMAorI2RlZmluZSAgIEdTX01JQV9JTl9SRVNF
VAkJICAoMHgwMSA8PCBHU19SRVNFVF9TSElGVCkKICNkZWZpbmUgICBHU19CT09UUk9NX1NISUZU
CQkxCiAjZGVmaW5lICAgR1NfQk9PVFJPTV9NQVNLCQkgICgweDdGIDw8IEdTX0JPT1RST01fU0hJ
RlQpCiAjZGVmaW5lICAgR1NfQk9PVFJPTV9SU0FfRkFJTEVECQkgICgweDUwIDw8IEdTX0JPT1RS
T01fU0hJRlQpCisjZGVmaW5lICAgR1NfQk9PVFJPTV9KVU1QX1BBU1NFRAkgICgweDc2IDw8IEdT
X0JPT1RST01fU0hJRlQpCiAjZGVmaW5lICAgR1NfVUtFUk5FTF9TSElGVAkJOAogI2RlZmluZSAg
IEdTX1VLRVJORUxfTUFTSwkJICAoMHhGRiA8PCBHU19VS0VSTkVMX1NISUZUKQogI2RlZmluZSAg
IEdTX1VLRVJORUxfTEFQSUNfRE9ORQkJICAoMHgzMCA8PCBHU19VS0VSTkVMX1NISUZUKQpAQCAt
MzgsNyArNDAsMTMgQEAKICNkZWZpbmUgICBHU19VS0VSTkVMX1JFQURZCQkgICgweEYwIDw8IEdT
X1VLRVJORUxfU0hJRlQpCiAjZGVmaW5lICAgR1NfTUlBX1NISUZUCQkJMTYKICNkZWZpbmUgICBH
U19NSUFfTUFTSwkJCSAgKDB4MDcgPDwgR1NfTUlBX1NISUZUKQotI2RlZmluZSAgIEdTX01JQV9D
T1JFX1NUQVRFCQkgICgxIDw8IEdTX01JQV9TSElGVCkKKyNkZWZpbmUgICBHU19NSUFfQ09SRV9T
VEFURQkJICAoMHgwMSA8PCBHU19NSUFfU0hJRlQpCisjZGVmaW5lICAgR1NfTUlBX0hBTFRfUkVR
VUVTVEVECQkgICgweDAyIDw8IEdTX01JQV9TSElGVCkKKyNkZWZpbmUgICBHU19NSUFfSVNSX0VO
VFJZCQkgICgweDA0IDw8IEdTX01JQV9TSElGVCkKKyNkZWZpbmUgICBHU19BVVRIX1NUQVRVU19T
SElGVAkJMzAKKyNkZWZpbmUgICBHU19BVVRIX1NUQVRVU19NQVNLCQkgICgweDAzIDw8IEdTX0FV
VEhfU1RBVFVTX1NISUZUKQorI2RlZmluZSAgIEdTX0FVVEhfU1RBVFVTX0JBRAkJICAoMHgwMSA8
PCBHU19BVVRIX1NUQVRVU19TSElGVCkKKyNkZWZpbmUgICBHU19BVVRIX1NUQVRVU19HT09ECQkg
ICgweDAyIDw8IEdTX0FVVEhfU1RBVFVTX1NISUZUKQogCiAjZGVmaW5lIFNPRlRfU0NSQVRDSChu
KQkJCV9NTUlPKDB4YzE4MCArIChuKSAqIDQpCiAjZGVmaW5lIFNPRlRfU0NSQVRDSF9DT1VOVAkJ
MTYKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYyBi
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYwppbmRleCBhMDdjMjI4Li5h
ODc1OTM2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVy
LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCkBAIC0zODcs
NyArMzg3LDcgQEAgaW50IGludGVsX2d1Y191Y29kZV9sb2FkKHN0cnVjdCBkcm1fZGV2aWNlICpk
ZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJp
dmF0ZTsKIAlzdHJ1Y3QgaW50ZWxfZ3VjX2Z3ICpndWNfZncgPSAmZGV2X3ByaXYtPmd1Yy5ndWNf
Znc7Ci0JaW50IGVyciA9IDA7CisJaW50IHJldHJpZXMsIGVyciA9IDA7CiAKIAlpZiAoIWk5MTUu
ZW5hYmxlX2d1Y19zdWJtaXNzaW9uKQogCQlyZXR1cm4gMDsKQEAgLTQ0MSwyOSArNDQxLDI2IEBA
IGludCBpbnRlbF9ndWNfdWNvZGVfbG9hZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCSAqIHN0
ZXBwaW5ncyBhbHNvIHNvIHRoaXMgaXMgZXh0ZW5kZWQgYXMgd2VsbC4KIAkgKi8KIAkvKiBXYUVu
YWJsZUd1Q0Jvb3RIYXNoQ2hlY2tOb3RTZXQ6c2tsLGJ4dCAqLwotCWVyciA9IGd1Y191Y29kZV94
ZmVyKGRldl9wcml2KTsKLQlpZiAoZXJyKSB7Ci0JCWludCByZXRyaWVzID0gMzsKLQotCQlEUk1f
RVJST1IoIkd1QyBmdyBsb2FkIGZhaWxlZCwgZXJyPSVkLCBhdHRlbXB0aW5nIHJlc2V0IGFuZCBy
ZXRyeVxuIiwgZXJyKTsKLQotCQl3aGlsZSAocmV0cmllcy0tKSB7Ci0JCQllcnIgPSBpOTE1X3Jl
c2V0X2d1YyhkZXZfcHJpdik7Ci0JCQlpZiAoZXJyKQotCQkJCWJyZWFrOwotCi0JCQllcnIgPSBn
dWNfdWNvZGVfeGZlcihkZXZfcHJpdik7Ci0JCQlpZiAoIWVycikgewotCQkJCURSTV9ERUJVR19E
UklWRVIoIkd1QyBmdyByZWxvYWQgc3VjY2VlZGVkIGFmdGVyIHJlc2V0XG4iKTsKLQkJCQlicmVh
azsKLQkJCX0KLQkJCURSTV9ERUJVR19EUklWRVIoIkd1QyBmdyByZWxvYWQgcmV0cmllcyBsZWZ0
OiAlZFxuIiwgcmV0cmllcyk7Ci0JCX0KLQorCWZvciAocmV0cmllcyA9IDM7IDsgKSB7CisJCS8q
CisJCSAqIEFsd2F5cyByZXNldCB0aGUgR3VDIGp1c3QgYmVmb3JlIChyZSlsb2FkaW5nLCBzbwor
CQkgKiB0aGF0IHRoZSBzdGF0ZSBhbmQgdGltaW5nIGFyZSBmYWlybHkgcHJlZGljdGFibGUKKwkJ
ICovCisJCWVyciA9IGk5MTVfcmVzZXRfZ3VjKGRldl9wcml2KTsKIAkJaWYgKGVycikgewotCQkJ
RFJNX0VSUk9SKCJHdUMgZncgcmVsb2FkIGF0dGVtcHQgZmFpbGVkLCByZXQ9JWRcbiIsIGVycik7
CisJCQlEUk1fRVJST1IoIkd1QyByZXNldCBmYWlsZWQsIGVyciAlZFxuIiwgZXJyKTsKIAkJCWdv
dG8gZmFpbDsKIAkJfQorCisJCWVyciA9IGd1Y191Y29kZV94ZmVyKGRldl9wcml2KTsKKwkJaWYg
KCFlcnIpCisJCQlicmVhazsKKworCQlpZiAoLS1yZXRyaWVzID09IDApCisJCQlnb3RvIGZhaWw7
CisKKwkJRFJNX0lORk8oIkd1QyBmdyBsb2FkIGZhaWxlZCwgZXJyICVkOyB3aWxsIHJlc2V0IGFu
ZCAiCisJCQkicmV0cnkgJWQgbW9yZSB0aW1lKHMpXG4iLCBlcnIsIHJldHJpZXMpOwogCX0KIAog
CWd1Y19mdy0+Z3VjX2Z3X2xvYWRfc3RhdHVzID0gR1VDX0ZJUk1XQVJFX1NVQ0NFU1M7CkBAIC00
ODUsNiArNDgyLDcgQEAgaW50IGludGVsX2d1Y191Y29kZV9sb2FkKHN0cnVjdCBkcm1fZGV2aWNl
ICpkZXYpCiAJcmV0dXJuIDA7CiAKIGZhaWw6CisJRFJNX0VSUk9SKCJHdUMgZmlybXdhcmUgbG9h
ZCBmYWlsZWQsIGVyciAlZFxuIiwgZXJyKTsKIAlpZiAoZ3VjX2Z3LT5ndWNfZndfbG9hZF9zdGF0
dXMgPT0gR1VDX0ZJUk1XQVJFX1BFTkRJTkcpCiAJCWd1Y19mdy0+Z3VjX2Z3X2xvYWRfc3RhdHVz
ID0gR1VDX0ZJUk1XQVJFX0ZBSUw7CiAKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdm
eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp
bG1hbi9saXN0aW5mby9pbnRlbC1nZngK