From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [CI 2/7] drm/i915: Force the switch to the i915->kernel_context Date: Sat, 4 Nov 2017 18:39:13 +0000 Message-ID: <20171104183918.19286-2-chris@chris-wilson.co.uk> References: <20171104183918.19286-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 D250C6E179 for ; Sat, 4 Nov 2017 18:39:24 +0000 (UTC) Received: from haswell.alporthouse.com (unverified [78.156.65.138]) by fireflyinternet.com (Firefly Internet (M1)) with ESMTP id 9466509-1500050 for ; Sat, 04 Nov 2017 18:39:21 +0000 In-Reply-To: <20171104183918.19286-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 SW4gdGhlIG5leHQgZmV3IHBhdGNoZXMsIHdlIHdpbGwgaGF2ZSBhIGhhcmQgcmVxdWlyZW1lbnQg dGhhdCB3ZSBlbWl0IGEKY29udGV4dC1zd2l0Y2ggdG8gdGhlIHBlcm1hLXBpbm5lZCBpOTE1LT5r ZXJuZWxfY29udGV4dCAoc28gdGhhdCB3ZSBjYW4Kc2F2ZSB0aGUgSFcgc3RhdGUgdXNpbmcgdGhh dCBjb250ZXh0LXN3aXRjaCkuIEFzIHRoZSBmaXJzdCBjb250ZXh0Cml0c2VsZiBtYXkgYmUgY2xh c3NlZCBhcyBhIGtlcm5lbCBjb250ZXh0LCB3ZSB3YW50IHRvIGJlIGV4cGxpY2l0IGluIG91cgpj b21wYXJpc29uLiBGb3IgYW4gZXh0cmEtbGF5ZXIgb2YgZmluZXNzZSwgd2UgY2FuIGNoZWNrIHRo ZSBsYXN0CnVucmV0aXJlZCBjb250ZXh0IG9uIHRoZSBlbmdpbmU7IGFzIHdlbGwgYXMgdGhlIGxh c3QgcmV0aXJlZCBjb250ZXh0CndoZW4gaWRsZS4KCnYyOiB2ZXJib3NlIHZlcmJvc2l0eQp2Mzog QWx3YXlzIGZvcmNlIHRoZSBzd2l0Y2gsIGV2ZW4gd2hlbiB0aGUgZW5naW5lIGlzIGlkbGUsIGFu ZCB1cGRhdGUKdGhlIGFzc2VydCB0aGF0IHRoaXMgaGFwcGVucyBiZWZvcmUgc3VzcGVuZC4KClNp Z25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpDYzog Sm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgpSZXZpZXdl ZC1ieTogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPiAj djEKUmV2aWV3ZWQtYnk6IE1pa2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAbGludXguaW50ZWwu Y29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAgICAgIHwgMTAgKysr KysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMgfCAyNiArKysr KysrKysrKysrKysrKysrKysrKystLQogMiBmaWxlcyBjaGFuZ2VkLCAzMCBpbnNlcnRpb25zKCsp LCA2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDZhNzE4MDViZTM4 OS4uMWMxYjA5MDZjYjE4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTQ2ODcsMTQgKzQ2 ODcsMTYgQEAgdm9pZCBfX2k5MTVfZ2VtX29iamVjdF9yZWxlYXNlX3VubGVzc19hY3RpdmUoc3Ry dWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIAkJaTkxNV9nZW1fb2JqZWN0X3B1dChvYmop OwogfQogCi1zdGF0aWMgdm9pZCBhc3NlcnRfa2VybmVsX2NvbnRleHRfaXNfY3VycmVudChzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCitzdGF0aWMgdm9pZCBhc3NlcnRfa2VybmVs X2NvbnRleHRfaXNfY3VycmVudChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKIHsKKwlz dHJ1Y3QgaTkxNV9nZW1fY29udGV4dCAqa2VybmVsX2NvbnRleHQgPSBpOTE1LT5rZXJuZWxfY29u dGV4dDsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmU7CiAJZW51bSBpbnRlbF9lbmdp bmVfaWQgaWQ7CiAKLQlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCBkZXZfcHJpdiwgaWQpCi0JCUdF TV9CVUdfT04oZW5naW5lLT5sYXN0X3JldGlyZWRfY29udGV4dCAmJgotCQkJICAgIWk5MTVfZ2Vt X2NvbnRleHRfaXNfa2VybmVsKGVuZ2luZS0+bGFzdF9yZXRpcmVkX2NvbnRleHQpKTsKKwlmb3Jf ZWFjaF9lbmdpbmUoZW5naW5lLCBpOTE1LCBpZCkgeworCQlHRU1fQlVHX09OKF9faTkxNV9nZW1f YWN0aXZlX3BlZWsoJmVuZ2luZS0+dGltZWxpbmUtPmxhc3RfcmVxdWVzdCkpOworCQlHRU1fQlVH X09OKGVuZ2luZS0+bGFzdF9yZXRpcmVkX2NvbnRleHQgIT0ga2VybmVsX2NvbnRleHQpOworCX0K IH0KIAogdm9pZCBpOTE1X2dlbV9zYW5pdGl6ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkx NSkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2luZV9jcy5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMKaW5kZXggMDk4Nzc2OGMzMTFk Li4zNzRlMzk4ZTg2N2EgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Vu Z2luZV9jcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2luZV9jcy5jCkBA IC0xNTkzLDEwICsxNTkzLDMyIEBAIGJvb2wgaW50ZWxfZW5naW5lc19hcmVfaWRsZShzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJcmV0dXJuIHRydWU7CiB9CiAKKy8qKgorICog aW50ZWxfZW5naW5lX2hhc19rZXJuZWxfY29udGV4dDoKKyAqIEBlbmdpbmU6IHRoZSBlbmdpbmUK KyAqCisgKiBSZXR1cm5zIHRydWUgaWYgdGhlIGxhc3QgY29udGV4dCB0byBiZSBleGVjdXRlZCBv biB0aGlzIGVuZ2luZSwgb3IgaGFzIGJlZW4KKyAqIGV4ZWN1dGVkIGlmIHRoZSBlbmdpbmUgaXMg YWxyZWFkeSBpZGxlLCBpcyB0aGUga2VybmVsIGNvbnRleHQKKyAqICgjaTkxNS5rZXJuZWxfY29u dGV4dCkuCisgKi8KIGJvb2wgaW50ZWxfZW5naW5lX2hhc19rZXJuZWxfY29udGV4dChjb25zdCBz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7Ci0JcmV0dXJuICghZW5naW5lLT5sYXN0 X3JldGlyZWRfY29udGV4dCB8fAotCQlpOTE1X2dlbV9jb250ZXh0X2lzX2tlcm5lbChlbmdpbmUt Pmxhc3RfcmV0aXJlZF9jb250ZXh0KSk7CisJY29uc3Qgc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQg KiBjb25zdCBrZXJuZWxfY29udGV4dCA9CisJCWVuZ2luZS0+aTkxNS0+a2VybmVsX2NvbnRleHQ7 CisJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpycTsKKworCWxvY2tkZXBfYXNzZXJ0X2hl bGQoJmVuZ2luZS0+aTkxNS0+ZHJtLnN0cnVjdF9tdXRleCk7CisKKwkvKgorCSAqIENoZWNrIHRo ZSBsYXN0IGNvbnRleHQgc2VlbiBieSB0aGUgZW5naW5lLiBJZiBhY3RpdmUsIGl0IHdpbGwgYmUK KwkgKiB0aGUgbGFzdCByZXF1ZXN0IHRoYXQgcmVtYWlucyBpbiB0aGUgdGltZWxpbmUuIFdoZW4g aWRsZSwgaXQgaXMKKwkgKiB0aGUgbGFzdCBleGVjdXRlZCBjb250ZXh0IGFzIHRyYWNrZWQgYnkg cmV0aXJlbWVudC4KKwkgKi8KKwlycSA9IF9faTkxNV9nZW1fYWN0aXZlX3BlZWsoJmVuZ2luZS0+ dGltZWxpbmUtPmxhc3RfcmVxdWVzdCk7CisJaWYgKHJxKQorCQlyZXR1cm4gcnEtPmN0eCA9PSBr ZXJuZWxfY29udGV4dDsKKwllbHNlCisJCXJldHVybiBlbmdpbmUtPmxhc3RfcmV0aXJlZF9jb250 ZXh0ID09IGtlcm5lbF9jb250ZXh0OwogfQogCiB2b2lkIGludGVsX2VuZ2luZXNfcmVzZXRfZGVm YXVsdF9zdWJtaXNzaW9uKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQotLSAKMi4xNS4w CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK