From mboxrd@z Thu Jan  1 00:00:00 1970
From: Dave Gordon <david.s.gordon@intel.com>
Subject: [PATCH 2/3] drm/i915/guc: disable GuC submission
	earlier during GuC (re)load
Date: Tue,  7 Jun 2016 09:14:50 +0100
Message-ID: <1465287291-2187-2-git-send-email-david.s.gordon@intel.com>
References: <1465287291-2187-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 mga14.intel.com (mga14.intel.com [192.55.52.115])
 by gabe.freedesktop.org (Postfix) with ESMTP id B74B46E6CB
 for <intel-gfx@lists.freedesktop.org>; Tue,  7 Jun 2016 08:15:05 +0000 (UTC)
In-Reply-To: <1465287291-2187-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

V2hlbiByZXNldHRpbmcgYW5kIHJlbG9hZGluZyB0aGUgR3VDLCB0aGUgR3VDIHN1Ym1pc3Npb24g
bWFuYWdlbWVudCBjb2RlCmFsc28gbmVlZHMgdG8gZGVzdHJveSBhbmQgcmVjcmVhdGUgdGhlIEd1
QyBjbGllbnQocykuIEN1cnJlbnRseSB0aGlzIGlzCmRvbmUgYnkgYSBzZXBhcmF0ZSBjYWxsIGZy
b20gdGhlIEd1QyBsb2FkZXIsIGJ1dCByZWFsbHksIGl0J3MganVzdCBhbgppbnRlcm5hbCBkZXRh
aWwgb2YgdGhlIHN1Ym1pc3Npb24gY29kZS4gU28gaGVyZSB3ZSByZW1vdmUgdGhlIGNhbGwgZnJv
bQp0aGUgbG9hZGVyICh3aGljaCBpcyB0b28gbGF0ZSwgcmVhbGx5LCBiZWNhdXNlIHRoZSBHdUMg
aGFzIGFscmVhZHkgYmVlbgpyZWxvYWRlZCBhdCB0aGlzIHBvaW50KSBhbmQgcHV0IGl0IGludG8g
Z3VjX3N1Ym1pc3Npb25faW5pdCgpIGluc3RlYWQuClRoaXMgbWVhbnMgdGhhdCBhbnkgcHJlZXhp
c3RpbmcgY2xpZW50IGlzIGRlc3Ryb3llZCAqYmVmb3JlKiB0aGUgR3VDCihyZSlsb2FkIGFuZCB0
aGVuIHJlY3JlYXRlZCBhZnRlciwgaWZmIHRoZSBmaXJtd2FyZSB3YXMgc3VjY2Vzc2Z1bGx5Cmxv
YWRlZC4gSWYgdGhlIEd1QyByZWxvYWQgZmFpbHMsIHdlIGRvbid0IHJlY3JlYXRlIHRoZSBjbGll
bnQsIHNvCmZhbGxiYWNrIHRvIGV4ZWNsaXN0cyBtb2RlIChpZiBhY3RpdmUpIHdvbid0IGxlYWsg
dGhlIGNsaWVudCBvYmplY3QKKHByZXZpb3VzbHksIHRoZSBub3ctdW51c2FibGUgY2xpZW50IHdv
dWxkIGhhdmUgYmVlbiBsZWZ0IGFsbG9jYXRlZCwKYW5kIGxlYWtlZCBpZiB0aGUgZHJpdmVyIHdl
cmUgdW5sb2FkZWQpLgoKU2lnbmVkLW9mZi1ieTogRGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9u
QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9u
LmMgfCAxNSArKysrKysrKysrLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19s
b2FkZXIuYyAgICB8ICAzIC0tLQogMiBmaWxlcyBjaGFuZ2VkLCAxMCBpbnNlcnRpb25zKCspLCA4
IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3Vj
X3N1Ym1pc3Npb24uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24u
YwppbmRleCBhYzcyNDUxLi4yZGIxMTgyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n
dWNfc3VibWlzc2lvbi5jCkBAIC02NTcsNiArNjU3LDggQEAgc3RhdGljIHZvaWQgZ3VjX2NsaWVu
dF9mcmVlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJICovCiAKIAlpZiAoY2xpZW50LT5jbGll
bnRfYmFzZSkgeworCQl1aW50MTZfdCBkYl9pZCA9IGNsaWVudC0+ZG9vcmJlbGxfaWQ7CisKIAkJ
LyoKIAkJICogSWYgd2UgZ290IGFzIGZhciBhcyBzZXR0aW5nIHVwIGEgZG9vcmJlbGwsIG1ha2Ug
c3VyZQogCQkgKiB3ZSBzaHV0IGl0IGRvd24gYmVmb3JlIHVubWFwcGluZyAmIGRlYWxsb2NhdGlu
ZyB0aGUKQEAgLTY2NCwxMCArNjY2LDExIEBAIHN0YXRpYyB2b2lkIGd1Y19jbGllbnRfZnJlZShz
dHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkgKiBHdUMgdGhhdCB3ZSd2ZSBmaW5pc2hlZCB3aXRo
IGl0LCBmaW5hbGx5IGRlYWxsb2NhdGUKIAkJICogaXQgaW4gb3VyIGJpdG1hcAogCQkgKi8KLQkJ
aWYgKGNsaWVudC0+ZG9vcmJlbGxfaWQgIT0gR1VDX0lOVkFMSURfRE9PUkJFTExfSUQpIHsKKwkJ
aWYgKGRiX2lkICE9IEdVQ19JTlZBTElEX0RPT1JCRUxMX0lEKSB7CiAJCQlndWNfZGlzYWJsZV9k
b29yYmVsbChndWMsIGNsaWVudCk7Ci0JCQlob3N0Mmd1Y19yZWxlYXNlX2Rvb3JiZWxsKGd1Yywg
Y2xpZW50KTsKLQkJCXJlbGVhc2VfZG9vcmJlbGwoZ3VjLCBjbGllbnQtPmRvb3JiZWxsX2lkKTsK
KwkJCWlmICh0ZXN0X2JpdChkYl9pZCwgZ3VjLT5kb29yYmVsbF9iaXRtYXApKQorCQkJCWhvc3Qy
Z3VjX3JlbGVhc2VfZG9vcmJlbGwoZ3VjLCBjbGllbnQpOworCQkJcmVsZWFzZV9kb29yYmVsbChn
dWMsIGRiX2lkKTsKIAkJfQogCiAJCWt1bm1hcChrbWFwX3RvX3BhZ2UoY2xpZW50LT5jbGllbnRf
YmFzZSkpOwpAQCAtOTEyLDYgKzkxNSwxMCBAQCBpbnQgaTkxNV9ndWNfc3VibWlzc2lvbl9pbml0
KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJY29uc3Qgc2l6ZV90IGdlbXNpemUgPSByb3VuZF91
cChwb29sc2l6ZSwgUEFHRV9TSVpFKTsKIAlzdHJ1Y3QgaW50ZWxfZ3VjICpndWMgPSAmZGV2X3By
aXYtPmd1YzsKIAorCS8qIFdpcGUgYml0bWFwICYgZGVsZXRlIGNsaWVudCBpbiBjYXNlIG9mIHJl
aW5pdGlhbGlzYXRpb24gKi8KKwliaXRtYXBfY2xlYXIoZ3VjLT5kb29yYmVsbF9iaXRtYXAsIDAs
IEdVQ19NQVhfRE9PUkJFTExTKTsKKwlpOTE1X2d1Y19zdWJtaXNzaW9uX2Rpc2FibGUoZGV2KTsK
KwogCWlmICghaTkxNS5lbmFibGVfZ3VjX3N1Ym1pc3Npb24pCiAJCXJldHVybiAwOyAvKiBub3Qg
ZW5hYmxlZCAgKi8KIApAQCAtOTIzLDkgKzkzMCw3IEBAIGludCBpOTE1X2d1Y19zdWJtaXNzaW9u
X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJcmV0dXJuIC1FTk9NRU07CiAKIAlpZGFf
aW5pdCgmZ3VjLT5jdHhfaWRzKTsKLQogCWd1Y19jcmVhdGVfbG9nKGd1Yyk7Ci0KIAlndWNfY3Jl
YXRlX2FkcyhndWMpOwogCiAJcmV0dXJuIDA7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNf
bG9hZGVyLmMKaW5kZXggNGUzNGMyZS4uNDFmN2M3ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu
dGVsX2d1Y19sb2FkZXIuYwpAQCAtNDkyLDkgKzQ5Miw2IEBAIGludCBpbnRlbF9ndWNfc2V0dXAo
c3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJaW50ZWxfZ3VjX2Z3X3N0YXR1c19yZXByKGd1Y19m
dy0+Z3VjX2Z3X2xvYWRfc3RhdHVzKSk7CiAKIAlpZiAoaTkxNS5lbmFibGVfZ3VjX3N1Ym1pc3Np
b24pIHsKLQkJLyogVGhlIGV4ZWNidWZfY2xpZW50IHdpbGwgYmUgcmVjcmVhdGVkLiBSZWxlYXNl
IGl0IGZpcnN0LiAqLwotCQlpOTE1X2d1Y19zdWJtaXNzaW9uX2Rpc2FibGUoZGV2KTsKLQogCQll
cnIgPSBpOTE1X2d1Y19zdWJtaXNzaW9uX2VuYWJsZShkZXYpOwogCQlpZiAoZXJyKQogCQkJZ290
byBmYWlsOwotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr
dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu
dGVsLWdmeAo=