From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 04/18] drm/i915: Plop vlv wm state into crtc_state Date: Thu, 16 Feb 2017 20:07:37 +0200 Message-ID: <20170216180751.3097-5-ville.syrjala@linux.intel.com> References: <20170216180751.3097-1-ville.syrjala@linux.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 ESMTPS id B280F6EBF6 for ; Thu, 16 Feb 2017 18:09:40 +0000 (UTC) In-Reply-To: <20170216180751.3097-1-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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClJl bG9jYXRlIHRoZSB2bHYvY2h2IHdtIHN0YXRlIHRvIGxpdmUgdW5kZXIgaW50ZWxfY3J0Y19zdGF0 ZS4gTm90ZQp0aGF0IGZvciBub3cgdGhpcyBqdXN0IGJlaGF2ZXMgYXMgYSB0ZW1wb3Jhcnkgc3Rv cmFnZS4gQnV0IGl0J2xsIGJlCmVhc2llciB0byBjb252ZXIgdGhlIHRoaW5nIG92ZXIgdG8gcHJv cGVybHkgcHJlLWNvbXB1dGluZyB0aGUgc3RhdGUKd2hlbiBpdCdzIGFscmVhZHkgaW4gdGhlIHJp Z2h0IHBsYWNlLgoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxh QGxpbnV4LmludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVu Lmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZHJ2LmggfCAzMCArKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3BtLmMgIHwgMzIgKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0t LS0KIDIgZmlsZXMgY2hhbmdlZCwgMzcgaW5zZXJ0aW9ucygrKSwgMjUgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCBmNGJhNjg2ZTNlMjIuLjgyY2FmNGY0YTAyYiAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTQ4OCw2ICs0ODgsMjIgQEAgc3RydWN0IHNr bF9waXBlX3dtIHsKIAl1aW50MzJfdCBsaW5ldGltZTsKIH07CiAKK2VudW0gdmx2X3dtX2xldmVs IHsKKwlWTFZfV01fTEVWRUxfUE0yLAorCVZMVl9XTV9MRVZFTF9QTTUsCisJVkxWX1dNX0xFVkVM X0REUl9EVkZTLAorCU5VTV9WTFZfV01fTEVWRUxTLAorfTsKKworc3RydWN0IHZsdl93bV9zdGF0 ZSB7CisJc3RydWN0IHZsdl9waXBlX3dtIHdtW05VTV9WTFZfV01fTEVWRUxTXTsKKwlzdHJ1Y3Qg dmx2X3NyX3dtIHNyW05VTV9WTFZfV01fTEVWRUxTXTsKKwl1aW50OF90IG51bV9hY3RpdmVfcGxh bmVzOworCXVpbnQ4X3QgbnVtX2xldmVsczsKKwl1aW50OF90IGxldmVsOworCWJvb2wgY3hzcjsK K307CisKIHN0cnVjdCBpbnRlbF9jcnRjX3dtX3N0YXRlIHsKIAl1bmlvbiB7CiAJCXN0cnVjdCB7 CkBAIC01MTIsNiArNTI4LDExIEBAIHN0cnVjdCBpbnRlbF9jcnRjX3dtX3N0YXRlIHsKIAkJCXN0 cnVjdCBza2xfcGlwZV93bSBvcHRpbWFsOwogCQkJc3RydWN0IHNrbF9kZGJfZW50cnkgZGRiOwog CQl9IHNrbDsKKworCQlzdHJ1Y3QgeworCQkJLyogaW52ZXJ0ZWQgb3B0aW1hbCB3YXRlcm1hcmtz ICovCisJCQlzdHJ1Y3Qgdmx2X3dtX3N0YXRlIG9wdGltYWw7CisJCX0gdmx2OwogCX07CiAKIAkv KgpAQCAtNjk2LDE1ICs3MTcsNiBAQCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSB7CiAJdTggYWN0 aXZlX3BsYW5lczsKIH07CiAKLXN0cnVjdCB2bHZfd21fc3RhdGUgewotCXN0cnVjdCB2bHZfcGlw ZV93bSB3bVszXTsKLQlzdHJ1Y3Qgdmx2X3NyX3dtIHNyWzNdOwotCXVpbnQ4X3QgbnVtX2FjdGl2 ZV9wbGFuZXM7Ci0JdWludDhfdCBudW1fbGV2ZWxzOwotCXVpbnQ4X3QgbGV2ZWw7Ci0JYm9vbCBj eHNyOwotfTsKLQogc3RydWN0IHZsdl9maWZvX3N0YXRlIHsKIAl1aW50MTZfdCBwbGFuZVtJOTE1 X01BWF9QTEFORVNdOwogfTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IGIyOWIwNWExOTVk OC4uNTA3ZTQ5Y2Q2ZTRhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w bS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTk0NywxMiArOTQ3 LDYgQEAgc3RhdGljIHZvaWQgdmx2X3dyaXRlX3dtX3ZhbHVlcyhzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsCiAKICN1bmRlZiBGV19XTV9WTFYKIAotZW51bSB2bHZfd21fbGV2ZWwg ewotCVZMVl9XTV9MRVZFTF9QTTIsCi0JVkxWX1dNX0xFVkVMX1BNNSwKLQlWTFZfV01fTEVWRUxf RERSX0RWRlMsCi19OwotCiAvKiBsYXRlbmN5IG11c3QgYmUgaW4gMC4xdXMgdW5pdHMuICovCiBz dGF0aWMgdW5zaWduZWQgaW50IHZsdl93bV9tZXRob2QyKHVuc2lnbmVkIGludCBwaXhlbF9yYXRl LAogCQkJCSAgIHVuc2lnbmVkIGludCBwaXBlX2h0b3RhbCwKQEAgLTEwMjMsOSArMTAxNywxMCBA QCBzdGF0aWMgdWludDE2X3Qgdmx2X2NvbXB1dGVfd21fbGV2ZWwoY29uc3Qgc3RydWN0IGludGVs X2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJcmV0dXJuIG1pbl90KGludCwgd20sIFVTSFJUX01B WCk7CiB9CiAKLXN0YXRpYyB2b2lkIHZsdl9jb21wdXRlX2ZpZm8oc3RydWN0IGludGVsX2NydGMg KmNydGMpCitzdGF0aWMgdm9pZCB2bHZfY29tcHV0ZV9maWZvKHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpjcnRjX3N0YXRlKQogewotCXN0cnVjdCB2bHZfd21fc3RhdGUgKndtX3N0YXRlID0gJmNy dGMtPndtLmFjdGl2ZS52bHY7CisJc3RydWN0IGludGVsX2NydGMgKmNydGMgPSB0b19pbnRlbF9j cnRjKGNydGNfc3RhdGUtPmJhc2UuY3J0Yyk7CisJc3RydWN0IHZsdl93bV9zdGF0ZSAqd21fc3Rh dGUgPSAmY3J0Y19zdGF0ZS0+d20udmx2Lm9wdGltYWw7CiAJc3RydWN0IHZsdl9maWZvX3N0YXRl ICpmaWZvX3N0YXRlID0gJmNydGMtPndtLmZpZm9fc3RhdGU7CiAJc3RydWN0IGRybV9kZXZpY2Ug KmRldiA9IGNydGMtPmJhc2UuZGV2OwogCXN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmU7CkBAIC0x MDk5LDkgKzEwOTQsMTAgQEAgc3RhdGljIHUxNiB2bHZfaW52ZXJ0X3dtX3ZhbHVlKHUxNiB3bSwg dTE2IGZpZm9fc2l6ZSkKIAkJcmV0dXJuIGZpZm9fc2l6ZSAtIHdtOwogfQogCi1zdGF0aWMgdm9p ZCB2bHZfaW52ZXJ0X3dtcyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKK3N0YXRpYyB2b2lkIHZs dl9pbnZlcnRfd21zKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQogewotCXN0 cnVjdCB2bHZfd21fc3RhdGUgKndtX3N0YXRlID0gJmNydGMtPndtLmFjdGl2ZS52bHY7CisJc3Ry dWN0IGludGVsX2NydGMgKmNydGMgPSB0b19pbnRlbF9jcnRjKGNydGNfc3RhdGUtPmJhc2UuY3J0 Yyk7CisJc3RydWN0IHZsdl93bV9zdGF0ZSAqd21fc3RhdGUgPSAmY3J0Y19zdGF0ZS0+d20udmx2 Lm9wdGltYWw7CiAJaW50IGxldmVsOwogCiAJZm9yIChsZXZlbCA9IDA7IGxldmVsIDwgd21fc3Rh dGUtPm51bV9sZXZlbHM7IGxldmVsKyspIHsKQEAgLTExMjYsMTAgKzExMjIsMTEgQEAgc3RhdGlj IHZvaWQgdmx2X2ludmVydF93bXMoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJfQogfQogCi1z dGF0aWMgdm9pZCB2bHZfY29tcHV0ZV93bShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKK3N0YXRp YyB2b2lkIHZsdl9jb21wdXRlX3dtKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRl KQogeworCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjX3N0YXRl LT5iYXNlLmNydGMpOwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5 MTUoY3J0Yy0+YmFzZS5kZXYpOwotCXN0cnVjdCB2bHZfd21fc3RhdGUgKndtX3N0YXRlID0gJmNy dGMtPndtLmFjdGl2ZS52bHY7CisJc3RydWN0IHZsdl93bV9zdGF0ZSAqd21fc3RhdGUgPSAmY3J0 Y19zdGF0ZS0+d20udmx2Lm9wdGltYWw7CiAJY29uc3Qgc3RydWN0IHZsdl9maWZvX3N0YXRlICpm aWZvX3N0YXRlID0gJmNydGMtPndtLmZpZm9fc3RhdGU7CiAJc3RydWN0IGludGVsX3BsYW5lICpw bGFuZTsKIAlpbnQgbGV2ZWw7CkBAIC0xMTQxLDcgKzExMzgsNyBAQCBzdGF0aWMgdm9pZCB2bHZf Y29tcHV0ZV93bShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAogCXdtX3N0YXRlLT5udW1fYWN0 aXZlX3BsYW5lcyA9IDA7CiAKLQl2bHZfY29tcHV0ZV9maWZvKGNydGMpOworCXZsdl9jb21wdXRl X2ZpZm8oY3J0Y19zdGF0ZSk7CiAKIAlpZiAod21fc3RhdGUtPm51bV9hY3RpdmVfcGxhbmVzICE9 IDEpCiAJCXdtX3N0YXRlLT5jeHNyID0gZmFsc2U7CkBAIC0xMTU2LDcgKzExNTMsNyBAQCBzdGF0 aWMgdm9pZCB2bHZfY29tcHV0ZV93bShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAogCQkvKiBu b3JtYWwgd2F0ZXJtYXJrcyAqLwogCQlmb3IgKGxldmVsID0gMDsgbGV2ZWwgPCB3bV9zdGF0ZS0+ bnVtX2xldmVsczsgbGV2ZWwrKykgewotCQkJaW50IHdtID0gdmx2X2NvbXB1dGVfd21fbGV2ZWwo Y3J0Yy0+Y29uZmlnLCBzdGF0ZSwgbGV2ZWwpOworCQkJaW50IHdtID0gdmx2X2NvbXB1dGVfd21f bGV2ZWwoY3J0Y19zdGF0ZSwgc3RhdGUsIGxldmVsKTsKIAkJCWludCBtYXhfd20gPSBmaWZvX3N0 YXRlLT5wbGFuZVtwbGFuZS0+aWRdOwogCiAJCQkvKiBoYWNrICovCkBAIC0xMTkzLDcgKzExOTAs NyBAQCBzdGF0aWMgdm9pZCB2bHZfY29tcHV0ZV93bShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykK IAkJbWVtc2V0KCZ3bV9zdGF0ZS0+c3JbbGV2ZWxdLCAwLCBzaXplb2Yod21fc3RhdGUtPnNyW2xl dmVsXSkpOwogCX0KIAotCXZsdl9pbnZlcnRfd21zKGNydGMpOworCXZsdl9pbnZlcnRfd21zKGNy dGNfc3RhdGUpOwogfQogCiAjZGVmaW5lIFZMVl9GSUZPKHBsYW5lLCB2YWx1ZSkgXApAQCAtMTM0 MSwxMSArMTMzOCwxNCBAQCBzdGF0aWMgYm9vbCBpc19lbmFibGluZyhpbnQgb2xkLCBpbnQgbmV3 LCBpbnQgdGhyZXNob2xkKQogc3RhdGljIHZvaWQgdmx2X3VwZGF0ZV93bShzdHJ1Y3QgaW50ZWxf Y3J0YyAqY3J0YykKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19p OTE1KGNydGMtPmJhc2UuZGV2KTsKKwlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0 ZSA9CisJCXRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+YmFzZS5zdGF0ZSk7CiAJZW51bSBwaXBl IHBpcGUgPSBjcnRjLT5waXBlOwogCXN0cnVjdCB2bHZfd21fdmFsdWVzICpvbGRfd20gPSAmZGV2 X3ByaXYtPndtLnZsdjsKIAlzdHJ1Y3Qgdmx2X3dtX3ZhbHVlcyBuZXdfd20gPSB7fTsKIAotCXZs dl9jb21wdXRlX3dtKGNydGMpOworCXZsdl9jb21wdXRlX3dtKGNydGNfc3RhdGUpOworCWNydGMt PndtLmFjdGl2ZS52bHYgPSBjcnRjX3N0YXRlLT53bS52bHYub3B0aW1hbDsKIAl2bHZfbWVyZ2Vf d20oZGV2X3ByaXYsICZuZXdfd20pOwogCiAJaWYgKG1lbWNtcChvbGRfd20sICZuZXdfd20sIHNp emVvZihuZXdfd20pKSA9PSAwKSB7Ci0tIAoyLjEwLjIKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=