From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 03/18] drm/i915: Move vlv wms from crtc->wm_state to crtc->wm.active.vlv Date: Thu, 16 Feb 2017 20:07:36 +0200 Message-ID: <20170216180751.3097-4-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6AD576EBF8 for ; Thu, 16 Feb 2017 18:08:03 +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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCklu IGFuIGVmZm9ydCB0byBtYWtlIHRoZSB2bHYvY2h2IHdtIGNvZGUgbG9vayBhbmQgYmVoYXZlIG1v cmUgbGlrZSB0aGUKaWxrKyBjb2RlLCBsZXQncyBtb3ZlIHRoZSBjdXJyZW50IGFjdGl2ZSB3bXMg bmV4dCB0byB0aGUKY29ycmVzcG9uZGluZyBpbGsgd21zLgoKU2lnbmVkLW9mZi1ieTogVmlsbGUg U3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IE1h YXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggfCAgMyArLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3BtLmMgIHwgMTAgKysrKystLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA2IGlu c2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRl eCBhNmVlMDViMDQwNGEuLmY0YmE2ODZlM2UyMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgK QEAgLTc1NCw2ICs3NTQsNyBAQCBzdHJ1Y3QgaW50ZWxfY3J0YyB7CiAJCS8qIHdhdGVybWFya3Mg Y3VycmVudGx5IGJlaW5nIHVzZWQgICovCiAJCXVuaW9uIHsKIAkJCXN0cnVjdCBpbnRlbF9waXBl X3dtIGlsazsKKwkJCXN0cnVjdCB2bHZfd21fc3RhdGUgdmx2OwogCQl9IGFjdGl2ZTsKIAogCQkv KiBhbGxvdyBDeFNSIG9uIHRoaXMgcGlwZSAqLwpAQCAtNzczLDggKzc3NCw2IEBAIHN0cnVjdCBp bnRlbF9jcnRjIHsKIAogCS8qIHNjYWxlcnMgYXZhaWxhYmxlIG9uIHRoaXMgY3J0YyAqLwogCWlu dCBudW1fc2NhbGVyczsKLQotCXN0cnVjdCB2bHZfd21fc3RhdGUgd21fc3RhdGU7CiB9OwogCiBz dHJ1Y3QgaW50ZWxfcGxhbmUgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXggMDY4MjY5NDU1 NzZlLi5iMjliMDVhMTk1ZDggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtMTAyNSw3ICsx MDI1LDcgQEAgc3RhdGljIHVpbnQxNl90IHZsdl9jb21wdXRlX3dtX2xldmVsKGNvbnN0IHN0cnVj dCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCiBzdGF0aWMgdm9pZCB2bHZfY29tcHV0 ZV9maWZvKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogewotCXN0cnVjdCB2bHZfd21fc3RhdGUg KndtX3N0YXRlID0gJmNydGMtPndtX3N0YXRlOworCXN0cnVjdCB2bHZfd21fc3RhdGUgKndtX3N0 YXRlID0gJmNydGMtPndtLmFjdGl2ZS52bHY7CiAJc3RydWN0IHZsdl9maWZvX3N0YXRlICpmaWZv X3N0YXRlID0gJmNydGMtPndtLmZpZm9fc3RhdGU7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9 IGNydGMtPmJhc2UuZGV2OwogCXN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmU7CkBAIC0xMTAxLDcg KzExMDEsNyBAQCBzdGF0aWMgdTE2IHZsdl9pbnZlcnRfd21fdmFsdWUodTE2IHdtLCB1MTYgZmlm b19zaXplKQogCiBzdGF0aWMgdm9pZCB2bHZfaW52ZXJ0X3dtcyhzdHJ1Y3QgaW50ZWxfY3J0YyAq Y3J0YykKIHsKLQlzdHJ1Y3Qgdmx2X3dtX3N0YXRlICp3bV9zdGF0ZSA9ICZjcnRjLT53bV9zdGF0 ZTsKKwlzdHJ1Y3Qgdmx2X3dtX3N0YXRlICp3bV9zdGF0ZSA9ICZjcnRjLT53bS5hY3RpdmUudmx2 OwogCWludCBsZXZlbDsKIAogCWZvciAobGV2ZWwgPSAwOyBsZXZlbCA8IHdtX3N0YXRlLT5udW1f bGV2ZWxzOyBsZXZlbCsrKSB7CkBAIC0xMTI5LDcgKzExMjksNyBAQCBzdGF0aWMgdm9pZCB2bHZf aW52ZXJ0X3dtcyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIHN0YXRpYyB2b2lkIHZsdl9jb21w dXRlX3dtKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoY3J0Yy0+YmFzZS5kZXYpOwotCXN0cnVjdCB2bHZfd21f c3RhdGUgKndtX3N0YXRlID0gJmNydGMtPndtX3N0YXRlOworCXN0cnVjdCB2bHZfd21fc3RhdGUg KndtX3N0YXRlID0gJmNydGMtPndtLmFjdGl2ZS52bHY7CiAJY29uc3Qgc3RydWN0IHZsdl9maWZv X3N0YXRlICpmaWZvX3N0YXRlID0gJmNydGMtPndtLmZpZm9fc3RhdGU7CiAJc3RydWN0IGludGVs X3BsYW5lICpwbGFuZTsKIAlpbnQgbGV2ZWw7CkBAIC0xMjkyLDcgKzEyOTIsNyBAQCBzdGF0aWMg dm9pZCB2bHZfbWVyZ2Vfd20oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCXdt LT5jeHNyID0gdHJ1ZTsKIAogCWZvcl9lYWNoX2ludGVsX2NydGMoJmRldl9wcml2LT5kcm0sIGNy dGMpIHsKLQkJY29uc3Qgc3RydWN0IHZsdl93bV9zdGF0ZSAqd21fc3RhdGUgPSAmY3J0Yy0+d21f c3RhdGU7CisJCWNvbnN0IHN0cnVjdCB2bHZfd21fc3RhdGUgKndtX3N0YXRlID0gJmNydGMtPndt LmFjdGl2ZS52bHY7CiAKIAkJaWYgKCFjcnRjLT5hY3RpdmUpCiAJCQljb250aW51ZTsKQEAgLTEz MTEsNyArMTMxMSw3IEBAIHN0YXRpYyB2b2lkIHZsdl9tZXJnZV93bShzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYsCiAJCXdtLT5sZXZlbCA9IFZMVl9XTV9MRVZFTF9QTTI7CiAKIAlm b3JfZWFjaF9pbnRlbF9jcnRjKCZkZXZfcHJpdi0+ZHJtLCBjcnRjKSB7Ci0JCXN0cnVjdCB2bHZf d21fc3RhdGUgKndtX3N0YXRlID0gJmNydGMtPndtX3N0YXRlOworCQljb25zdCBzdHJ1Y3Qgdmx2 X3dtX3N0YXRlICp3bV9zdGF0ZSA9ICZjcnRjLT53bS5hY3RpdmUudmx2OwogCQllbnVtIHBpcGUg cGlwZSA9IGNydGMtPnBpcGU7CiAKIAkJaWYgKCFjcnRjLT5hY3RpdmUpCi0tIAoyLjEwLjIKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=