From: Ben Widawsky Subject: [PATCH 4/4] drm/i915: Add support for CCS modifiers Date: Fri, 23 Jun 2017 09:45:44 -0700 Message-ID: <20170623164544.7362-5-ben@bwidawsk.net> References: <20170623164544.7362-1-ben@bwidawsk.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170623164544.7362-1-ben@bwidawsk.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: DRI Development , Intel GFX Cc: Ben Widawsky , Daniel Stone List-Id: dri-devel@lists.freedesktop.org djI6ClN1cHBvcnQgc3ByaXRlIHBsYW5lLgpTdXBwb3J0IHBpcGUgQy9EIGxpbWl0YXRpb24gb24g R0VOOS4KClRoaXMgcmVxdWlyZXMgcmViYXNlIG9uIHRoZSBjb3JyZWN0IFZpbGxlIHBhdGNoZXMK CkNjOiBEYW5pZWwgU3RvbmUgPGRhbmllbHNAY29sbGFib3JhLmNvbT4KQ2M6IEtyaXN0aWFuIEjD uGdzYmVyZyA8a3JoQGJpdHBsYW5ldC5uZXQ+ClNpZ25lZC1vZmYtYnk6IEJlbiBXaWRhd3NreSA8 YmVuQGJ3aWRhd3NrLm5ldD4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMgfCAzNCArKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9zcHJpdGUuYyAgfCAzOSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKy0KIDIgZmlsZXMgY2hhbmdlZCwgNjYgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggODc3YTUxNTE0YzYxLi4yYTBl NWNkMjYwNTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTkzLDcgKzkz LDE3IEBAIHN0YXRpYyBjb25zdCB1aW50MzJfdCBza2xfcHJpbWFyeV9mb3JtYXRzW10gPSB7CiAJ RFJNX0ZPUk1BVF9WWVVZLAogfTsKIAorc3RhdGljIGNvbnN0IHVpbnQ2NF90IHNrbF9mb3JtYXRf bW9kaWZpZXJzX25vY2NzW10gPSB7CisJSTkxNV9GT1JNQVRfTU9EX1lmX1RJTEVELAorCUk5MTVf Rk9STUFUX01PRF9ZX1RJTEVELAorCUk5MTVfRk9STUFUX01PRF9YX1RJTEVELAorCURSTV9GT1JN QVRfTU9EX0xJTkVBUiwKKwlEUk1fRk9STUFUX01PRF9JTlZBTElECit9OworCiBzdGF0aWMgY29u c3QgdWludDY0X3Qgc2tsX2Zvcm1hdF9tb2RpZmllcnNbXSA9IHsKKwlJOTE1X0ZPUk1BVF9NT0Rf WWZfVElMRURfQ0NTLAorCUk5MTVfRk9STUFUX01PRF9ZX1RJTEVEX0NDUywKIAlJOTE1X0ZPUk1B VF9NT0RfWWZfVElMRUQsCiAJSTkxNV9GT1JNQVRfTU9EX1lfVElMRUQsCiAJSTkxNV9GT1JNQVRf TU9EX1hfVElMRUQsCkBAIC0xMzg3MiwxNyArMTM4ODIsMTMgQEAgc3RhdGljIGJvb2wgc2tsX21v ZF9zdXBwb3J0ZWQodWludDMyX3QgZm9ybWF0LCB1aW50NjRfdCBtb2RpZmllcikKIAkJCXJldHVy biBmYWxzZTsKIAkJfQogCWNhc2UgRFJNX0ZPUk1BVF9SR0I1NjU6Ci0JY2FzZSBEUk1fRk9STUFU X1hSR0I4ODg4OgotCWNhc2UgRFJNX0ZPUk1BVF9YQkdSODg4ODoKLQljYXNlIERSTV9GT1JNQVRf QVJHQjg4ODg6Ci0JY2FzZSBEUk1fRk9STUFUX0FCR1I4ODg4OgogCWNhc2UgRFJNX0ZPUk1BVF9Y UkdCMjEwMTAxMDoKIAljYXNlIERSTV9GT1JNQVRfWEJHUjIxMDEwMTA6CiAJY2FzZSBEUk1fRk9S TUFUX1lVWVY6CiAJY2FzZSBEUk1fRk9STUFUX1lWWVU6CiAJY2FzZSBEUk1fRk9STUFUX1VZVlk6 CiAJY2FzZSBEUk1fRk9STUFUX1ZZVVk6Ci0JCS8qIEFsbCBpOTE1IG1vZGlmaWVycyBhcmUgZmlu ZSAqLworCQkvKiBBbGwgbm9uLWNjcyBpOTE1IG1vZGlmaWVycyBhcmUgZmluZSAqLwogCQlzd2l0 Y2ggKG1vZGlmaWVyKSB7CiAJCWNhc2UgRFJNX0ZPUk1BVF9NT0RfTElORUFSOgogCQljYXNlIEk5 MTVfRk9STUFUX01PRF9YX1RJTEVEOgpAQCAtMTM4OTIsNiArMTM4OTgsMTIgQEAgc3RhdGljIGJv b2wgc2tsX21vZF9zdXBwb3J0ZWQodWludDMyX3QgZm9ybWF0LCB1aW50NjRfdCBtb2RpZmllcikK IAkJZGVmYXVsdDoKIAkJCXJldHVybiBmYWxzZTsKIAkJfQorCWNhc2UgRFJNX0ZPUk1BVF9YUkdC ODg4ODoKKwljYXNlIERSTV9GT1JNQVRfWEJHUjg4ODg6CisJY2FzZSBEUk1fRk9STUFUX0FSR0I4 ODg4OgorCWNhc2UgRFJNX0ZPUk1BVF9BQkdSODg4ODoKKwkJLyogQWxsIGk5MTUgbW9kaWZpZXJz IGFyZSBmaW5lICovCisJCXJldHVybiB0cnVlOwogCWRlZmF1bHQ6CiAJCXJldHVybiBmYWxzZTsK IAl9CkBAIC0xNDEyMywxMyArMTQxMzUsMjMgQEAgaW50ZWxfcHJpbWFyeV9wbGFuZV9jcmVhdGUo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBlbnVtIHBpcGUgcGlwZSkKIAlwcmlt YXJ5LT5mcm9udGJ1ZmZlcl9iaXQgPSBJTlRFTF9GUk9OVEJVRkZFUl9QUklNQVJZKHBpcGUpOwog CXByaW1hcnktPmNoZWNrX3BsYW5lID0gaW50ZWxfY2hlY2tfcHJpbWFyeV9wbGFuZTsKIAotCWlm IChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkpIHsKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+ PSAxMCkgewogCQlpbnRlbF9wcmltYXJ5X2Zvcm1hdHMgPSBza2xfcHJpbWFyeV9mb3JtYXRzOwog CQludW1fZm9ybWF0cyA9IEFSUkFZX1NJWkUoc2tsX3ByaW1hcnlfZm9ybWF0cyk7CiAJCWludGVs X2Zvcm1hdF9tb2RpZmllcnMgPSBza2xfZm9ybWF0X21vZGlmaWVyczsKIAogCQlwcmltYXJ5LT51 cGRhdGVfcGxhbmUgPSBza3lsYWtlX3VwZGF0ZV9wcmltYXJ5X3BsYW5lOwogCQlwcmltYXJ5LT5k aXNhYmxlX3BsYW5lID0gc2t5bGFrZV9kaXNhYmxlX3ByaW1hcnlfcGxhbmU7CisJfSBlbHNlIGlm IChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkpIHsKKwkJaW50ZWxfcHJpbWFyeV9mb3JtYXRzID0g c2tsX3ByaW1hcnlfZm9ybWF0czsKKwkJbnVtX2Zvcm1hdHMgPSBBUlJBWV9TSVpFKHNrbF9wcmlt YXJ5X2Zvcm1hdHMpOworCQlpZiAocGlwZSA+PSBQSVBFX0MpCisJCQlpbnRlbF9mb3JtYXRfbW9k aWZpZXJzID0gc2tsX2Zvcm1hdF9tb2RpZmllcnM7CisJCWVsc2UKKwkJCWludGVsX2Zvcm1hdF9t b2RpZmllcnMgPSBza2xfZm9ybWF0X21vZGlmaWVyc19ub2NjczsKKworCQlwcmltYXJ5LT51cGRh dGVfcGxhbmUgPSBza3lsYWtlX3VwZGF0ZV9wcmltYXJ5X3BsYW5lOworCQlwcmltYXJ5LT5kaXNh YmxlX3BsYW5lID0gc2t5bGFrZV9kaXNhYmxlX3ByaW1hcnlfcGxhbmU7CiAJfSBlbHNlIGlmIChJ TlRFTF9HRU4oZGV2X3ByaXYpID49IDQpIHsKIAkJaW50ZWxfcHJpbWFyeV9mb3JtYXRzID0gaTk2 NV9wcmltYXJ5X2Zvcm1hdHM7CiAJCW51bV9mb3JtYXRzID0gQVJSQVlfU0laRShpOTY1X3ByaW1h cnlfZm9ybWF0cyk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJp dGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCmluZGV4IGU4MDgzNGNi MWY0Yy4uZGU0NDU0YThlZjllIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9zcHJpdGUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpAQCAt MTA4NSw3ICsxMDg1LDE3IEBAIHN0YXRpYyB1aW50MzJfdCBza2xfcGxhbmVfZm9ybWF0c1tdID0g ewogCURSTV9GT1JNQVRfVllVWSwKIH07CiAKK3N0YXRpYyBjb25zdCB1aW50NjRfdCBza2xfcGxh bmVfZm9ybWF0X21vZGlmaWVyc19ub2Njc1tdID0geworCUk5MTVfRk9STUFUX01PRF9ZZl9USUxF RCwKKwlJOTE1X0ZPUk1BVF9NT0RfWV9USUxFRCwKKwlJOTE1X0ZPUk1BVF9NT0RfWF9USUxFRCwK KwlEUk1fRk9STUFUX01PRF9MSU5FQVIsCisJRFJNX0ZPUk1BVF9NT0RfSU5WQUxJRAorfTsKKwog c3RhdGljIGNvbnN0IHVpbnQ2NF90IHNrbF9wbGFuZV9mb3JtYXRfbW9kaWZpZXJzW10gPSB7CisJ STkxNV9GT1JNQVRfTU9EX1lmX1RJTEVEX0NDUywKKwlJOTE1X0ZPUk1BVF9NT0RfWV9USUxFRF9D Q1MsCiAJSTkxNV9GT1JNQVRfTU9EX1lmX1RJTEVELAogCUk5MTVfRk9STUFUX01PRF9ZX1RJTEVE LAogCUk5MTVfRk9STUFUX01PRF9YX1RJTEVELApAQCAtMTEwOCw2ICsxMTE4LDIwIEBAIHN0YXRp YyBib29sIGludGVsX3Nwcml0ZV9wbGFuZV9mb3JtYXRfbW9kX3N1cHBvcnRlZChzdHJ1Y3QgZHJt X3BsYW5lICpwbGFuZSwKIAkgICAgbW9kaWZpZXIgIT0gRFJNX0ZPUk1BVF9NT0RfTElORUFSKQog CQlyZXR1cm4gZmFsc2U7CiAKKwlzd2l0Y2ggKG1vZGlmaWVyKSB7CisJY2FzZSBJOTE1X0ZPUk1B VF9NT0RfWWZfVElMRURfQ0NTOgorCWNhc2UgSTkxNV9GT1JNQVRfTU9EX1lfVElMRURfQ0NTOgor CQlzd2l0Y2ggKGZvcm1hdCkgeworCQljYXNlIERSTV9GT1JNQVRfQUJHUjg4ODg6CisJCWNhc2Ug RFJNX0ZPUk1BVF9BUkdCODg4ODoKKwkJY2FzZSBEUk1fRk9STUFUX1hCR1I4ODg4OgorCQljYXNl IERSTV9GT1JNQVRfWFJHQjg4ODg6CisJCQlyZXR1cm4gdHJ1ZTsKKwkJZGVmYXVsdDoKKwkJCXJl dHVybiBmYWxzZTsKKwkJfQorCX0KKwogCXN3aXRjaCAoZm9ybWF0KSB7CiAJCWNhc2UgRFJNX0ZP Uk1BVF9YQkdSMjEwMTAxMDoKIAkJY2FzZSBEUk1fRk9STUFUX0FCR1IyMTAxMDEwOgpAQCAtMTE3 Myw3ICsxMTk3LDcgQEAgaW50ZWxfc3ByaXRlX3BsYW5lX2NyZWF0ZShzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYsCiAJfQogCWludGVsX3BsYW5lLT5iYXNlLnN0YXRlID0gJnN0YXRl LT5iYXNlOwogCi0JaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOSkgeworCWlmIChJTlRFTF9H RU4oZGV2X3ByaXYpID49IDEwKSB7CiAJCWludGVsX3BsYW5lLT5jYW5fc2NhbGUgPSB0cnVlOwog CQlzdGF0ZS0+c2NhbGVyX2lkID0gLTE7CiAKQEAgLTExODMsNiArMTIwNywxOSBAQCBpbnRlbF9z cHJpdGVfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJ cGxhbmVfZm9ybWF0cyA9IHNrbF9wbGFuZV9mb3JtYXRzOwogCQludW1fcGxhbmVfZm9ybWF0cyA9 IEFSUkFZX1NJWkUoc2tsX3BsYW5lX2Zvcm1hdHMpOwogCQltb2RpZmllcnMgPSBza2xfcGxhbmVf Zm9ybWF0X21vZGlmaWVyczsKKwl9IGVsc2UgaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOSkg eworCQlpbnRlbF9wbGFuZS0+Y2FuX3NjYWxlID0gdHJ1ZTsKKwkJc3RhdGUtPnNjYWxlcl9pZCA9 IC0xOworCisJCWludGVsX3BsYW5lLT51cGRhdGVfcGxhbmUgPSBza2xfdXBkYXRlX3BsYW5lOwor CQlpbnRlbF9wbGFuZS0+ZGlzYWJsZV9wbGFuZSA9IHNrbF9kaXNhYmxlX3BsYW5lOworCisJCXBs YW5lX2Zvcm1hdHMgPSBza2xfcGxhbmVfZm9ybWF0czsKKwkJbnVtX3BsYW5lX2Zvcm1hdHMgPSBB UlJBWV9TSVpFKHNrbF9wbGFuZV9mb3JtYXRzKTsKKwkJaWYgKHBpcGUgPj0gUElQRV9DKQorCQkJ bW9kaWZpZXJzID0gc2tsX3BsYW5lX2Zvcm1hdF9tb2RpZmllcnNfbm9jY3M7CisJCWVsc2UKKwkJ CW1vZGlmaWVycyA9IHNrbF9wbGFuZV9mb3JtYXRfbW9kaWZpZXJzOwogCX0gZWxzZSBpZiAoSVNf VkFMTEVZVklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJaW50 ZWxfcGxhbmUtPmNhbl9zY2FsZSA9IGZhbHNlOwogCQlpbnRlbF9wbGFuZS0+bWF4X2Rvd25zY2Fs ZSA9IDE7Ci0tIAoyLjEzLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Ry aS1kZXZlbAo=