From: Imre Deak Subject: [PATCH v2] drm/i915/gen9: Fix DMC firmware initialization Date: Fri, 4 Mar 2016 21:57:41 +0200 Message-ID: <1457121461-16729-1-git-send-email-imre.deak@intel.com> References: <1457111962-11687-1-git-send-email-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 5E4266E6FF for ; Fri, 4 Mar 2016 19:57:43 +0000 (UTC) In-Reply-To: <1457111962-11687-1-git-send-email-imre.deak@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: Mika Kuoppala List-Id: intel-gfx@lists.freedesktop.org SW4gY29tbWl0IDFlNjU3YWQ3IHdlIG1vdmVkIHRoZSBsYXN0IHN0ZXAgb2YgZmlybXdhcmUgaW5p dGlhbGl6YXRpb24gdG8Kc2tsX2Rpc3BsYXlfY29yZV9pbml0KCksIHdoZXJlIGl0IHdpbGwgYmUg cnVuIG9ubHkgZHVyaW5nIHN5c3RlbSByZXN1bWUsCmJ1dCBub3QgZHVyaW5nIGRyaXZlciBsb2Fk aW5nLiBTaW5jZSB0aGlzIGluaXQgc3RlcCBuZWVkcyB0byBiZSBkb25lCndoZW5ldmVyIHdlIHBy b2dyYW0gdGhlIGZpcm13YXJlIGZpeCB0aGlzIGJ5IG1vdmluZyB0aGUgaW5pdGlhbGl6YXRpb24K dG8gdGhlIGVuZCBvZiBpbnRlbF9jc3JfbG9hZF9wcm9ncmFtKCkuCgpXaGlsZSBhdCBpdCBzaW1w bGlmeSBhIGJpdCBjc3JfbG9hZF93b3JrX2ZuKCkuCgpUaGlzIGlzc3VlIHByZXZlbnRlZCBEQzUv NiB0cmFuc2l0aW9ucywgdGhpcyBjaGFuZ2Ugd2lsbCByZS1lbmFibGUgdGhvc2UuCgp2MjoKLSBy ZW1vdmUgZGVidWdnaW5nIGxlZnQtb3ZlciBhbmQgcmVkdW5kYW50IGNvbW1lbnQgaW4gY3NyX2xv YWRfd29ya19mbigpCgpGaXhlczogMWU2NTdhZDdhNDhmICgiZHJtL2k5MTUvZ2VuOTogV3JpdGUg ZGMgc3RhdGUgZGVidWdtYXNrIGJpdHMgb25seSBvbmNlIikKQ0M6IE1pa2EgS3VvcHBhbGEgPG1p a2Eua3VvcHBhbGFAaW50ZWwuY29tPgpDQzogUGF0cmlrIEpha29ic3NvbiA8cGF0cmlrLmpha29i c3NvbkBsaW51eC5pbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IEltcmUgRGVhayA8aW1yZS5kZWFr QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jc3IuYyAgICAgICAg fCA0MCArKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rydi5oICAgICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9ydW50aW1lX3BtLmMgfCAyMiArKy0tLS0tLS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwg MjkgaW5zZXJ0aW9ucygrKSwgMzUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfY3NyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jc3Iu YwppbmRleCA5MDIwNTRlLi5kNDE3ZDlhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9jc3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jc3IuYwpAQCAt MjEyLDYgKzIxMiwyNCBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IHN0ZXBwaW5nX2luZm8gKmludGVs X2dldF9zdGVwcGluZ19pbmZvKHN0cnVjdCBkcm1fZGV2aWNlICpkZQogCXJldHVybiBOVUxMOwog fQogCitzdGF0aWMgdm9pZCBnZW45X3NldF9kY19zdGF0ZV9kZWJ1Z21hc2soc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQoreworCXVpbnQzMl90IHZhbCwgbWFzazsKKworCW1hc2sg PSBEQ19TVEFURV9ERUJVR19NQVNLX01FTU9SWV9VUDsKKworCWlmIChJU19CUk9YVE9OKGRldl9w cml2KSkKKwkJbWFzayB8PSBEQ19TVEFURV9ERUJVR19NQVNLX0NPUkVTOworCisJLyogVGhlIGJl bG93IGJpdCBkb2Vzbid0IG5lZWQgdG8gYmUgY2xlYXJlZCBldmVyIGFmdGVyd2FyZHMgKi8KKwl2 YWwgPSBJOTE1X1JFQUQoRENfU1RBVEVfREVCVUcpOworCWlmICgodmFsICYgbWFzaykgIT0gbWFz aykgeworCQl2YWwgfD0gbWFzazsKKwkJSTkxNV9XUklURShEQ19TVEFURV9ERUJVRywgdmFsKTsK KwkJUE9TVElOR19SRUFEKERDX1NUQVRFX0RFQlVHKTsKKwl9Cit9CisKIC8qKgogICogaW50ZWxf Y3NyX2xvYWRfcHJvZ3JhbSgpIC0gd3JpdGUgdGhlIGZpcm13YXJlIGZyb20gbWVtb3J5IHRvIHJl Z2lzdGVyLgogICogQGRldl9wcml2OiBpOTE1IGRybSBkZXZpY2UuCkBAIC0yMjAsMTkgKzIzOCwx OSBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IHN0ZXBwaW5nX2luZm8gKmludGVsX2dldF9zdGVwcGlu Z19pbmZvKHN0cnVjdCBkcm1fZGV2aWNlICpkZQogICogRXZlcnl0aW1lIGRpc3BsYXkgY29tZXMg YmFjayBmcm9tIGxvdyBwb3dlciBzdGF0ZSB0aGlzIGZ1bmN0aW9uIGlzIGNhbGxlZCB0bwogICog Y29weSB0aGUgZmlybXdhcmUgZnJvbSBpbnRlcm5hbCBtZW1vcnkgdG8gcmVnaXN0ZXJzLgogICov Ci1ib29sIGludGVsX2Nzcl9sb2FkX3Byb2dyYW0oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KQordm9pZCBpbnRlbF9jc3JfbG9hZF9wcm9ncmFtKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKIHsKIAl1MzIgKnBheWxvYWQgPSBkZXZfcHJpdi0+Y3NyLmRtY19wYXls b2FkOwogCXVpbnQzMl90IGksIGZ3X3NpemU7CiAKIAlpZiAoIUlTX0dFTjkoZGV2X3ByaXYpKSB7 CiAJCURSTV9FUlJPUigiTm8gQ1NSIHN1cHBvcnQgYXZhaWxhYmxlIGZvciB0aGlzIHBsYXRmb3Jt XG4iKTsKLQkJcmV0dXJuIGZhbHNlOworCQlyZXR1cm47CiAJfQogCiAJaWYgKCFkZXZfcHJpdi0+ Y3NyLmRtY19wYXlsb2FkKSB7CiAJCURSTV9FUlJPUigiVHJpZWQgdG8gcHJvZ3JhbSBDU1Igd2l0 aCBlbXB0eSBwYXlsb2FkXG4iKTsKLQkJcmV0dXJuIGZhbHNlOworCQlyZXR1cm47CiAJfQogCiAJ Zndfc2l6ZSA9IGRldl9wcml2LT5jc3IuZG1jX2Z3X3NpemU7CkBAIC0yNDYsNyArMjY0LDcgQEAg Ym9vbCBpbnRlbF9jc3JfbG9hZF9wcm9ncmFtKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdikKIAogCWRldl9wcml2LT5jc3IuZGNfc3RhdGUgPSAwOwogCi0JcmV0dXJuIHRydWU7CisJ Z2VuOV9zZXRfZGNfc3RhdGVfZGVidWdtYXNrKGRldl9wcml2KTsKIH0KIAogc3RhdGljIHVpbnQz Ml90ICpwYXJzZV9jc3JfZncoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LApAQCAt Mzg4LDE4ICs0MDYsMTIgQEAgc3RhdGljIHZvaWQgY3NyX2xvYWRfd29ya19mbihzdHJ1Y3Qgd29y a19zdHJ1Y3QgKndvcmspCiAKIAlyZXQgPSByZXF1ZXN0X2Zpcm13YXJlKCZmdywgZGV2X3ByaXYt PmNzci5md19wYXRoLAogCQkJICAgICAgICZkZXZfcHJpdi0+ZGV2LT5wZGV2LT5kZXYpOwotCWlm ICghZncpCi0JCWdvdG8gb3V0OworCWlmIChmdykKKwkJZGV2X3ByaXYtPmNzci5kbWNfcGF5bG9h ZCA9IHBhcnNlX2Nzcl9mdyhkZXZfcHJpdiwgZncpOwogCi0JZGV2X3ByaXYtPmNzci5kbWNfcGF5 bG9hZCA9IHBhcnNlX2Nzcl9mdyhkZXZfcHJpdiwgZncpOwotCWlmICghZGV2X3ByaXYtPmNzci5k bWNfcGF5bG9hZCkKLQkJZ290byBvdXQ7Ci0KLQkvKiBsb2FkIGNzciBwcm9ncmFtIGR1cmluZyBz eXN0ZW0gYm9vdCwgYXMgbmVlZGVkIGZvciBEQyBzdGF0ZXMgKi8KLQlpbnRlbF9jc3JfbG9hZF9w cm9ncmFtKGRldl9wcml2KTsKLQotb3V0OgogCWlmIChkZXZfcHJpdi0+Y3NyLmRtY19wYXlsb2Fk KSB7CisJCWludGVsX2Nzcl9sb2FkX3Byb2dyYW0oZGV2X3ByaXYpOworCiAJCWludGVsX2Rpc3Bs YXlfcG93ZXJfcHV0KGRldl9wcml2LCBQT1dFUl9ET01BSU5fSU5JVCk7CiAKIAkJRFJNX0lORk8o IkZpbmlzaGVkIGxvYWRpbmcgJXMgKHYldS4ldSlcbiIsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5o CmluZGV4IGNkMGI0ZWEuLjNkYWYxZTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC0x Mjc5LDcgKzEyNzksNyBAQCB1MzIgc2tsX3BsYW5lX2N0bF9yb3RhdGlvbih1bnNpZ25lZCBpbnQg cm90YXRpb24pOwogCiAvKiBpbnRlbF9jc3IuYyAqLwogdm9pZCBpbnRlbF9jc3JfdWNvZGVfaW5p dChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqKTsKLWJvb2wgaW50ZWxfY3NyX2xvYWRfcHJvZ3Jh bShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqKTsKK3ZvaWQgaW50ZWxfY3NyX2xvYWRfcHJvZ3Jh bShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqKTsKIHZvaWQgaW50ZWxfY3NyX3Vjb2RlX2Zpbmko c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKik7CiAKIC8qIGludGVsX2RwLmMgKi8KZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYwppbmRleCAwOWM1MmIxLi41YWRmNGIzIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jCkBAIC00NzAsMjQgKzQ3MCw2IEBA IHN0YXRpYyB2b2lkIGFzc2VydF9jYW5fZGlzYWJsZV9kYzkoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KQogCSAgKi8KIH0KIAotc3RhdGljIHZvaWQgZ2VuOV9zZXRfZGNfc3RhdGVf ZGVidWdtYXNrKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKLXsKLQl1aW50MzJf dCB2YWwsIG1hc2s7Ci0KLQltYXNrID0gRENfU1RBVEVfREVCVUdfTUFTS19NRU1PUllfVVA7Ci0K LQlpZiAoSVNfQlJPWFRPTihkZXZfcHJpdikpCi0JCW1hc2sgfD0gRENfU1RBVEVfREVCVUdfTUFT S19DT1JFUzsKLQotCS8qIFRoZSBiZWxvdyBiaXQgZG9lc24ndCBuZWVkIHRvIGJlIGNsZWFyZWQg ZXZlciBhZnRlcndhcmRzICovCi0JdmFsID0gSTkxNV9SRUFEKERDX1NUQVRFX0RFQlVHKTsKLQlp ZiAoKHZhbCAmIG1hc2spICE9IG1hc2spIHsKLQkJdmFsIHw9IG1hc2s7Ci0JCUk5MTVfV1JJVEUo RENfU1RBVEVfREVCVUcsIHZhbCk7Ci0JCVBPU1RJTkdfUkVBRChEQ19TVEFURV9ERUJVRyk7Ci0J fQotfQotCiBzdGF0aWMgdm9pZCBnZW45X3dyaXRlX2RjX3N0YXRlKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwKIAkJCQl1MzIgc3RhdGUpCiB7CkBAIC0yMTQxLDggKzIxMjMsOCBA QCBzdGF0aWMgdm9pZCBza2xfZGlzcGxheV9jb3JlX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2LAogCiAJc2tsX2luaXRfY2RjbGsoZGV2X3ByaXYpOwogCi0JaWYgKGRldl9w cml2LT5jc3IuZG1jX3BheWxvYWQgJiYgaW50ZWxfY3NyX2xvYWRfcHJvZ3JhbShkZXZfcHJpdikp Ci0JCWdlbjlfc2V0X2RjX3N0YXRlX2RlYnVnbWFzayhkZXZfcHJpdik7CisJaWYgKGRldl9wcml2 LT5jc3IuZG1jX3BheWxvYWQpCisJCWludGVsX2Nzcl9sb2FkX3Byb2dyYW0oZGV2X3ByaXYpOwog fQogCiBzdGF0aWMgdm9pZCBza2xfZGlzcGxheV9jb3JlX3VuaW5pdChzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpCi0tIAoyLjUuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vaW50ZWwtZ2Z4Cg==