From mboxrd@z Thu Jan  1 00:00:00 1970
From: ville.syrjala@linux.intel.com
Subject: [PATCH v2 08/16] drm/i915: Split watermark programming
	into pre and post steps
Date: Thu, 22 May 2014 17:48:13 +0300
Message-ID: <1400770101-14277-9-git-send-email-ville.syrjala@linux.intel.com>
References: <1400770101-14277-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga11.intel.com (mga11.intel.com [192.55.52.93])
 by gabe.freedesktop.org (Postfix) with ESMTP id 4CB096EC38
 for <intel-gfx@lists.freedesktop.org>; Thu, 22 May 2014 07:48:54 -0700 (PDT)
In-Reply-To: <1400770101-14277-1-git-send-email-ville.syrjala@linux.intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://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: <http://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: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCldl
IG5lZWQgdG8gcGVyZm9ybSB3YXRlcm1hcmsgcHJvZ3JhbW1pbmcgYmVmb3JlIGFuZCBhZnRlciBj
aGFuZ2luZyB0aGUKcGxhbmUgY29uZmlndXJhdGlvbi4gQWRkIHR3byBuZXcgdmZ1bmNzIHRvIGRv
IHRoYXQuIFRoZSBwcmUgcGhhc2UgaXMKc3VwcG9zZWQgdG8gc3dpdGNoIG92ZXIgdG8gdGhlIGlu
dGVybWVkaWF0ZSB3YXRlcm1hcmtzIHdoaWNoIGFyZQpjb21wdXRlZCBzbyB0aGF0IHRoZXkgY2Fu
IGRlYWwgd2l0aCBib3RoIHRoZSBvbGQgYW5kIG5ldyBwbGFuZQpjb25maWd1cmF0aW9ucy4gVGhl
IHBvc3QgcGhhc2Ugd2lsbCBhcm0gdGhlIHZibGFuayBiYXNlZCB1cGRhdGUKc3lzdGVtcyB0byBz
d2l0Y2ggb3ZlciB0byB0aGUgb3B0aW1hbCB0YXJnZXQgd2F0ZXJtYXJrcyBhZnRlciB0aGUKcGxh
bmUgY29uZmlndXJhdGlvbiBoYXMgZm9yIHN1cmUgY2hhbmdlZC4KCnYyOiBQYXNzIGFyb3VuZCBp
bnRlbF9jcnRjIGFuZCBzL2ludGVsX2NydGMvY3J0Yy8KClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5
cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaTkxNV9kcnYuaCAgfCAgNSArKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs
X2Rydi5oIHwgMTEgKysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgIHwgODgg
KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogMyBmaWxlcyBjaGFuZ2Vk
LCAxMDQgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5
MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IGM5MGQ1YWMu
LmQ0ZjhhZTggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysr
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtNDA3LDYgKzQwNyw3IEBAIHN0
cnVjdCBpbnRlbF9wbGFuZV9jb25maWc7CiBzdHJ1Y3QgaW50ZWxfY3J0YzsKIHN0cnVjdCBpbnRl
bF9saW1pdDsKIHN0cnVjdCBkcGxsOworc3RydWN0IGludGVsX2NydGNfd21fY29uZmlnOwogCiBz
dHJ1Y3QgZHJtX2k5MTVfZGlzcGxheV9mdW5jcyB7CiAJYm9vbCAoKmZiY19lbmFibGVkKShzdHJ1
Y3QgZHJtX2RldmljZSAqZGV2KTsKQEAgLTQzNyw2ICs0MzgsMTAgQEAgc3RydWN0IGRybV9pOTE1
X2Rpc3BsYXlfZnVuY3MgewogCQkJCSBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCQkJIHVpbnQz
Ml90IHNwcml0ZV93aWR0aCwgaW50IHBpeGVsX3NpemUsCiAJCQkJIGJvb2wgZW5hYmxlLCBib29s
IHNjYWxlZCk7CisJdm9pZCAoKnByb2dyYW1fd21fcHJlKShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0
YywKKwkJCSAgICAgICBjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y193bV9jb25maWcgKmNvbmZpZyk7
CisJdm9pZCAoKnByb2dyYW1fd21fcG9zdCkoc3RydWN0IGludGVsX2NydGMgKmNydGMsCisJCQkJ
Y29uc3Qgc3RydWN0IGludGVsX2NydGNfd21fY29uZmlnICpjb25maWcpOwogCXZvaWQgKCptb2Rl
c2V0X2dsb2JhbF9yZXNvdXJjZXMpKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogCS8qIFJldHVy
bnMgdGhlIGFjdGl2ZSBzdGF0ZSBvZiB0aGUgY3J0YywgYW5kIGlmIHRoZSBjcnRjIGlzIGFjdGl2
ZSwKIAkgKiBmaWxscyBvdXQgdGhlIHBpcGUtY29uZmlnIHdpdGggdGhlIGh3IHN0YXRlLiAqLwpk
aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCA3MmYwMWIxLi40YjU5YmUzIDEwMDY0NAotLS0g
YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9kcnYuaApAQCAtMzU4LDYgKzM1OCwxMyBAQCBzdHJ1Y3QgaW50ZWxfcGlwZV93
bSB7CiAJYm9vbCBzcHJpdGVzX3NjYWxlZDsKIH07CiAKK3N0cnVjdCBpbnRlbF9jcnRjX3dtX2Nv
bmZpZyB7CisJLyogdGFyZ2V0IHdhdGVybWFya3MgZm9yIHRoZSBwaXBlICovCisJc3RydWN0IGlu
dGVsX3BpcGVfd20gdGFyZ2V0OworCS8qIGludGVybWVkaWF0ZSB3YXRlcm1hcmtzIGZvciBwZW5k
aW5nL2FjdGl2ZS0+dGFyZ2V0IHRyYW5zaXRpb24gKi8KKwlzdHJ1Y3QgaW50ZWxfcGlwZV93bSBp
bnRtOworfTsKKwogc3RydWN0IGludGVsX2NydGMgewogCXN0cnVjdCBkcm1fY3J0YyBiYXNlOwog
CWVudW0gcGlwZSBwaXBlOwpAQCAtMTAwMSw2ICsxMDA4LDEwIEBAIHZvaWQgaW50ZWxfaW5pdF9y
dW50aW1lX3BtKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiB2b2lkIGludGVs
X2ZpbmlfcnVudGltZV9wbShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogdm9p
ZCBpbGtfd21fZ2V0X2h3X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogdm9pZCBpbGtf
dXBkYXRlX3BpcGVfd20oc3RydWN0IGRybV9kZXZpY2UgKmRldiwgZW51bSBwaXBlIHBpcGUpOwor
dm9pZCBpbnRlbF9wcm9ncmFtX3dhdGVybWFya3NfcHJlKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRj
LAorCQkJCSAgY29uc3Qgc3RydWN0IGludGVsX2NydGNfd21fY29uZmlnICpjb25maWcpOwordm9p
ZCBpbnRlbF9wcm9ncmFtX3dhdGVybWFya3NfcG9zdChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywK
KwkJCQkgICBjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y193bV9jb25maWcgKmNvbmZpZyk7CiAKIAog
LyogaW50ZWxfc2R2by5jICovCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl
bF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCA2ZmM2NDE2Li5j
Y2Y5MjBhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBi
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTI5NTAsNiArMjk1MCwyMCBAQCB2
b2lkIGlsa191cGRhdGVfcGlwZV93bShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBlbnVtIHBpcGUg
cGlwZSkKIAlzcGluX3VubG9jaygmY3J0Yy0+d20ubG9jayk7CiB9CiAKK3N0YXRpYyB2b2lkIGls
a193bV9jYW5jZWwoc3RydWN0IGludGVsX2NydGMgKmNydGMpCit7CisJc3RydWN0IGRybV9kZXZp
Y2UgKmRldiA9IGNydGMtPmJhc2UuZGV2OworCisJYXNzZXJ0X3NwaW5fbG9ja2VkKCZjcnRjLT53
bS5sb2NrKTsKKworCWNydGMtPndtLmRpcnR5ID0gZmFsc2U7CisKKwlpZiAoY3J0Yy0+d20udmJs
YW5rKSB7CisJCWRybV92YmxhbmtfcHV0KGRldiwgY3J0Yy0+cGlwZSk7CisJCWNydGMtPndtLnZi
bGFuayA9IGZhbHNlOworCX0KK30KKwogc3RhdGljIHZvaWQgaWxrX3VwZGF0ZV9zcHJpdGVfd20o
c3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJCQkJICAgICBzdHJ1Y3QgZHJtX2NydGMgKmNydGMs
CiAJCQkJICAgICB1aW50MzJfdCBzcHJpdGVfd2lkdGgsIGludCBwaXhlbF9zaXplLApAQCAtMzA4
NCw2ICszMDk4LDI0IEBAIHZvaWQgaW50ZWxfdXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzKHN0cnVj
dCBkcm1fcGxhbmUgKnBsYW5lLAogCQkJCQkJICAgcGl4ZWxfc2l6ZSwgZW5hYmxlZCwgc2NhbGVk
KTsKIH0KIAordm9pZCBpbnRlbF9wcm9ncmFtX3dhdGVybWFya3NfcHJlKHN0cnVjdCBpbnRlbF9j
cnRjICpjcnRjLAorCQkJCSAgY29uc3Qgc3RydWN0IGludGVsX2NydGNfd21fY29uZmlnICpjb25m
aWcpCit7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gY3J0Yy0+YmFzZS5k
ZXYtPmRldl9wcml2YXRlOworCisJaWYgKGRldl9wcml2LT5kaXNwbGF5LnByb2dyYW1fd21fcHJl
KQorCQlkZXZfcHJpdi0+ZGlzcGxheS5wcm9ncmFtX3dtX3ByZShjcnRjLCBjb25maWcpOworfQor
Cit2b2lkIGludGVsX3Byb2dyYW1fd2F0ZXJtYXJrc19wb3N0KHN0cnVjdCBpbnRlbF9jcnRjICpj
cnRjLAorCQkJCSAgIGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3dtX2NvbmZpZyAqY29uZmlnKQor
eworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGNydGMtPmJhc2UuZGV2LT5k
ZXZfcHJpdmF0ZTsKKworCWlmIChkZXZfcHJpdi0+ZGlzcGxheS5wcm9ncmFtX3dtX3Bvc3QpCisJ
CWRldl9wcml2LT5kaXNwbGF5LnByb2dyYW1fd21fcG9zdChjcnRjLCBjb25maWcpOworfQorCiBz
dGF0aWMgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKgogaW50ZWxfYWxsb2NfY29udGV4dF9w
YWdlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CkBAIC02NTIyLDYgKzY1NTQsNjAgQEAgdm9p
ZCBpbnRlbF9maW5pX3J1bnRpbWVfcG0oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2
KQogCXBtX3J1bnRpbWVfZGlzYWJsZShkZXZpY2UpOwogfQogCitzdGF0aWMgdm9pZCBpbGtfcHJv
Z3JhbV93bV9wcmUoc3RydWN0IGludGVsX2NydGMgKmNydGMsCisJCQkgICAgICAgY29uc3Qgc3Ry
dWN0IGludGVsX2NydGNfd21fY29uZmlnICpjb25maWcpCit7CisJc3RydWN0IGRybV9kZXZpY2Ug
KmRldiA9IGNydGMtPmJhc2UuZGV2OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp
diA9IGRldi0+ZGV2X3ByaXZhdGU7CisKKwltdXRleF9sb2NrKCZkZXZfcHJpdi0+d20ubXV0ZXgp
OworCisJc3Bpbl9sb2NrX2lycSgmY3J0Yy0+d20ubG9jayk7CisJaWxrX3dtX2NhbmNlbChjcnRj
KTsKKwlzcGluX3VubG9ja19pcnEoJmNydGMtPndtLmxvY2spOworCisJLyogcGVuZGluZyB1cGRh
dGUgKGlmIGFueSkgZ290IGNhbmNlbGxlZCAqLworCWNydGMtPndtLnBlbmRpbmcgPSBjcnRjLT53
bS5hY3RpdmU7CisKKwlpZiAoIW1lbWNtcCgmY3J0Yy0+d20uYWN0aXZlLCAmY29uZmlnLT5pbnRt
LCBzaXplb2YoY29uZmlnLT5pbnRtKSkpCisJCWdvdG8gdW5sb2NrOworCisJY3J0Yy0+d20uYWN0
aXZlID0gY29uZmlnLT5pbnRtOworCisJLyogdXNlIHRoZSBtb3N0IHVwIHRvIGRhdGUgd2F0ZXJt
YXJrcyBmb3Igb3RoZXIgcGlwZXMgKi8KKwlpbGtfcmVmcmVzaF9wZW5kaW5nX3dhdGVybWFya3Mo
ZGV2KTsKKworCS8qIHN3aXRjaCBvdmVyIHRvIHRoZSBpbnRlcm1lZGlhdGUgd2F0ZXJtYXJrcyAq
LworCWlsa19wcm9ncmFtX3dhdGVybWFya3MoZGV2KTsKKworIHVubG9jazoKKwltdXRleF91bmxv
Y2soJmRldl9wcml2LT53bS5tdXRleCk7Cit9CisKK3N0YXRpYyB2b2lkIGlsa19wcm9ncmFtX3dt
X3Bvc3Qoc3RydWN0IGludGVsX2NydGMgKmNydGMsCisJCQkJY29uc3Qgc3RydWN0IGludGVsX2Ny
dGNfd21fY29uZmlnICpjb25maWcpCit7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMt
PmJhc2UuZGV2OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2
X3ByaXZhdGU7CisJdTMyIHZibF9jb3VudDsKKworCS8qCisJICogRklYTUUgc2FtcGxlIHRoaXMg
aW5zaWRlIHRoZSBhdG9taWMgc2VjdGlvbiB0byBhdm9pZAorCSAqIG5lZWRsZXNzbHkgbG9uZyBw
ZXJpb2RzIHcvIHN1Yi1wYXIgd2F0ZXJtYXJrcworCSAqLworCXZibF9jb3VudCA9IGRldi0+ZHJp
dmVyLT5nZXRfdmJsYW5rX2NvdW50ZXIoZGV2LCBjcnRjLT5waXBlKTsKKworCW11dGV4X2xvY2so
JmRldl9wcml2LT53bS5tdXRleCk7CisKKwkvKgorCSAqIFdlIGNhbiBzd2l0Y2ggb3ZlciB0byB0
aGUgdGFyZ2V0CisJICogd2F0ZXJtYXJrcyBhZnRlciB0aGUgbmV4dCB2YmxhbmsuCisJICovCisJ
aWxrX3NldHVwX3BlbmRpbmdfd2F0ZXJtYXJrcyhjcnRjLCAmY29uZmlnLT50YXJnZXQsIHZibF9j
b3VudCk7CisKKwltdXRleF91bmxvY2soJmRldl9wcml2LT53bS5tdXRleCk7Cit9CisKIC8qIFNl
dCB1cCBjaGlwIHNwZWNpZmljIHBvd2VyIG1hbmFnZW1lbnQtcmVsYXRlZCBmdW5jdGlvbnMgKi8K
IHZvaWQgaW50ZWxfaW5pdF9wbShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewpAQCAtNjU2OSw2
ICs2NjU1LDggQEAgdm9pZCBpbnRlbF9pbml0X3BtKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJ
CSAgICAgZGV2X3ByaXYtPndtLnNwcl9sYXRlbmN5WzBdICYmIGRldl9wcml2LT53bS5jdXJfbGF0
ZW5jeVswXSkpIHsKIAkJCWRldl9wcml2LT5kaXNwbGF5LnVwZGF0ZV93bSA9IGlsa191cGRhdGVf
d207CiAJCQlkZXZfcHJpdi0+ZGlzcGxheS51cGRhdGVfc3ByaXRlX3dtID0gaWxrX3VwZGF0ZV9z
cHJpdGVfd207CisJCQlkZXZfcHJpdi0+ZGlzcGxheS5wcm9ncmFtX3dtX3ByZSA9IGlsa19wcm9n
cmFtX3dtX3ByZTsKKwkJCWRldl9wcml2LT5kaXNwbGF5LnByb2dyYW1fd21fcG9zdCA9IGlsa19w
cm9ncmFtX3dtX3Bvc3Q7CiAJCX0gZWxzZSB7CiAJCQlEUk1fREVCVUdfS01TKCJGYWlsZWQgdG8g
cmVhZCBkaXNwbGF5IHBsYW5lIGxhdGVuY3kuICIKIAkJCQkgICAgICAiRGlzYWJsZSBDeFNSXG4i
KTsKLS0gCjEuOC41LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w
Lm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt
Z2Z4Cg==