From: Dave Gordon Subject: [PATCH v4 5/6] drm/i915/guc: disable GuC submission earlier during GuC (re)load Date: Thu, 7 Apr 2016 18:21:17 +0100 Message-ID: <1460049678-21918-6-git-send-email-david.s.gordon@intel.com> References: <1460049678-21918-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id D10E46E9EF for ; Thu, 7 Apr 2016 17:21:52 +0000 (UTC) In-Reply-To: <1460049678-21918-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 V2hlbiByZXNldHRpbmcgYW5kIHJlbG9hZGluZyB0aGUgR3VDLCB0aGUgR3VDIHN1Ym1pc3Npb24g bWFuYWdlbWVudCBjb2RlCmFsc28gbmVlZHMgdG8gZGVzdHJveSBhbmQgcmVjcmVhdGUgdGhlIEd1 QyBjbGllbnQocykuIEN1cnJlbnRseSB0aGlzIGlzCmRvbmUgYnkgYSBzZXBhcmF0ZSBjYWxsIGZy b20gdGhlIEd1QyBsb2FkZXIsIGJ1dCByZWFsbHksIGl0J3MganVzdCBhbgppbnRlcm5hbCBkZXRh aWwgb2YgdGhlIHN1Ym1pc3Npb24gY29kZS4gU28gaGVyZSB3ZSByZW1vdmUgdGhlIGNhbGwgZnJv bQp0aGUgbG9hZGVyICh3aGljaCBpcyB0b28gbGF0ZSwgcmVhbGx5LCBiZWNhdXNlIHRoZSBHdUMg aGFzIGFscmVhZHkgYmVlbgpyZWxvYWRlZCBhdCB0aGlzIHBvaW50KSBhbmQgcHV0IGl0IGludG8g Z3VjX3N1Ym1pc3Npb25faW5pdCgpIGluc3RlYWQuClRoaXMgbWVhbnMgdGhhdCBhbnkgcHJlZXhp c3RpbmcgY2xpZW50IGlzIGRlc3Ryb3llZCAqYmVmb3JlKiB0aGUgR3VDCihyZSlsb2FkIGFuZCB0 aGVuIHJlY3JlYXRlZCBhZnRlciwgaWZmIHRoZSBmaXJtd2FyZSB3YXMgc3VjY2Vzc2Z1bGx5Cmxv YWRlZC4gSWYgdGhlIEd1QyByZWxvYWQgZmFpbHMsIHdlIGRvbid0IHJlY3JlYXRlIHRoZSBjbGll bnQsIHNvIGZhbGxiYWNrCnRvIGV4ZWNsaXN0cyBtb2RlIChpZiBhY3RpdmUpIHdvbid0IGxlYWsg dGhlIGNsaWVudCBvYmplY3QgKHByZXZpb3VzbHksCnRoZSBub3ctdW51c2FibGUgY2xpZW50IHdv dWxkIGhhdmUgYmVlbiBsZWZ0IGFsbG9jYXRlZCwgYW5kIGxlYWtlZCBpZgp0aGUgZHJpdmVyIHdl cmUgdW5sb2FkZWQpLgoKU2lnbmVkLW9mZi1ieTogRGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9u QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9u LmMgfCA2ICsrKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jICAg IHwgMyAtLS0KIDIgZmlsZXMgY2hhbmdlZCwgNCBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24u YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwppbmRleCBmNDY2 ZWFiLi5hODcxN2Y3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19z dWJtaXNzaW9uLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lv bi5jCkBAIC05ODEsNiArOTgxLDEwIEBAIGludCBpOTE1X2d1Y19zdWJtaXNzaW9uX2luaXQoc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKIAljb25zdCBzaXplX3QgZ2Vtc2l6ZSA9IHJvdW5kX3VwKHBv b2xzaXplLCBQQUdFX1NJWkUpOwogCXN0cnVjdCBpbnRlbF9ndWMgKmd1YyA9ICZkZXZfcHJpdi0+ Z3VjOwogCisJLyogV2lwZSBiaXRtYXAgJiBkZWxldGUgY2xpZW50IGluIGNhc2Ugb2YgcmVpbml0 aWFsaXNhdGlvbiAqLworCWJpdG1hcF9jbGVhcihndWMtPmRvb3JiZWxsX2JpdG1hcCwgMCwgR1VD X01BWF9ET09SQkVMTFMpOworCWk5MTVfZ3VjX3N1Ym1pc3Npb25fZGlzYWJsZShkZXYpOworCiAJ aWYgKCFpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbikKIAkJcmV0dXJuIDA7IC8qIG5vdCBlbmFi bGVkICAqLwogCkBAIC05OTIsOSArOTk2LDcgQEAgaW50IGk5MTVfZ3VjX3N1Ym1pc3Npb25faW5p dChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlyZXR1cm4gLUVOT01FTTsKIAogCWlkYV9pbml0 KCZndWMtPmN0eF9pZHMpOwotCiAJZ3VjX2NyZWF0ZV9sb2coZ3VjKTsKLQogCWd1Y19jcmVhdGVf YWRzKGd1Yyk7CiAKIAlyZXR1cm4gMDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2d1Y19sb2FkZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2Fk ZXIuYwppbmRleCA4NzZlNWRhLi4zZTE0YTlhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf Z3VjX2xvYWRlci5jCkBAIC00NzAsOSArNDcwLDYgQEAgaW50IGludGVsX2d1Y191Y29kZV9sb2Fk KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCWludGVsX2d1Y19md19zdGF0dXNfcmVwcihndWNf ZnctPmd1Y19md19sb2FkX3N0YXR1cykpOwogCiAJaWYgKGk5MTUuZW5hYmxlX2d1Y19zdWJtaXNz aW9uKSB7Ci0JCS8qIFRoZSBleGVjYnVmX2NsaWVudCB3aWxsIGJlIHJlY3JlYXRlZC4gUmVsZWFz ZSBpdCBmaXJzdC4gKi8KLQkJaTkxNV9ndWNfc3VibWlzc2lvbl9kaXNhYmxlKGRldik7Ci0KIAkJ ZXJyID0gaTkxNV9ndWNfc3VibWlzc2lvbl9lbmFibGUoZGV2KTsKIAkJaWYgKGVycikKIAkJCWdv dG8gZmFpbDsKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK