From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH v1.1] drm/i915: Update state before setting
	watermarks, v2.
Date: Wed, 2 Mar 2016 15:48:01 +0100
Message-ID: <56D6FD21.7020907@linux.intel.com>
References: <56CDB61D.8020108@linux.intel.com>
 <1456754892.2734.17.camel@gmail.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 mga04.intel.com (mga04.intel.com [192.55.52.120])
 by gabe.freedesktop.org (Postfix) with ESMTP id 9FDDB6E8A6
 for <intel-gfx@lists.freedesktop.org>; Wed,  2 Mar 2016 14:48:03 +0000 (UTC)
In-Reply-To: <1456754892.2734.17.camel@gmail.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: Ander Conselvan De Oliveira <conselvan2@gmail.com>, Intel Graphics Development <intel-gfx@lists.freedesktop.org>
List-Id: intel-gfx@lists.freedesktop.org

V2hlbiBpbnRlbF91cGRhdGVfd2F0ZXJtYXJrcyBpcyBjYWxsZWQgb24gc2t5bGFrZSBmcm9tIHRo
ZSBodwpzdGF0ZSByZWFkb3V0IGRpc2FibGUgZnVuY3Rpb24gaXQgY2FsbHMgaW50ZWxfdXBkYXRl
X3dhdGVybWFya3MuCmludGVsX3VwZGF0ZV93YXRlcm1hcmtzIGluc3BlY3RzIGNydGMtPnN0YXRl
LCB3aGljaCBzaG91bGQgYmUKc2V0IHRvIGRpc2FibGVkLgoKVGhpcyB3YXNuJ3QgdGhlIGNhc2Us
IGFuZCB0aGlzIHJlc3VsdGVkIGluIGEgZGl2aWRlLWJ5LXplcm8gaW4Kc2tsX3VwZGF0ZV93bSB3
aGVuIGludGVsX3VwZGF0ZV93YXRlcm1hcmtzIGdvdCBjYWxsZWQuCgogLS0tLS0tLS0tLS0tWyBj
dXQgaGVyZSBdLS0tLS0tLS0tLS0tCiBXQVJOSU5HOiBDUFU6IDEgUElEOiAyOTUgYXQgZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYzoyODM0CnNrbF91cGRhdGVfcGlwZV93bSsweDEwMi8w
eDhjMCBbaTkxNV0oKQogV0FSTl9PTighY29uZmlnLT5udW1fcGlwZXNfYWN0aXZlKQogTW9kdWxl
cyBsaW5rZWQgaW46IGNvcmV0ZW1wIGk5MTUoKykKeHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4
eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4CiBDUFU6IDEgUElEOiAyOTUgQ29tbTogc3lz
dGVtZC11ZGV2ZCBUYWludGVkOiBHICAgICBVICBXICAgICAgIDQuNS4wLXJjNAoteHh4eHh4ICMy
NQogSGFyZHdhcmUgbmFtZTogeHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4
eHgKICAwMDAwMDAwMDAwMDAwMDAwIGZmZmY4ODAwMzc3N2Y1YTggZmZmZmZmZmY4MTM0ODVjMiBm
ZmZmODgwMDM3NzdmNWYwCiAgZmZmZmZmZmZhMDIzNjI0MCBmZmZmODgwMDM3NzdmNWUwIGZmZmZm
ZmZmODEwNTBmY2UgZmZmZjg4MDBhYTQyMDAwMAogIGZmZmY4ODAwYWJhMTgwMDAgZmZmZjg4MDBh
YmExODAwMCBmZmZmODgwMDM3MzA0YzAwIGZmZmY4ODAwYWE0MjAwMDAKIENhbGwgVHJhY2U6CiAg
WzxmZmZmZmZmZjgxMzQ4NWMyPl0gZHVtcF9zdGFjaysweDY3LzB4OTUKICBbPGZmZmZmZmZmODEw
NTBmY2U+XSB3YXJuX3Nsb3dwYXRoX2NvbW1vbisweDllLzB4YzAKICBbPGZmZmZmZmZmODEwNTEw
M2M+XSB3YXJuX3Nsb3dwYXRoX2ZtdCsweDRjLzB4NTAKICBbPGZmZmZmZmZmODEwNjk0NWU+XSA/
IGZsdXNoX3dvcmsrMHg4ZS8weDI4MAogIFs8ZmZmZmZmZmY4MTA2OTNkNT5dID8gZmx1c2hfd29y
aysweDUvMHgyODAKICBbPGZmZmZmZmZmYTAxNmFkZDI+XSBza2xfdXBkYXRlX3BpcGVfd20rMHgx
MDIvMHg4YzAgW2k5MTVdCiAgWzxmZmZmZmZmZmEwMTZiOTZmPl0gc2tsX3VwZGF0ZV93bSsweGZm
LzB4NWYwIFtpOTE1XQogIFs8ZmZmZmZmZmY4MTA5MjhlZT5dID8gdHJhY2VfaGFyZGlycXNfb25f
Y2FsbGVyKzB4MTVlLzB4MWQwCiAgWzxmZmZmZmZmZjgxMDkyOTZkPl0gPyB0cmFjZV9oYXJkaXJx
c19vbisweGQvMHgxMAogIFs8ZmZmZmZmZmZhMDE2Y2U2ZT5dIGludGVsX3VwZGF0ZV93YXRlcm1h
cmtzKzB4MWUvMHgzMCBbaTkxNV0KICBbPGZmZmZmZmZmYTAxZDNlZTI+XSBpbnRlbF9jcnRjX2Rp
c2FibGVfbm9hdG9taWMrMHhkMi8weDE1MCBbaTkxNV0KICBbPGZmZmZmZmZmYTAxZGQzZDI+XSBp
bnRlbF9tb2Rlc2V0X3NldHVwX2h3X3N0YXRlKzB4ZGQyLzB4ZGUwIFtpOTE1XQogIFs8ZmZmZmZm
ZmZhMDFkZmQ4Mz5dIGludGVsX21vZGVzZXRfaW5pdCsweDE1YTMvMHgxOTUwIFtpOTE1XQogIFs8
ZmZmZmZmZmZhMDIxNjBiNj5dIGk5MTVfZHJpdmVyX2xvYWQrMHgxM2M2LzB4MTcyMCBbaTkxNV0K
ICBbPGZmZmZmZmZmODE1MjIxNjA+XSA/IGFkZF9zeXNmc19md19tYXBfZW50cnkrMHg5Yi8weDli
CiAgWzxmZmZmZmZmZmEwMGIxNWVmPl0gZHJtX2Rldl9yZWdpc3RlcisweDZmLzB4YjAgW2RybV0K
ICBbPGZmZmZmZmZmYTAwYjNiM2E+XSBkcm1fZ2V0X3BjaV9kZXYrMHgxMGEvMHgxZDAgW2RybV0K
ICBbPGZmZmZmZmZmYTAxNTgyZDk+XSBpOTE1X3BjaV9wcm9iZSsweDQ5LzB4NTAgW2k5MTVdCiAg
WzxmZmZmZmZmZjgxMzhhZTMwPl0gcGNpX2RldmljZV9wcm9iZSsweDgwLzB4ZjAKICBbPGZmZmZm
ZmZmODE0M2UyYWM+XSBkcml2ZXJfcHJvYmVfZGV2aWNlKzB4MWJjLzB4M2QwCiAgWzxmZmZmZmZm
ZjgxNDNlNTI2Pl0gX19kcml2ZXJfYXR0YWNoKzB4NjYvMHg5MAogIFs8ZmZmZmZmZmY4MTQzZTRj
MD5dID8gZHJpdmVyX3Byb2JlX2RldmljZSsweDNkMC8weDNkMAogIFs8ZmZmZmZmZmY4MTQzYmUz
Yj5dIGJ1c19mb3JfZWFjaF9kZXYrMHg1Yi8weGEwCiAgWzxmZmZmZmZmZjgxNDNkYjNlPl0gZHJp
dmVyX2F0dGFjaCsweDFlLzB4MjAKICBbPGZmZmZmZmZmODE0M2Q0NjE+XSBidXNfYWRkX2RyaXZl
cisweDE1MS8weDI3MAogIFs8ZmZmZmZmZmY4MTQzZWFiYz5dIGRyaXZlcl9yZWdpc3RlcisweDhj
LzB4ZDAKICBbPGZmZmZmZmZmODEzOGEyZWQ+XSBfX3BjaV9yZWdpc3Rlcl9kcml2ZXIrMHg1ZC8w
eDYwCiAgWzxmZmZmZmZmZmEwMGIzYzU4Pl0gZHJtX3BjaV9pbml0KzB4NTgvMHhmMCBbZHJtXQog
IFs8ZmZmZmZmZmY4MTA5Mjk2ZD5dID8gdHJhY2VfaGFyZGlycXNfb24rMHhkLzB4MTAKICBbPGZm
ZmZmZmZmYTAyYWEwMDA+XSA/IDB4ZmZmZmZmZmZhMDJhYTAwMAogIFs8ZmZmZmZmZmZhMDJhYTA5
ND5dIGk5MTVfaW5pdCsweDk0LzB4OWIgW2k5MTVdCiAgWzxmZmZmZmZmZjgxMDAwNDIzPl0gZG9f
b25lX2luaXRjYWxsKzB4MTEzLzB4MWYwCiAgWzxmZmZmZmZmZjgxMGE0YjIxPl0gPyByY3VfcmVh
ZF9sb2NrX3NjaGVkX2hlbGQrMHg2MS8weDkwCiAgWzxmZmZmZmZmZjgxMTYwMWRjPl0gPyBrbWVt
X2NhY2hlX2FsbG9jX3RyYWNlKzB4MWNjLzB4MjgwCiAgWzxmZmZmZmZmZjgxMTExMTBhPl0gZG9f
aW5pdF9tb2R1bGUrMHg2MC8weDFjOAogIFs8ZmZmZmZmZmY4MTBjNzMxYj5dIGxvYWRfbW9kdWxl
KzB4MWNlYi8weDI0MTAKICBbPGZmZmZmZmZmODEwYzNhNjA+XSA/IHN0b3JlX3VldmVudCsweDQw
LzB4NDAKICBbPGZmZmZmZmZmODExNzYzZDE+XSA/IGtlcm5lbF9yZWFkKzB4NDEvMHg2MAogIFs8
ZmZmZmZmZmY4MTBjN2MxZD5dIFNZU0NfZmluaXRfbW9kdWxlKzB4OGQvMHhhMAogIFs8ZmZmZmZm
ZmY4MTBjN2M0ZT5dIFN5U19maW5pdF9tb2R1bGUrMHhlLzB4MTAKICBbPGZmZmZmZmZmODE1ZjFl
OTc+XSBlbnRyeV9TWVNDQUxMXzY0X2Zhc3RwYXRoKzB4MTIvMHg2ZgogLS0tWyBlbmQgdHJhY2Ug
MTE0OWU5YWIzNjk1YTQyMyBdLS0tCiAtLS0tLS0tLS0tLS1bIGN1dCBoZXJlIF0tLS0tLS0tLS0t
LS0KCkNoYW5nZXMgc2luY2UgdjE6Ci0gQ2xlYXIgc3RhdGUgYmVmb3JlIGNhbGxpbmcgYW55IGZ1
bmN0aW9uIGFmdGVyIC5jcnRjX2Rpc2FibGUuCgpSZXBvcnRlZC1ieTogVHZydGtvIFVyc3VsaW4g
PHR2cnRrby51cnN1bGluQGxpbnV4LmludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBM
YW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCmRpZmYgLS1n
aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggM2U2ZDUxZTAwZjU2Li42MWI0NzNkYzhlZDQg
MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTY0ODYsNiArNjQ4Niw3IEBA
IHN0YXRpYyB2b2lkIGk5eHhfY3J0Y19kaXNhYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAog
c3RhdGljIHZvaWQgaW50ZWxfY3J0Y19kaXNhYmxlX25vYXRvbWljKHN0cnVjdCBkcm1fY3J0YyAq
Y3J0YykKIHsKKwlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcjsKIAlzdHJ1Y3QgaW50ZWxf
Y3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAJc3RydWN0IGRybV9pOTE1
X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShjcnRjLT5kZXYpOwogCWVudW0gaW50ZWxfZGlz
cGxheV9wb3dlcl9kb21haW4gZG9tYWluOwpAQCAtNjUwNCw3ICs2NTA1LDIwIEBAIHN0YXRpYyB2
b2lkIGludGVsX2NydGNfZGlzYWJsZV9ub2F0b21pYyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJ
fQogCiAJZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19kaXNhYmxlKGNydGMpOworCisJRFJNX0RFQlVH
X0tNUygiW0NSVEM6JWRdIGh3IHN0YXRlIGFkanVzdGVkLCB3YXMgZW5hYmxlZCwgbm93IGRpc2Fi
bGVkXG4iLAorCQkgICAgICBjcnRjLT5iYXNlLmlkKTsKKworCVdBUk5fT04oZHJtX2F0b21pY19z
ZXRfbW9kZV9mb3JfY3J0YyhjcnRjLT5zdGF0ZSwgTlVMTCkgPCAwKTsKKwljcnRjLT5zdGF0ZS0+
YWN0aXZlID0gZmFsc2U7CiAJaW50ZWxfY3J0Yy0+YWN0aXZlID0gZmFsc2U7CisJY3J0Yy0+ZW5h
YmxlZCA9IGZhbHNlOworCWNydGMtPnN0YXRlLT5jb25uZWN0b3JfbWFzayA9IDA7CisJY3J0Yy0+
c3RhdGUtPmVuY29kZXJfbWFzayA9IDA7CisKKwlmb3JfZWFjaF9lbmNvZGVyX29uX2NydGMoY3J0
Yy0+ZGV2LCBjcnRjLCBlbmNvZGVyKQorCQllbmNvZGVyLT5iYXNlLmNydGMgPSBOVUxMOworCiAJ
aW50ZWxfZmJjX2Rpc2FibGUoaW50ZWxfY3J0Yyk7CiAJaW50ZWxfdXBkYXRlX3dhdGVybWFya3Mo
Y3J0Yyk7CiAJaW50ZWxfZGlzYWJsZV9zaGFyZWRfZHBsbChpbnRlbF9jcnRjKTsKQEAgLTE1ODAw
LDM4ICsxNTgxNCw5IEBAIHN0YXRpYyB2b2lkIGludGVsX3Nhbml0aXplX2NydGMoc3RydWN0IGlu
dGVsX2NydGMgKmNydGMpCiAKIAkvKiBBZGp1c3QgdGhlIHN0YXRlIG9mIHRoZSBvdXRwdXQgcGlw
ZSBhY2NvcmRpbmcgdG8gd2hldGhlciB3ZQogCSAqIGhhdmUgYWN0aXZlIGNvbm5lY3RvcnMvZW5j
b2RlcnMuICovCi0JaWYgKCFpbnRlbF9jcnRjX2hhc19lbmNvZGVycyhjcnRjKSkKKwlpZiAoY3J0
Yy0+YWN0aXZlICYmICFpbnRlbF9jcnRjX2hhc19lbmNvZGVycyhjcnRjKSkKIAkJaW50ZWxfY3J0
Y19kaXNhYmxlX25vYXRvbWljKCZjcnRjLT5iYXNlKTsKIAotCWlmIChjcnRjLT5hY3RpdmUgIT0g
Y3J0Yy0+YmFzZS5zdGF0ZS0+YWN0aXZlKSB7Ci0JCXN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNv
ZGVyOwotCi0JCS8qIFRoaXMgY2FuIGhhcHBlbiBlaXRoZXIgZHVlIHRvIGJ1Z3MgaW4gdGhlIGdl
dF9od19zdGF0ZQotCQkgKiBmdW5jdGlvbnMgb3IgYmVjYXVzZSBvZiBjYWxscyB0byBpbnRlbF9j
cnRjX2Rpc2FibGVfbm9hdG9taWMsCi0JCSAqIG9yIGJlY2F1c2UgdGhlIHBpcGUgaXMgZm9yY2Ut
ZW5hYmxlZCBkdWUgdG8gdGhlCi0JCSAqIHBpcGUgQSBxdWlyay4gKi8KLQkJRFJNX0RFQlVHX0tN
UygiW0NSVEM6JWRdIGh3IHN0YXRlIGFkanVzdGVkLCB3YXMgJXMsIG5vdyAlc1xuIiwKLQkJCSAg
ICAgIGNydGMtPmJhc2UuYmFzZS5pZCwKLQkJCSAgICAgIGNydGMtPmJhc2Uuc3RhdGUtPmVuYWJs
ZSA/ICJlbmFibGVkIiA6ICJkaXNhYmxlZCIsCi0JCQkgICAgICBjcnRjLT5hY3RpdmUgPyAiZW5h
YmxlZCIgOiAiZGlzYWJsZWQiKTsKLQotCQlXQVJOX09OKGRybV9hdG9taWNfc2V0X21vZGVfZm9y
X2NydGMoY3J0Yy0+YmFzZS5zdGF0ZSwgTlVMTCkgPCAwKTsKLQkJY3J0Yy0+YmFzZS5zdGF0ZS0+
YWN0aXZlID0gY3J0Yy0+YWN0aXZlOwotCQljcnRjLT5iYXNlLmVuYWJsZWQgPSBjcnRjLT5hY3Rp
dmU7Ci0JCWNydGMtPmJhc2Uuc3RhdGUtPmNvbm5lY3Rvcl9tYXNrID0gMDsKLQkJY3J0Yy0+YmFz
ZS5zdGF0ZS0+ZW5jb2Rlcl9tYXNrID0gMDsKLQotCQkvKiBCZWNhdXNlIHdlIG9ubHkgZXN0YWJs
aXNoIHRoZSBjb25uZWN0b3IgLT4gZW5jb2RlciAtPgotCQkgKiBjcnRjIGxpbmtzIGlmIHNvbWV0
aGluZyBpcyBhY3RpdmUsIHRoaXMgbWVhbnMgdGhlCi0JCSAqIGNydGMgaXMgbm93IGRlYWN0aXZh
dGVkLiBCcmVhayB0aGUgbGlua3MuIGNvbm5lY3RvcgotCQkgKiAtPiBlbmNvZGVyIGxpbmtzIGFy
ZSBvbmx5IGVzdGFibGlzaCB3aGVuIHRoaW5ncyBhcmUKLQkJICogIGFjdHVhbGx5IHVwLCBoZW5j
ZSBubyBuZWVkIHRvIGJyZWFrIHRoZW0uICovCi0JCVdBUk5fT04oY3J0Yy0+YWN0aXZlKTsKLQot
CQlmb3JfZWFjaF9lbmNvZGVyX29uX2NydGMoZGV2LCAmY3J0Yy0+YmFzZSwgZW5jb2RlcikKLQkJ
CWVuY29kZXItPmJhc2UuY3J0YyA9IE5VTEw7Ci0JfQotCiAJaWYgKGNydGMtPmFjdGl2ZSB8fCBI
QVNfR01DSF9ESVNQTEFZKGRldikpIHsKIAkJLyoKIAkJICogV2Ugc3RhcnQgb3V0IHdpdGggdW5k
ZXJydW4gcmVwb3J0aW5nIGRpc2FibGVkIHRvIGF2b2lkIHJhY2VzLgoKX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJ
bnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au
b3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==