From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chi Ding <chix.ding@intel.com>
Subject: [RFC 7/8] drm/i915/vlv: Move active watermarks into
	intel_crtc->wm.active.vlv
Date: Thu, 23 Jun 2016 14:36:27 +0200
Message-ID: <1466685388-16504-8-git-send-email-chix.ding@intel.com>
References: <1466685388-16504-1-git-send-email-chix.ding@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga09.intel.com (mga09.intel.com [134.134.136.24])
 by gabe.freedesktop.org (Postfix) with ESMTP id E91A26E3AF
 for <intel-gfx@lists.freedesktop.org>; Thu, 23 Jun 2016 12:36:49 +0000 (UTC)
In-Reply-To: <1466685388-16504-1-git-send-email-chix.ding@intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: yetundex.adebisi@intel.com, maarten.lankhorst@linux.intel.com, ville.syrjala@linux.intel.com, matthew.d.roper@intel.com, intel-gfx@lists.freedesktop.org, isg-gms@eclists.intel.com
Cc: Chi Ding <chix.ding@intel.com>
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNv
bT4KClByZXZpb3VzbHkgdGhlIGFjdGl2ZSB3YXRlcm1hcmtzIGlzIHNhdmVkIGluIGludGVsX2Ny
dGMtPndtX3N0YXRlClRoaXMgY29tbWl0IGFkZHMgYSBuZXcgZmllbGQgInZsdiIgaW50byBpbnRl
bF9jcnRjLT53bS5hY3RpdmUgYW5kIHNhdmUKdGhlIGFjdGl2ZSB3YXRlcm1hcmtzIGluIGl0IHRv
IGJlIGNvbnNpc3RlbnQgd2l0aCB3aGF0IHdlIGRvIG9uIG90aGVyCnBsYXRmb3Jtcy4KClNpZ25l
ZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRl
bC5jb20+ClNpZ25lZC1vZmYtYnk6IENoaSBEaW5nIDxjaGl4LmRpbmdAaW50ZWwuY29tPgotLS0K
IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIHwgIDEgKwogZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfcG0uYyAgfCAxMiArKysrKystLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgNyBp
bnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5k
ZXggYWMwMTI0Yy4uOGU3N2FkYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTY4MCw2
ICs2ODAsNyBAQCBzdHJ1Y3QgaW50ZWxfY3J0YyB7CiAJCXVuaW9uIHsKIAkJCXN0cnVjdCBpbnRl
bF9waXBlX3dtIGlsazsKIAkJCXN0cnVjdCBza2xfcGlwZV93bSBza2w7CisJCQlzdHJ1Y3Qgdmx2
X3dtX3N0YXRlIHZsdjsKIAkJfSBhY3RpdmU7CiAKIAkJLyogYWxsb3cgQ3hTUiBvbiB0aGlzIHBp
cGUgKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDA0MjY1ZWEuLmNjNDNjMWUgMTAwNjQ0
Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtMTIyOSw3ICsxMjI5LDcgQEAgc3RhdGljIHZvaWQgdmx2
X3BpcGVfc2V0X2ZpZm9fc2l6ZShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAlzdHJ1Y3QgZHJt
X2RldmljZSAqZGV2ID0gY3J0Yy0+YmFzZS5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg
KmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCWludCBzcHJpdGUwX3N0YXJ0ID0gMCwgc3ByaXRl
MV9zdGFydCA9IDAsIGZpZm9fc2l6ZSA9IDA7Ci0JY29uc3Qgc3RydWN0IHZsdl93bV9zdGF0ZSAq
d21fc3RhdGUgPSAmY3J0Yy0+d21fc3RhdGU7CisJY29uc3Qgc3RydWN0IHZsdl93bV9zdGF0ZSAq
d21fc3RhdGUgPSAmY3J0Yy0+d20uYWN0aXZlLnZsdjsKIAogCiAJV0FSTl9PTih3bV9zdGF0ZS0+
Zmlmb19zaXplW1BMQU5FX0NVUlNPUl0gIT0gNjMpOwpAQCAtMTMxMSw3ICsxMzExLDcgQEAgc3Rh
dGljIHZvaWQgdmx2X21lcmdlX3dtKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJd20tPmN4c3Ig
PSB0cnVlOwogCiAJZm9yX2VhY2hfaW50ZWxfY3J0YyhkZXYsIGNydGMpIHsKLQkJY29uc3Qgc3Ry
dWN0IHZsdl93bV9zdGF0ZSAqd21fc3RhdGUgPSAmY3J0Yy0+d21fc3RhdGU7CisJCWNvbnN0IHN0
cnVjdCB2bHZfd21fc3RhdGUgKndtX3N0YXRlID0gJmNydGMtPndtLmFjdGl2ZS52bHY7CiAKIAkJ
aWYgKCFjcnRjLT5hY3RpdmUpCiAJCQljb250aW51ZTsKQEAgLTEzMzAsNyArMTMzMCw3IEBAIHN0
YXRpYyB2b2lkIHZsdl9tZXJnZV93bShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQl3bS0+bGV2
ZWwgPSBWTFZfV01fTEVWRUxfUE0yOwogCiAJZm9yX2VhY2hfaW50ZWxfY3J0YyhkZXYsIGNydGMp
IHsKLQkJc3RydWN0IHZsdl93bV9zdGF0ZSAqd21fc3RhdGUgPSAmY3J0Yy0+d21fc3RhdGU7CisJ
CXN0cnVjdCB2bHZfd21fc3RhdGUgKndtX3N0YXRlID0gJmNydGMtPndtLmFjdGl2ZS52bHY7CiAJ
CWVudW0gcGlwZSBwaXBlID0gY3J0Yy0+cGlwZTsKIAogCQlpZiAoIWNydGMtPmFjdGl2ZSkKQEAg
LTEzNTcsNyArMTM1Nyw3IEBAIHN0YXRpYyB2b2lkIHZsdl91cGRhdGVfd20oc3RydWN0IGRybV9j
cnRjICpjcnRjKQogCiAJdmx2X2NvbXB1dGVfd20oaW50ZWxfY3J0Yy0+Y29uZmlnKTsKIAltdXRl
eF9sb2NrKCZkZXZfcHJpdi0+d20ud21fbXV0ZXgpOwotCWludGVsX2NydGMtPndtX3N0YXRlID0g
aW50ZWxfY3J0Yy0+Y29uZmlnLT53bS52bHYub3B0aW1hbDsKKwlpbnRlbF9jcnRjLT53bS5hY3Rp
dmUudmx2ID0gaW50ZWxfY3J0Yy0+Y29uZmlnLT53bS52bHYub3B0aW1hbDsKIAl2bHZfbWVyZ2Vf
d20oZGV2LCAmd20pOwogCW11dGV4X3VubG9jaygmZGV2X3ByaXYtPndtLndtX211dGV4KTsKIApA
QCAtNDM3Miw3ICs0MzcyLDcgQEAgdm9pZCB2bHZfd21fZ2V0X2h3X3N0YXRlKHN0cnVjdCBkcm1f
ZGV2aWNlICpkZXYpCiAJCWludCBpID0gd21fcGxhbmVfaWQocGxhbmUpOwogCiAJCWNydGMgPSB0
b19pbnRlbF9jcnRjKGludGVsX2dldF9jcnRjX2Zvcl9waXBlKGRldiwgcGxhbmUtPnBpcGUpKTsK
LQkJd21fc3RhdGUgPSAmY3J0Yy0+d21fc3RhdGU7CisJCXdtX3N0YXRlID0gJmNydGMtPndtLmFj
dGl2ZS52bHY7CiAKIAkJc3dpdGNoIChwbGFuZS0+YmFzZS50eXBlKSB7CiAJCWNhc2UgRFJNX1BM
QU5FX1RZUEVfQ1VSU09SOgpAQCAtNDQyNiw3ICs0NDI2LDcgQEAgdm9pZCB2bHZfd21fZ2V0X2h3
X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJZm9yX2VhY2hfaW50ZWxfY3J0YyhkZXYs
IGNydGMpIHsKIAkJcGlwZSA9IGNydGMtPnBpcGU7CiAJCXRvX2ludGVsX2NydGNfc3RhdGUoY3J0
Yy0+YmFzZS5zdGF0ZSktPndtLnZsdi5vcHRpbWFsCi0JCQk9IGNydGMtPndtX3N0YXRlOworCQkJ
PSBjcnRjLT53bS5hY3RpdmUudmx2OwogCiAJCURSTV9ERUJVR19LTVMoIkluaXRpYWwgd2F0ZXJt
YXJrczogcGlwZSAlYywgcGxhbmU9JWQsIGN1cnNvcj0lZCwgc3ByaXRlMD0lZCwgc3ByaXRlMT0l
ZFxuIiwKIAkJCSAgICAgIHBpcGVfbmFtZShwaXBlKSwgd20tPnBpcGVbcGlwZV0ucHJpbWFyeSwg
d20tPnBpcGVbcGlwZV0uY3Vyc29yLAotLSAKMS44LjAuMQoKX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n
ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h
aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==