From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arun Siluvery Subject: [PATCH] drm/i915: Initialize workarounds in logical ring mode too Date: Tue, 28 Oct 2014 17:19:21 +0000 Message-ID: <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 357F66E48E for ; Tue, 28 Oct 2014 10:29:46 -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 Cc: Deepak S List-Id: intel-gfx@lists.freedesktop.org RnJvbTogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGludGVsLmNvbT4KCkZvbGxvd2lu ZyB0aGUgbGVnYWN5IHJpbmcgc3VibWlzc2lvbiBleGFtcGxlLCB1cGRhdGUgdGhlCnJpbmctPmlu aXRfY29udGV4dCgpIGhvb2sgdG8gc3VwcG9ydCB0aGUgZXhlY2xpc3Qgc3VibWlzc2lvbiBtb2Rl LgoKdjI6IHVwZGF0ZSB0byB1c2UgdGhlIG5ldyB3b3JrYXJvdW5kIG1hY3JvcyBhbmQgY2xlYW51 cCB1bnVzZWQgY29kZS4KVGhpcyB0YWtlcyBjYXJlIG9mIGJvdGggYmR3IGFuZCBjaHYgd29ya2Fy b3VuZHMuCgp2Mi4xOiBBZGQgbWlzc2luZyBjYWxsIHRvIGluaXRfY29udGV4dCgpIGR1cmluZyBk ZWZlcnJlZCBjb250ZXh0IGNyZWF0aW9uLgoKSXNzdWU6IFZJWi00MDkyCklzc3VlOiBHTUlOLTM0 NzUKQ2hhbmdlLUlkOiBJZTNkMDkzYjI1NDJhYjBlMmE0NGI5MDQ2MDUzM2UyZjk3OTc4OGQ2YwpD YzogRGVlcGFrIFMgPGRlZXBhay5zQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogTWljaGVsIFRo aWVycnkgPG1pY2hlbC50aGllcnJ5QGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogQXJ1biBTaWx1 dmVyeSA8YXJ1bi5zaWx1dmVyeUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fY29udGV4dC5jIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2xyYy5jICAgICAgICB8IDQ2ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIHwgIDUgKystLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIHwgIDQgKystCiA0IGZpbGVzIGNoYW5n ZWQsIDUyIGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fY29udGV4dC5jCmluZGV4IGE1MjIxZDguLmEzNzY2OGYgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKQEAgLTYyOSw3ICs2MjksNyBAQCBkb25lOgogCiAJ aWYgKHVuaW5pdGlhbGl6ZWQpIHsKIAkJaWYgKHJpbmctPmluaXRfY29udGV4dCkgewotCQkJcmV0 ID0gcmluZy0+aW5pdF9jb250ZXh0KHJpbmcpOworCQkJcmV0ID0gcmluZy0+aW5pdF9jb250ZXh0 KHJpbmctPmJ1ZmZlcik7CiAJCQlpZiAocmV0KQogCQkJCURSTV9FUlJPUigicmluZyBpbml0IGNv bnRleHQ6ICVkXG4iLCByZXQpOwogCQl9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IGNk NzRlNWMuLmYzZWZkYmQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xy Yy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC05OTEsNiArOTkx LDQzIEBAIGludCBpbnRlbF9sb2dpY2FsX3JpbmdfYmVnaW4oc3RydWN0IGludGVsX3JpbmdidWZm ZXIgKnJpbmdidWYsIGludCBudW1fZHdvcmRzKQogCXJldHVybiAwOwogfQogCitzdGF0aWMgaW50 IGludGVsX2xvZ2ljYWxfcmluZ193b3JrYXJvdW5kc19lbWl0KHN0cnVjdCBpbnRlbF9yaW5nYnVm ZmVyICpyaW5nYnVmKQoreworCWludCByZXQsIGk7CisJc3RydWN0IGludGVsX2VuZ2luZV9jcyAq cmluZyA9IHJpbmdidWYtPnJpbmc7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHJpbmctPmRl djsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRl OworCXN0cnVjdCBpOTE1X3dvcmthcm91bmRzICp3ID0gJmRldl9wcml2LT53b3JrYXJvdW5kczsK KworCWlmIChXQVJOX09OKHctPmNvdW50ID09IDApKQorCQlyZXR1cm4gMDsKKworCXJpbmctPmdw dV9jYWNoZXNfZGlydHkgPSB0cnVlOworCXJldCA9IGxvZ2ljYWxfcmluZ19mbHVzaF9hbGxfY2Fj aGVzKHJpbmdidWYpOworCWlmIChyZXQpCisJCXJldHVybiByZXQ7CisKKwlyZXQgPSBpbnRlbF9s b2dpY2FsX3JpbmdfYmVnaW4ocmluZ2J1Ziwgdy0+Y291bnQgKiAyICsgMik7CisJaWYgKHJldCkK KwkJcmV0dXJuIHJldDsKKworCWludGVsX2xvZ2ljYWxfcmluZ19lbWl0KHJpbmdidWYsIE1JX0xP QURfUkVHSVNURVJfSU1NKHctPmNvdW50KSk7CisJZm9yIChpID0gMDsgaSA8IHctPmNvdW50OyBp KyspIHsKKwkJaW50ZWxfbG9naWNhbF9yaW5nX2VtaXQocmluZ2J1Ziwgdy0+cmVnW2ldLmFkZHIp OworCQlpbnRlbF9sb2dpY2FsX3JpbmdfZW1pdChyaW5nYnVmLCB3LT5yZWdbaV0udmFsdWUpOwor CX0KKwlpbnRlbF9sb2dpY2FsX3JpbmdfZW1pdChyaW5nYnVmLCBNSV9OT09QKTsKKworCWludGVs X2xvZ2ljYWxfcmluZ19hZHZhbmNlKHJpbmdidWYpOworCisJcmluZy0+Z3B1X2NhY2hlc19kaXJ0 eSA9IHRydWU7CisJcmV0ID0gbG9naWNhbF9yaW5nX2ZsdXNoX2FsbF9jYWNoZXMocmluZ2J1Zik7 CisJaWYgKHJldCkKKwkJcmV0dXJuIHJldDsKKworCXJldHVybiAwOworfQorCiBzdGF0aWMgaW50 IGdlbjhfaW5pdF9jb21tb25fcmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogewog CXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSByaW5nLT5kZXY7CkBAIC0xMDM0LDcgKzEwNzEsNyBA QCBzdGF0aWMgaW50IGdlbjhfaW5pdF9yZW5kZXJfcmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICpyaW5nKQogCiAJSTkxNV9XUklURShJTlNUUE0sIF9NQVNLRURfQklUX0VOQUJMRShJTlNUUE1f Rk9SQ0VfT1JERVJJTkcpKTsKIAotCXJldHVybiByZXQ7CisJcmV0dXJuIGluaXRfd29ya2Fyb3Vu ZHNfcmluZyhyaW5nKTsKIH0KIAogc3RhdGljIGludCBnZW44X2VtaXRfYmJfc3RhcnQoc3RydWN0 IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCkBAIC0xMjgyLDYgKzEzMTksNyBAQCBzdGF0aWMg aW50IGxvZ2ljYWxfcmVuZGVyX3JpbmdfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQly aW5nLT5pcnFfa2VlcF9tYXNrIHw9IEdUX1JFTkRFUl9MM19QQVJJVFlfRVJST1JfSU5URVJSVVBU OwogCiAJcmluZy0+aW5pdCA9IGdlbjhfaW5pdF9yZW5kZXJfcmluZzsKKwlyaW5nLT5pbml0X2Nv bnRleHQgPSBpbnRlbF9sb2dpY2FsX3Jpbmdfd29ya2Fyb3VuZHNfZW1pdDsKIAlyaW5nLT5jbGVh bnVwID0gaW50ZWxfZmluaV9waXBlX2NvbnRyb2w7CiAJcmluZy0+Z2V0X3NlcW5vID0gZ2VuOF9n ZXRfc2Vxbm87CiAJcmluZy0+c2V0X3NlcW5vID0gZ2VuOF9zZXRfc2Vxbm87CkBAIC0xNzQ1LDYg KzE3ODMsMTIgQEAgaW50IGludGVsX2xyX2NvbnRleHRfZGVmZXJyZWRfY3JlYXRlKHN0cnVjdCBp bnRlbF9jb250ZXh0ICpjdHgsCiAJfQogCiAJaWYgKHJpbmctPmlkID09IFJDUyAmJiAhY3R4LT5y Y3NfaW5pdGlhbGl6ZWQpIHsKKwkJaWYgKHJpbmctPmluaXRfY29udGV4dCkgeworCQkJcmV0ID0g cmluZy0+aW5pdF9jb250ZXh0KHJpbmdidWYpOworCQkJaWYgKHJldCkKKwkJCQlEUk1fRVJST1Io InJpbmcgaW5pdCBjb250ZXh0OiAlZFxuIiwgcmV0KTsKKwkJfQorCiAJCXJldCA9IGludGVsX2xy X2NvbnRleHRfcmVuZGVyX3N0YXRlX2luaXQocmluZywgY3R4KTsKIAkJaWYgKHJldCkgewogCQkJ RFJNX0VSUk9SKCJJbml0IHJlbmRlciBzdGF0ZSBmYWlsZWQ6ICVkXG4iLCByZXQpOwpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4IDM2OGIyMGEuLjcwNDQyZmEgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKQEAgLTY2NSw5ICs2NjUsMTAg QEAgZXJyOgogCXJldHVybiByZXQ7CiB9CiAKLXN0YXRpYyBpbnQgaW50ZWxfcmluZ193b3JrYXJv dW5kc19lbWl0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCitzdGF0aWMgaW50IGludGVs X3Jpbmdfd29ya2Fyb3VuZHNfZW1pdChzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZikK IHsKIAlpbnQgcmV0LCBpOworCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcgPSByaW5nYnVm LT5yaW5nOwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSByaW5nLT5kZXY7CiAJc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaTkx NV93b3JrYXJvdW5kcyAqdyA9ICZkZXZfcHJpdi0+d29ya2Fyb3VuZHM7CkBAIC04MDYsNyArODA3 LDcgQEAgc3RhdGljIGludCBjaHZfaW5pdF93b3JrYXJvdW5kcyhzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICpyaW5nKQogCXJldHVybiAwOwogfQogCi1zdGF0aWMgaW50IGluaXRfd29ya2Fyb3VuZHNf cmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQoraW50IGluaXRfd29ya2Fyb3VuZHNf cmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogewogCXN0cnVjdCBkcm1fZGV2aWNl ICpkZXYgPSByaW5nLT5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g ZGV2LT5kZXZfcHJpdmF0ZTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3JpbmdidWZmZXIuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaApp bmRleCA5NjQ3OWM4Li5hNjllZjhiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9yaW5nYnVmZmVyLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1 ZmZlci5oCkBAIC0xNDgsNyArMTQ4LDcgQEAgc3RydWN0ICBpbnRlbF9lbmdpbmVfY3MgewogCiAJ aW50CQkoKmluaXQpKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpOwogCi0JaW50CQkoKmlu aXRfY29udGV4dCkoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7CisJaW50CQkoKmluaXRf Y29udGV4dCkoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYpOwogCiAJdm9pZAkJKCp3 cml0ZV90YWlsKShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCQkJCSAgICAgIHUzMiB2 YWx1ZSk7CkBAIC00MjQsNiArNDI0LDggQEAgaW50IGludGVsX2luaXRfdmVib3hfcmluZ19idWZm ZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiB1NjQgaW50ZWxfcmluZ19nZXRfYWN0aXZlX2hl YWQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7CiB2b2lkIGludGVsX3Jpbmdfc2V0dXBf c3RhdHVzX3BhZ2Uoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7CiAKK2ludCBpbml0X3dv cmthcm91bmRzX3Jpbmcoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7CisKIHN0YXRpYyBp bmxpbmUgdTMyIGludGVsX3JpbmdfZ2V0X3RhaWwoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJp bmdidWYpCiB7CiAJcmV0dXJuIHJpbmdidWYtPnRhaWw7Ci0tIAoyLjEuMgoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK