From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH] drm/i915: Update state before setting
	watermarks.
Date: Wed, 24 Feb 2016 14:54:37 +0100
Message-ID: <56CDB61D.8020108@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 91F976E424
 for <intel-gfx@lists.freedesktop.org>; Wed, 24 Feb 2016 14:03:18 +0000 (UTC)
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: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
List-Id: intel-gfx@lists.freedesktop.org

V2hlbiBpbnRlbF91cGRhdGVfd2F0ZXJtYXJrcyBpcyBjYWxsZWQgb24gc2t5bGFrZSBpdCBpbnNw
ZWN0cwpjcnRjLT5zdGF0ZSwgd2hpY2ggc2hvdWxkIHNob3cgYXMgZGlzYWJsZWQuIFRoaXMgd2Fz
bid0IHRoZSBjYXNlLAphbmQgdGhpcyByZXN1bHRlZCBpbiBhIGRpdmlkZS1ieS16ZXJvIGluCnNr
bF9kZGJfZ2V0X3BpcGVfYWxsb2NhdGlvbl9saW1pdHMgd2hlbiBpbnRlbF91cGRhdGVfd2F0ZXJt
YXJrcyB3YXMgY2FsbGVkLgoKIC0tLS0tLS0tLS0tLVsgY3V0IGhlcmUgXS0tLS0tLS0tLS0tLQog
V0FSTklORzogQ1BVOiAxIFBJRDogMjk1IGF0IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bt
LmM6MjgzNCBza2xfdXBkYXRlX3BpcGVfd20rMHgxMDIvMHg4YzAgW2k5MTVdKCkKIFdBUk5fT04o
IWNvbmZpZy0+bnVtX3BpcGVzX2FjdGl2ZSkKIE1vZHVsZXMgbGlua2VkIGluOiBjb3JldGVtcCBp
OTE1KCspIHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4
eHh4eHh4eAogQ1BVOiAxIFBJRDogMjk1IENvbW06IHN5c3RlbWQtdWRldmQgVGFpbnRlZDogRyAg
ICAgVSAgVyAgICAgICA0LjUuMC1yYzQteHh4eHh4ICMyNQogSGFyZHdhcmUgbmFtZTogeHh4eHh4
eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHgKICAwMDAwMDAwMDAwMDAwMDAwIGZm
ZmY4ODAwMzc3N2Y1YTggZmZmZmZmZmY4MTM0ODVjMiBmZmZmODgwMDM3NzdmNWYwCiAgZmZmZmZm
ZmZhMDIzNjI0MCBmZmZmODgwMDM3NzdmNWUwIGZmZmZmZmZmODEwNTBmY2UgZmZmZjg4MDBhYTQy
MDAwMAogIGZmZmY4ODAwYWJhMTgwMDAgZmZmZjg4MDBhYmExODAwMCBmZmZmODgwMDM3MzA0YzAw
IGZmZmY4ODAwYWE0MjAwMDAKIENhbGwgVHJhY2U6CiAgWzxmZmZmZmZmZjgxMzQ4NWMyPl0gZHVt
cF9zdGFjaysweDY3LzB4OTUKICBbPGZmZmZmZmZmODEwNTBmY2U+XSB3YXJuX3Nsb3dwYXRoX2Nv
bW1vbisweDllLzB4YzAKICBbPGZmZmZmZmZmODEwNTEwM2M+XSB3YXJuX3Nsb3dwYXRoX2ZtdCsw
eDRjLzB4NTAKICBbPGZmZmZmZmZmODEwNjk0NWU+XSA/IGZsdXNoX3dvcmsrMHg4ZS8weDI4MAog
IFs8ZmZmZmZmZmY4MTA2OTNkNT5dID8gZmx1c2hfd29yaysweDUvMHgyODAKICBbPGZmZmZmZmZm
YTAxNmFkZDI+XSBza2xfdXBkYXRlX3BpcGVfd20rMHgxMDIvMHg4YzAgW2k5MTVdCiAgWzxmZmZm
ZmZmZmEwMTZiOTZmPl0gc2tsX3VwZGF0ZV93bSsweGZmLzB4NWYwIFtpOTE1XQogIFs8ZmZmZmZm
ZmY4MTA5MjhlZT5dID8gdHJhY2VfaGFyZGlycXNfb25fY2FsbGVyKzB4MTVlLzB4MWQwCiAgWzxm
ZmZmZmZmZjgxMDkyOTZkPl0gPyB0cmFjZV9oYXJkaXJxc19vbisweGQvMHgxMAogIFs8ZmZmZmZm
ZmZhMDE2Y2U2ZT5dIGludGVsX3VwZGF0ZV93YXRlcm1hcmtzKzB4MWUvMHgzMCBbaTkxNV0KICBb
PGZmZmZmZmZmYTAxZDNlZTI+XSBpbnRlbF9jcnRjX2Rpc2FibGVfbm9hdG9taWMrMHhkMi8weDE1
MCBbaTkxNV0KICBbPGZmZmZmZmZmYTAxZGQzZDI+XSBpbnRlbF9tb2Rlc2V0X3NldHVwX2h3X3N0
YXRlKzB4ZGQyLzB4ZGUwIFtpOTE1XQogIFs8ZmZmZmZmZmZhMDFkZmQ4Mz5dIGludGVsX21vZGVz
ZXRfaW5pdCsweDE1YTMvMHgxOTUwIFtpOTE1XQogIFs8ZmZmZmZmZmZhMDIxNjBiNj5dIGk5MTVf
ZHJpdmVyX2xvYWQrMHgxM2M2LzB4MTcyMCBbaTkxNV0KICBbPGZmZmZmZmZmODE1MjIxNjA+XSA/
IGFkZF9zeXNmc19md19tYXBfZW50cnkrMHg5Yi8weDliCiAgWzxmZmZmZmZmZmEwMGIxNWVmPl0g
ZHJtX2Rldl9yZWdpc3RlcisweDZmLzB4YjAgW2RybV0KICBbPGZmZmZmZmZmYTAwYjNiM2E+XSBk
cm1fZ2V0X3BjaV9kZXYrMHgxMGEvMHgxZDAgW2RybV0KICBbPGZmZmZmZmZmYTAxNTgyZDk+XSBp
OTE1X3BjaV9wcm9iZSsweDQ5LzB4NTAgW2k5MTVdCiAgWzxmZmZmZmZmZjgxMzhhZTMwPl0gcGNp
X2RldmljZV9wcm9iZSsweDgwLzB4ZjAKICBbPGZmZmZmZmZmODE0M2UyYWM+XSBkcml2ZXJfcHJv
YmVfZGV2aWNlKzB4MWJjLzB4M2QwCiAgWzxmZmZmZmZmZjgxNDNlNTI2Pl0gX19kcml2ZXJfYXR0
YWNoKzB4NjYvMHg5MAogIFs8ZmZmZmZmZmY4MTQzZTRjMD5dID8gZHJpdmVyX3Byb2JlX2Rldmlj
ZSsweDNkMC8weDNkMAogIFs8ZmZmZmZmZmY4MTQzYmUzYj5dIGJ1c19mb3JfZWFjaF9kZXYrMHg1
Yi8weGEwCiAgWzxmZmZmZmZmZjgxNDNkYjNlPl0gZHJpdmVyX2F0dGFjaCsweDFlLzB4MjAKICBb
PGZmZmZmZmZmODE0M2Q0NjE+XSBidXNfYWRkX2RyaXZlcisweDE1MS8weDI3MAogIFs8ZmZmZmZm
ZmY4MTQzZWFiYz5dIGRyaXZlcl9yZWdpc3RlcisweDhjLzB4ZDAKICBbPGZmZmZmZmZmODEzOGEy
ZWQ+XSBfX3BjaV9yZWdpc3Rlcl9kcml2ZXIrMHg1ZC8weDYwCiAgWzxmZmZmZmZmZmEwMGIzYzU4
Pl0gZHJtX3BjaV9pbml0KzB4NTgvMHhmMCBbZHJtXQogIFs8ZmZmZmZmZmY4MTA5Mjk2ZD5dID8g
dHJhY2VfaGFyZGlycXNfb24rMHhkLzB4MTAKICBbPGZmZmZmZmZmYTAyYWEwMDA+XSA/IDB4ZmZm
ZmZmZmZhMDJhYTAwMAogIFs8ZmZmZmZmZmZhMDJhYTA5ND5dIGk5MTVfaW5pdCsweDk0LzB4OWIg
W2k5MTVdCiAgWzxmZmZmZmZmZjgxMDAwNDIzPl0gZG9fb25lX2luaXRjYWxsKzB4MTEzLzB4MWYw
CiAgWzxmZmZmZmZmZjgxMGE0YjIxPl0gPyByY3VfcmVhZF9sb2NrX3NjaGVkX2hlbGQrMHg2MS8w
eDkwCiAgWzxmZmZmZmZmZjgxMTYwMWRjPl0gPyBrbWVtX2NhY2hlX2FsbG9jX3RyYWNlKzB4MWNj
LzB4MjgwCiAgWzxmZmZmZmZmZjgxMTExMTBhPl0gZG9faW5pdF9tb2R1bGUrMHg2MC8weDFjOAog
IFs8ZmZmZmZmZmY4MTBjNzMxYj5dIGxvYWRfbW9kdWxlKzB4MWNlYi8weDI0MTAKICBbPGZmZmZm
ZmZmODEwYzNhNjA+XSA/IHN0b3JlX3VldmVudCsweDQwLzB4NDAKICBbPGZmZmZmZmZmODExNzYz
ZDE+XSA/IGtlcm5lbF9yZWFkKzB4NDEvMHg2MAogIFs8ZmZmZmZmZmY4MTBjN2MxZD5dIFNZU0Nf
ZmluaXRfbW9kdWxlKzB4OGQvMHhhMAogIFs8ZmZmZmZmZmY4MTBjN2M0ZT5dIFN5U19maW5pdF9t
b2R1bGUrMHhlLzB4MTAKICBbPGZmZmZmZmZmODE1ZjFlOTc+XSBlbnRyeV9TWVNDQUxMXzY0X2Zh
c3RwYXRoKzB4MTIvMHg2ZgogLS0tWyBlbmQgdHJhY2UgMTE0OWU5YWIzNjk1YTQyMyBdLS0tCiAt
LS0tLS0tLS0tLS1bIGN1dCBoZXJlIF0tLS0tLS0tLS0tLS0KClJlcG9ydGVkLWJ5OiBUdnJ0a28g
VXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AbGludXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBN
YWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgotLS0K
ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBkZWVlNTYwMTBlZWUuLmQ5ZTA0
NzA0MTlhMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j
CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtNjM1OCw2ICs2
MzU4LDcgQEAgc3RhdGljIHZvaWQgaTl4eF9jcnRjX2Rpc2FibGUoc3RydWN0IGRybV9jcnRjICpj
cnRjKQogCiBzdGF0aWMgdm9pZCBpbnRlbF9jcnRjX2Rpc2FibGVfbm9hdG9taWMoc3RydWN0IGRy
bV9jcnRjICpjcnRjKQogeworCXN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyOwogCXN0cnVj
dCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKIAlzdHJ1Y3Qg
ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGNydGMtPmRldik7CiAJZW51bSBp
bnRlbF9kaXNwbGF5X3Bvd2VyX2RvbWFpbiBkb21haW47CkBAIC02Mzc4LDYgKzYzNzksMTkgQEAg
c3RhdGljIHZvaWQgaW50ZWxfY3J0Y19kaXNhYmxlX25vYXRvbWljKHN0cnVjdCBkcm1fY3J0YyAq
Y3J0YykKIAlkZXZfcHJpdi0+ZGlzcGxheS5jcnRjX2Rpc2FibGUoY3J0Yyk7CiAJaW50ZWxfY3J0
Yy0+YWN0aXZlID0gZmFsc2U7CiAJaW50ZWxfZmJjX2Rpc2FibGUoaW50ZWxfY3J0Yyk7CisKKwlE
Uk1fREVCVUdfS01TKCJbQ1JUQzolZF0gaHcgc3RhdGUgYWRqdXN0ZWQsIHdhcyBlbmFibGVkLCBu
b3cgZGlzYWJsZWRcbiIsCisJCSAgICAgIGNydGMtPmJhc2UuaWQpOworCisJV0FSTl9PTihkcm1f
YXRvbWljX3NldF9tb2RlX2Zvcl9jcnRjKGNydGMtPnN0YXRlLCBOVUxMKSA8IDApOworCWNydGMt
PnN0YXRlLT5hY3RpdmUgPSBmYWxzZTsKKwljcnRjLT5lbmFibGVkID0gZmFsc2U7CisJY3J0Yy0+
c3RhdGUtPmNvbm5lY3Rvcl9tYXNrID0gMDsKKwljcnRjLT5zdGF0ZS0+ZW5jb2Rlcl9tYXNrID0g
MDsKKworCWZvcl9lYWNoX2VuY29kZXJfb25fY3J0YyhjcnRjLT5kZXYsIGNydGMsIGVuY29kZXIp
CisJCWVuY29kZXItPmJhc2UuY3J0YyA9IE5VTEw7CisKIAlpbnRlbF91cGRhdGVfd2F0ZXJtYXJr
cyhjcnRjKTsKIAlpbnRlbF9kaXNhYmxlX3NoYXJlZF9kcGxsKGludGVsX2NydGMpOwogCkBAIC0x
NTUyNiwzOCArMTU1NDAsOSBAQCBzdGF0aWMgdm9pZCBpbnRlbF9zYW5pdGl6ZV9jcnRjKHN0cnVj
dCBpbnRlbF9jcnRjICpjcnRjKQogCiAJLyogQWRqdXN0IHRoZSBzdGF0ZSBvZiB0aGUgb3V0cHV0
IHBpcGUgYWNjb3JkaW5nIHRvIHdoZXRoZXIgd2UKIAkgKiBoYXZlIGFjdGl2ZSBjb25uZWN0b3Jz
L2VuY29kZXJzLiAqLwotCWlmICghaW50ZWxfY3J0Y19oYXNfZW5jb2RlcnMoY3J0YykpCisJaWYg
KGNydGMtPmFjdGl2ZSAmJiAhaW50ZWxfY3J0Y19oYXNfZW5jb2RlcnMoY3J0YykpCiAJCWludGVs
X2NydGNfZGlzYWJsZV9ub2F0b21pYygmY3J0Yy0+YmFzZSk7CiAKLQlpZiAoY3J0Yy0+YWN0aXZl
ICE9IGNydGMtPmJhc2Uuc3RhdGUtPmFjdGl2ZSkgewotCQlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAq
ZW5jb2RlcjsKLQotCQkvKiBUaGlzIGNhbiBoYXBwZW4gZWl0aGVyIGR1ZSB0byBidWdzIGluIHRo
ZSBnZXRfaHdfc3RhdGUKLQkJICogZnVuY3Rpb25zIG9yIGJlY2F1c2Ugb2YgY2FsbHMgdG8gaW50
ZWxfY3J0Y19kaXNhYmxlX25vYXRvbWljLAotCQkgKiBvciBiZWNhdXNlIHRoZSBwaXBlIGlzIGZv
cmNlLWVuYWJsZWQgZHVlIHRvIHRoZQotCQkgKiBwaXBlIEEgcXVpcmsuICovCi0JCURSTV9ERUJV
R19LTVMoIltDUlRDOiVkXSBodyBzdGF0ZSBhZGp1c3RlZCwgd2FzICVzLCBub3cgJXNcbiIsCi0J
CQkgICAgICBjcnRjLT5iYXNlLmJhc2UuaWQsCi0JCQkgICAgICBjcnRjLT5iYXNlLnN0YXRlLT5l
bmFibGUgPyAiZW5hYmxlZCIgOiAiZGlzYWJsZWQiLAotCQkJICAgICAgY3J0Yy0+YWN0aXZlID8g
ImVuYWJsZWQiIDogImRpc2FibGVkIik7Ci0KLQkJV0FSTl9PTihkcm1fYXRvbWljX3NldF9tb2Rl
X2Zvcl9jcnRjKGNydGMtPmJhc2Uuc3RhdGUsIE5VTEwpIDwgMCk7Ci0JCWNydGMtPmJhc2Uuc3Rh
dGUtPmFjdGl2ZSA9IGNydGMtPmFjdGl2ZTsKLQkJY3J0Yy0+YmFzZS5lbmFibGVkID0gY3J0Yy0+
YWN0aXZlOwotCQljcnRjLT5iYXNlLnN0YXRlLT5jb25uZWN0b3JfbWFzayA9IDA7Ci0JCWNydGMt
PmJhc2Uuc3RhdGUtPmVuY29kZXJfbWFzayA9IDA7Ci0KLQkJLyogQmVjYXVzZSB3ZSBvbmx5IGVz
dGFibGlzaCB0aGUgY29ubmVjdG9yIC0+IGVuY29kZXIgLT4KLQkJICogY3J0YyBsaW5rcyBpZiBz
b21ldGhpbmcgaXMgYWN0aXZlLCB0aGlzIG1lYW5zIHRoZQotCQkgKiBjcnRjIGlzIG5vdyBkZWFj
dGl2YXRlZC4gQnJlYWsgdGhlIGxpbmtzLiBjb25uZWN0b3IKLQkJICogLT4gZW5jb2RlciBsaW5r
cyBhcmUgb25seSBlc3RhYmxpc2ggd2hlbiB0aGluZ3MgYXJlCi0JCSAqICBhY3R1YWxseSB1cCwg
aGVuY2Ugbm8gbmVlZCB0byBicmVhayB0aGVtLiAqLwotCQlXQVJOX09OKGNydGMtPmFjdGl2ZSk7
Ci0KLQkJZm9yX2VhY2hfZW5jb2Rlcl9vbl9jcnRjKGRldiwgJmNydGMtPmJhc2UsIGVuY29kZXIp
Ci0JCQllbmNvZGVyLT5iYXNlLmNydGMgPSBOVUxMOwotCX0KLQogCWlmIChjcnRjLT5hY3RpdmUg
fHwgSEFTX0dNQ0hfRElTUExBWShkZXYpKSB7CiAJCS8qCiAJCSAqIFdlIHN0YXJ0IG91dCB3aXRo
IHVuZGVycnVuIHJlcG9ydGluZyBkaXNhYmxlZCB0byBhdm9pZCByYWNlcy4KCl9fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp
c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr
dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=