From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [PATCH 08/15] drm/i915: clean up cache coloring Date: Mon, 6 Mar 2017 23:54:07 +0000 Message-ID: <20170306235414.23407-9-matthew.auld@intel.com> References: <20170306235414.23407-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 ABAC06E580 for ; Mon, 6 Mar 2017 23:54:25 +0000 (UTC) In-Reply-To: <20170306235414.23407-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 VG8ga2VlcCB0aGUgbmV4dCBwYXRjaCBzaW1wbGUsIHJpZCB0aGUgY29kZSBvZiBhbnkgbW0uY29s b3JfYWRqdXN0CmFzc3VtcHRpb25zIHRvIGFsbG93IGFkZGluZyBhbm90aGVyIGZsYXZvdXIgb2Yg Y29sb3JpbmcuCgpTaWduZWQtb2ZmLWJ5OiBNYXR0aGV3IEF1bGQgPG1hdHRoZXcuYXVsZEBpbnRl bC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICB8ICAyICst CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICAgIHwgIDMgKystCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ldmljdC5jIHwgMTIgKysrKystLS0tLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaCAgIHwgIDYgKysrKysrCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X3ZtYS5jICAgICAgIHwgMTAgKysrKysrKy0tLQogNSBmaWxlcyBjaGFuZ2Vk LCAyMSBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aAppbmRleCBlNDViOGQ3NGNlYmYuLmFhYzc2NGI1YWFkNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oCkBAIC0zNTI2LDcgKzM1MjYsNyBAQCBpbnQgaTkxNV9wZXJmX29wZW5faW9jdGwoc3RydWN0 IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIC8qIGk5MTVfZ2VtX2V2aWN0LmMgKi8KIGlu dCBfX211c3RfY2hlY2sgaTkxNV9nZW1fZXZpY3Rfc29tZXRoaW5nKHN0cnVjdCBpOTE1X2FkZHJl c3Nfc3BhY2UgKnZtLAogCQkJCQkgIHU2NCBtaW5fc2l6ZSwgdTY0IGFsaWdubWVudCwKLQkJCQkJ ICB1bnNpZ25lZCBjYWNoZV9sZXZlbCwKKwkJCQkJICB1bnNpZ25lZCBsb25nIGNvbG9yLAogCQkJ CQkgIHU2NCBzdGFydCwgdTY0IGVuZCwKIAkJCQkJICB1bnNpZ25lZCBmbGFncyk7CiBpbnQgX19t dXN0X2NoZWNrIGk5MTVfZ2VtX2V2aWN0X2Zvcl9ub2RlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3Bh Y2UgKnZtLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggMGE2ZWQyYzU0NjI5Li45YWNmMjc5 ZTVmOTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMzM5Miw3ICszMzkyLDggQEAgaW50 IGk5MTVfZ2VtX29iamVjdF9zZXRfY2FjaGVfbGV2ZWwoc3RydWN0IGRybV9pOTE1X2dlbV9vYmpl Y3QgKm9iaiwKIAkJb2JqLT5jYWNoZV9kaXJ0eSA9IHRydWU7CiAKIAlsaXN0X2Zvcl9lYWNoX2Vu dHJ5KHZtYSwgJm9iai0+dm1hX2xpc3QsIG9ial9saW5rKQotCQl2bWEtPm5vZGUuY29sb3IgPSBj YWNoZV9sZXZlbDsKKwkJaWYgKGk5MTVfdXNlc19jYWNoZV9jb2xvcmluZyh2bWEtPnZtKSkKKwkJ CXZtYS0+bm9kZS5jb2xvciA9IGNhY2hlX2xldmVsOwogCW9iai0+Y2FjaGVfbGV2ZWwgPSBjYWNo ZV9sZXZlbDsKIAogCXJldHVybiAwOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fZXZpY3QuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V2aWN0LmMK aW5kZXggMmRhM2E5NGZjOWYzLi5mOTM2NGY5MTdiNjcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX2V2aWN0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW1fZXZpY3QuYwpAQCAtNzQsNyArNzQsNyBAQCBtYXJrX2ZyZWUoc3RydWN0IGRybV9tbV9z Y2FuICpzY2FuLAogICogQHZtOiBhZGRyZXNzIHNwYWNlIHRvIGV2aWN0IGZyb20KICAqIEBtaW5f c2l6ZTogc2l6ZSBvZiB0aGUgZGVzaXJlZCBmcmVlIHNwYWNlCiAgKiBAYWxpZ25tZW50OiBhbGln bm1lbnQgY29uc3RyYWludCBvZiB0aGUgZGVzaXJlZCBmcmVlIHNwYWNlCi0gKiBAY2FjaGVfbGV2 ZWw6IGNhY2hlX2xldmVsIGZvciB0aGUgZGVzaXJlZCBzcGFjZQorICogQGNvbG9yOiBjb2xvciBm b3IgdGhlIGRlc2lyZWQgc3BhY2UKICAqIEBzdGFydDogc3RhcnQgKGluY2x1c2l2ZSkgb2YgdGhl IHJhbmdlIGZyb20gd2hpY2ggdG8gZXZpY3Qgb2JqZWN0cwogICogQGVuZDogZW5kIChleGNsdXNp dmUpIG9mIHRoZSByYW5nZSBmcm9tIHdoaWNoIHRvIGV2aWN0IG9iamVjdHMKICAqIEBmbGFnczog YWRkaXRpb25hbCBmbGFncyB0byBjb250cm9sIHRoZSBldmljdGlvbiBhbGdvcml0aG0KQEAgLTk1 LDcgKzk1LDcgQEAgbWFya19mcmVlKHN0cnVjdCBkcm1fbW1fc2NhbiAqc2NhbiwKIGludAogaTkx NV9nZW1fZXZpY3Rfc29tZXRoaW5nKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCQkJ IHU2NCBtaW5fc2l6ZSwgdTY0IGFsaWdubWVudCwKLQkJCSB1bnNpZ25lZCBjYWNoZV9sZXZlbCwK KwkJCSB1bnNpZ25lZCBsb25nIGNvbG9yLAogCQkJIHU2NCBzdGFydCwgdTY0IGVuZCwKIAkJCSB1 bnNpZ25lZCBmbGFncykKIHsKQEAgLTEzNCw3ICsxMzQsNyBAQCBpOTE1X2dlbV9ldmljdF9zb21l dGhpbmcoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJaWYgKGZsYWdzICYgUElOX01B UFBBQkxFKQogCQltb2RlID0gRFJNX01NX0lOU0VSVF9MT1c7CiAJZHJtX21tX3NjYW5faW5pdF93 aXRoX3JhbmdlKCZzY2FuLCAmdm0tPm1tLAotCQkJCSAgICBtaW5fc2l6ZSwgYWxpZ25tZW50LCBj YWNoZV9sZXZlbCwKKwkJCQkgICAgbWluX3NpemUsIGFsaWdubWVudCwgY29sb3IsCiAJCQkJICAg IHN0YXJ0LCBlbmQsIG1vZGUpOwogCiAJLyogUmV0aXJlIGJlZm9yZSB3ZSBzZWFyY2ggdGhlIGFj dGl2ZSBsaXN0LiBBbHRob3VnaCB3ZSBoYXZlCkBAIC0yNTQsNyArMjU0LDYgQEAgaW50IGk5MTVf Z2VtX2V2aWN0X2Zvcl9ub2RlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCXU2NCBz dGFydCA9IHRhcmdldC0+c3RhcnQ7CiAJdTY0IGVuZCA9IHN0YXJ0ICsgdGFyZ2V0LT5zaXplOwog CXN0cnVjdCBpOTE1X3ZtYSAqdm1hLCAqbmV4dDsKLQlib29sIGNoZWNrX2NvbG9yOwogCWludCBy ZXQgPSAwOwogCiAJbG9ja2RlcF9hc3NlcnRfaGVsZCgmdm0tPmk5MTUtPmRybS5zdHJ1Y3RfbXV0 ZXgpOwpAQCAtMjcxLDggKzI3MCw3IEBAIGludCBpOTE1X2dlbV9ldmljdF9mb3Jfbm9kZShzdHJ1 Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAlpZiAoIShmbGFncyAmIFBJTl9OT05CTE9DSykp CiAJCWk5MTVfZ2VtX3JldGlyZV9yZXF1ZXN0cyh2bS0+aTkxNSk7CiAKLQljaGVja19jb2xvciA9 IHZtLT5tbS5jb2xvcl9hZGp1c3Q7Ci0JaWYgKGNoZWNrX2NvbG9yKSB7CisJaWYgKGk5MTVfdXNl c19jYWNoZV9jb2xvcmluZyh2bSkpIHsKIAkJLyogRXhwYW5kIHNlYXJjaCB0byBjb3ZlciBuZWln aGJvdXJpbmcgZ3VhcmQgcGFnZXMgKG9yIGxhY2shKSAqLwogCQlpZiAoc3RhcnQpCiAJCQlzdGFy dCAtPSBJOTE1X0dUVF9QQUdFX1NJWkU7CkBAIC0yOTgsNyArMjk2LDcgQEAgaW50IGk5MTVfZ2Vt X2V2aWN0X2Zvcl9ub2RlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCQkgKiBhYnV0 dCBhbmQgY29uZmxpY3QuIElmIHRoZXkgYXJlIGluIGNvbmZsaWN0LCB0aGVuIHdlIGV2aWN0CiAJ CSAqIHRob3NlIGFzIHdlbGwgdG8gbWFrZSByb29tIGZvciBvdXIgZ3VhcmQgcGFnZXMuCiAJCSAq LwotCQlpZiAoY2hlY2tfY29sb3IpIHsKKwkJaWYgKGk5MTVfdXNlc19jYWNoZV9jb2xvcmluZyh2 bSkpIHsKIAkJCWlmIChub2RlLT5zdGFydCArIG5vZGUtPnNpemUgPT0gdGFyZ2V0LT5zdGFydCkg ewogCQkJCWlmIChub2RlLT5jb2xvciA9PSB0YXJnZXQtPmNvbG9yKQogCQkJCQljb250aW51ZTsK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKaW5kZXggMWY1MTQwMmNmODE2Li44ZDc0MzYx MDU3MTggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCkBAIC0zNDYsNiArMzQ2LDEy IEBAIHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgewogI2RlZmluZSBpOTE1X2lzX2dndHQoVikg KCEoViktPmZpbGUpCiAKIHN0YXRpYyBpbmxpbmUgYm9vbAoraTkxNV91c2VzX2NhY2hlX2NvbG9y aW5nKGNvbnN0IHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtKQoreworCXJldHVybiB2bS0+ bW0uY29sb3JfYWRqdXN0ICYmIGk5MTVfaXNfZ2d0dCh2bSk7Cit9CisKK3N0YXRpYyBpbmxpbmUg Ym9vbAogaTkxNV92bV9pc180OGJpdChjb25zdCBzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2 bSkKIHsKIAlyZXR1cm4gKHZtLT50b3RhbCAtIDEpID4+IDMyOwpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV92bWEuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfdm1h LmMKaW5kZXggMWFiYTQ3MDI0NjU2Li4zMWUyMzI3NDkyYmEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfdm1hLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV92 bWEuYwpAQCAtMzkwLDcgKzM5MCw3IEBAIGJvb2wgaTkxNV9nZW1fdmFsaWRfZ3R0X3NwYWNlKHN0 cnVjdCBpOTE1X3ZtYSAqdm1hLCB1bnNpZ25lZCBsb25nIGNhY2hlX2xldmVsKQogCSAqIHRoZXNl IGNvbnN0cmFpbnRzIGFwcGx5IGFuZCBzZXQgdGhlIGRybV9tbS5jb2xvcl9hZGp1c3QKIAkgKiBh cHByb3ByaWF0ZWx5LgogCSAqLwotCWlmICh2bWEtPnZtLT5tbS5jb2xvcl9hZGp1c3QgPT0gTlVM TCkKKwlpZiAoIWk5MTVfdXNlc19jYWNoZV9jb2xvcmluZyh2bWEtPnZtKSkKIAkJcmV0dXJuIHRy dWU7CiAKIAkvKiBPbmx5IHZhbGlkIHRvIGJlIGNhbGxlZCBvbiBhbiBhbHJlYWR5IGluc2VydGVk IHZtYSAqLwpAQCAtNDI5LDYgKzQyOSw3IEBAIGk5MTVfdm1hX2luc2VydChzdHJ1Y3QgaTkxNV92 bWEgKnZtYSwgdTY0IHNpemUsIHU2NCBhbGlnbm1lbnQsIHU2NCBmbGFncykKIAlzdHJ1Y3QgZHJt X2k5MTVfZ2VtX29iamVjdCAqb2JqID0gdm1hLT5vYmo7CiAJdTY0IHN0YXJ0LCBlbmQ7CiAJaW50 IHJldDsKKwl1bnNpZ25lZCBsb25nIGNvbG9yID0gMDsKIAogCUdFTV9CVUdfT04odm1hLT5mbGFn cyAmIChJOTE1X1ZNQV9HTE9CQUxfQklORCB8IEk5MTVfVk1BX0xPQ0FMX0JJTkQpKTsKIAlHRU1f QlVHX09OKGRybV9tbV9ub2RlX2FsbG9jYXRlZCgmdm1hLT5ub2RlKSk7CkBAIC00NzEsNiArNDcy LDkgQEAgaTkxNV92bWFfaW5zZXJ0KHN0cnVjdCBpOTE1X3ZtYSAqdm1hLCB1NjQgc2l6ZSwgdTY0 IGFsaWdubWVudCwgdTY0IGZsYWdzKQogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKKwlpZiAo aTkxNV91c2VzX2NhY2hlX2NvbG9yaW5nKHZtYS0+dm0pKQorCQljb2xvciA9IG9iai0+Y2FjaGVf bGV2ZWw7CisKIAlpZiAoZmxhZ3MgJiBQSU5fT0ZGU0VUX0ZJWEVEKSB7CiAJCXU2NCBvZmZzZXQg PSBmbGFncyAmIFBJTl9PRkZTRVRfTUFTSzsKIAkJaWYgKCFJU19BTElHTkVEKG9mZnNldCwgYWxp Z25tZW50KSB8fApAQCAtNDgwLDEzICs0ODQsMTMgQEAgaTkxNV92bWFfaW5zZXJ0KHN0cnVjdCBp OTE1X3ZtYSAqdm1hLCB1NjQgc2l6ZSwgdTY0IGFsaWdubWVudCwgdTY0IGZsYWdzKQogCQl9CiAK IAkJcmV0ID0gaTkxNV9nZW1fZ3R0X3Jlc2VydmUodm1hLT52bSwgJnZtYS0+bm9kZSwKLQkJCQkJ ICAgc2l6ZSwgb2Zmc2V0LCBvYmotPmNhY2hlX2xldmVsLAorCQkJCQkgICBzaXplLCBvZmZzZXQs IGNvbG9yLAogCQkJCQkgICBmbGFncyk7CiAJCWlmIChyZXQpCiAJCQlnb3RvIGVycl91bnBpbjsK IAl9IGVsc2UgewogCQlyZXQgPSBpOTE1X2dlbV9ndHRfaW5zZXJ0KHZtYS0+dm0sICZ2bWEtPm5v ZGUsCi0JCQkJCSAgc2l6ZSwgYWxpZ25tZW50LCBvYmotPmNhY2hlX2xldmVsLAorCQkJCQkgIHNp emUsIGFsaWdubWVudCwgY29sb3IsCiAJCQkJCSAgc3RhcnQsIGVuZCwgZmxhZ3MpOwogCQlpZiAo cmV0KQogCQkJZ290byBlcnJfdW5waW47Ci0tIAoyLjkuMwoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==