From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michel Thierry Subject: [PATCH v4] drm/i915: Initialize workarounds in logical ring mode too Date: Tue, 11 Nov 2014 16:47:33 +0000 Message-ID: <1415724453-21648-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 087886E64E for ; Tue, 11 Nov 2014 08:47:35 -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 bSB0aGUgY29udGV4dCAoTWlrYS9EYW5pZWwpLgoKdjQ6IE1lcmdlIGluaXRfY29udGV4dCBpbnRl cmZhY2VzIGJhY2ssIHRoZSBsZWdhY3kgbW9kZSBvbmx5IG5lZWRzIHRoZSByaW5nLApidXQgdGhl IGxyYyBtb2RlIG5lZWRzIHRoZSByaW5nIGFuZCBjb250ZXh0IChNaWthKS4KCklzc3VlOiBWSVot NDA5MgpJc3N1ZTogR01JTi0zNDc1CkNoYW5nZS1JZDogSWUzZDA5M2IyNTQyYWIwZTJhNDRiOTA0 NjA1MzNlMmY5Nzk3ODhkNmMKQ2M6IERlZXBhayBTIDxkZWVwYWsuc0BpbnRlbC5jb20+CkNjOiBN aWthIEt1b3BwYWxhIDxtaWthLmt1b3BwYWxhQGxpbnV4LmludGVsLmNvbT4KQ2M6IERhbmllbCBW ZXR0ZXIgPGRhbmllbEBmZndsbC5jaD4KU2lnbmVkLW9mZi1ieTogTWljaGVsIFRoaWVycnkgPG1p Y2hlbC50aGllcnJ5QGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogQXJ1biBTaWx1dmVyeSA8YXJ1 bi5zaWx1dmVyeUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW1fY29udGV4dC5jIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5j ICAgICAgICB8IDQ3ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIHwgIDUgKystLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIHwgIDUgKysrLQogNCBmaWxlcyBjaGFuZ2VkLCA1NCBp bnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2NvbnRleHQuYwppbmRleCBjNGRhYzE5Li5kN2U3MjQ3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fY29udGV4dC5jCkBAIC02NjMsNyArNjYzLDcgQEAgZG9uZToKIAogCWlmICh1bmlu aXRpYWxpemVkKSB7CiAJCWlmIChyaW5nLT5pbml0X2NvbnRleHQpIHsKLQkJCXJldCA9IHJpbmct PmluaXRfY29udGV4dChyaW5nKTsKKwkJCXJldCA9IHJpbmctPmluaXRfY29udGV4dChyaW5nLCB0 byk7CiAJCQlpZiAocmV0KQogCQkJCURSTV9FUlJPUigicmluZyBpbml0IGNvbnRleHQ6ICVkXG4i LCByZXQpOwogCQl9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IDc4YzNkZmMuLmNiM2Jj MTEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC0xMDcyLDYgKzEwNzIsNDQgQEAgaW50 IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbihzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1 ZiwgaW50IG51bV9kd29yZHMpCiAJcmV0dXJuIDA7CiB9CiAKK3N0YXRpYyBpbnQgaW50ZWxfbG9n aWNhbF9yaW5nX3dvcmthcm91bmRzX2VtaXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywK KwkgICAgICAgc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCkKK3sKKwlpbnQgcmV0LCBpOworCXN0 cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmID0gY3R4LT5lbmdpbmVbcmluZy0+aWRdLnJp bmdidWY7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHJpbmctPmRldjsKKwlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOworCXN0cnVjdCBpOTE1 X3dvcmthcm91bmRzICp3ID0gJmRldl9wcml2LT53b3JrYXJvdW5kczsKKworCWlmIChXQVJOX09O KHctPmNvdW50ID09IDApKQorCQlyZXR1cm4gMDsKKworCXJpbmctPmdwdV9jYWNoZXNfZGlydHkg PSB0cnVlOworCXJldCA9IGxvZ2ljYWxfcmluZ19mbHVzaF9hbGxfY2FjaGVzKHJpbmdidWYpOwor CWlmIChyZXQpCisJCXJldHVybiByZXQ7CisKKwlyZXQgPSBpbnRlbF9sb2dpY2FsX3JpbmdfYmVn aW4ocmluZ2J1Ziwgdy0+Y291bnQgKiAyICsgMik7CisJaWYgKHJldCkKKwkJcmV0dXJuIHJldDsK KworCWludGVsX2xvZ2ljYWxfcmluZ19lbWl0KHJpbmdidWYsIE1JX0xPQURfUkVHSVNURVJfSU1N KHctPmNvdW50KSk7CisJZm9yIChpID0gMDsgaSA8IHctPmNvdW50OyBpKyspIHsKKwkJaW50ZWxf bG9naWNhbF9yaW5nX2VtaXQocmluZ2J1Ziwgdy0+cmVnW2ldLmFkZHIpOworCQlpbnRlbF9sb2dp Y2FsX3JpbmdfZW1pdChyaW5nYnVmLCB3LT5yZWdbaV0udmFsdWUpOworCX0KKwlpbnRlbF9sb2dp Y2FsX3JpbmdfZW1pdChyaW5nYnVmLCBNSV9OT09QKTsKKworCWludGVsX2xvZ2ljYWxfcmluZ19h ZHZhbmNlKHJpbmdidWYpOworCisJcmluZy0+Z3B1X2NhY2hlc19kaXJ0eSA9IHRydWU7CisJcmV0 ID0gbG9naWNhbF9yaW5nX2ZsdXNoX2FsbF9jYWNoZXMocmluZ2J1Zik7CisJaWYgKHJldCkKKwkJ cmV0dXJuIHJldDsKKworCXJldHVybiAwOworfQorCiBzdGF0aWMgaW50IGdlbjhfaW5pdF9jb21t b25fcmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogewogCXN0cnVjdCBkcm1fZGV2 aWNlICpkZXYgPSByaW5nLT5kZXY7CkBAIC0xMTE1LDcgKzExNTMsNyBAQCBzdGF0aWMgaW50IGdl bjhfaW5pdF9yZW5kZXJfcmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogCiAJSTkx NV9XUklURShJTlNUUE0sIF9NQVNLRURfQklUX0VOQUJMRShJTlNUUE1fRk9SQ0VfT1JERVJJTkcp KTsKIAotCXJldHVybiByZXQ7CisJcmV0dXJuIGluaXRfd29ya2Fyb3VuZHNfcmluZyhyaW5nKTsK IH0KIAogc3RhdGljIGludCBnZW44X2VtaXRfYmJfc3RhcnQoc3RydWN0IGludGVsX3JpbmdidWZm ZXIgKnJpbmdidWYsCkBAIC0xMzY2LDYgKzE0MDQsNyBAQCBzdGF0aWMgaW50IGxvZ2ljYWxfcmVu ZGVyX3JpbmdfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlyaW5nLT5pcnFfa2VlcF9t YXNrIHw9IEdUX1JFTkRFUl9MM19QQVJJVFlfRVJST1JfSU5URVJSVVBUOwogCiAJcmluZy0+aW5p dCA9IGdlbjhfaW5pdF9yZW5kZXJfcmluZzsKKwlyaW5nLT5pbml0X2NvbnRleHQgPSBpbnRlbF9s b2dpY2FsX3Jpbmdfd29ya2Fyb3VuZHNfZW1pdDsKIAlyaW5nLT5jbGVhbnVwID0gaW50ZWxfZmlu aV9waXBlX2NvbnRyb2w7CiAJcmluZy0+Z2V0X3NlcW5vID0gZ2VuOF9nZXRfc2Vxbm87CiAJcmlu Zy0+c2V0X3NlcW5vID0gZ2VuOF9zZXRfc2Vxbm87CkBAIC0xODcwLDYgKzE5MDksMTIgQEAgaW50 IGludGVsX2xyX2NvbnRleHRfZGVmZXJyZWRfY3JlYXRlKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpj dHgsCiAJfQogCiAJaWYgKHJpbmctPmlkID09IFJDUyAmJiAhY3R4LT5yY3NfaW5pdGlhbGl6ZWQp IHsKKwkJaWYgKHJpbmctPmluaXRfY29udGV4dCkgeworCQkJcmV0ID0gcmluZy0+aW5pdF9jb250 ZXh0KHJpbmcsIGN0eCk7CisJCQlpZiAocmV0KQorCQkJCURSTV9FUlJPUigicmluZyBpbml0IGNv bnRleHQ6ICVkXG4iLCByZXQpOworCQl9CisKIAkJcmV0ID0gaW50ZWxfbHJfY29udGV4dF9yZW5k ZXJfc3RhdGVfaW5pdChyaW5nLCBjdHgpOwogCQlpZiAocmV0KSB7CiAJCQlEUk1fRVJST1IoIklu aXQgcmVuZGVyIHN0YXRlIGZhaWxlZDogJWRcbiIsIHJldCk7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9yaW5nYnVmZmVyLmMKaW5kZXggOThmMjc4Ny4uOWUxNzQzMiAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtNjc3LDcgKzY3Nyw4IEBAIGVycjoKIAlyZXR1 cm4gcmV0OwogfQogCi1zdGF0aWMgaW50IGludGVsX3Jpbmdfd29ya2Fyb3VuZHNfZW1pdChzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQorc3RhdGljIGludCBpbnRlbF9yaW5nX3dvcmthcm91 bmRzX2VtaXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKKwkJc3RydWN0IGludGVsX2Nv bnRleHQgKmN0eCkKIHsKIAlpbnQgcmV0LCBpOwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBy aW5nLT5kZXY7CkBAIC04MTgsNyArODE5LDcgQEAgc3RhdGljIGludCBjaHZfaW5pdF93b3JrYXJv dW5kcyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogCXJldHVybiAwOwogfQogCi1zdGF0 aWMgaW50IGluaXRfd29ya2Fyb3VuZHNfcmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5n KQoraW50IGluaXRfd29ya2Fyb3VuZHNfcmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5n KQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSByaW5nLT5kZXY7CiAJc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3JpbmdidWZmZXIuaAppbmRleCBmMGU3NzYxLi44NmM0NDQ3IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCkBAIC0xNDgsNyArMTQ4LDggQEAgc3RydWN0 ICBpbnRlbF9lbmdpbmVfY3MgewogCiAJaW50CQkoKmluaXQpKHN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKnJpbmcpOwogCi0JaW50CQkoKmluaXRfY29udGV4dCkoc3RydWN0IGludGVsX2VuZ2luZV9j cyAqcmluZyk7CisJaW50CQkoKmluaXRfY29udGV4dCkoc3RydWN0IGludGVsX2VuZ2luZV9jcyAq cmluZywKKwkJCQkgICAgICBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4KTsKIAogCXZvaWQJCSgq d3JpdGVfdGFpbCkoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAkJCQkgICAgICB1MzIg dmFsdWUpOwpAQCAtNDI5LDYgKzQzMCw4IEBAIGludCBpbnRlbF9pbml0X3ZlYm94X3JpbmdfYnVm ZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogdTY0IGludGVsX3JpbmdfZ2V0X2FjdGl2ZV9o ZWFkKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpOwogdm9pZCBpbnRlbF9yaW5nX3NldHVw X3N0YXR1c19wYWdlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpOwogCitpbnQgaW5pdF93 b3JrYXJvdW5kc19yaW5nKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpOworCiBzdGF0aWMg aW5saW5lIHUzMiBpbnRlbF9yaW5nX2dldF90YWlsKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpy aW5nYnVmKQogewogCXJldHVybiByaW5nYnVmLT50YWlsOwotLSAKMi4xLjEKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==