From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH v2 08/11] drm/i915/gen9+: Use the watermarks
	from crtc_state for everything, v2.
Date: Wed, 26 Oct 2016 15:41:36 +0200
Message-ID: <1477489299-25777-9-git-send-email-maarten.lankhorst@linux.intel.com>
References: <1477489299-25777-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
 [IPv6:2a02:2308::216:3eff:fe92:dfa3])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 6C6346E87C
 for <intel-gfx@lists.freedesktop.org>; Wed, 26 Oct 2016 13:42:00 +0000 (UTC)
In-Reply-To: <1477489299-25777-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

VGhlcmUncyBubyBuZWVkIHRvIGtlZXAgYSBkdXBsaWNhdGUgc2tsX3BpcGVfd20gYXJvdW5kIGFu
eSBtb3JlLApldmVyeXRoaW5nIGNhbiBiZSBkaXNjb3ZlcmVkIGZyb20gY3J0Y19zdGF0ZSwgd2hp
Y2ggd2UgcGFzcyBhcm91bmQKY29ycmVjdGx5IG5vdyBldmVuIGluIGNhc2Ugb2YgcGxhbmUgZGlz
YWJsZS4KClRoZSBjb3B5IGluIGludGVsX2NydGMtPndtLnNrbC5hY3RpdmUgaXMgZXF1YWwgdG8K
Y3J0Y19zdGF0ZS0+d20uc2tsLm9wdGltYWwgYWZ0ZXIgdGhlIGF0b21pYyBjb21taXQgY29tcGxl
dGVzLgpJdCdzIHVzZWZ1bCBmb3IgdHdvLXN0ZXAgd2F0ZXJtYXJrIHByb2dyYW1taW5nLCBidXQg
bm90IHJlcXVpcmVkIGZvcgpnZW45KyB3aGljaCBkb2VzIGl0IGluIGEgc2luZ2xlIHN0ZXAuIFdl
IGNhbiBwdWxsIHRoZSBvbGQgYWxsb2NhdGlvbgpmcm9tIG9sZF9jcnRjX3N0YXRlLgoKU2lnbmVk
LW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVs
LmNvbT4KQ2M6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+ClJldmlld2Vk
LWJ5OiBQYXVsbyBaYW5vbmkgPHBhdWxvLnIuemFub25pQGludGVsLmNvbT4KLS0tCiBkcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfZHJ2LmggICAgIHwgIDEgLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0u
YyAgICAgIHwgMTggKysrKysrKystLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDkgaW5zZXJ0
aW9ucygrKSwgMTIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j
CmluZGV4IDQ4ZWIwNjM1ZWMwZi4uNTkyYTZlYzM1NGE3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfZGlzcGxheS5jCkBAIC0xMzQ3OCw3ICsxMzQ3OCw3IEBAIHN0YXRpYyB2b2lkIHZlcmlmeV93
bV9zdGF0ZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCXJldHVybjsKIAogCXNrbF9waXBlX3dt
X2dldF9od19zdGF0ZShjcnRjLCAmaHdfd20pOwotCXN3X3dtID0gJmludGVsX2NydGMtPndtLmFj
dGl2ZS5za2w7CisJc3dfd20gPSAmdG9faW50ZWxfY3J0Y19zdGF0ZShuZXdfc3RhdGUpLT53bS5z
a2wub3B0aW1hbDsKIAogCXNrbF9kZGJfZ2V0X2h3X3N0YXRlKGRldl9wcml2LCAmaHdfZGRiKTsK
IAlzd19kZGIgPSAmZGV2X3ByaXYtPndtLnNrbF9ody5kZGI7CmRpZmYgLS1naXQgYS9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Ry
di5oCmluZGV4IDczYmU2NDBmYWQzNi4uNzdhMGE3M2UzN2IwIDEwMDY0NAotLS0gYS9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl
bF9kcnYuaApAQCAtNzIzLDcgKzcyMyw2IEBAIHN0cnVjdCBpbnRlbF9jcnRjIHsKIAkJLyogd2F0
ZXJtYXJrcyBjdXJyZW50bHkgYmVpbmcgdXNlZCAgKi8KIAkJdW5pb24gewogCQkJc3RydWN0IGlu
dGVsX3BpcGVfd20gaWxrOwotCQkJc3RydWN0IHNrbF9waXBlX3dtIHNrbDsKIAkJfSBhY3RpdmU7
CiAKIAkJLyogYWxsb3cgQ3hTUiBvbiB0aGlzIHBpcGUgKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5j
CmluZGV4IDVmZjM1ODMzYjI1OC4uZmU0YmM5N2VkNTZhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bt
LmMKQEAgLTM5MzAsMTEgKzM5MzAsMTEgQEAgYm9vbCBza2xfZGRiX2FsbG9jYXRpb25fb3Zlcmxh
cHMoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAogfQogCiBzdGF0aWMgaW50IHNrbF91
cGRhdGVfcGlwZV93bShzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNzdGF0ZSwKLQkJCSAgICAgIHN0
cnVjdCBza2xfZGRiX2FsbG9jYXRpb24gKmRkYiwgLyogb3V0ICovCisJCQkgICAgICBjb25zdCBz
dHJ1Y3Qgc2tsX3BpcGVfd20gKm9sZF9waXBlX3dtLAogCQkJICAgICAgc3RydWN0IHNrbF9waXBl
X3dtICpwaXBlX3dtLCAvKiBvdXQgKi8KKwkJCSAgICAgIHN0cnVjdCBza2xfZGRiX2FsbG9jYXRp
b24gKmRkYiwgLyogb3V0ICovCiAJCQkgICAgICBib29sICpjaGFuZ2VkIC8qIG91dCAqLykKIHsK
LQlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3N0YXRlLT5j
cnRjKTsKIAlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqaW50ZWxfY3N0YXRlID0gdG9faW50ZWxf
Y3J0Y19zdGF0ZShjc3RhdGUpOwogCWludCByZXQ7CiAKQEAgLTM5NDIsNyArMzk0Miw3IEBAIHN0
YXRpYyBpbnQgc2tsX3VwZGF0ZV9waXBlX3dtKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3N0YXRl
LAogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKLQlpZiAoIW1lbWNtcCgmaW50ZWxfY3J0Yy0+
d20uYWN0aXZlLnNrbCwgcGlwZV93bSwgc2l6ZW9mKCpwaXBlX3dtKSkpCisJaWYgKCFtZW1jbXAo
b2xkX3BpcGVfd20sIHBpcGVfd20sIHNpemVvZigqcGlwZV93bSkpKQogCQkqY2hhbmdlZCA9IGZh
bHNlOwogCWVsc2UKIAkJKmNoYW5nZWQgPSB0cnVlOwpAQCAtNDE3NywxMCArNDE3NywxMiBAQCBz
a2xfY29tcHV0ZV93bShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiAJZm9yX2VhY2hf
Y3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgY3N0YXRlLCBpKSB7CiAJCXN0cnVjdCBpbnRlbF9j
cnRjX3N0YXRlICppbnRlbF9jc3RhdGUgPQogCQkJdG9faW50ZWxfY3J0Y19zdGF0ZShjc3RhdGUp
OworCQljb25zdCBzdHJ1Y3Qgc2tsX3BpcGVfd20gKm9sZF9waXBlX3dtID0KKwkJCSZ0b19pbnRl
bF9jcnRjX3N0YXRlKGNydGMtPnN0YXRlKS0+d20uc2tsLm9wdGltYWw7CiAKIAkJcGlwZV93bSA9
ICZpbnRlbF9jc3RhdGUtPndtLnNrbC5vcHRpbWFsOwotCQlyZXQgPSBza2xfdXBkYXRlX3BpcGVf
d20oY3N0YXRlLCAmcmVzdWx0cy0+ZGRiLCBwaXBlX3dtLAotCQkJCQkgJmNoYW5nZWQpOworCQly
ZXQgPSBza2xfdXBkYXRlX3BpcGVfd20oY3N0YXRlLCBvbGRfcGlwZV93bSwgcGlwZV93bSwKKwkJ
CQkJICZyZXN1bHRzLT5kZGIsICZjaGFuZ2VkKTsKIAkJaWYgKHJldCkKIAkJCXJldHVybiByZXQ7
CiAKQEAgLTQyMjQsOCArNDIyNiw2IEBAIHN0YXRpYyB2b2lkIHNrbF91cGRhdGVfd20oc3RydWN0
IGRybV9jcnRjICpjcnRjKQogCWlmICgocmVzdWx0cy0+ZGlydHlfcGlwZXMgJiBkcm1fY3J0Y19t
YXNrKGNydGMpKSA9PSAwKQogCQlyZXR1cm47CiAKLQlpbnRlbF9jcnRjLT53bS5hY3RpdmUuc2ts
ID0gKnBpcGVfd207Ci0KIAltdXRleF9sb2NrKCZkZXZfcHJpdi0+d20ud21fbXV0ZXgpOwogCiAJ
LyoKQEAgLTQzOTUsMTAgKzQzOTUsOCBAQCB2b2lkIHNrbF93bV9nZXRfaHdfc3RhdGUoc3RydWN0
IGRybV9kZXZpY2UgKmRldikKIAogCQlza2xfcGlwZV93bV9nZXRfaHdfc3RhdGUoY3J0YywgJmNz
dGF0ZS0+d20uc2tsLm9wdGltYWwpOwogCi0JCWlmIChpbnRlbF9jcnRjLT5hY3RpdmUpIHsKKwkJ
aWYgKGludGVsX2NydGMtPmFjdGl2ZSkKIAkJCWh3LT5kaXJ0eV9waXBlcyB8PSBkcm1fY3J0Y19t
YXNrKGNydGMpOwotCQkJaW50ZWxfY3J0Yy0+d20uYWN0aXZlLnNrbCA9IGNzdGF0ZS0+d20uc2ts
Lm9wdGltYWw7Ci0JCX0KIAl9CiAKIAlpZiAoZGV2X3ByaXYtPmFjdGl2ZV9jcnRjcykgewotLSAK
Mi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu
dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw
czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=