From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH v4 7/8] drm/i915: Do not compute watermarks on a
	noop.
Date: Wed, 10 Feb 2016 13:49:42 +0100
Message-ID: <1455108583-29227-8-git-send-email-maarten.lankhorst@linux.intel.com>
References: <1455108583-29227-1-git-send-email-maarten.lankhorst@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 mblankhorst.nl (mblankhorst.nl [141.105.120.124])
 by gabe.freedesktop.org (Postfix) with ESMTPS id DB97C6E6C6
 for <intel-gfx@lists.freedesktop.org>; Wed, 10 Feb 2016 04:49:49 -0800 (PST)
In-Reply-To: <1455108583-29227-1-git-send-email-maarten.lankhorst@linux.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: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

Tm8gYXRvbWljIHN0YXRlIHNob3VsZCBiZSBpbmNsdWRlZCBhZnRlciBhbGwgdmFsaWRhdGlvbiB3
aGVuIG5vdGhpbmcgaGFzCmNoYW5nZWQuIER1cmluZyBtb2Rlc2V0IGFsbCBhY3RpdmUgcGxhbmVz
IHdpbGwgYmUgYWRkZWQgdG8gdGhlIHN0YXRlLAp3aGlsZSBkaXNhYmxlZCBwbGFuZXMgd29uJ3Qg
Y2hhbmdlIHRoZWlyIHN0YXRlLgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1h
YXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KQ2M6IE1hdHQgUm9wZXIgPG1hdHRoZXcu
ZC5yb3BlckBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh
eS5jIHwgIDMgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICB8IDEzICsr
KysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgICAgfCA2MSArKysrKysr
KysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgNTEgaW5zZXJ0
aW9ucygrKSwgMjYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j
CmluZGV4IDAwY2IyNjFjNjc4Ny4uNmJiMWY1ZGJjN2EwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfZGlzcGxheS5jCkBAIC0xMTkxMCw3ICsxMTkxMCw4IEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0
Y19hdG9taWNfY2hlY2soc3RydWN0IGRybV9jcnRjICpjcnRjLAogCX0KIAogCXJldCA9IDA7Ci0J
aWYgKGRldl9wcml2LT5kaXNwbGF5LmNvbXB1dGVfcGlwZV93bSkgeworCWlmIChkZXZfcHJpdi0+
ZGlzcGxheS5jb21wdXRlX3BpcGVfd20gJiYKKwkgICAgKG1vZGVfY2hhbmdlZCB8fCBwaXBlX2Nv
bmZpZy0+dXBkYXRlX3BpcGUgfHwgY3J0Y19zdGF0ZS0+cGxhbmVzX2NoYW5nZWQpKSB7CiAJCXJl
dCA9IGRldl9wcml2LT5kaXNwbGF5LmNvbXB1dGVfcGlwZV93bShpbnRlbF9jcnRjLCBzdGF0ZSk7
CiAJCWlmIChyZXQpCiAJCQlyZXR1cm4gcmV0OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRl
eCA4ZWZmYjllY2UyMWUuLjE0NDU5N2FjNzRlMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgK
QEAgLTE1ODMsNiArMTU4MywxOSBAQCBpbnRlbF9hdG9taWNfZ2V0X2NydGNfc3RhdGUoc3RydWN0
IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAogCiAJcmV0dXJuIHRvX2ludGVsX2NydGNfc3RhdGUo
Y3J0Y19zdGF0ZSk7CiB9CisKK3N0YXRpYyBpbmxpbmUgc3RydWN0IGludGVsX3BsYW5lX3N0YXRl
ICoKK2ludGVsX2F0b21pY19nZXRfZXhpc3RpbmdfcGxhbmVfc3RhdGUoc3RydWN0IGRybV9hdG9t
aWNfc3RhdGUgKnN0YXRlLAorCQkJCSAgICAgIHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUpCit7
CisJc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGU7CisKKwlwbGFuZV9zdGF0ZSA9
IGRybV9hdG9taWNfZ2V0X2V4aXN0aW5nX3BsYW5lX3N0YXRlKHN0YXRlLCAmcGxhbmUtPmJhc2Up
OworCisJcmV0dXJuIHRvX2ludGVsX3BsYW5lX3N0YXRlKHBsYW5lX3N0YXRlKTsKK30KKworCiBp
bnQgaW50ZWxfYXRvbWljX3NldHVwX3NjYWxlcnMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlz
dHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywKIAlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAq
Y3J0Y19zdGF0ZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5j
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCAzNzllYWJlMDkzY2IuLjhm
YjhjNjg5MWFlNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwor
KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC0yMDEwLDExICsyMDEwLDE4
IEBAIHN0YXRpYyB2b2lkIGlsa19jb21wdXRlX3dtX2xldmVsKGNvbnN0IHN0cnVjdCBkcm1faTkx
NV9wcml2YXRlICpkZXZfcHJpdiwKIAkJY3VyX2xhdGVuY3kgKj0gNTsKIAl9CiAKLQlyZXN1bHQt
PnByaV92YWwgPSBpbGtfY29tcHV0ZV9wcmlfd20oY3N0YXRlLCBwcmlzdGF0ZSwKLQkJCQkJICAg
ICBwcmlfbGF0ZW5jeSwgbGV2ZWwpOwotCXJlc3VsdC0+c3ByX3ZhbCA9IGlsa19jb21wdXRlX3Nw
cl93bShjc3RhdGUsIHNwcnN0YXRlLCBzcHJfbGF0ZW5jeSk7Ci0JcmVzdWx0LT5jdXJfdmFsID0g
aWxrX2NvbXB1dGVfY3VyX3dtKGNzdGF0ZSwgY3Vyc3RhdGUsIGN1cl9sYXRlbmN5KTsKLQlyZXN1
bHQtPmZiY192YWwgPSBpbGtfY29tcHV0ZV9mYmNfd20oY3N0YXRlLCBwcmlzdGF0ZSwgcmVzdWx0
LT5wcmlfdmFsKTsKKwlpZiAocHJpc3RhdGUpIHsKKwkJcmVzdWx0LT5wcmlfdmFsID0gaWxrX2Nv
bXB1dGVfcHJpX3dtKGNzdGF0ZSwgcHJpc3RhdGUsCisJCQkJCQkgICAgIHByaV9sYXRlbmN5LCBs
ZXZlbCk7CisJCXJlc3VsdC0+ZmJjX3ZhbCA9IGlsa19jb21wdXRlX2ZiY193bShjc3RhdGUsIHBy
aXN0YXRlLCByZXN1bHQtPnByaV92YWwpOworCX0KKworCWlmIChzcHJzdGF0ZSkKKwkJcmVzdWx0
LT5zcHJfdmFsID0gaWxrX2NvbXB1dGVfc3ByX3dtKGNzdGF0ZSwgc3Byc3RhdGUsIHNwcl9sYXRl
bmN5KTsKKworCWlmIChjdXJzdGF0ZSkKKwkJcmVzdWx0LT5jdXJfdmFsID0gaWxrX2NvbXB1dGVf
Y3VyX3dtKGNzdGF0ZSwgY3Vyc3RhdGUsIGN1cl9sYXRlbmN5KTsKKwogCXJlc3VsdC0+ZW5hYmxl
ID0gdHJ1ZTsKIH0KIApAQCAtMjI4Nyw3ICsyMjk0LDYgQEAgc3RhdGljIGludCBpbGtfY29tcHV0
ZV9waXBlX3dtKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAogCWNvbnN0IHN0cnVjdCBk
cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGlu
dGVsX2NydGNfc3RhdGUgKmNzdGF0ZSA9IE5VTEw7CiAJc3RydWN0IGludGVsX3BsYW5lICppbnRl
bF9wbGFuZTsKLQlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwczsKIAlzdHJ1Y3QgaW50ZWxfcGxh
bmVfc3RhdGUgKnByaXN0YXRlID0gTlVMTDsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnNw
cnN0YXRlID0gTlVMTDsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKmN1cnN0YXRlID0gTlVM
TDsKQEAgLTIzMDYsMzAgKzIzMTIsMzcgQEAgc3RhdGljIGludCBpbGtfY29tcHV0ZV9waXBlX3dt
KHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAogCW1lbXNldChwaXBlX3dtLCAwLCBzaXpl
b2YoKnBpcGVfd20pKTsKIAogCWZvcl9lYWNoX2ludGVsX3BsYW5lX29uX2NydGMoZGV2LCBpbnRl
bF9jcnRjLCBpbnRlbF9wbGFuZSkgewotCQlwcyA9IGRybV9hdG9taWNfZ2V0X3BsYW5lX3N0YXRl
KHN0YXRlLAotCQkJCQkJJmludGVsX3BsYW5lLT5iYXNlKTsKLQkJaWYgKElTX0VSUihwcykpCi0J
CQlyZXR1cm4gUFRSX0VSUihwcyk7CisJCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcHM7CisK
KwkJcHMgPSBpbnRlbF9hdG9taWNfZ2V0X2V4aXN0aW5nX3BsYW5lX3N0YXRlKHN0YXRlLAorCQkJ
CQkJCSAgIGludGVsX3BsYW5lKTsKKwkJaWYgKCFwcykKKwkJCWNvbnRpbnVlOwogCiAJCWlmIChp
bnRlbF9wbGFuZS0+YmFzZS50eXBlID09IERSTV9QTEFORV9UWVBFX1BSSU1BUlkpCi0JCQlwcmlz
dGF0ZSA9IHRvX2ludGVsX3BsYW5lX3N0YXRlKHBzKTsKLQkJZWxzZSBpZiAoaW50ZWxfcGxhbmUt
PmJhc2UudHlwZSA9PSBEUk1fUExBTkVfVFlQRV9PVkVSTEFZKQotCQkJc3Byc3RhdGUgPSB0b19p
bnRlbF9wbGFuZV9zdGF0ZShwcyk7Ci0JCWVsc2UgaWYgKGludGVsX3BsYW5lLT5iYXNlLnR5cGUg
PT0gRFJNX1BMQU5FX1RZUEVfQ1VSU09SKQotCQkJY3Vyc3RhdGUgPSB0b19pbnRlbF9wbGFuZV9z
dGF0ZShwcyk7CisJCQlwcmlzdGF0ZSA9IHBzOworCQllbHNlIGlmIChpbnRlbF9wbGFuZS0+YmFz
ZS50eXBlID09IERSTV9QTEFORV9UWVBFX09WRVJMQVkpIHsKKwkJCXNwcnN0YXRlID0gcHM7CisK
KwkJCWlmIChwcykgeworCQkJCXBpcGVfd20tPnNwcml0ZXNfZW5hYmxlZCA9IHNwcnN0YXRlLT52
aXNpYmxlOworCQkJCXBpcGVfd20tPnNwcml0ZXNfc2NhbGVkID0gc3Byc3RhdGUtPnZpc2libGUg
JiYKKwkJCQkJKGRybV9yZWN0X3dpZHRoKCZzcHJzdGF0ZS0+ZHN0KSAhPSBkcm1fcmVjdF93aWR0
aCgmc3Byc3RhdGUtPnNyYykgPj4gMTYgfHwKKwkJCQkJZHJtX3JlY3RfaGVpZ2h0KCZzcHJzdGF0
ZS0+ZHN0KSAhPSBkcm1fcmVjdF9oZWlnaHQoJnNwcnN0YXRlLT5zcmMpID4+IDE2KTsKKwkJCX0K
KwkJfSBlbHNlIGlmIChpbnRlbF9wbGFuZS0+YmFzZS50eXBlID09IERSTV9QTEFORV9UWVBFX0NV
UlNPUikKKwkJCWN1cnN0YXRlID0gcHM7CiAJfQogCi0JY29uZmlnLnNwcml0ZXNfZW5hYmxlZCA9
IHNwcnN0YXRlLT52aXNpYmxlOwotCWNvbmZpZy5zcHJpdGVzX3NjYWxlZCA9IHNwcnN0YXRlLT52
aXNpYmxlICYmCi0JCShkcm1fcmVjdF93aWR0aCgmc3Byc3RhdGUtPmRzdCkgIT0gZHJtX3JlY3Rf
d2lkdGgoJnNwcnN0YXRlLT5zcmMpID4+IDE2IHx8Ci0JCWRybV9yZWN0X2hlaWdodCgmc3Byc3Rh
dGUtPmRzdCkgIT0gZHJtX3JlY3RfaGVpZ2h0KCZzcHJzdGF0ZS0+c3JjKSA+PiAxNik7CisJY29u
ZmlnLnNwcml0ZXNfZW5hYmxlZCA9IHBpcGVfd20tPnNwcml0ZXNfZW5hYmxlZDsKKwljb25maWcu
c3ByaXRlc19zY2FsZWQgPSBwaXBlX3dtLT5zcHJpdGVzX3NjYWxlZDsKIAogCXBpcGVfd20tPnBp
cGVfZW5hYmxlZCA9IGNzdGF0ZS0+YmFzZS5hY3RpdmU7CiAJcGlwZV93bS0+c3ByaXRlc19lbmFi
bGVkID0gY29uZmlnLnNwcml0ZXNfZW5hYmxlZDsKIAlwaXBlX3dtLT5zcHJpdGVzX3NjYWxlZCA9
IGNvbmZpZy5zcHJpdGVzX3NjYWxlZDsKIAogCS8qIElMSy9TTkI6IExQMisgd2F0ZXJtYXJrcyBv
bmx5IHcvbyBzcHJpdGVzICovCi0JaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuIDw9IDYgJiYgc3By
c3RhdGUtPnZpc2libGUpCisJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuIDw9IDYgJiYgcGlwZV93
bS0+c3ByaXRlc19lbmFibGVkKQogCQltYXhfbGV2ZWwgPSAxOwogCiAJLyogSUxLL1NOQi9JVkI6
IExQMSsgd2F0ZXJtYXJrcyBvbmx5IHcvbyBzY2FsaW5nICovCkBAIC0yMzUyLDIwICsyMzY1LDE4
IEBAIHN0YXRpYyBpbnQgaWxrX2NvbXB1dGVfcGlwZV93bShzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50
ZWxfY3J0YywKIAlpbGtfY29tcHV0ZV93bV9yZWdfbWF4aW11bXMoZGV2LCAxLCAmbWF4KTsKIAog
CWZvciAobGV2ZWwgPSAxOyBsZXZlbCA8PSBtYXhfbGV2ZWw7IGxldmVsKyspIHsKLQkJc3RydWN0
IGludGVsX3dtX2xldmVsIHdtID0ge307CisJCXN0cnVjdCBpbnRlbF93bV9sZXZlbCAqd20gPSAm
cGlwZV93bS0+d21bbGV2ZWxdOwogCiAJCWlsa19jb21wdXRlX3dtX2xldmVsKGRldl9wcml2LCBp
bnRlbF9jcnRjLCBsZXZlbCwgY3N0YXRlLAotCQkJCSAgICAgcHJpc3RhdGUsIHNwcnN0YXRlLCBj
dXJzdGF0ZSwgJndtKTsKKwkJCQkgICAgIHByaXN0YXRlLCBzcHJzdGF0ZSwgY3Vyc3RhdGUsIHdt
KTsKIAogCQkvKgogCQkgKiBEaXNhYmxlIGFueSB3YXRlcm1hcmsgbGV2ZWwgdGhhdCBleGNlZWRz
IHRoZQogCQkgKiByZWdpc3RlciBtYXhpbXVtcyBzaW5jZSBzdWNoIHdhdGVybWFya3MgYXJlCiAJ
CSAqIGFsd2F5cyBpbnZhbGlkLgogCQkgKi8KLQkJaWYgKCFpbGtfdmFsaWRhdGVfd21fbGV2ZWwo
bGV2ZWwsICZtYXgsICZ3bSkpCisJCWlmICghaWxrX3ZhbGlkYXRlX3dtX2xldmVsKGxldmVsLCAm
bWF4LCB3bSkpCiAJCQlicmVhazsKLQotCQlwaXBlX3dtLT53bVtsZXZlbF0gPSB3bTsKIAl9CiAK
IAlyZXR1cm4gMDsKLS0gCjIuMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl
ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m
by9pbnRlbC1nZngK