From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [PATCH 05/18] drm/i915: clean up cache coloring Date: Tue, 4 Apr 2017 23:11:15 +0100 Message-ID: <20170404221128.3943-6-matthew.auld@intel.com> References: <20170404221128.3943-1-matthew.auld@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 13C836E6D6 for ; Tue, 4 Apr 2017 22:11:36 +0000 (UTC) In-Reply-To: <20170404221128.3943-1-matthew.auld@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 UmlkIHRoZSBjb2RlIG9mIGFueSBtbS5jb2xvcl9hZGp1c3QgYXNzdW1wdGlvbnMgdG8gYWxsb3cg YWRkaW5nIGFub3RoZXIKZmxhdm91ciBvZiBjb2xvcmluZy4KCnYyOiBiZXR0ZXIgbmFtaW5nCgpT aWduZWQtb2ZmLWJ5OiBNYXR0aGV3IEF1bGQgPG1hdHRoZXcuYXVsZEBpbnRlbC5jb20+CkNjOiBN aWthIEt1b3BwYWxhIDxtaWthLmt1b3BwYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgICAgICAgICB8ICAyICstCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICAgICAgICAgICAgICB8ICAzICsrLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXZpY3QuYyAgICAgICAgICAgfCAxMiArKysrKy0tLS0t LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oICAgICAgICAgICAgIHwgIDYg KysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3ZtYS5jICAgICAgICAgICAgICAgICB8 IDEwICsrKysrKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9pOTE1X2dlbV9l dmljdC5jIHwgIDggKysrKystLS0KIDYgZmlsZXMgY2hhbmdlZCwgMjYgaW5zZXJ0aW9ucygrKSwg MTUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggYWI3YTEwNzJlN2I1 Li44MzhjZTIyYTBhNDAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMzU0Myw3ICszNTQz LDcgQEAgaW50IGk5MTVfcGVyZl9vcGVuX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZv aWQgKmRhdGEsCiAvKiBpOTE1X2dlbV9ldmljdC5jICovCiBpbnQgX19tdXN0X2NoZWNrIGk5MTVf Z2VtX2V2aWN0X3NvbWV0aGluZyhzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAkJCQkJ ICB1NjQgbWluX3NpemUsIHU2NCBhbGlnbm1lbnQsCi0JCQkJCSAgdW5zaWduZWQgY2FjaGVfbGV2 ZWwsCisJCQkJCSAgdW5zaWduZWQgbG9uZyBjb2xvciwKIAkJCQkJICB1NjQgc3RhcnQsIHU2NCBl bmQsCiAJCQkJCSAgdW5zaWduZWQgZmxhZ3MpOwogaW50IF9fbXVzdF9jaGVjayBpOTE1X2dlbV9l dmljdF9mb3Jfbm9kZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbS5jCmluZGV4IGNiZjk3ZjRiYmI3Mi4uNTM2MmY0ZDE4Njg5IDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtLmMKQEAgLTM1NzgsNyArMzU3OCw4IEBAIGludCBpOTE1X2dlbV9vYmplY3Rfc2V0 X2NhY2hlX2xldmVsKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJCW9iai0+Y2Fj aGVfZGlydHkgPSB0cnVlOwogCiAJbGlzdF9mb3JfZWFjaF9lbnRyeSh2bWEsICZvYmotPnZtYV9s aXN0LCBvYmpfbGluaykKLQkJdm1hLT5ub2RlLmNvbG9yID0gY2FjaGVfbGV2ZWw7CisJCWlmIChp OTE1X3ZtX2hhc19jYWNoZV9jb2xvcmluZyh2bWEtPnZtKSkKKwkJCXZtYS0+bm9kZS5jb2xvciA9 IGNhY2hlX2xldmVsOwogCW9iai0+Y2FjaGVfbGV2ZWwgPSBjYWNoZV9sZXZlbDsKIAogCXJldHVy biAwOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXZpY3QuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V2aWN0LmMKaW5kZXggNTFlMzY1ZjcwNDY0 Li4wYzljNTFiZTBmNmEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2V2aWN0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXZpY3QuYwpAQCAt NzQsNyArNzQsNyBAQCBtYXJrX2ZyZWUoc3RydWN0IGRybV9tbV9zY2FuICpzY2FuLAogICogQHZt OiBhZGRyZXNzIHNwYWNlIHRvIGV2aWN0IGZyb20KICAqIEBtaW5fc2l6ZTogc2l6ZSBvZiB0aGUg ZGVzaXJlZCBmcmVlIHNwYWNlCiAgKiBAYWxpZ25tZW50OiBhbGlnbm1lbnQgY29uc3RyYWludCBv ZiB0aGUgZGVzaXJlZCBmcmVlIHNwYWNlCi0gKiBAY2FjaGVfbGV2ZWw6IGNhY2hlX2xldmVsIGZv ciB0aGUgZGVzaXJlZCBzcGFjZQorICogQGNvbG9yOiBjb2xvciBmb3IgdGhlIGRlc2lyZWQgc3Bh Y2UKICAqIEBzdGFydDogc3RhcnQgKGluY2x1c2l2ZSkgb2YgdGhlIHJhbmdlIGZyb20gd2hpY2gg dG8gZXZpY3Qgb2JqZWN0cwogICogQGVuZDogZW5kIChleGNsdXNpdmUpIG9mIHRoZSByYW5nZSBm cm9tIHdoaWNoIHRvIGV2aWN0IG9iamVjdHMKICAqIEBmbGFnczogYWRkaXRpb25hbCBmbGFncyB0 byBjb250cm9sIHRoZSBldmljdGlvbiBhbGdvcml0aG0KQEAgLTk1LDcgKzk1LDcgQEAgbWFya19m cmVlKHN0cnVjdCBkcm1fbW1fc2NhbiAqc2NhbiwKIGludAogaTkxNV9nZW1fZXZpY3Rfc29tZXRo aW5nKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCQkJIHU2NCBtaW5fc2l6ZSwgdTY0 IGFsaWdubWVudCwKLQkJCSB1bnNpZ25lZCBjYWNoZV9sZXZlbCwKKwkJCSB1bnNpZ25lZCBsb25n IGNvbG9yLAogCQkJIHU2NCBzdGFydCwgdTY0IGVuZCwKIAkJCSB1bnNpZ25lZCBmbGFncykKIHsK QEAgLTEzNCw3ICsxMzQsNyBAQCBpOTE1X2dlbV9ldmljdF9zb21ldGhpbmcoc3RydWN0IGk5MTVf YWRkcmVzc19zcGFjZSAqdm0sCiAJaWYgKGZsYWdzICYgUElOX01BUFBBQkxFKQogCQltb2RlID0g RFJNX01NX0lOU0VSVF9MT1c7CiAJZHJtX21tX3NjYW5faW5pdF93aXRoX3JhbmdlKCZzY2FuLCAm dm0tPm1tLAotCQkJCSAgICBtaW5fc2l6ZSwgYWxpZ25tZW50LCBjYWNoZV9sZXZlbCwKKwkJCQkg ICAgbWluX3NpemUsIGFsaWdubWVudCwgY29sb3IsCiAJCQkJICAgIHN0YXJ0LCBlbmQsIG1vZGUp OwogCiAJLyogUmV0aXJlIGJlZm9yZSB3ZSBzZWFyY2ggdGhlIGFjdGl2ZSBsaXN0LiBBbHRob3Vn aCB3ZSBoYXZlCkBAIC0yNTMsNyArMjUzLDYgQEAgaW50IGk5MTVfZ2VtX2V2aWN0X2Zvcl9ub2Rl KHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCXU2NCBzdGFydCA9IHRhcmdldC0+c3Rh cnQ7CiAJdTY0IGVuZCA9IHN0YXJ0ICsgdGFyZ2V0LT5zaXplOwogCXN0cnVjdCBpOTE1X3ZtYSAq dm1hLCAqbmV4dDsKLQlib29sIGNoZWNrX2NvbG9yOwogCWludCByZXQgPSAwOwogCiAJbG9ja2Rl cF9hc3NlcnRfaGVsZCgmdm0tPmk5MTUtPmRybS5zdHJ1Y3RfbXV0ZXgpOwpAQCAtMjcwLDggKzI2 OSw3IEBAIGludCBpOTE1X2dlbV9ldmljdF9mb3Jfbm9kZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3Nw YWNlICp2bSwKIAlpZiAoIShmbGFncyAmIFBJTl9OT05CTE9DSykpCiAJCWk5MTVfZ2VtX3JldGly ZV9yZXF1ZXN0cyh2bS0+aTkxNSk7CiAKLQljaGVja19jb2xvciA9IHZtLT5tbS5jb2xvcl9hZGp1 c3Q7Ci0JaWYgKGNoZWNrX2NvbG9yKSB7CisJaWYgKGk5MTVfdm1faGFzX2NhY2hlX2NvbG9yaW5n KHZtKSkgewogCQkvKiBFeHBhbmQgc2VhcmNoIHRvIGNvdmVyIG5laWdoYm91cmluZyBndWFyZCBw YWdlcyAob3IgbGFjayEpICovCiAJCWlmIChzdGFydCkKIAkJCXN0YXJ0IC09IEk5MTVfR1RUX1BB R0VfU0laRTsKQEAgLTI5Nyw3ICsyOTUsNyBAQCBpbnQgaTkxNV9nZW1fZXZpY3RfZm9yX25vZGUo c3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJCSAqIGFidXR0IGFuZCBjb25mbGljdC4g SWYgdGhleSBhcmUgaW4gY29uZmxpY3QsIHRoZW4gd2UgZXZpY3QKIAkJICogdGhvc2UgYXMgd2Vs bCB0byBtYWtlIHJvb20gZm9yIG91ciBndWFyZCBwYWdlcy4KIAkJICovCi0JCWlmIChjaGVja19j b2xvcikgeworCQlpZiAoaTkxNV92bV9oYXNfY2FjaGVfY29sb3Jpbmcodm0pKSB7CiAJCQlpZiAo bm9kZS0+c3RhcnQgKyBub2RlLT5zaXplID09IHRhcmdldC0+c3RhcnQpIHsKIAkJCQlpZiAobm9k ZS0+Y29sb3IgPT0gdGFyZ2V0LT5jb2xvcikKIAkJCQkJY29udGludWU7CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2d0dC5oCmluZGV4IDIzMmY3ZWY0YzIxYi4uOWM1OTJlMmRlNTE2IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAorKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaApAQCAtMzQ3LDYgKzM0NywxMiBAQCBzdHJ1Y3QgaTkx NV9hZGRyZXNzX3NwYWNlIHsKICNkZWZpbmUgaTkxNV9pc19nZ3R0KFYpICghKFYpLT5maWxlKQog CiBzdGF0aWMgaW5saW5lIGJvb2wKK2k5MTVfdm1faGFzX2NhY2hlX2NvbG9yaW5nKGNvbnN0IHN0 cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtKQoreworCXJldHVybiB2bS0+bW0uY29sb3JfYWRq dXN0ICYmIGk5MTVfaXNfZ2d0dCh2bSk7Cit9CisKK3N0YXRpYyBpbmxpbmUgYm9vbAogaTkxNV92 bV9pc180OGJpdChjb25zdCBzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSkKIHsKIAlyZXR1 cm4gKHZtLT50b3RhbCAtIDEpID4+IDMyOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV92bWEuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfdm1hLmMKaW5kZXggMGNm OWMwYTk4YzE5Li40ZWFkN2QwNzVmZDMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfdm1hLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV92bWEuYwpAQCAtMzkw LDcgKzM5MCw3IEBAIGJvb2wgaTkxNV9nZW1fdmFsaWRfZ3R0X3NwYWNlKHN0cnVjdCBpOTE1X3Zt YSAqdm1hLCB1bnNpZ25lZCBsb25nIGNhY2hlX2xldmVsKQogCSAqIHRoZXNlIGNvbnN0cmFpbnRz IGFwcGx5IGFuZCBzZXQgdGhlIGRybV9tbS5jb2xvcl9hZGp1c3QKIAkgKiBhcHByb3ByaWF0ZWx5 LgogCSAqLwotCWlmICh2bWEtPnZtLT5tbS5jb2xvcl9hZGp1c3QgPT0gTlVMTCkKKwlpZiAoIWk5 MTVfdm1faGFzX2NhY2hlX2NvbG9yaW5nKHZtYS0+dm0pKQogCQlyZXR1cm4gdHJ1ZTsKIAogCS8q IE9ubHkgdmFsaWQgdG8gYmUgY2FsbGVkIG9uIGFuIGFscmVhZHkgaW5zZXJ0ZWQgdm1hICovCkBA IC00MjksNiArNDI5LDcgQEAgaTkxNV92bWFfaW5zZXJ0KHN0cnVjdCBpOTE1X3ZtYSAqdm1hLCB1 NjQgc2l6ZSwgdTY0IGFsaWdubWVudCwgdTY0IGZsYWdzKQogCXN0cnVjdCBkcm1faTkxNV9nZW1f b2JqZWN0ICpvYmogPSB2bWEtPm9iajsKIAl1NjQgc3RhcnQsIGVuZDsKIAlpbnQgcmV0OworCXVu c2lnbmVkIGxvbmcgY29sb3IgPSAwOwogCiAJR0VNX0JVR19PTih2bWEtPmZsYWdzICYgKEk5MTVf Vk1BX0dMT0JBTF9CSU5EIHwgSTkxNV9WTUFfTE9DQUxfQklORCkpOwogCUdFTV9CVUdfT04oZHJt X21tX25vZGVfYWxsb2NhdGVkKCZ2bWEtPm5vZGUpKTsKQEAgLTQ3MSw2ICs0NzIsOSBAQCBpOTE1 X3ZtYV9pbnNlcnQoc3RydWN0IGk5MTVfdm1hICp2bWEsIHU2NCBzaXplLCB1NjQgYWxpZ25tZW50 LCB1NjQgZmxhZ3MpCiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAorCWlmIChpOTE1X3ZtX2hh c19jYWNoZV9jb2xvcmluZyh2bWEtPnZtKSkKKwkJY29sb3IgPSBvYmotPmNhY2hlX2xldmVsOwor CiAJaWYgKGZsYWdzICYgUElOX09GRlNFVF9GSVhFRCkgewogCQl1NjQgb2Zmc2V0ID0gZmxhZ3Mg JiBQSU5fT0ZGU0VUX01BU0s7CiAJCWlmICghSVNfQUxJR05FRChvZmZzZXQsIGFsaWdubWVudCkg fHwKQEAgLTQ4MCwxMyArNDg0LDEzIEBAIGk5MTVfdm1hX2luc2VydChzdHJ1Y3QgaTkxNV92bWEg KnZtYSwgdTY0IHNpemUsIHU2NCBhbGlnbm1lbnQsIHU2NCBmbGFncykKIAkJfQogCiAJCXJldCA9 IGk5MTVfZ2VtX2d0dF9yZXNlcnZlKHZtYS0+dm0sICZ2bWEtPm5vZGUsCi0JCQkJCSAgIHNpemUs IG9mZnNldCwgb2JqLT5jYWNoZV9sZXZlbCwKKwkJCQkJICAgc2l6ZSwgb2Zmc2V0LCBjb2xvciwK IAkJCQkJICAgZmxhZ3MpOwogCQlpZiAocmV0KQogCQkJZ290byBlcnJfdW5waW47CiAJfSBlbHNl IHsKIAkJcmV0ID0gaTkxNV9nZW1fZ3R0X2luc2VydCh2bWEtPnZtLCAmdm1hLT5ub2RlLAotCQkJ CQkgIHNpemUsIGFsaWdubWVudCwgb2JqLT5jYWNoZV9sZXZlbCwKKwkJCQkJICBzaXplLCBhbGln bm1lbnQsIGNvbG9yLAogCQkJCQkgIHN0YXJ0LCBlbmQsIGZsYWdzKTsKIAkJaWYgKHJldCkKIAkJ CWdvdG8gZXJyX3VucGluOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRl c3RzL2k5MTVfZ2VtX2V2aWN0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvaTkx NV9nZW1fZXZpY3QuYwppbmRleCAxNGU5YzJmYmM0ZTYuLjhjMGI0ZGM5ZGUzZCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2k5MTVfZ2VtX2V2aWN0LmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2k5MTVfZ2VtX2V2aWN0LmMKQEAgLTIyNCwx MSArMjI0LDEzIEBAIHN0YXRpYyBpbnQgaWd0X2V2aWN0X2Zvcl9jYWNoZV9jb2xvcih2b2lkICph cmcpCiAJaW50IGVycjsKIAogCS8qIEN1cnJlbnRseSB0aGUgdXNlIG9mIGNvbG9yX2FkanVzdCBp cyBsaW1pdGVkIHRvIGNhY2hlIGRvbWFpbnMgd2l0aGluCi0JICogdGhlIGdndHQsIGFuZCBzbyB0 aGUgcHJlc2VuY2Ugb2YgbW0uY29sb3JfYWRqdXN0IGlzIGFzc3VtZWQgdG8gYmUKLQkgKiBpOTE1 X2d0dF9jb2xvcl9hZGp1c3QgdGhyb3VnaG91dCBvdXIgZHJpdmVyLCBzbyB1c2luZyBhIG1vY2sg Y29sb3IKLQkgKiBhZGp1c3Qgd2lsbCB3b3JrIGp1c3QgZmluZSBmb3Igb3VyIHB1cnBvc2VzLgor CSAqIHRoZSBnZ3R0LCBhbmQgcGFnZSBzaXplcyB3aXRoaW4gdGhlIHBwZ3R0LCBzbyB0aGUgcHJl c2VuY2Ugb2YKKwkgKiBtbS5jb2xvcl9hZGp1c3QgaXMgYXNzdW1lZCB0byBiZSBpOTE1X2d0dF9j b2xvcl9hZGp1c3Qgd2hlbiBpZiB2bSBpcworCSAqIGdndHQsIHNvIHVzaW5nIGEgbW9jayBjb2xv ciBhZGp1c3Qgd2lsbCB3b3JrIGp1c3QgZmluZSBmb3Igb3VyCisJICogcHVycG9zZXMuCiAJICov CiAJZ2d0dC0+YmFzZS5tbS5jb2xvcl9hZGp1c3QgPSBtb2NrX2NvbG9yX2FkanVzdDsKKwlHRU1f QlVHX09OKCFpOTE1X3ZtX2hhc19jYWNoZV9jb2xvcmluZygmZ2d0dC0+YmFzZSkpOwogCiAJb2Jq ID0gaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZV9pbnRlcm5hbChpOTE1LCBJOTE1X0dUVF9QQUdFX1NJ WkUpOwogCWlmIChJU19FUlIob2JqKSkgewotLSAKMi45LjMKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=