From: Chris Wilson Subject: [PATCH] drm/i915: Keep the ctx workarounds tightly packed Date: Fri, 15 Jun 2018 08:37:29 +0100 Message-ID: <20180615073729.20966-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 0498A6E090 for ; Fri, 15 Jun 2018 07:37:49 +0000 (UTC) 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 Rm9yIGVhY2ggcGxhdGZvcm0sIHdlIGhhdmUgYSBmZXcgcmVnaXN0ZXJzIHRoYXQgcmV3cml0dGVu IHdpdGggbXVsdGlwbGUKdmFsdWVzIC0tIHRoZXkgYXJlIG5vdCBwYXJ0IG9mIGEgc2VxdWVuY2Us IGp1c3QgZGlmZmVyZW50IHBhcnRzIG9mIGEKbWFza2VkIHJlZ2lzdGVyIHNldCBhdCBkaWZmZXJl bnQgdGltZXMgKGUuZy4gcGxhdGZvcm0gYW5kIGdlbgp3b3JrYXJvdW5kcykuIENvbnNvbGlkYXRl IHRoZXNlIGludG8gYSBzaW5nbGUgcmVnaXN0ZXIgd3JpdGUgdG8ga2VlcCB0aGUKdGFibGUgY29t cGFjdC4KCldoaWxlIGFkanVzdGluZyB0aGUgY29uc3RydWN0aW9uIG9mIHRoZSB3YSB0YWJsZSwg bWFrZSBpdCBub24gZmF0YWwgc28KdGhhdCB0aGUgZHJpdmVyIHN0aWxsIGxvYWRzIGJ1dCBrZWVw aW5nIHRoZSB3YXJuaW5nIGFuZCBleHRyYSBkZXRhaWxzCmZvciBpbnNwZWN0aW9uLgoKU2lnbmVk LW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBPc2Nh ciBNYXRlbyA8b3NjYXIubWF0ZW9AaW50ZWwuY29tPgpDYzogTWlrYSBLdW9wcGFsYSA8bWlrYS5r dW9wcGFsYUBsaW51eC5pbnRlbC5jb20+CkNjOiBKb29uYXMgTGFodGluZW4gPGpvb25hcy5sYWh0 aW5lbkBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1 Z2ZzLmMgICAgICB8IDI1ICsrLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmggICAgICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfd29ya2Fyb3Vu ZHMuYyB8IDYzICsrKysrKysrKysrKysrKysrLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCA1MiBp bnNlcnRpb25zKCspLCAzOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdm cy5jCmluZGV4IDk5ZDMyNzJkODJkOC4uYzQwMGY0MmE1NGVjIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2RlYnVnZnMuYwpAQCAtMzM3OCwyOCArMzM3OCwxMyBAQCBzdGF0aWMgaW50IGk5MTVfc2hh cmVkX2RwbGxzX2luZm8oc3RydWN0IHNlcV9maWxlICptLCB2b2lkICp1bnVzZWQpCiAKIHN0YXRp YyBpbnQgaTkxNV93YV9yZWdpc3RlcnMoc3RydWN0IHNlcV9maWxlICptLCB2b2lkICp1bnVzZWQp CiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gbm9kZV90b19pOTE1KG0t PnByaXZhdGUpOwotCXN0cnVjdCBpOTE1X3dvcmthcm91bmRzICp3b3JrYXJvdW5kcyA9ICZkZXZf cHJpdi0+d29ya2Fyb3VuZHM7CisJc3RydWN0IGk5MTVfd29ya2Fyb3VuZHMgKndhID0gJm5vZGVf dG9faTkxNShtLT5wcml2YXRlKS0+d29ya2Fyb3VuZHM7CiAJaW50IGk7CiAKLQlpbnRlbF9ydW50 aW1lX3BtX2dldChkZXZfcHJpdik7Ci0KLQlzZXFfcHJpbnRmKG0sICJXb3JrYXJvdW5kcyBhcHBs aWVkOiAlZFxuIiwgd29ya2Fyb3VuZHMtPmNvdW50KTsKLQlmb3IgKGkgPSAwOyBpIDwgd29ya2Fy b3VuZHMtPmNvdW50OyArK2kpIHsKLQkJaTkxNV9yZWdfdCBhZGRyOwotCQl1MzIgbWFzaywgdmFs dWUsIHJlYWQ7Ci0JCWJvb2wgb2s7Ci0KLQkJYWRkciA9IHdvcmthcm91bmRzLT5yZWdbaV0uYWRk cjsKLQkJbWFzayA9IHdvcmthcm91bmRzLT5yZWdbaV0ubWFzazsKLQkJdmFsdWUgPSB3b3JrYXJv dW5kcy0+cmVnW2ldLnZhbHVlOwotCQlyZWFkID0gSTkxNV9SRUFEKGFkZHIpOwotCQlvayA9ICh2 YWx1ZSAmIG1hc2spID09IChyZWFkICYgbWFzayk7Ci0JCXNlcV9wcmludGYobSwgIjB4JVg6IDB4 JTA4WCwgbWFzazogMHglMDhYLCByZWFkOiAweCUwOHgsIHN0YXR1czogJXNcbiIsCi0JCQkgICBp OTE1X21taW9fcmVnX29mZnNldChhZGRyKSwgdmFsdWUsIG1hc2ssIHJlYWQsIG9rID8gIk9LIiA6 ICJGQUlMIik7Ci0JfQotCi0JaW50ZWxfcnVudGltZV9wbV9wdXQoZGV2X3ByaXYpOworCXNlcV9w cmludGYobSwgIldvcmthcm91bmRzIGFwcGxpZWQ6ICVkXG4iLCB3YS0+Y291bnQpOworCWZvciAo aSA9IDA7IGkgPCB3YS0+Y291bnQ7ICsraSkKKwkJc2VxX3ByaW50ZihtLCAiMHglWDogMHglMDhY LCBtYXNrOiAweCUwOFhcbiIsCisJCQkgICB3YS0+cmVnW2ldLmFkZHIsIHdhLT5yZWdbaV0udmFs dWUsIHdhLT5yZWdbaV0ubWFzayk7CiAKIAlyZXR1cm4gMDsKIH0KZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oCmluZGV4IDc0ZGQ4OGQ4NTYzZS4uZWEzODk3NzFmOTE3IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmgKQEAgLTEzMDUsNyArMTMwNSw3IEBAIHN0cnVjdCBpOTE1X2Zyb250YnVmZmVyX3RyYWNr aW5nIHsKIH07CiAKIHN0cnVjdCBpOTE1X3dhX3JlZyB7Ci0JaTkxNV9yZWdfdCBhZGRyOworCXUz MiBhZGRyOwogCXUzMiB2YWx1ZTsKIAkvKiBiaXRtYXNrIHJlcHJlc2VudGluZyBXQSBiaXRzICov CiAJdTMyIG1hc2s7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF93b3Jr YXJvdW5kcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfd29ya2Fyb3VuZHMuYwppbmRl eCAyNGI5MjljZTMzNDEuLmY4YmIzMmU5NzRmNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfd29ya2Fyb3VuZHMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF93b3JrYXJvdW5kcy5jCkBAIC00OCwyOSArNDgsNTggQEAKICAqIC0gUHVibGljIGZ1bmN0aW9u cyB0byBpbml0IG9yIGFwcGx5IHRoZSBnaXZlbiB3b3JrYXJvdW5kIHR5cGUuCiAgKi8KIAotc3Rh dGljIGludCB3YV9hZGQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAotCQkgIGk5 MTVfcmVnX3QgYWRkciwKLQkJICBjb25zdCB1MzIgbWFzaywgY29uc3QgdTMyIHZhbCkKK3N0YXRp YyB2b2lkIHdhX2FkZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSwKKwkJICAgaTkxNV9y ZWdfdCByZWcsIGNvbnN0IHUzMiBtYXNrLCBjb25zdCB1MzIgdmFsKQogewotCWNvbnN0IHVuc2ln bmVkIGludCBpZHggPSBkZXZfcHJpdi0+d29ya2Fyb3VuZHMuY291bnQ7CisJc3RydWN0IGk5MTVf d29ya2Fyb3VuZHMgKndhID0gJmk5MTUtPndvcmthcm91bmRzOworCXVuc2lnbmVkIGludCBzdGFy dCA9IDAsIGVuZCA9IHdhLT5jb3VudDsKKwl1bnNpZ25lZCBpbnQgYWRkciA9IGk5MTVfbW1pb19y ZWdfb2Zmc2V0KHJlZyk7CisJc3RydWN0IGk5MTVfd2FfcmVnICpyOworCisJd2hpbGUgKHN0YXJ0 IDwgZW5kKSB7CisJCXVuc2lnbmVkIGludCBtaWQgPSBzdGFydCArIChlbmQgLSBzdGFydCkgLyAy OworCisJCWlmICh3YS0+cmVnW21pZF0uYWRkciA8IGFkZHIpIHsKKwkJCXN0YXJ0ID0gbWlkICsg MTsKKwkJfSBlbHNlIGlmICh3YS0+cmVnW21pZF0uYWRkciA+IGFkZHIpIHsKKwkJCWVuZCA9IG1p ZDsKKwkJfSBlbHNlIHsKKwkJCXIgPSAmd2EtPnJlZ1ttaWRdOworCisJCQlpZiAoKG1hc2sgJiB+ ci0+bWFzaykgPT0gMCkgeworCQkJCURSTV9FUlJPUigiRGlzY2FyZGluZyBvdmVyd3JpdHRlbiB3 L2EgZm9yIHJlZyAlMDR4IChtYXNrOiAlMDh4LCB2YWx1ZTogJTA4eClcbiIsCisJCQkJCSAgYWRk ciwgci0+bWFzaywgci0+dmFsdWUpOworCisJCQkJci0+dmFsdWUgJj0gfm1hc2s7CisJCQl9CisK KwkJCXItPnZhbHVlIHw9IHZhbDsKKwkJCXItPm1hc2sgIHw9IG1hc2s7CisJCQlyZXR1cm47CisJ CX0KKwl9CiAKLQlpZiAoV0FSTl9PTihpZHggPj0gSTkxNV9NQVhfV0FfUkVHUykpCi0JCXJldHVy biAtRU5PU1BDOworCWlmIChXQVJOX09OX09OQ0Uod2EtPmNvdW50ID49IEk5MTVfTUFYX1dBX1JF R1MpKSB7CisJCURSTV9FUlJPUigiRHJvcHBpbmcgdy9hIGZvciByZWcgJTA0eCAobWFzazogJTA4 eCwgdmFsdWU6ICUwOHgpXG4iLAorCQkJICBhZGRyLCBtYXNrLCB2YWwpOworCQlyZXR1cm47CisJ fQogCi0JZGV2X3ByaXYtPndvcmthcm91bmRzLnJlZ1tpZHhdLmFkZHIgPSBhZGRyOwotCWRldl9w cml2LT53b3JrYXJvdW5kcy5yZWdbaWR4XS52YWx1ZSA9IHZhbDsKLQlkZXZfcHJpdi0+d29ya2Fy b3VuZHMucmVnW2lkeF0ubWFzayA9IG1hc2s7CisJciA9ICZ3YS0+cmVnW3dhLT5jb3VudCsrXTsK KwlyLT5hZGRyICA9IGFkZHI7CisJci0+dmFsdWUgPSB2YWw7CisJci0+bWFzayAgPSBtYXNrOwog Ci0JZGV2X3ByaXYtPndvcmthcm91bmRzLmNvdW50Kys7CisJd2hpbGUgKHItLSA+IHdhLT5yZWcp IHsKKwkJR0VNX0JVR19PTihyWzBdLmFkZHIgPT0gclsxXS5hZGRyKTsKKwkJaWYgKHJbMV0uYWRk ciA+IHJbMF0uYWRkcikKKwkJCWJyZWFrOwogCi0JcmV0dXJuIDA7CisJCXN3YXAoclsxXSwgclsw XSk7CisJfQogfQogCi0jZGVmaW5lIFdBX1JFRyhhZGRyLCBtYXNrLCB2YWwpIGRvIHsgXAotCQlj b25zdCBpbnQgciA9IHdhX2FkZChkZXZfcHJpdiwgKGFkZHIpLCAobWFzayksICh2YWwpKTsgXAot CQlpZiAocikgXAotCQkJcmV0dXJuIHI7IFwKLQl9IHdoaWxlICgwKQorI2RlZmluZSBXQV9SRUco YWRkciwgbWFzaywgdmFsKSB3YV9hZGQoZGV2X3ByaXYsIChhZGRyKSwgKG1hc2spLCAodmFsKSkK IAogI2RlZmluZSBXQV9TRVRfQklUX01BU0tFRChhZGRyLCBtYXNrKSBcCiAJV0FfUkVHKGFkZHIs IChtYXNrKSwgX01BU0tFRF9CSVRfRU5BQkxFKG1hc2spKQpAQCAtNTQwLDcgKzU2OSw3IEBAIGlu dCBpbnRlbF9jdHhfd29ya2Fyb3VuZHNfZW1pdChzdHJ1Y3QgaTkxNV9yZXF1ZXN0ICpycSkKIAog CSpjcysrID0gTUlfTE9BRF9SRUdJU1RFUl9JTU0ody0+Y291bnQpOwogCWZvciAoaSA9IDA7IGkg PCB3LT5jb3VudDsgaSsrKSB7Ci0JCSpjcysrID0gaTkxNV9tbWlvX3JlZ19vZmZzZXQody0+cmVn W2ldLmFkZHIpOworCQkqY3MrKyA9IHctPnJlZ1tpXS5hZGRyOwogCQkqY3MrKyA9IHctPnJlZ1tp XS52YWx1ZTsKIAl9CiAJKmNzKysgPSBNSV9OT09QOwotLSAKMi4xNy4xCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK