From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michel Thierry Subject: [PATCH v3] drm/i915: Initialize workarounds in logical ring mode too Date: Tue, 11 Nov 2014 15:49:55 +0000 Message-ID: <1415720995-3706-1-git-send-email-michel.thierry@intel.com> References: <1414516762-27254-1-git-send-email-arun.siluvery@linux.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 2BF086E737 for ; Tue, 11 Nov 2014 07:49:59 -0800 (PST) In-Reply-To: <1414516762-27254-1-git-send-email-arun.siluvery@linux.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 Cc: Deepak S List-Id: intel-gfx@lists.freedesktop.org Rm9sbG93aW5nIHRoZSBsZWdhY3kgcmluZyBzdWJtaXNzaW9uIGV4YW1wbGUsIHVwZGF0ZSB0aGUK cmluZy0+aW5pdF9jb250ZXh0KCkgaG9vayB0byBzdXBwb3J0IHRoZSBleGVjbGlzdCBzdWJtaXNz aW9uIG1vZGUuCgp2MjogdXBkYXRlIHRvIHVzZSB0aGUgbmV3IHdvcmthcm91bmQgbWFjcm9zIGFu ZCBjbGVhbnVwIHVudXNlZCBjb2RlLgpUaGlzIHRha2VzIGNhcmUgb2YgYm90aCBiZHcgYW5kIGNo diB3b3JrYXJvdW5kcy4KCnYyLjE6IEFkZCBtaXNzaW5nIGNhbGwgdG8gaW5pdF9jb250ZXh0KCkg ZHVyaW5nIGRlZmVycmVkIGNvbnRleHQgY3JlYXRpb24uCgp2MzogU3BsaXQgaW5pdF9jb250ZXh0 IChlbWl0KSBpbiBsZWdhY3kvbHJjIG1vZGVzLiBGb3IgbHJjLCBnZXQgdGhlIHJpbmdidWYKZnJv bSB0aGUgY29udGV4dC4gKE1pa2EvRGFuaWVsKS4KCklzc3VlOiBWSVotNDA5MgpJc3N1ZTogR01J Ti0zNDc1CkNoYW5nZS1JZDogSWUzZDA5M2IyNTQyYWIwZTJhNDRiOTA0NjA1MzNlMmY5Nzk3ODhk NmMKQ2M6IERlZXBhayBTIDxkZWVwYWsuc0BpbnRlbC5jb20+CkNjOiBNaWthIEt1b3BwYWxhIDxt aWthLmt1b3BwYWxhQGxpbnV4LmludGVsLmNvbT4KQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbEBm ZndsbC5jaD4KU2lnbmVkLW9mZi1ieTogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGlu dGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogQXJ1biBTaWx1dmVyeSA8YXJ1bi5zaWx1dmVyeUBsaW51 eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAg IHwgNDcgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcmluZ2J1ZmZlci5oIHwgIDQgKysrCiAzIGZpbGVzIGNoYW5nZWQsIDUxIGluc2VydGlvbnMo KyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCA3OGMzZGZj Li42OWQ2NzJiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtMTA3Miw2ICsxMDcyLDQ0 IEBAIGludCBpbnRlbF9sb2dpY2FsX3JpbmdfYmVnaW4oc3RydWN0IGludGVsX3JpbmdidWZmZXIg KnJpbmdidWYsIGludCBudW1fZHdvcmRzKQogCXJldHVybiAwOwogfQogCitzdGF0aWMgaW50IGlu dGVsX2xvZ2ljYWxfcmluZ193b3JrYXJvdW5kc19lbWl0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KnJpbmcsCisJICAgICAgIHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgpCit7CisJaW50IHJldCwg aTsKKwlzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiA9IGN0eC0+ZW5naW5lW3Jpbmct PmlkXS5yaW5nYnVmOworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSByaW5nLT5kZXY7CisJc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKKwlzdHJ1 Y3QgaTkxNV93b3JrYXJvdW5kcyAqdyA9ICZkZXZfcHJpdi0+d29ya2Fyb3VuZHM7CisKKwlpZiAo V0FSTl9PTih3LT5jb3VudCA9PSAwKSkKKwkJcmV0dXJuIDA7CisKKwlyaW5nLT5ncHVfY2FjaGVz X2RpcnR5ID0gdHJ1ZTsKKwlyZXQgPSBsb2dpY2FsX3JpbmdfZmx1c2hfYWxsX2NhY2hlcyhyaW5n YnVmKTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0OworCisJcmV0ID0gaW50ZWxfbG9naWNhbF9y aW5nX2JlZ2luKHJpbmdidWYsIHctPmNvdW50ICogMiArIDIpOworCWlmIChyZXQpCisJCXJldHVy biByZXQ7CisKKwlpbnRlbF9sb2dpY2FsX3JpbmdfZW1pdChyaW5nYnVmLCBNSV9MT0FEX1JFR0lT VEVSX0lNTSh3LT5jb3VudCkpOworCWZvciAoaSA9IDA7IGkgPCB3LT5jb3VudDsgaSsrKSB7CisJ CWludGVsX2xvZ2ljYWxfcmluZ19lbWl0KHJpbmdidWYsIHctPnJlZ1tpXS5hZGRyKTsKKwkJaW50 ZWxfbG9naWNhbF9yaW5nX2VtaXQocmluZ2J1Ziwgdy0+cmVnW2ldLnZhbHVlKTsKKwl9CisJaW50 ZWxfbG9naWNhbF9yaW5nX2VtaXQocmluZ2J1ZiwgTUlfTk9PUCk7CisKKwlpbnRlbF9sb2dpY2Fs X3JpbmdfYWR2YW5jZShyaW5nYnVmKTsKKworCXJpbmctPmdwdV9jYWNoZXNfZGlydHkgPSB0cnVl OworCXJldCA9IGxvZ2ljYWxfcmluZ19mbHVzaF9hbGxfY2FjaGVzKHJpbmdidWYpOworCWlmIChy ZXQpCisJCXJldHVybiByZXQ7CisKKwlyZXR1cm4gMDsKK30KKwogc3RhdGljIGludCBnZW44X2lu aXRfY29tbW9uX3Jpbmcoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIHsKIAlzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2ID0gcmluZy0+ZGV2OwpAQCAtMTExNSw3ICsxMTUzLDcgQEAgc3RhdGlj IGludCBnZW44X2luaXRfcmVuZGVyX3Jpbmcoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykK IAogCUk5MTVfV1JJVEUoSU5TVFBNLCBfTUFTS0VEX0JJVF9FTkFCTEUoSU5TVFBNX0ZPUkNFX09S REVSSU5HKSk7CiAKLQlyZXR1cm4gcmV0OworCXJldHVybiBpbml0X3dvcmthcm91bmRzX3Jpbmco cmluZyk7CiB9CiAKIHN0YXRpYyBpbnQgZ2VuOF9lbWl0X2JiX3N0YXJ0KHN0cnVjdCBpbnRlbF9y aW5nYnVmZmVyICpyaW5nYnVmLApAQCAtMTM2Niw2ICsxNDA0LDcgQEAgc3RhdGljIGludCBsb2dp Y2FsX3JlbmRlcl9yaW5nX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJcmluZy0+aXJx X2tlZXBfbWFzayB8PSBHVF9SRU5ERVJfTDNfUEFSSVRZX0VSUk9SX0lOVEVSUlVQVDsKIAogCXJp bmctPmluaXQgPSBnZW44X2luaXRfcmVuZGVyX3Jpbmc7CisJcmluZy0+aW5pdF9jb250ZXh0X2xy YyA9IGludGVsX2xvZ2ljYWxfcmluZ193b3JrYXJvdW5kc19lbWl0OwogCXJpbmctPmNsZWFudXAg PSBpbnRlbF9maW5pX3BpcGVfY29udHJvbDsKIAlyaW5nLT5nZXRfc2Vxbm8gPSBnZW44X2dldF9z ZXFubzsKIAlyaW5nLT5zZXRfc2Vxbm8gPSBnZW44X3NldF9zZXFubzsKQEAgLTE4NzAsNiArMTkw OSwxMiBAQCBpbnQgaW50ZWxfbHJfY29udGV4dF9kZWZlcnJlZF9jcmVhdGUoc3RydWN0IGludGVs X2NvbnRleHQgKmN0eCwKIAl9CiAKIAlpZiAocmluZy0+aWQgPT0gUkNTICYmICFjdHgtPnJjc19p bml0aWFsaXplZCkgeworCQlpZiAocmluZy0+aW5pdF9jb250ZXh0X2xyYykgeworCQkJcmV0ID0g cmluZy0+aW5pdF9jb250ZXh0X2xyYyhyaW5nLCBjdHgpOworCQkJaWYgKHJldCkKKwkJCQlEUk1f RVJST1IoInJpbmcgaW5pdCBjb250ZXh0OiAlZFxuIiwgcmV0KTsKKwkJfQorCiAJCXJldCA9IGlu dGVsX2xyX2NvbnRleHRfcmVuZGVyX3N0YXRlX2luaXQocmluZywgY3R4KTsKIAkJaWYgKHJldCkg ewogCQkJRFJNX0VSUk9SKCJJbml0IHJlbmRlciBzdGF0ZSBmYWlsZWQ6ICVkXG4iLCByZXQpOwpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4IDk4ZjI3ODcuLmI3ZjMy YjkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKQEAgLTgxOCw3ICs4 MTgsNyBAQCBzdGF0aWMgaW50IGNodl9pbml0X3dvcmthcm91bmRzKHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKnJpbmcpCiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyBpbnQgaW5pdF93b3JrYXJvdW5k c19yaW5nKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCitpbnQgaW5pdF93b3JrYXJvdW5k c19yaW5nKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiB7CiAJc3RydWN0IGRybV9kZXZp Y2UgKmRldiA9IHJpbmctPmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSBkZXYtPmRldl9wcml2YXRlOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcmluZ2J1ZmZlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5o CmluZGV4IGYwZTc3NjEuLmE2YzQ0NTggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3JpbmdidWZmZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5n YnVmZmVyLmgKQEAgLTE0OSw2ICsxNDksOCBAQCBzdHJ1Y3QgIGludGVsX2VuZ2luZV9jcyB7CiAJ aW50CQkoKmluaXQpKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpOwogCiAJaW50CQkoKmlu aXRfY29udGV4dCkoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7CisJaW50CQkoKmluaXRf Y29udGV4dF9scmMpKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCisJCQkJICAgICAgc3Ry dWN0IGludGVsX2NvbnRleHQgKmN0eCk7CiAKIAl2b2lkCQkoKndyaXRlX3RhaWwpKHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJCQkJICAgICAgdTMyIHZhbHVlKTsKQEAgLTQyOSw2ICs0 MzEsOCBAQCBpbnQgaW50ZWxfaW5pdF92ZWJveF9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KTsKIHU2NCBpbnRlbF9yaW5nX2dldF9hY3RpdmVfaGVhZChzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICpyaW5nKTsKIHZvaWQgaW50ZWxfcmluZ19zZXR1cF9zdGF0dXNfcGFnZShzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICpyaW5nKTsKIAoraW50IGluaXRfd29ya2Fyb3VuZHNfcmluZyhzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKKwogc3RhdGljIGlubGluZSB1MzIgaW50ZWxfcmlu Z19nZXRfdGFpbChzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZikKIHsKIAlyZXR1cm4g cmluZ2J1Zi0+dGFpbDsKLS0gCjIuMS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2ludGVsLWdmeAo=