From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 09/15] drm/i915: Trick CL2 into life on CHV when using pipe B with port B Date: Wed, 8 Jul 2015 23:45:55 +0300 Message-ID: <1436388361-11130-10-git-send-email-ville.syrjala@linux.intel.com> References: <1436388361-11130-1-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 229CE6EBDB for ; Wed, 8 Jul 2015 13:46:49 -0700 (PDT) In-Reply-To: <1436388361-11130-1-git-send-email-ville.syrjala@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"@freedesktop.org, deepak.s@intel.com List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCk5v cm1tYWxseSB0aGUgY29tbW9uIGxhbmUgaW4gYSBQSFkgY2hhbm5lbCBnZXRzIHBvd2VyZWQgdXAg d2hlbiBzb21lCm9mIHRoZSBkYXRhIGxhbmVzIGdldCBwb3dlcmVkIHVwLiBCdXQgd2hlbiB3ZSdy ZSBkcml2aW5nIHBvcnQgQiB3aXRoCnBpcGUgQiB3ZSBkb24ndCB3YW50IHRvIGVuYWJsZWQgYW55 IG9mIHRoZSBkYXRhIGxhbmVzLCBhbmQganVzdCB3YW50CnRoZSBEUExMIGluIHRoZSBjb21tb24g bGFuZSB0byBiZSBhY3RpdmUuCgpUbyBtYWtlIHRoYXQgaGFwcGVucyB3ZSBoYXZlIHRvIHRlbXBv cmFyaWx5IGVuYWJsZSBzb21lIGRhdGEgbGFuZXMKYWZ0ZXIgd2hpY2ggd2UgY2FuIGFjY2VzcyB0 aGUgRFBMTCByZWdpc3RlcnMgaW4gdGhlIGNvbW1vbiBsYW5lLiBPbmNlCnRoZSBwaXBlIGlzIHVw IGFuZCBydW5uaW5nIHdlIGNhbiBkcm9wIHRoZSBwb3dlciBvdmVycmlkZSBvbiB0aGUgZGF0YQps YW5lcyBhbGxvd2luZyB0aGVtIHRvIHNodXQgZG93bi4gRnJvbSB0aGlzIHBvaW50IGZvcndhcmQg dGhlIGNvbW1vbgpsYW5lIHdpbGwgaW4gZmFjdCBzdGF5IHBvd2VyZWQgb24gdW50aWwgdGhlIGRh dGEgbGFuZXMgaW4gdGhlIG90aGVyCmNoYW5uZWwgZ2V0IHBvd2VyZWQgZG93bi4KClNpZ25lZC1v ZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyAgICAgICAgIHwgMjMgKysrKysrKysr KysrKysrKysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICAgICB8 ICAzICsrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaGRtaS5jICAgICAgIHwgMjMgKysr KysrKysrKysrKysrKysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVf cG0uYyB8IDI5ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiA0IGZpbGVzIGNoYW5nZWQs IDc4IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwppbmRleCA2MDU4MTI5Li44 ZDA4OGYzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKQEAgLTI4NjUsNiArMjg2NSwxMiBAQCBz dGF0aWMgdm9pZCBjaHZfcHJlX2VuYWJsZV9kcChzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2Rl cikKIAltdXRleF91bmxvY2soJmRldl9wcml2LT5zYl9sb2NrKTsKIAogCWludGVsX2VuYWJsZV9k cChlbmNvZGVyKTsKKworCS8qIFNlY29uZCBjb21tb24gbGFuZSB3aWxsIHN0YXkgYWxpdmUgb24g aXRzIG93biBub3cgKi8KKwlpZiAoZHBvcnQtPnJlbGVhc2VfY2wyX292ZXJyaWRlKSB7CisJCWNo dl9waHlfcG93ZXJnYXRlX2NoKGRldl9wcml2LCBEUElPX1BIWTAsIERQSU9fQ0gxLCBmYWxzZSk7 CisJCWRwb3J0LT5yZWxlYXNlX2NsMl9vdmVycmlkZSA9IGZhbHNlOworCX0KIH0KIAogc3RhdGlj IHZvaWQgY2h2X2RwX3ByZV9wbGxfZW5hYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVy KQpAQCAtMjg4Miw2ICsyODg4LDE0IEBAIHN0YXRpYyB2b2lkIGNodl9kcF9wcmVfcGxsX2VuYWJs ZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcikKIAogCWludGVsX2RwX3ByZXBhcmUoZW5j b2Rlcik7CiAKKwkvKgorCSAqIE11c3QgdHJpY2sgdGhlIHNlY29uZCBjb21tb24gbGFuZSBpbnRv IGxpZmUuCisJICogT3RoZXJ3aXNlIHdlIGNhbid0IGV2ZW4gYWNjZXNzIHRoZSBQTEwuCisJICov CisJaWYgKGNoID09IERQSU9fQ0gwICYmIHBpcGUgPT0gUElQRV9CKQorCQlkcG9ydC0+cmVsZWFz ZV9jbDJfb3ZlcnJpZGUgPQorCQkJIWNodl9waHlfcG93ZXJnYXRlX2NoKGRldl9wcml2LCBEUElP X1BIWTAsIERQSU9fQ0gxLCB0cnVlKTsKKwogCWNodl9waHlfcG93ZXJnYXRlX2xhbmVzKGVuY29k ZXIsIHRydWUsIGxhbmVfbWFzayk7CiAKIAltdXRleF9sb2NrKCZkZXZfcHJpdi0+c2JfbG9jayk7 CkBAIC0yOTYwLDYgKzI5NzQsMTUgQEAgc3RhdGljIHZvaWQgY2h2X2RwX3Bvc3RfcGxsX2Rpc2Fi bGUoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIpCiAKIAltdXRleF91bmxvY2soJmRldl9w cml2LT5zYl9sb2NrKTsKIAorCS8qCisJICogTGVhdmUgdGhlIHBvd2VyIGRvd24gYml0IGNsZWFy ZWQgZm9yIGF0IGxlYXN0IG9uZQorCSAqIGxhbmUgc28gdGhhdCBjaHZfcG93ZXJnYXRlX3BoeV9j aCgpIHdpbGwgcG93ZXIKKwkgKiBvbiBzb21ldGhpbmcgd2hlbiB0aGUgY2hhbm5lbCBpcyBvdGhl cndpc2UgdW51c2VkLgorCSAqIFdoZW4gdGhlIHBvcnQgaXMgb2ZmIGFuZCB0aGUgb3ZlcnJpZGUg aXMgcmVtb3ZlZAorCSAqIHRoZSBsYW5lcyBwb3dlciBkb3duIGFueXdheSwgc28gb3RoZXJ3aXNl IGl0IGRvZXNuJ3QKKwkgKiByZWFsbHkgbWF0dGVyIHdoYXQgdGhlIHN0YXRlIG9mIHBvd2VyIGRv d24gYml0cyBpcworCSAqIGFmdGVyIHRoaXMuCisJICovCiAJY2h2X3BoeV9wb3dlcmdhdGVfbGFu ZXMoZW5jb2RlciwgZmFsc2UsIDB4MCk7CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5k ZXggZjhhMTZkYy4uNjEzM2E5OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTc4Miw2 ICs3ODIsNyBAQCBzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0IHsKIAlzdHJ1Y3QgaW50ZWxfZHAg ZHA7CiAJc3RydWN0IGludGVsX2hkbWkgaGRtaTsKIAllbnVtIGlycXJldHVybiAoKmhwZF9wdWxz ZSkoc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqLCBib29sKTsKKwlib29sIHJlbGVhc2VfY2wy X292ZXJyaWRlOwogfTsKIAogc3RydWN0IGludGVsX2RwX21zdF9lbmNvZGVyIHsKQEAgLTEzNzIs NiArMTM3Myw4IEBAIHZvaWQgaW50ZWxfZGlzcGxheV9zZXRfaW5pdF9wb3dlcihzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2LCBib29sIGVuYWJsZSk7CiAKIHZvaWQgY2h2X3BoeV9wb3dlcmdh dGVfbGFuZXMoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJCQkgICAgIGJvb2wgb3Zl cnJpZGUsIHVuc2lnbmVkIGludCBtYXNrKTsKK2Jvb2wgY2h2X3BoeV9wb3dlcmdhdGVfY2goc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBlbnVtIGRwaW9fcGh5IHBoeSwKKwkJCSAg ZW51bSBkcGlvX2NoYW5uZWwgY2gsIGJvb2wgb3ZlcnJpZGUpOwogCiAKIC8qIGludGVsX3BtLmMg Ki8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYwppbmRleCBiM2Y2YzlmLi40YjYwNGVlIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9oZG1pLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfaGRtaS5jCkBAIC0xNjI1LDYgKzE2MjUsMTQgQEAgc3RhdGljIHZv aWQgY2h2X2hkbWlfcHJlX3BsbF9lbmFibGUoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIp CiAKIAlpbnRlbF9oZG1pX3ByZXBhcmUoZW5jb2Rlcik7CiAKKwkvKgorCSAqIE11c3QgdHJpY2sg dGhlIHNlY29uZCBjb21tb24gbGFuZSBpbnRvIGxpZmUuCisJICogT3RoZXJ3aXNlIHdlIGNhbid0 IGV2ZW4gYWNjZXNzIHRoZSBQTEwuCisJICovCisJaWYgKGNoID09IERQSU9fQ0gwICYmIHBpcGUg PT0gUElQRV9CKQorCQlkcG9ydC0+cmVsZWFzZV9jbDJfb3ZlcnJpZGUgPQorCQkJIWNodl9waHlf cG93ZXJnYXRlX2NoKGRldl9wcml2LCBEUElPX1BIWTAsIERQSU9fQ0gxLCB0cnVlKTsKKwogCWNo dl9waHlfcG93ZXJnYXRlX2xhbmVzKGVuY29kZXIsIHRydWUsIDB4MCk7CiAKIAltdXRleF9sb2Nr KCZkZXZfcHJpdi0+c2JfbG9jayk7CkBAIC0xNzAxLDYgKzE3MDksMTUgQEAgc3RhdGljIHZvaWQg Y2h2X2hkbWlfcG9zdF9wbGxfZGlzYWJsZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcikK IAogCW11dGV4X3VubG9jaygmZGV2X3ByaXYtPnNiX2xvY2spOwogCisJLyoKKwkgKiBMZWF2ZSB0 aGUgcG93ZXIgZG93biBiaXQgY2xlYXJlZCBmb3IgYXQgbGVhc3Qgb25lCisJICogbGFuZSBzbyB0 aGF0IGNodl9wb3dlcmdhdGVfcGh5X2NoKCkgd2lsbCBwb3dlcgorCSAqIG9uIHNvbWV0aGluZyB3 aGVuIHRoZSBjaGFubmVsIGlzIG90aGVyd2lzZSB1bnVzZWQuCisJICogV2hlbiB0aGUgcG9ydCBp cyBvZmYgYW5kIHRoZSBvdmVycmlkZSBpcyByZW1vdmVkCisJICogdGhlIGxhbmVzIHBvd2VyIGRv d24gYW55d2F5LCBzbyBvdGhlcndpc2UgaXQgZG9lc24ndAorCSAqIHJlYWxseSBtYXR0ZXIgd2hh dCB0aGUgc3RhdGUgb2YgcG93ZXIgZG93biBiaXRzIGlzCisJICogYWZ0ZXIgdGhpcy4KKwkgKi8K IAljaHZfcGh5X3Bvd2VyZ2F0ZV9sYW5lcyhlbmNvZGVyLCBmYWxzZSwgMHgwKTsKIH0KIApAQCAt MTkyMiw2ICsxOTM5LDEyIEBAIHN0YXRpYyB2b2lkIGNodl9oZG1pX3ByZV9lbmFibGUoc3RydWN0 IGludGVsX2VuY29kZXIgKmVuY29kZXIpCiAJZzR4X2VuYWJsZV9oZG1pKGVuY29kZXIpOwogCiAJ dmx2X3dhaXRfcG9ydF9yZWFkeShkZXZfcHJpdiwgZHBvcnQsIDB4MCk7CisKKwkvKiBTZWNvbmQg Y29tbW9uIGxhbmUgd2lsbCBzdGF5IGFsaXZlIG9uIGl0cyBvd24gbm93ICovCisJaWYgKGRwb3J0 LT5yZWxlYXNlX2NsMl9vdmVycmlkZSkgeworCQljaHZfcGh5X3Bvd2VyZ2F0ZV9jaChkZXZfcHJp diwgRFBJT19QSFkwLCBEUElPX0NIMSwgZmFsc2UpOworCQlkcG9ydC0+cmVsZWFzZV9jbDJfb3Zl cnJpZGUgPSBmYWxzZTsKKwl9CiB9CiAKIHN0YXRpYyB2b2lkIGludGVsX2hkbWlfZGVzdHJveShz dHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cnVudGltZV9wbS5jCmluZGV4IDUwNmE4Y2MuLjU1MWNmMDggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9ydW50aW1lX3BtLmMKQEAgLTEwMTYsNiArMTAxNiwzNSBAQCBzdGF0aWMgdm9pZCBj aHZfZHBpb19jbW5fcG93ZXJfd2VsbF9kaXNhYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiwKIAkJICAgICAgcGh5LCBkZXZfcHJpdi0+Y2h2X3BoeV9jb250cm9sKTsKIH0KIAor Ym9vbCBjaHZfcGh5X3Bvd2VyZ2F0ZV9jaChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYsIGVudW0gZHBpb19waHkgcGh5LAorCQkJICBlbnVtIGRwaW9fY2hhbm5lbCBjaCwgYm9vbCBv dmVycmlkZSkKK3sKKwlzdHJ1Y3QgaTkxNV9wb3dlcl9kb21haW5zICpwb3dlcl9kb21haW5zID0g JmRldl9wcml2LT5wb3dlcl9kb21haW5zOworCWJvb2wgd2FzX292ZXJyaWRlOworCisJbXV0ZXhf bG9jaygmcG93ZXJfZG9tYWlucy0+bG9jayk7CisKKwl3YXNfb3ZlcnJpZGUgPSBkZXZfcHJpdi0+ Y2h2X3BoeV9jb250cm9sICYgUEhZX0NIX1BPV0VSX0RPV05fT1ZSRF9FTihwaHksIGNoKTsKKwor CWlmIChvdmVycmlkZSA9PSB3YXNfb3ZlcnJpZGUpCisJCWdvdG8gb3V0OworCisJaWYgKG92ZXJy aWRlKQorCQlkZXZfcHJpdi0+Y2h2X3BoeV9jb250cm9sIHw9IFBIWV9DSF9QT1dFUl9ET1dOX09W UkRfRU4ocGh5LCBjaCk7CisJZWxzZQorCQlkZXZfcHJpdi0+Y2h2X3BoeV9jb250cm9sICY9IH5Q SFlfQ0hfUE9XRVJfRE9XTl9PVlJEX0VOKHBoeSwgY2gpOworCisJSTkxNV9XUklURShESVNQTEFZ X1BIWV9DT05UUk9MLCBkZXZfcHJpdi0+Y2h2X3BoeV9jb250cm9sKTsKKworCURSTV9ERUJVR19L TVMoIlBvd2VyIGdhdGluZyBEUElPIFBIWSVkIENIJWQgKERQSU9fUEhZX0NPTlRST0w9MHglMDh4 KVxuIiwKKwkJICAgICAgcGh5LCBjaCwgZGV2X3ByaXYtPmNodl9waHlfY29udHJvbCk7CisKK291 dDoKKwltdXRleF91bmxvY2soJnBvd2VyX2RvbWFpbnMtPmxvY2spOworCisJcmV0dXJuIHdhc19v dmVycmlkZTsKK30KKwogdm9pZCBjaHZfcGh5X3Bvd2VyZ2F0ZV9sYW5lcyhzdHJ1Y3QgaW50ZWxf ZW5jb2RlciAqZW5jb2RlciwKIAkJCSAgICAgYm9vbCBvdmVycmlkZSwgdW5zaWduZWQgaW50IG1h c2spCiB7Ci0tIAoyLjMuNgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK