From: Dave Gordon Subject: [PATCH] drm/i915: don't track relative-constants-mode Date: Thu, 22 Oct 2015 19:09:03 +0100 Message-ID: <1445537343-10587-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id BC76F6E5D0 for ; Thu, 22 Oct 2015 11:09:34 -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 aWNlLCBidXQgdGhpcwpoYXMgYWN0dWFsbHkgYmVlbiB3cm9uZyBldmVyIHNpbmNlIGhhcmR3YXJl IGNvbnRleHRzIHdlcmUgaW50cm9kdWNlZCwgYXMKdGhlIElOU1RQTSByZWdpc3RlciBpcyBzYXZl ZCAoYW5kIGF1dG9tYXRpY2FsbHkgcmVzdG9yZWQpIGFzIHBhcnQgb2YgdGhlCnJlbmRlciByaW5n IGNvbnRleHQuIFRoZSBzb2Z0d2FyZSBwZXItZGV2aWNlIHZhbHVlIGNvdWxkIHRoZXJlZm9yZSBn ZXQKb3V0IG9mIHN5bmMgd2l0aCB0aGUgaGFyZHdhcmUgcGVyLWNvbnRleHQgdmFsdWUuCgpSYXRo ZXIgdGhhbiB0cmFjayB0aGlzIGNvcnJlY3RseSAocGVyLWNvbnRleHQpLCBhIHNpbXBsZXIgc29s dXRpb24gaXMKanVzdCB0byBnaXZlIHVwIHRyeWluZyB0byB0cmFjayBpdCBhdCBhbGwsIGFuZCBh bHdheXMgcHJlZml4IGVhY2ggcmVuZGVyCmJhdGNoIHdpdGggdGhlIHNpbmdsZSBpbnN0cnVjdGlv biBuZWVkZWQgdG8gZXhwbGljaXRseSBzZXQgaXQgdG8gdGhlCnJlcXVpcmVkIG1vZGUgZm9yIHRo ZSBjdXJyZW50IGJhdGNoLgoKVGVzdCBjYXNlIChpZiBhbnlvbmUgd2FudHMgdG8gd3JpdGUgaXQp IHdvdWxkIGJlIHRvIGNyZWF0ZSB0d28gY29udGV4dHMsCnN1Ym1pdCBhIGJhdGNoIHdpdGggYSBu b24tZGVmYXVsdCBtb2RlIGluIHRoZSBmaXJzdCBjb250ZXh0LCBzdWJtaXQgYQpiYXRjaCB3aXRo IHRoZSBkZWZhdWx0IG1vZGUgaW4gdGhlIG90aGVyIGNvbnRleHQsIHN1Ym1pdCBhbm90aGVyIGJh dGNoCmluIHRoZSBmaXJzdCBjb250ZXh0LCBidXQgdGhpcyB0aW1lIGluIGRlZmF1bHQgbW9kZS4g V2l0aG91dCB0aGlzIHBhdGNoLAp0aGUgZHJpdmVyIHdpbGwgZmFpbCB0byBpbnNlcnQgdGhlIGlu c3RydWN0aW9ucyB0byByZXNldCBJTlNUUE0gaW50bwp0aGUgZmlyc3QgY29udGV4dCdzIHJpbmdi dWZmZXIuCgpCdWd6aWxsYTogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5j Z2k/aWQ9OTI0NDgKClNpZ25lZC1vZmYtYnk6IERhdmUgR29yZG9uIDxkYXZpZC5zLmdvcmRvbkBp bnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgICAg IHwgIDIgLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAgICAgICAgICB8ICAy IC0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMgfCAzMiArKysr KysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xy Yy5jICAgICAgICAgICB8IDIwICsrKysrKysrLS0tLS0tLS0tLS0KIDQgZmlsZXMgY2hhbmdlZCwg MjIgaW5zZXJ0aW9ucygrKSwgMzQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgK aW5kZXggOWExNWViZS4uOWRkYmI5MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0xNzA3 LDggKzE3MDcsNiBAQCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSB7CiAKIAljb25zdCBzdHJ1Y3Qg aW50ZWxfZGV2aWNlX2luZm8gaW5mbzsKIAotCWludCByZWxhdGl2ZV9jb25zdGFudHNfbW9kZTsK LQogCXZvaWQgX19pb21lbSAqcmVnczsKIAogCXN0cnVjdCBpbnRlbF91bmNvcmUgdW5jb3JlOwpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggZDBmYTU0OC4uNzY5OTgyYSAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbS5jCkBAIC00OTQ3LDggKzQ5NDcsNiBAQCBpOTE1X2dlbV9sb2FkKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCiAJCQkgIGk5MTVfZ2VtX2lkbGVfd29ya19oYW5kbGVyKTsKIAlpbml0 X3dhaXRxdWV1ZV9oZWFkKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLnJlc2V0X3F1ZXVlKTsKIAotCWRl dl9wcml2LT5yZWxhdGl2ZV9jb25zdGFudHNfbW9kZSA9IEk5MTVfRVhFQ19DT05TVEFOVFNfUkVM X0dFTkVSQUw7Ci0KIAlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gNyAmJiAhSVNfVkFMTEVZ VklFVyhkZXYpKQogCQlkZXZfcHJpdi0+bnVtX2ZlbmNlX3JlZ3MgPSAzMjsKIAllbHNlIGlmIChJ TlRFTF9JTkZPKGRldiktPmdlbiA+PSA0IHx8IElTX0k5NDVHKGRldikgfHwgSVNfSTk0NUdNKGRl dikgfHwgSVNfRzMzKGRldikpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9leGVjYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVm ZmVyLmMKaW5kZXggNmVkN2Q2M2EuLjA3YWUxMmQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9leGVjYnVmZmVyLmMKQEAgLTEyMTEsMzAgKzEyMTEsMjggQEAgaTkxNV9nZW1fcmlu Z2J1ZmZlcl9zdWJtaXNzaW9uKHN0cnVjdCBpOTE1X2V4ZWNidWZmZXJfcGFyYW1zICpwYXJhbXMs CiAJCQlyZXR1cm4gLUVJTlZBTDsKIAkJfQogCi0JCWlmIChpbnN0cF9tb2RlICE9IGRldl9wcml2 LT5yZWxhdGl2ZV9jb25zdGFudHNfbW9kZSkgewotCQkJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2Vu IDwgNCkgewotCQkJCURSTV9ERUJVRygibm8gcmVsIGNvbnN0YW50cyBvbiBwcmUtZ2VuNFxuIik7 Ci0JCQkJcmV0dXJuIC1FSU5WQUw7Ci0JCQl9Ci0KLQkJCWlmIChJTlRFTF9JTkZPKGRldiktPmdl biA+IDUgJiYKLQkJCSAgICBpbnN0cF9tb2RlID09IEk5MTVfRVhFQ19DT05TVEFOVFNfUkVMX1NV UkZBQ0UpIHsKLQkJCQlEUk1fREVCVUcoInJlbCBzdXJmYWNlIGNvbnN0YW50cyBtb2RlIGludmFs aWQgb24gZ2VuNStcbiIpOwotCQkJCXJldHVybiAtRUlOVkFMOwotCQkJfQorCQlpZiAoSU5URUxf SU5GTyhkZXYpLT5nZW4gPCA0KSB7CisJCQlEUk1fREVCVUcoIm5vIHJlbCBjb25zdGFudHMgb24g cHJlLWdlbjRcbiIpOworCQkJcmV0dXJuIC1FSU5WQUw7CisJCX0KIAotCQkJLyogVGhlIEhXIGNo YW5nZWQgdGhlIG1lYW5pbmcgb24gdGhpcyBiaXQgb24gZ2VuNiAqLwotCQkJaWYgKElOVEVMX0lO Rk8oZGV2KS0+Z2VuID49IDYpCi0JCQkJaW5zdHBfbWFzayAmPSB+STkxNV9FWEVDX0NPTlNUQU5U U19SRUxfU1VSRkFDRTsKKwkJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID4gNSAmJgorCQkgICAg aW5zdHBfbW9kZSA9PSBJOTE1X0VYRUNfQ09OU1RBTlRTX1JFTF9TVVJGQUNFKSB7CisJCQlEUk1f REVCVUcoInJlbCBzdXJmYWNlIGNvbnN0YW50cyBtb2RlIGludmFsaWQgb24gZ2VuNStcbiIpOwor CQkJcmV0dXJuIC1FSU5WQUw7CiAJCX0KKworCQkvKiBUaGUgSFcgY2hhbmdlZCB0aGUgbWVhbmlu ZyBvbiB0aGlzIGJpdCBvbiBnZW42ICovCisJCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA2 KQorCQkJaW5zdHBfbWFzayAmPSB+STkxNV9FWEVDX0NPTlNUQU5UU19SRUxfU1VSRkFDRTsKKwog CQlicmVhazsKIAlkZWZhdWx0OgogCQlEUk1fREVCVUcoImV4ZWNidWYgd2l0aCB1bmtub3duIGNv bnN0YW50czogJWRcbiIsIGluc3RwX21vZGUpOwogCQlyZXR1cm4gLUVJTlZBTDsKIAl9CiAKLQlp ZiAocmluZyA9PSAmZGV2X3ByaXYtPnJpbmdbUkNTXSAmJgotCSAgICBpbnN0cF9tb2RlICE9IGRl dl9wcml2LT5yZWxhdGl2ZV9jb25zdGFudHNfbW9kZSkgeworCWlmIChyaW5nID09ICZkZXZfcHJp di0+cmluZ1tSQ1NdKSB7CiAJCXJldCA9IGludGVsX3JpbmdfYmVnaW4ocGFyYW1zLT5yZXF1ZXN0 LCA0KTsKIAkJaWYgKHJldCkKIAkJCXJldHVybiByZXQ7CkBAIC0xMjQ0LDggKzEyNDIsNiBAQCBp OTE1X2dlbV9yaW5nYnVmZmVyX3N1Ym1pc3Npb24oc3RydWN0IGk5MTVfZXhlY2J1ZmZlcl9wYXJh bXMgKnBhcmFtcywKIAkJaW50ZWxfcmluZ19lbWl0KHJpbmcsIElOU1RQTSk7CiAJCWludGVsX3Jp bmdfZW1pdChyaW5nLCBpbnN0cF9tYXNrIDw8IDE2IHwgaW5zdHBfbW9kZSk7CiAJCWludGVsX3Jp bmdfYWR2YW5jZShyaW5nKTsKLQotCQlkZXZfcHJpdi0+cmVsYXRpdmVfY29uc3RhbnRzX21vZGUg PSBpbnN0cF9tb2RlOwogCX0KIAogCWlmIChhcmdzLT5mbGFncyAmIEk5MTVfRVhFQ19HRU43X1NP TF9SRVNFVCkgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCAzMjY1NDI3Li44YjNmZThm IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtODg5LDE1ICs4ODksMTQgQEAgaW50IGlu dGVsX2V4ZWNsaXN0c19zdWJtaXNzaW9uKHN0cnVjdCBpOTE1X2V4ZWNidWZmZXJfcGFyYW1zICpw YXJhbXMsCiAJCQlyZXR1cm4gLUVJTlZBTDsKIAkJfQogCi0JCWlmIChpbnN0cF9tb2RlICE9IGRl dl9wcml2LT5yZWxhdGl2ZV9jb25zdGFudHNfbW9kZSkgewotCQkJaWYgKGluc3RwX21vZGUgPT0g STkxNV9FWEVDX0NPTlNUQU5UU19SRUxfU1VSRkFDRSkgewotCQkJCURSTV9ERUJVRygicmVsIHN1 cmZhY2UgY29uc3RhbnRzIG1vZGUgaW52YWxpZCBvbiBnZW41K1xuIik7Ci0JCQkJcmV0dXJuIC1F SU5WQUw7Ci0JCQl9Ci0KLQkJCS8qIFRoZSBIVyBjaGFuZ2VkIHRoZSBtZWFuaW5nIG9uIHRoaXMg Yml0IG9uIGdlbjYgKi8KLQkJCWluc3RwX21hc2sgJj0gfkk5MTVfRVhFQ19DT05TVEFOVFNfUkVM X1NVUkZBQ0U7CisJCWlmIChpbnN0cF9tb2RlID09IEk5MTVfRVhFQ19DT05TVEFOVFNfUkVMX1NV UkZBQ0UpIHsKKwkJCURSTV9ERUJVRygicmVsIHN1cmZhY2UgY29uc3RhbnRzIG1vZGUgaW52YWxp ZCBvbiBnZW41K1xuIik7CisJCQlyZXR1cm4gLUVJTlZBTDsKIAkJfQorCisJCS8qIFRoZSBIVyBj aGFuZ2VkIHRoZSBtZWFuaW5nIG9uIHRoaXMgYml0IG9uIGdlbjYgKi8KKwkJaW5zdHBfbWFzayAm PSB+STkxNV9FWEVDX0NPTlNUQU5UU19SRUxfU1VSRkFDRTsKKwogCQlicmVhazsKIAlkZWZhdWx0 OgogCQlEUk1fREVCVUcoImV4ZWNidWYgd2l0aCB1bmtub3duIGNvbnN0YW50czogJWRcbiIsIGlu c3RwX21vZGUpOwpAQCAtOTEzLDggKzkxMiw3IEBAIGludCBpbnRlbF9leGVjbGlzdHNfc3VibWlz c2lvbihzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3BhcmFtcyAqcGFyYW1zLAogCWlmIChyZXQpCiAJ CXJldHVybiByZXQ7CiAKLQlpZiAocmluZyA9PSAmZGV2X3ByaXYtPnJpbmdbUkNTXSAmJgotCSAg ICBpbnN0cF9tb2RlICE9IGRldl9wcml2LT5yZWxhdGl2ZV9jb25zdGFudHNfbW9kZSkgeworCWlm IChyaW5nID09ICZkZXZfcHJpdi0+cmluZ1tSQ1NdKSB7CiAJCXJldCA9IGludGVsX2xvZ2ljYWxf cmluZ19iZWdpbihwYXJhbXMtPnJlcXVlc3QsIDQpOwogCQlpZiAocmV0KQogCQkJcmV0dXJuIHJl dDsKQEAgLTkyNCw4ICs5MjIsNiBAQCBpbnQgaW50ZWxfZXhlY2xpc3RzX3N1Ym1pc3Npb24oc3Ry dWN0IGk5MTVfZXhlY2J1ZmZlcl9wYXJhbXMgKnBhcmFtcywKIAkJaW50ZWxfbG9naWNhbF9yaW5n X2VtaXQocmluZ2J1ZiwgSU5TVFBNKTsKIAkJaW50ZWxfbG9naWNhbF9yaW5nX2VtaXQocmluZ2J1 ZiwgaW5zdHBfbWFzayA8PCAxNiB8IGluc3RwX21vZGUpOwogCQlpbnRlbF9sb2dpY2FsX3Jpbmdf YWR2YW5jZShyaW5nYnVmKTsKLQotCQlkZXZfcHJpdi0+cmVsYXRpdmVfY29uc3RhbnRzX21vZGUg PSBpbnN0cF9tb2RlOwogCX0KIAogCWV4ZWNfc3RhcnQgPSBwYXJhbXMtPmJhdGNoX29ial92bV9v ZmZzZXQgKwotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==