From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [CI 5/8] drm/i915: Split execlists/guc reset preparations Date: Wed, 16 May 2018 19:33:52 +0100 Message-ID: <20180516183355.10553-5-chris@chris-wilson.co.uk> References: <20180516183355.10553-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id DB8B66E500 for ; Wed, 16 May 2018 18:34:08 +0000 (UTC) Received: from haswell.alporthouse.com (unverified [78.156.65.138]) by fireflyinternet.com (Firefly Internet (M1)) with ESMTP id 11727775-1500050 for ; Wed, 16 May 2018 19:34:02 +0100 In-Reply-To: <20180516183355.10553-1-chris@chris-wilson.co.uk> 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 SW4gdGhlIG5leHQgcGF0Y2gsIHdlIHdpbGwgbWFrZSB0aGUgZXhlY2xpc3RzIHJlc2V0IHByZXBh cmUgY2FsbGJhY2sKdGFrZSBpbnRvIGFjY291bnQgcHJlZW1wdGlvbiBieSBmbHVzaGluZyB0aGUg Y29udGV4dC1zd2l0Y2ggaGFuZGxlci4KVGhpcyBpcyBub3QgYXBwbGljYWJsZSB0byB0aGUgR3VD IHN1Ym1pc3Npb24gYmFja2VuZCwgc28gc3BsaXQgdGhlIHR3bwppbnRvIHRoZWlyIG93biBiYWNr ZW5kIGNhbGxiYWNrcy4KClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMt d2lsc29uLmNvLnVrPgpDYzogTWljaGHFgiBXaW5pYXJza2kgPG1pY2hhbC53aW5pYXJza2lAaW50 ZWwuY29tPgpDQzogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGludGVsLmNvbT4KQ2M6 IEplZmYgTWNHZWUgPGplZmYubWNnZWVAaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogSmVmZiBNY0dl ZSA8amVmZi5tY2dlZUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf Z3VjX3N1Ym1pc3Npb24uYyB8IDM0ICsrKysrKysrKysrKysrKysrKysrKwogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAgICAgICB8IDEyICsrLS0tLS0tCiAyIGZpbGVzIGNo YW5nZWQsIDM2IGluc2VydGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19zdWJtaXNzaW9uLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9ndWNfc3VibWlzc2lvbi5jCmluZGV4IGNhMzhhYzlmZjRmYS4uNjM3ZTg1 Mjg4OGVjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfc3VibWlz c2lvbi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19zdWJtaXNzaW9uLmMK QEAgLTgxNSw2ICs4MTUsMzcgQEAgc3RhdGljIHZvaWQgZ3VjX3N1Ym1pc3Npb25fdGFza2xldCh1 bnNpZ25lZCBsb25nIGRhdGEpCiAJCWd1Y19kZXF1ZXVlKGVuZ2luZSk7CiB9CiAKK3N0YXRpYyBz dHJ1Y3QgaTkxNV9yZXF1ZXN0ICoKK2d1Y19yZXNldF9wcmVwYXJlKHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKmVuZ2luZSkKK3sKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2V4ZWNsaXN0cyAqIGNvbnN0 IGV4ZWNsaXN0cyA9ICZlbmdpbmUtPmV4ZWNsaXN0czsKKworCUdFTV9UUkFDRSgiJXNcbiIsIGVu Z2luZS0+bmFtZSk7CisKKwkvKgorCSAqIFByZXZlbnQgcmVxdWVzdCBzdWJtaXNzaW9uIHRvIHRo ZSBoYXJkd2FyZSB1bnRpbCB3ZSBoYXZlCisJICogY29tcGxldGVkIHRoZSByZXNldCBpbiBpOTE1 X2dlbV9yZXNldF9maW5pc2goKS4gSWYgYSByZXF1ZXN0CisJICogaXMgY29tcGxldGVkIGJ5IG9u ZSBlbmdpbmUsIGl0IG1heSB0aGVuIHF1ZXVlIGEgcmVxdWVzdAorCSAqIHRvIGEgc2Vjb25kIHZp YSBpdHMgZXhlY2xpc3RzLT50YXNrbGV0ICpqdXN0KiBhcyB3ZSBhcmUKKwkgKiBjYWxsaW5nIGVu Z2luZS0+aW5pdF9odygpIGFuZCBhbHNvIHdyaXRpbmcgdGhlIEVMU1AuCisJICogVHVybmluZyBv ZmYgdGhlIGV4ZWNsaXN0cy0+dGFza2xldCB1bnRpbCB0aGUgcmVzZXQgaXMgb3ZlcgorCSAqIHBy ZXZlbnRzIHRoZSByYWNlLgorCSAqLworCV9fdGFza2xldF9kaXNhYmxlX3N5bmNfb25jZSgmZXhl Y2xpc3RzLT50YXNrbGV0KTsKKworCS8qCisJICogV2UncmUgdXNpbmcgd29ya2VyIHRvIHF1ZXVl IHByZWVtcHRpb24gcmVxdWVzdHMgZnJvbSB0aGUgdGFza2xldCBpbgorCSAqIEd1QyBzdWJtaXNz aW9uIG1vZGUuCisJICogRXZlbiB0aG91Z2ggdGFza2xldCB3YXMgZGlzYWJsZWQsIHdlIG1heSBz dGlsbCBoYXZlIGEgd29ya2VyIHF1ZXVlZC4KKwkgKiBMZXQncyBtYWtlIHN1cmUgdGhhdCBhbGwg d29ya2VycyBzY2hlZHVsZWQgYmVmb3JlIGRpc2FibGluZyB0aGUKKwkgKiB0YXNrbGV0IGFyZSBj b21wbGV0ZWQgYmVmb3JlIGNvbnRpbnVpbmcgd2l0aCB0aGUgcmVzZXQuCisJICovCisJaWYgKGVu Z2luZS0+aTkxNS0+Z3VjLnByZWVtcHRfd3EpCisJCWZsdXNoX3dvcmtxdWV1ZShlbmdpbmUtPmk5 MTUtPmd1Yy5wcmVlbXB0X3dxKTsKKworCXJldHVybiBpOTE1X2dlbV9maW5kX2FjdGl2ZV9yZXF1 ZXN0KGVuZ2luZSk7Cit9CisKIC8qCiAgKiBFdmVyeXRoaW5nIGJlbG93IGhlcmUgaXMgY29uY2Vy bmVkIHdpdGggc2V0dXAgJiB0ZWFyZG93biwgYW5kIGlzCiAgKiB0aGVyZWZvcmUgbm90IHBhcnQg b2YgdGhlIHNvbWV3aGF0IHRpbWUtY3JpdGljYWwgYmF0Y2gtc3VibWlzc2lvbgpAQCAtMTI3NSw2 ICsxMzA2LDkgQEAgaW50IGludGVsX2d1Y19zdWJtaXNzaW9uX2VuYWJsZShzdHJ1Y3QgaW50ZWxf Z3VjICpndWMpCiAJCQkmZW5naW5lLT5leGVjbGlzdHM7CiAKIAkJZXhlY2xpc3RzLT50YXNrbGV0 LmZ1bmMgPSBndWNfc3VibWlzc2lvbl90YXNrbGV0OworCisJCWVuZ2luZS0+cmVzZXQucHJlcGFy ZSA9IGd1Y19yZXNldF9wcmVwYXJlOworCiAJCWVuZ2luZS0+cGFyayA9IGd1Y19zdWJtaXNzaW9u X3Bhcms7CiAJCWVuZ2luZS0+dW5wYXJrID0gZ3VjX3N1Ym1pc3Npb25fdW5wYXJrOwogCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IDY3ZmVkOThhYmVlNy4uZjVkNzRkZjBlMGQwIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtMTg0NCwxNiArMTg0NCw2IEBAIGV4ZWNsaXN0c19y ZXNldF9wcmVwYXJlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAkgKi8KIAlfX3Rh c2tsZXRfZGlzYWJsZV9zeW5jX29uY2UoJmV4ZWNsaXN0cy0+dGFza2xldCk7CiAKLQkvKgotCSAq IFdlJ3JlIHVzaW5nIHdvcmtlciB0byBxdWV1ZSBwcmVlbXB0aW9uIHJlcXVlc3RzIGZyb20gdGhl IHRhc2tsZXQgaW4KLQkgKiBHdUMgc3VibWlzc2lvbiBtb2RlLgotCSAqIEV2ZW4gdGhvdWdoIHRh c2tsZXQgd2FzIGRpc2FibGVkLCB3ZSBtYXkgc3RpbGwgaGF2ZSBhIHdvcmtlciBxdWV1ZWQuCi0J ICogTGV0J3MgbWFrZSBzdXJlIHRoYXQgYWxsIHdvcmtlcnMgc2NoZWR1bGVkIGJlZm9yZSBkaXNh YmxpbmcgdGhlCi0JICogdGFza2xldCBhcmUgY29tcGxldGVkIGJlZm9yZSBjb250aW51aW5nIHdp dGggdGhlIHJlc2V0LgotCSAqLwotCWlmIChlbmdpbmUtPmk5MTUtPmd1Yy5wcmVlbXB0X3dxKQot CQlmbHVzaF93b3JrcXVldWUoZW5naW5lLT5pOTE1LT5ndWMucHJlZW1wdF93cSk7Ci0KIAlyZXR1 cm4gaTkxNV9nZW1fZmluZF9hY3RpdmVfcmVxdWVzdChlbmdpbmUpOwogfQogCkBAIC0yMjU1LDYg KzIyNDUsOCBAQCBzdGF0aWMgdm9pZCBleGVjbGlzdHNfc2V0X2RlZmF1bHRfc3VibWlzc2lvbihz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJZW5naW5lLT5zY2hlZHVsZSA9IGV4ZWNs aXN0c19zY2hlZHVsZTsKIAllbmdpbmUtPmV4ZWNsaXN0cy50YXNrbGV0LmZ1bmMgPSBleGVjbGlz dHNfc3VibWlzc2lvbl90YXNrbGV0OwogCisJZW5naW5lLT5yZXNldC5wcmVwYXJlID0gZXhlY2xp c3RzX3Jlc2V0X3ByZXBhcmU7CisKIAllbmdpbmUtPnBhcmsgPSBOVUxMOwogCWVuZ2luZS0+dW5w YXJrID0gTlVMTDsKIAotLSAKMi4xNy4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK