From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 34/39] drm/i915: Rename intel_context.active to .inflight Date: Wed, 13 Mar 2019 14:43:56 +0000 Message-ID: <20190313144401.17735-34-chris@chris-wilson.co.uk> References: <20190313144401.17735-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 A799A89F73 for ; Wed, 13 Mar 2019 14:45:04 +0000 (UTC) In-Reply-To: <20190313144401.17735-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 UmVuYW1lIHRoZSBlbmdpbmUgdGhpcyBIVyBjb250ZXh0IGlzIGN1cnJlbnRseSBhY3RpdmUgdXBv biAodGhhdCB3ZSBhcmUKZmx5aW5nIHVwb24pIHRvIGRpc2FtYmlndWF0ZSBiZXR3ZWVuIHRoZSBt aXh0dXJlIG9mIGRpZmZlcmVudCBhY3RpdmUKdGVybXMgKGFuZCBwcmV2ZW50IGNvbmZsaWN0IGlu IGZ1dHVyZSBwYXRjaGVzKS4KClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hy aXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NvbnRleHRf dHlwZXMuaCB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAg ICAgfCAyMiArKysrKysrKysrKy0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDEyIGluc2Vy dGlvbnMoKyksIDEyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2NvbnRleHRfdHlwZXMuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Nv bnRleHRfdHlwZXMuaAppbmRleCA2MjQ3MjlhMzU4NzUuLmY4NmY0YWU4NzI0YyAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY29udGV4dF90eXBlcy5oCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2NvbnRleHRfdHlwZXMuaApAQCAtNDIsNyArNDIsNyBAQCBz dHJ1Y3QgaW50ZWxfY29udGV4dCB7CiAKIAlzdHJ1Y3QgaTkxNV9nZW1fY29udGV4dCAqZ2VtX2Nv bnRleHQ7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOwotCXN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKmFjdGl2ZTsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICppbmZsaWdodDsKIAog CXN0cnVjdCBsaXN0X2hlYWQgYWN0aXZlX2xpbms7CiAJc3RydWN0IGxpc3RfaGVhZCBzaWduYWxf bGluazsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggYjk0MTdkMDMxNzQzLi5mNGQ5OGY4 NTMwYTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC00NTcsNyArNDU3LDcgQEAgX191 bndpbmRfaW5jb21wbGV0ZV9yZXF1ZXN0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUp CiAJCV9faTkxNV9yZXF1ZXN0X3Vuc3VibWl0KHJxKTsKIAkJdW53aW5kX3dhX3RhaWwocnEpOwog Ci0JCUdFTV9CVUdfT04ocnEtPmh3X2NvbnRleHQtPmFjdGl2ZSk7CisJCUdFTV9CVUdfT04ocnEt Pmh3X2NvbnRleHQtPmluZmxpZ2h0KTsKIAogCQkvKgogCQkgKiBQdXNoIHRoZSByZXF1ZXN0IGJh Y2sgaW50byB0aGUgcXVldWUgZm9yIGxhdGVyIHJlc3VibWlzc2lvbi4KQEAgLTU1MywxNyArNTUz LDE3IEBAIGV4ZWNsaXN0c191c2VyX2VuZChzdHJ1Y3QgaW50ZWxfZW5naW5lX2V4ZWNsaXN0cyAq ZXhlY2xpc3RzKQogc3RhdGljIGlubGluZSB2b2lkCiBleGVjbGlzdHNfY29udGV4dF9zY2hlZHVs ZV9pbihzdHJ1Y3QgaTkxNV9yZXF1ZXN0ICpycSkKIHsKLQlHRU1fQlVHX09OKHJxLT5od19jb250 ZXh0LT5hY3RpdmUpOworCUdFTV9CVUdfT04ocnEtPmh3X2NvbnRleHQtPmluZmxpZ2h0KTsKIAog CWV4ZWNsaXN0c19jb250ZXh0X3N0YXR1c19jaGFuZ2UocnEsIElOVEVMX0NPTlRFWFRfU0NIRURV TEVfSU4pOwogCWludGVsX2VuZ2luZV9jb250ZXh0X2luKHJxLT5lbmdpbmUpOwotCXJxLT5od19j b250ZXh0LT5hY3RpdmUgPSBycS0+ZW5naW5lOworCXJxLT5od19jb250ZXh0LT5pbmZsaWdodCA9 IHJxLT5lbmdpbmU7CiB9CiAKIHN0YXRpYyBpbmxpbmUgdm9pZAogZXhlY2xpc3RzX2NvbnRleHRf c2NoZWR1bGVfb3V0KHN0cnVjdCBpOTE1X3JlcXVlc3QgKnJxLCB1bnNpZ25lZCBsb25nIHN0YXR1 cykKIHsKLQlycS0+aHdfY29udGV4dC0+YWN0aXZlID0gTlVMTDsKKwlycS0+aHdfY29udGV4dC0+ aW5mbGlnaHQgPSBOVUxMOwogCWludGVsX2VuZ2luZV9jb250ZXh0X291dChycS0+ZW5naW5lKTsK IAlleGVjbGlzdHNfY29udGV4dF9zdGF0dXNfY2hhbmdlKHJxLCBzdGF0dXMpOwogCXRyYWNlX2k5 MTVfcmVxdWVzdF9vdXQocnEpOwpAQCAtODI0LDcgKzgyNCw3IEBAIHN0YXRpYyB2b2lkIGV4ZWNs aXN0c19kZXF1ZXVlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAkJc3RydWN0IHZp cnR1YWxfZW5naW5lICp2ZSA9CiAJCQlyYl9lbnRyeShyYiwgdHlwZW9mKCp2ZSksIG5vZGVzW2Vu Z2luZS0+aWRdLnJiKTsKIAkJc3RydWN0IGk5MTVfcmVxdWVzdCAqcnEgPSBSRUFEX09OQ0UodmUt PnJlcXVlc3QpOwotCQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICphY3RpdmU7CisJCXN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKmluZmxpZ2h0OwogCiAJCWlmICghcnEpIHsgLyogbGF6aWx5IGNsZWFu dXAgYWZ0ZXIgYW5vdGhlciBlbmdpbmUgaGFuZGxlZCBycSAqLwogCQkJcmJfZXJhc2VfY2FjaGVk KHJiLCAmZXhlY2xpc3RzLT52aXJ0dWFsKTsKQEAgLTg0Miw4ICs4NDIsOCBAQCBzdGF0aWMgdm9p ZCBleGVjbGlzdHNfZGVxdWV1ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJCSAq IHdlIHJldXNlIHRoZSByZWdpc3RlciBvZmZzZXRzKS4gVGhpcyBpcyBhIHZlcnkgc21hbGwKIAkJ ICogaHlzdGVyc2lzIG9uIHRoZSBncmVlZHkgc2VlbGN0aW9uIGFsZ29yaXRobS4KIAkJICovCi0J CWFjdGl2ZSA9IFJFQURfT05DRSh2ZS0+Y29udGV4dC5hY3RpdmUpOwotCQlpZiAoYWN0aXZlICYm IGFjdGl2ZSAhPSBlbmdpbmUpIHsKKwkJaW5mbGlnaHQgPSBSRUFEX09OQ0UodmUtPmNvbnRleHQu aW5mbGlnaHQpOworCQlpZiAoaW5mbGlnaHQgJiYgaW5mbGlnaHQgIT0gZW5naW5lKSB7CiAJCQly YiA9IHJiX25leHQocmIpOwogCQkJY29udGludWU7CiAJCX0KQEAgLTk0Nyw3ICs5NDcsNyBAQCBz dGF0aWMgdm9pZCBleGVjbGlzdHNfZGVxdWV1ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdp bmUpCiAJCQkJdTMyICpyZWdzID0gdmUtPmNvbnRleHQubHJjX3JlZ19zdGF0ZTsKIAkJCQl1bnNp Z25lZCBpbnQgbjsKIAotCQkJCUdFTV9CVUdfT04oUkVBRF9PTkNFKHZlLT5jb250ZXh0LmFjdGl2 ZSkpOworCQkJCUdFTV9CVUdfT04oUkVBRF9PTkNFKHZlLT5jb250ZXh0LmluZmxpZ2h0KSk7CiAJ CQkJdmlydHVhbF91cGRhdGVfcmVnaXN0ZXJfb2Zmc2V0cyhyZWdzLCBlbmdpbmUpOwogCiAJCQkJ LyoKQEAgLTE1MTksNyArMTUxOSw3IEBAIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19jb250ZXh0X3Vu cGluKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjZSkKIAkgKiBoYWQgdGhlIGNoYW5jZSB0byBydW4g eWV0OyBsZXQgaXQgcnVuIGJlZm9yZSB3ZSB0ZWFyZG93biB0aGUKIAkgKiByZWZlcmVuY2UgaXQg bWF5IHVzZS4KIAkgKi8KLQllbmdpbmUgPSBSRUFEX09OQ0UoY2UtPmFjdGl2ZSk7CisJZW5naW5l ID0gUkVBRF9PTkNFKGNlLT5pbmZsaWdodCk7CiAJaWYgKHVubGlrZWx5KGVuZ2luZSkpIHsKIAkJ dW5zaWduZWQgbG9uZyBmbGFnczsKIApAQCAtMTUyNyw3ICsxNTI3LDcgQEAgc3RhdGljIHZvaWQg ZXhlY2xpc3RzX2NvbnRleHRfdW5waW4oc3RydWN0IGludGVsX2NvbnRleHQgKmNlKQogCQlwcm9j ZXNzX2NzYihlbmdpbmUpOwogCQlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZlbmdpbmUtPnRpbWVs aW5lLmxvY2ssIGZsYWdzKTsKIAotCQlHRU1fQlVHX09OKFJFQURfT05DRShjZS0+YWN0aXZlKSk7 CisJCUdFTV9CVUdfT04oUkVBRF9PTkNFKGNlLT5pbmZsaWdodCkpOwogCX0KIAogCWk5MTVfZ2Vt X2NvbnRleHRfdW5waW5faHdfaWQoY2UtPmdlbV9jb250ZXh0KTsKQEAgLTMxNjgsNyArMzE2OCw3 IEBAIHN0YXRpYyB2b2lkIHZpcnR1YWxfY29udGV4dF9kZXN0cm95KHN0cnVjdCBrcmVmICprcmVm KQogCXVuc2lnbmVkIGludCBuOwogCiAJR0VNX0JVR19PTih2ZS0+cmVxdWVzdCk7Ci0JR0VNX0JV R19PTih2ZS0+Y29udGV4dC5hY3RpdmUpOworCUdFTV9CVUdfT04odmUtPmNvbnRleHQuaW5mbGln aHQpOwogCiAJZm9yIChuID0gMDsgbiA8IHZlLT5jb3VudDsgbisrKSB7CiAJCXN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKnNpYmxpbmcgPSB2ZS0+c2libGluZ3Nbbl07Ci0tIAoyLjIwLjEKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeA==