From: Ramalingam C Subject: [PATCH v3 2/4] drm/i915: Read Vprime thrice incase of mismatch Date: Mon, 2 Apr 2018 15:40:32 +0530 Message-ID: <1522663834-24482-3-git-send-email-ramalingam.c@intel.com> References: <1522663834-24482-1-git-send-email-ramalingam.c@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1522663834-24482-1-git-send-email-ramalingam.c@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, dri-devel@lists.freedesktop.org, seanpaul@chromium.org, ville.syrjala@linux.intel.com Cc: rodrigo.vivi@intel.com List-Id: dri-devel@lists.freedesktop.org SW4gY2FzZSBvZiBWIHByaW1lIG1pc21hdGNoLCBEUCBIRENQIHNwZWMgbWFuZGF0ZXMgdGhlIHJl LXJlYWQgb2YKVnByaW1lIGF0bGVhc3QgdHdpY2UuCgpUaGlzIHBhdGNoIG5lZWRlZCBmb3IgRFAg SERDUDEuNCBDVFMgVGVzdDogMUItMDUuCgp2MjoKICBNb3ZlZCB0aGUgVicgdmFsaWRhdGlvbiBp bnRvIGEgZnVuY3Rpb24gZm9yIHJldHJ5LiBbU2VhbiBQYXVsXQp2MzoKICBSZW1vdmVkIElubGlu ZSBrZXl3b3JkIGFuZCBEUk1fREVCVUdfS01TIGFyZSB1c2VkIFtTZWFuIFBhdWxdCgpTaWduZWQt b2ZmLWJ5OiBSYW1hbGluZ2FtIEMgPHJhbWFsaW5nYW0uY0BpbnRlbC5jb20+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfaGRjcC5jIHwgMTEyICsrKysrKysrKysrKysrKysrKysrKysr Ky0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNzAgaW5zZXJ0aW9ucygrKSwgNDIgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaGRjcC5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaGRjcC5jCmluZGV4IDgzOGM4Y2QwZjU0My4u ZTBiYzAzZWVlOTQxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9oZGNw LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaGRjcC5jCkBAIC0xNDIsNTMgKzE0 MiwxNyBAQCBib29sIGludGVsX2hkY3BfaXNfa3N2X3ZhbGlkKHU4ICprc3YpCiAJcmV0dXJuIHRy dWU7CiB9CiAKLS8qIEltcGxlbWVudHMgUGFydCAyIG9mIHRoZSBIRENQIGF1dGhvcml6YXRpb24g cHJvY2VkdXJlICovCiBzdGF0aWMKLWludCBpbnRlbF9oZGNwX2F1dGhfZG93bnN0cmVhbShzdHJ1 Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCwKLQkJCSAgICAgICBjb25zdCBz dHJ1Y3QgaW50ZWxfaGRjcF9zaGltICpzaGltKQoraW50IGludGVsX2hkY3BfdmFsaWRhdGVfdl9w cmltZShzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCwKKwkJCQljb25z dCBzdHJ1Y3QgaW50ZWxfaGRjcF9zaGltICpzaGltLAorCQkJCXU4ICprc3ZfZmlmbywgdTggbnVt X2Rvd25zdHJlYW0sIHU4ICpic3RhdHVzKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdjsKIAl1MzIgdnByaW1lLCBzaGFfdGV4dCwgc2hhX2xlZnRvdmVycywgcmVwX2N0bDsK LQl1OCBic3RhdHVzWzJdLCBudW1fZG93bnN0cmVhbSwgKmtzdl9maWZvOwogCWludCByZXQsIGks IGosIHNoYV9pZHg7CiAKIAlkZXZfcHJpdiA9IGludGVsX2RpZ19wb3J0LT5iYXNlLmJhc2UuZGV2 LT5kZXZfcHJpdmF0ZTsKIAotCXJldCA9IGludGVsX2hkY3BfcG9sbF9rc3ZfZmlmbyhpbnRlbF9k aWdfcG9ydCwgc2hpbSk7Ci0JaWYgKHJldCkgewotCQlEUk1fRVJST1IoIktTViBsaXN0IGZhaWxl ZCB0byBiZWNvbWUgcmVhZHkgKCVkKVxuIiwgcmV0KTsKLQkJcmV0dXJuIHJldDsKLQl9Ci0KLQly ZXQgPSBzaGltLT5yZWFkX2JzdGF0dXMoaW50ZWxfZGlnX3BvcnQsIGJzdGF0dXMpOwotCWlmIChy ZXQpCi0JCXJldHVybiByZXQ7Ci0KLQlpZiAoRFJNX0hEQ1BfTUFYX0RFVklDRV9FWENFRURFRChi c3RhdHVzWzBdKSB8fAotCSAgICBEUk1fSERDUF9NQVhfQ0FTQ0FERV9FWENFRURFRChic3RhdHVz WzFdKSkgewotCQlEUk1fRVJST1IoIk1heCBUb3BvbG9neSBMaW1pdCBFeGNlZWRlZFxuIik7Ci0J CXJldHVybiAtRVBFUk07Ci0JfQotCi0JLyoKLQkgKiBXaGVuIHJlcGVhdGVyIHJlcG9ydHMgMCBk ZXZpY2UgY291bnQsIEhEQ1AxLjQgc3BlYyBhbGxvd3MgZGlzYWJsaW5nCi0JICogdGhlIEhEQ1Ag ZW5jcnlwdGlvbi4gVGhhdCBpbXBsaWVzIHRoYXQgcmVwZWF0ZXIgY2FuJ3QgaGF2ZSBpdHMgb3du Ci0JICogZGlzcGxheS4gQXMgdGhlcmUgaXMgbm8gY29uc3VtcHRpb24gb2YgZW5jcnlwdGVkIGNv bnRlbnQgaW4gdGhlCi0JICogcmVwZWF0ZXIgd2l0aCAwIGRvd25zdHJlYW0gZGV2aWNlcywgd2Ug YXJlIGZhaWxpbmcgdGhlCi0JICogYXV0aGVudGljYXRpb24uCi0JICovCi0JbnVtX2Rvd25zdHJl YW0gPSBEUk1fSERDUF9OVU1fRE9XTlNUUkVBTShic3RhdHVzWzBdKTsKLQlpZiAobnVtX2Rvd25z dHJlYW0gPT0gMCkKLQkJcmV0dXJuIC1FSU5WQUw7Ci0KLQlrc3ZfZmlmbyA9IGt6YWxsb2MobnVt X2Rvd25zdHJlYW0gKiBEUk1fSERDUF9LU1ZfTEVOLCBHRlBfS0VSTkVMKTsKLQlpZiAoIWtzdl9m aWZvKQotCQlyZXR1cm4gLUVOT01FTTsKLQotCXJldCA9IHNoaW0tPnJlYWRfa3N2X2ZpZm8oaW50 ZWxfZGlnX3BvcnQsIG51bV9kb3duc3RyZWFtLCBrc3ZfZmlmbyk7Ci0JaWYgKHJldCkKLQkJcmV0 dXJuIHJldDsKLQogCS8qIFByb2Nlc3MgVicgdmFsdWVzIGZyb20gdGhlIHJlY2VpdmVyICovCiAJ Zm9yIChpID0gMDsgaSA8IERSTV9IRENQX1ZfUFJJTUVfTlVNX1BBUlRTOyBpKyspIHsKIAkJcmV0 ID0gc2hpbS0+cmVhZF92X3ByaW1lX3BhcnQoaW50ZWxfZGlnX3BvcnQsIGksICZ2cHJpbWUpOwpA QCAtMzUzLDcgKzMxNyw4IEBAIGludCBpbnRlbF9oZGNwX2F1dGhfZG93bnN0cmVhbShzdHJ1Y3Qg aW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCwKIAkJCXJldHVybiByZXQ7CiAJCXNo YV9pZHggKz0gc2l6ZW9mKHNoYV90ZXh0KTsKIAl9IGVsc2UgewotCQlEUk1fRVJST1IoIkludmFs aWQgbnVtYmVyIG9mIGxlZnRvdmVycyAlZFxuIiwgc2hhX2xlZnRvdmVycyk7CisJCURSTV9ERUJV R19LTVMoIkludmFsaWQgbnVtYmVyIG9mIGxlZnRvdmVycyAlZFxuIiwKKwkJCSAgICAgIHNoYV9s ZWZ0b3ZlcnMpOwogCQlyZXR1cm4gLUVJTlZBTDsKIAl9CiAKQEAgLTM4MSwxNCArMzQ2LDc3IEBA IGludCBpbnRlbF9oZGNwX2F1dGhfZG93bnN0cmVhbShzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0 ICppbnRlbF9kaWdfcG9ydCwKIAlpZiAoaW50ZWxfd2FpdF9mb3JfcmVnaXN0ZXIoZGV2X3ByaXYs IEhEQ1BfUkVQX0NUTCwKIAkJCQkgICAgSERDUF9TSEExX0NPTVBMRVRFLAogCQkJCSAgICBIRENQ X1NIQTFfQ09NUExFVEUsIDEpKSB7Ci0JCURSTV9FUlJPUigiVGltZWQgb3V0IHdhaXRpbmcgZm9y IFNIQTEgY29tcGxldGVcbiIpOworCQlEUk1fREVCVUdfS01TKCJUaW1lZCBvdXQgd2FpdGluZyBm b3IgU0hBMSBjb21wbGV0ZVxuIik7CiAJCXJldHVybiAtRVRJTUVET1VUOwogCX0KIAlpZiAoIShJ OTE1X1JFQUQoSERDUF9SRVBfQ1RMKSAmIEhEQ1BfU0hBMV9WX01BVENIKSkgewotCQlEUk1fRVJS T1IoIlNIQS0xIG1pc21hdGNoLCBIRENQIGZhaWxlZFxuIik7CisJCURSTV9ERUJVR19LTVMoIlNI QS0xIG1pc21hdGNoLCBIRENQIGZhaWxlZFxuIik7CiAJCXJldHVybiAtRU5YSU87CiAJfQogCisJ cmV0dXJuIDA7Cit9CisKKy8qIEltcGxlbWVudHMgUGFydCAyIG9mIHRoZSBIRENQIGF1dGhvcml6 YXRpb24gcHJvY2VkdXJlICovCitzdGF0aWMKK2ludCBpbnRlbF9oZGNwX2F1dGhfZG93bnN0cmVh bShzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCwKKwkJCSAgICAgICBj b25zdCBzdHJ1Y3QgaW50ZWxfaGRjcF9zaGltICpzaGltKQoreworCXU4IGJzdGF0dXNbMl0sIG51 bV9kb3duc3RyZWFtLCAqa3N2X2ZpZm87CisJaW50IHJldCwgaSwgdHJpZXMgPSAzOworCisJcmV0 ID0gaW50ZWxfaGRjcF9wb2xsX2tzdl9maWZvKGludGVsX2RpZ19wb3J0LCBzaGltKTsKKwlpZiAo cmV0KSB7CisJCURSTV9FUlJPUigiS1NWIGxpc3QgZmFpbGVkIHRvIGJlY29tZSByZWFkeSAoJWQp XG4iLCByZXQpOworCQlyZXR1cm4gcmV0OworCX0KKworCXJldCA9IHNoaW0tPnJlYWRfYnN0YXR1 cyhpbnRlbF9kaWdfcG9ydCwgYnN0YXR1cyk7CisJaWYgKHJldCkKKwkJcmV0dXJuIHJldDsKKwor CWlmIChEUk1fSERDUF9NQVhfREVWSUNFX0VYQ0VFREVEKGJzdGF0dXNbMF0pIHx8CisJICAgIERS TV9IRENQX01BWF9DQVNDQURFX0VYQ0VFREVEKGJzdGF0dXNbMV0pKSB7CisJCURSTV9FUlJPUigi TWF4IFRvcG9sb2d5IExpbWl0IEV4Y2VlZGVkXG4iKTsKKwkJcmV0dXJuIC1FUEVSTTsKKwl9CisK KwkvKgorCSAqIFdoZW4gcmVwZWF0ZXIgcmVwb3J0cyAwIGRldmljZSBjb3VudCwgSERDUDEuNCBz cGVjIGFsbG93cyBkaXNhYmxpbmcKKwkgKiB0aGUgSERDUCBlbmNyeXB0aW9uLiBUaGF0IGltcGxp ZXMgdGhhdCByZXBlYXRlciBjYW4ndCBoYXZlIGl0cyBvd24KKwkgKiBkaXNwbGF5LiBBcyB0aGVy ZSBpcyBubyBjb25zdW1wdGlvbiBvZiBlbmNyeXB0ZWQgY29udGVudCBpbiB0aGUKKwkgKiByZXBl YXRlciB3aXRoIDAgZG93bnN0cmVhbSBkZXZpY2VzLCB3ZSBhcmUgZmFpbGluZyB0aGUKKwkgKiBh dXRoZW50aWNhdGlvbi4KKwkgKi8KKwludW1fZG93bnN0cmVhbSA9IERSTV9IRENQX05VTV9ET1dO U1RSRUFNKGJzdGF0dXNbMF0pOworCWlmIChudW1fZG93bnN0cmVhbSA9PSAwKQorCQlyZXR1cm4g LUVJTlZBTDsKKworCWtzdl9maWZvID0ga3phbGxvYyhudW1fZG93bnN0cmVhbSAqIERSTV9IRENQ X0tTVl9MRU4sIEdGUF9LRVJORUwpOworCWlmICgha3N2X2ZpZm8pCisJCXJldHVybiAtRU5PTUVN OworCisJcmV0ID0gc2hpbS0+cmVhZF9rc3ZfZmlmbyhpbnRlbF9kaWdfcG9ydCwgbnVtX2Rvd25z dHJlYW0sIGtzdl9maWZvKTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0OworCisJLyoKKwkgKiBX aGVuIFYgcHJpbWUgbWlzbWF0Y2hlcywgRFAgU3BlYyBtYW5kYXRlcyByZS1yZWFkIG9mCisJICog ViBwcmltZSBhdGxlYXN0IHR3aWNlLgorCSAqLworCWZvciAoaSA9IDA7IGkgPCB0cmllczsgaSsr KSB7CisJCXJldCA9IGludGVsX2hkY3BfdmFsaWRhdGVfdl9wcmltZShpbnRlbF9kaWdfcG9ydCwg c2hpbSwKKwkJCQkJCSAga3N2X2ZpZm8sIG51bV9kb3duc3RyZWFtLAorCQkJCQkJICBic3RhdHVz KTsKKwkJaWYgKCFyZXQpCisJCQlicmVhazsKKwl9CisKKwlpZiAoaSA9PSB0cmllcykgeworCQlE Uk1fRVJST1IoIlYgUHJpbWUgdmFsaWRhdGlvbiBmYWlsZWQuKCVkKVxuIiwgcmV0KTsKKwkJcmV0 dXJuIHJldDsKKwl9CisKIAlEUk1fREVCVUdfS01TKCJIRENQIGlzIGVuYWJsZWQgKCVkIGRvd25z dHJlYW0gZGV2aWNlcylcbiIsCiAJCSAgICAgIG51bV9kb3duc3RyZWFtKTsKIAlyZXR1cm4gMDsK LS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK