From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Gordon Subject: [PATCH] drm/i915: track relative-constants-mode per-context not per-device Date: Tue, 13 Oct 2015 14:20:05 +0100 Message-ID: <1444742405-9322-1-git-send-email-david.s.gordon@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id C12626E34F for ; Tue, 13 Oct 2015 06:20:19 -0700 (PDT) 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 J3JlbGF0aXZlX2NvbnN0YW50c19tb2RlJyBoYXMgYWx3YXlzIGJlZW4gdHJhY2tlZCBwZXItZGV2 aWNlLCBidXQgdGhpcwppcyB3cm9uZyBpbiBleGVjbGlzdHMgKG9yIEd1QykgbW9kZSwgYXMgSU5T VFBNIGlzIHNhdmVkIGFuZCByZXN0b3JlZAp3aXRoIHRoZSBsb2dpY2FsIGNvbnRleHQsIGFuZCB0 aGUgcGVyLWNvbnRleHQgdmFsdWUgY291bGQgdGhlcmVmb3JlIGdldApvdXQgb2Ygc3luYyB3aXRo IHRoZSB0cmFja2VkIHZhbHVlLiBUaGlzIHBhdGNoIG1vdmVzIHRoZSB0cmFja2luZwplbGVtZW50 IGZyb20gdGhlIGRldl9wcml2IHN0cnVjdHVyZSBpbnRvIHRoZSBpbnRlbF9jb250ZXh0IHN0cnVj dHVyZSwKd2l0aCBjb3JyZXNwb25kaW5nIGFkanVzdG1lbnRzIHRvIHRoZSBjb2RlIHRoYXQgaW5p dGlhbGlzZXMgYW5kIHVzZXMgaXQuCgpUZXN0IGNhc2UgKGlmIGFueW9uZSB3YW50cyB0byB3cml0 ZSBpdCkgd291bGQgYmUgdG8gY3JlYXRlIHR3byBjb250ZXh0cywKc3VibWl0IGEgYmF0Y2ggd2l0 aCBhIG5vbi1kZWZhdWx0IG1vZGUgaW4gdGhlIGZpcnN0IGNvbnRleHQsIHN1Ym1pdCBhCmJhdGNo IHdpdGggdGhlIGRlZmF1bHQgbW9kZSBpbiB0aGUgb3RoZXIgY29udGV4dCwgc3VibWl0IGFub3Ro ZXIgYmF0Y2gKaW4gdGhlIGZpcnN0IGNvbnRleHQsIGJ1dCB0aGlzIHRpbWUgaW4gZGVmYXVsdCBt b2RlLiBUaGUgZHJpdmVyIHdpbGwKZmFpbCB0byBpbnNlcnQgdGhlIGluc3RydWN0aW9ucyB0byBy ZXNldCBJTlNUUE0gaW50byB0aGUgZmlyc3QgY29udGV4dCdzCnJpbmdidWZmZXIuCgpCdWd6aWxs YTogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTI0NDgKClNp Z25lZC1vZmYtYnk6IERhdmUgR29yZG9uIDxkYXZpZC5zLmdvcmRvbkBpbnRlbC5jb20+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgICAgIHwgNCArKy0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICAgICAgICAgfCAyIC0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgICAgfCAzICsrKwogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jIHwgNiArKystLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2xyYy5jICAgICAgICAgICB8IDYgKysrLS0tCiA1IGZpbGVzIGNoYW5nZWQsIDEx IGluc2VydGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmlu ZGV4IDUxZWVhMjkuLjI5MTczNzAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtODcyLDYg Kzg3Miw4IEBAIHN0cnVjdCBpbnRlbF9jb250ZXh0IHsKIAlzdHJ1Y3QgaTkxNV9jdHhfaGFuZ19z dGF0cyBoYW5nX3N0YXRzOwogCXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dDsKIAorCWludCBy ZWxhdGl2ZV9jb25zdGFudHNfbW9kZTsKKwogCS8qIExlZ2FjeSByaW5nIGJ1ZmZlciBzdWJtaXNz aW9uICovCiAJc3RydWN0IHsKIAkJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKnJjc19zdGF0 ZTsKQEAgLTE3MDcsOCArMTcwOSw2IEBAIHN0cnVjdCBkcm1faTkxNV9wcml2YXRlIHsKIAogCWNv bnN0IHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyBpbmZvOwogCi0JaW50IHJlbGF0aXZlX2NvbnN0 YW50c19tb2RlOwotCiAJdm9pZCBfX2lvbWVtICpyZWdzOwogCiAJc3RydWN0IGludGVsX3VuY29y ZSB1bmNvcmU7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCBmMGNmYmI5Li4zNzRhZjJkIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTQ4OTQsOCArNDg5NCw2IEBAIGk5MTVfZ2VtX2xv YWQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJCSAgaTkxNV9nZW1faWRsZV93b3JrX2hhbmRs ZXIpOwogCWluaXRfd2FpdHF1ZXVlX2hlYWQoJmRldl9wcml2LT5ncHVfZXJyb3IucmVzZXRfcXVl dWUpOwogCi0JZGV2X3ByaXYtPnJlbGF0aXZlX2NvbnN0YW50c19tb2RlID0gSTkxNV9FWEVDX0NP TlNUQU5UU19SRUxfR0VORVJBTDsKLQogCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA3ICYm ICFJU19WQUxMRVlWSUVXKGRldikpCiAJCWRldl9wcml2LT5udW1fZmVuY2VfcmVncyA9IDMyOwog CWVsc2UgaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDQgfHwgSVNfSTk0NUcoZGV2KSB8fCBJ U19JOTQ1R00oZGV2KSB8fCBJU19HMzMoZGV2KSkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2NvbnRleHQuYwppbmRleCA3NGFhMGM5Li40NjVlM2UwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fY29udGV4dC5jCkBAIC0yMjIsNiArMjIyLDkgQEAgX19jcmVhdGVfaHdfY29udGV4 dChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCSAqIGlzIG5vIHJlbWFwIGluZm8sIGl0IHdpbGwg YmUgYSBOT1AuICovCiAJY3R4LT5yZW1hcF9zbGljZSA9ICgxIDw8IE5VTV9MM19TTElDRVMoZGV2 KSkgLSAxOwogCisJLyogRmlyc3QgZXhlY2J1ZmZlciB3aWxsIG92ZXJyaWRlIHRoaXMgKi8KKwlj dHgtPnJlbGF0aXZlX2NvbnN0YW50c19tb2RlID0gLTE7CisKIAljdHgtPmhhbmdfc3RhdHMuYmFu X3BlcmlvZF9zZWNvbmRzID0gRFJNX0k5MTVfQ1RYX0JBTl9QRVJJT0Q7CiAKIAlyZXR1cm4gY3R4 OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCmluZGV4IGVkYzE3 YmUuLjk4MzNjOGEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4 ZWNidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVy LmMKQEAgLTEyODMsNyArMTI4Myw3IEBAIGk5MTVfZ2VtX3JpbmdidWZmZXJfc3VibWlzc2lvbihz dHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3BhcmFtcyAqcGFyYW1zLAogCQkJZ290byBlcnJvcjsKIAkJ fQogCi0JCWlmIChpbnN0cF9tb2RlICE9IGRldl9wcml2LT5yZWxhdGl2ZV9jb25zdGFudHNfbW9k ZSkgeworCQlpZiAoaW5zdHBfbW9kZSAhPSBwYXJhbXMtPmN0eC0+cmVsYXRpdmVfY29uc3RhbnRz X21vZGUpIHsKIAkJCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA8IDQpIHsKIAkJCQlEUk1fREVC VUcoIm5vIHJlbCBjb25zdGFudHMgb24gcHJlLWdlbjRcbiIpOwogCQkJCXJldCA9IC1FSU5WQUw7 CkBAIC0xMzA5LDcgKzEzMDksNyBAQCBpOTE1X2dlbV9yaW5nYnVmZmVyX3N1Ym1pc3Npb24oc3Ry dWN0IGk5MTVfZXhlY2J1ZmZlcl9wYXJhbXMgKnBhcmFtcywKIAl9CiAKIAlpZiAocmluZyA9PSAm ZGV2X3ByaXYtPnJpbmdbUkNTXSAmJgotCQkJaW5zdHBfbW9kZSAhPSBkZXZfcHJpdi0+cmVsYXRp dmVfY29uc3RhbnRzX21vZGUpIHsKKwkJCWluc3RwX21vZGUgIT0gcGFyYW1zLT5jdHgtPnJlbGF0 aXZlX2NvbnN0YW50c19tb2RlKSB7CiAJCXJldCA9IGludGVsX3JpbmdfYmVnaW4ocGFyYW1zLT5y ZXF1ZXN0LCA0KTsKIAkJaWYgKHJldCkKIAkJCWdvdG8gZXJyb3I7CkBAIC0xMzIwLDcgKzEzMjAs NyBAQCBpOTE1X2dlbV9yaW5nYnVmZmVyX3N1Ym1pc3Npb24oc3RydWN0IGk5MTVfZXhlY2J1ZmZl cl9wYXJhbXMgKnBhcmFtcywKIAkJaW50ZWxfcmluZ19lbWl0KHJpbmcsIGluc3RwX21hc2sgPDwg MTYgfCBpbnN0cF9tb2RlKTsKIAkJaW50ZWxfcmluZ19hZHZhbmNlKHJpbmcpOwogCi0JCWRldl9w cml2LT5yZWxhdGl2ZV9jb25zdGFudHNfbW9kZSA9IGluc3RwX21vZGU7CisJCXBhcmFtcy0+Y3R4 LT5yZWxhdGl2ZV9jb25zdGFudHNfbW9kZSA9IGluc3RwX21vZGU7CiAJfQogCiAJaWYgKGFyZ3Mt PmZsYWdzICYgSTkxNV9FWEVDX0dFTjdfU09MX1JFU0VUKSB7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xy Yy5jCmluZGV4IDgyNWZhN2EuLjlmZjQwOWQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBA IC04ODksNyArODg5LDcgQEAgaW50IGludGVsX2V4ZWNsaXN0c19zdWJtaXNzaW9uKHN0cnVjdCBp OTE1X2V4ZWNidWZmZXJfcGFyYW1zICpwYXJhbXMsCiAJCQlyZXR1cm4gLUVJTlZBTDsKIAkJfQog Ci0JCWlmIChpbnN0cF9tb2RlICE9IGRldl9wcml2LT5yZWxhdGl2ZV9jb25zdGFudHNfbW9kZSkg eworCQlpZiAoaW5zdHBfbW9kZSAhPSBwYXJhbXMtPmN0eC0+cmVsYXRpdmVfY29uc3RhbnRzX21v ZGUpIHsKIAkJCWlmIChpbnN0cF9tb2RlID09IEk5MTVfRVhFQ19DT05TVEFOVFNfUkVMX1NVUkZB Q0UpIHsKIAkJCQlEUk1fREVCVUcoInJlbCBzdXJmYWNlIGNvbnN0YW50cyBtb2RlIGludmFsaWQg b24gZ2VuNStcbiIpOwogCQkJCXJldHVybiAtRUlOVkFMOwpAQCAtOTI5LDcgKzkyOSw3IEBAIGlu dCBpbnRlbF9leGVjbGlzdHNfc3VibWlzc2lvbihzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3BhcmFt cyAqcGFyYW1zLAogCQlyZXR1cm4gcmV0OwogCiAJaWYgKHJpbmcgPT0gJmRldl9wcml2LT5yaW5n W1JDU10gJiYKLQkgICAgaW5zdHBfbW9kZSAhPSBkZXZfcHJpdi0+cmVsYXRpdmVfY29uc3RhbnRz X21vZGUpIHsKKwkgICAgaW5zdHBfbW9kZSAhPSBwYXJhbXMtPmN0eC0+cmVsYXRpdmVfY29uc3Rh bnRzX21vZGUpIHsKIAkJcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHBhcmFtcy0+cmVx dWVzdCwgNCk7CiAJCWlmIChyZXQpCiAJCQlyZXR1cm4gcmV0OwpAQCAtOTQwLDcgKzk0MCw3IEBA IGludCBpbnRlbF9leGVjbGlzdHNfc3VibWlzc2lvbihzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3Bh cmFtcyAqcGFyYW1zLAogCQlpbnRlbF9sb2dpY2FsX3JpbmdfZW1pdChyaW5nYnVmLCBpbnN0cF9t YXNrIDw8IDE2IHwgaW5zdHBfbW9kZSk7CiAJCWludGVsX2xvZ2ljYWxfcmluZ19hZHZhbmNlKHJp bmdidWYpOwogCi0JCWRldl9wcml2LT5yZWxhdGl2ZV9jb25zdGFudHNfbW9kZSA9IGluc3RwX21v ZGU7CisJCXBhcmFtcy0+Y3R4LT5yZWxhdGl2ZV9jb25zdGFudHNfbW9kZSA9IGluc3RwX21vZGU7 CiAJfQogCiAJZXhlY19zdGFydCA9IHBhcmFtcy0+YmF0Y2hfb2JqX3ZtX29mZnNldCArCi0tIAox LjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK