From: Matt Roper Subject: [RFC 11/15] drm/i915: Calculate pipe watermark values during atomic check Date: Wed, 20 May 2015 19:12:23 -0700 Message-ID: <1432174347-19138-12-git-send-email-matthew.d.roper@intel.com> References: <1432174347-19138-1-git-send-email-matthew.d.roper@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 3294A6E807 for ; Wed, 20 May 2015 19:12:30 -0700 (PDT) In-Reply-To: <1432174347-19138-1-git-send-email-matthew.d.roper@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org Q2FsY3VsYXRlIHBpcGUgd2F0ZXJtYXJrcyBkdXJpbmcgYXRvbWljIGNhbGN1bGF0aW9uIHBoYXNl LCBiYXNlZCBvbiB0aGUKY29udGVudHMgb2YgdGhlIGF0b21pYyB0cmFuc2FjdGlvbidzIHN0YXRl IHN0cnVjdHVyZS4KCkZJWE1FOiAgRm9yIG5vdyB3ZSBqdXN0IGR1bXAgdGhpcyBpbiBhIHRlbXBv cmFyeSBzdHJ1Y3R1cmUgYW5kIGRvbid0IGRvCmFueXRoaW5nIHdpdGggaXQgZXhjZXB0IGNvbXBh cmUgaXQgdG8gdGhlIHZhbHVlcyB3ZSByZS1jYWxjdWxhdGUgbGF0ZXIuClVsdGltYXRlbHkgd2Ug c2hvdWxkIHNxdWFzaCB0aGUgbmV4dCBwYXRjaCBpbnRvIHRoaXMgb25lIG9uY2Ugd2UncmUgc3Vy ZQp0aGlzIGlzIHJlYWxseSB3b3JraW5nIGFzIGV4cGVjdGVkLgoKU2lnbmVkLW9mZi1ieTogTWF0 dCBSb3BlciA8bWF0dGhldy5kLnJvcGVyQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oICAgICAgfCAgMyArKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2F0b21pYy5jICB8IDI5ICsrKysrKysrKysrKysrKysrKysrKysrKysrKy0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcnYuaCAgICAgfCAgNSArKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0u YyAgICAgIHwgIDYgKysrKystCiA1IGZpbGVzIGNoYW5nZWQsIDQxIGluc2VydGlvbnMoKyksIDMg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggZGY1NjczZi4uMjE0Y2U3 NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC01NjIsNiArNTYyLDkgQEAgc3RydWN0IGRy bV9pOTE1X2Rpc3BsYXlfZnVuY3MgewogCQkJICBpbnQgdGFyZ2V0LCBpbnQgcmVmY2xrLAogCQkJ ICBzdHJ1Y3QgZHBsbCAqbWF0Y2hfY2xvY2ssCiAJCQkgIHN0cnVjdCBkcGxsICpiZXN0X2Nsb2Nr KTsKKwlpbnQgKCpjb21wdXRlX3BpcGVfd20pKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKKwkJCSAg ICAgICBzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCisJCQkgICAgICAgdm9pZCAqdGFy Z2V0KTsKIAl2b2lkICgqdXBkYXRlX3dtKShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOwogCXZvaWQg KCp1cGRhdGVfc3ByaXRlX3dtKShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJCQkgc3RydWN0 IGRybV9jcnRjICpjcnRjLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf YXRvbWljLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYwppbmRleCA3ZWQ4 MDMzLi5kYjM0OWRkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9t aWMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYwpAQCAtMTc2LDgg KzE3NiwxMyBAQCBpbnQgaW50ZWxfYXRvbWljX2NvbW1pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LAogCQkJY29udGludWU7CiAJCX0KIAotCQl0b19pbnRlbF9jcnRjKGNydGMpLT5jb25maWctPnNj YWxlcl9zdGF0ZSA9Ci0JCQl0b19pbnRlbF9jcnRjX3N0YXRlKHN0YXRlLT5jcnRjX3N0YXRlc1tp XSktPnNjYWxlcl9zdGF0ZTsKKyNkZWZpbmUgU1RBVEVfU1dBUCh4KSB0b19pbnRlbF9jcnRjKGNy dGMpLT5jb25maWctPnggPSBcCisJdG9faW50ZWxfY3J0Y19zdGF0ZShzdGF0ZS0+Y3J0Y19zdGF0 ZXNbaV0pLT54OworCisJCVNUQVRFX1NXQVAoc2NhbGVyX3N0YXRlKTsKKwkJU1RBVEVfU1dBUCh3 bSk7CisKKyN1bmRlZiBTVEFURV9TV0FQCiAKIAkJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49 IDkpCiAJCQlza2xfZGV0YWNoX3NjYWxlcnModG9faW50ZWxfY3J0YyhjcnRjKSk7CkBAIC00MjEs MyArNDI2LDIzIEBAIGludCBpbnRlbF9hdG9taWNfc2V0dXBfc2NhbGVycyhzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LAogCiAJcmV0dXJuIDA7CiB9CisKKy8qCisgKiBpbnRlbF9jaGVja19jcnRjOiBD aGVjayBDUlRDIHN0YXRlCisgKi8KK2ludAoraW50ZWxfY2hlY2tfY3J0YyhzdHJ1Y3QgZHJtX2Ny dGMgKmNydGMsCisJCSBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKnN0YXRlKQoreworCXN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoY3J0Yy0+ZGV2KTsKKwlzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSAqaW50ZWxfc3RhdGUgPSB0b19pbnRlbF9jcnRjX3N0YXRlKHN0YXRl KTsKKwlpbnQgcmV0OworCisJaWYgKCFkZXZfcHJpdi0+ZGlzcGxheS5jb21wdXRlX3BpcGVfd20p CisJCXJldHVybiAwOworCisJcmV0ID0gZGV2X3ByaXYtPmRpc3BsYXkuY29tcHV0ZV9waXBlX3dt KGNydGMsIHN0YXRlLT5zdGF0ZSwKKwkJCQkJCSZpbnRlbF9zdGF0ZS0+d20udG1wKTsKKworCXJl dHVybiByZXQ7Cit9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggZjQzOThh Ny4uNzZhZmZiYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTEwOTYs NiArMTEwOTYsNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9jcnRjX2hlbHBlcl9mdW5jcyBp bnRlbF9oZWxwZXJfZnVuY3MgPSB7CiAJLmxvYWRfbHV0ID0gaW50ZWxfY3J0Y19sb2FkX2x1dCwK IAkuYXRvbWljX2JlZ2luID0gaW50ZWxfYmVnaW5fY3J0Y19jb21taXQsCiAJLmF0b21pY19mbHVz aCA9IGludGVsX2ZpbmlzaF9jcnRjX2NvbW1pdCwKKwkuYXRvbWljX2NoZWNrID0gaW50ZWxfY2hl Y2tfY3J0YywKIH07CiAKIC8qKgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCA0YWUxMDlj Li42Y2EzYzA2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtNDY0LDYgKzQ2NCw5IEBA IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlIHsKIAlzdHJ1Y3QgaW50ZWxfY3J0Y19zY2FsZXJfc3Rh dGUgc2NhbGVyX3N0YXRlOwogCiAJc3RydWN0IHsKKwkJLyogdG1wIHdtICovCisJCXN0cnVjdCBp bnRlbF9waXBlX3dtIHRtcDsKKwogCQkvKiBmaW5hbCwgdGFyZ2V0IHdhdGVybWFya3MgZm9yIHN0 YXRlICovCiAJCXVuaW9uIHsKIAkJCXN0cnVjdCBpbnRlbF9waXBlX3dtIGlsazsKQEAgLTE0MjQs NiArMTQyNyw4IEBAIGludGVsX2F0b21pY19nZXRfY3J0Y19zdGF0ZShzdHJ1Y3QgZHJtX2F0b21p Y19zdGF0ZSAqc3RhdGUsCiBpbnQgaW50ZWxfYXRvbWljX3NldHVwX3NjYWxlcnMoc3RydWN0IGRy bV9kZXZpY2UgKmRldiwKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywKIAlzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSk7CitpbnQgaW50ZWxfY2hlY2tfY3J0YyhzdHJ1 Y3QgZHJtX2NydGMgKmNydGMsCisJCSAgICAgc3RydWN0IGRybV9jcnRjX3N0YXRlICpzdGF0ZSk7 CiAKIC8qIGludGVsX2F0b21pY19wbGFuZS5jICovCiBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUg KmludGVsX2NyZWF0ZV9wbGFuZV9zdGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSk7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcG0uYwppbmRleCA3ODliNGZlLi4wMTdiMTg0IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3BtLmMKQEAgLTIwNzQsOCArMjA3NCw5IEBAIHN0YXRpYyB2b2lkIGlsa19jb21wdXRlX3dt X2NvbmZpZyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogLyogQ29tcHV0ZSBuZXcgd2F0ZXJtYXJr cyBmb3IgdGhlIHBpcGUgKi8KIHN0YXRpYyBpbnQgaWxrX2NvbXB1dGVfcGlwZV93bShzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMsCiAJCQkgICAgICAgc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRl LAotCQkJICAgICAgIHN0cnVjdCBpbnRlbF9waXBlX3dtICpwaXBlX3dtKQorCQkJICAgICAgIHZv aWQgKnRhcmdldCkKIHsKKwlzdHJ1Y3QgaW50ZWxfcGlwZV93bSAqcGlwZV93bSA9IHRhcmdldDsK IAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwogCWNvbnN0IHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVs X2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwpAQCAtMzUxNCw2ICszNTE1 LDggQEAgc3RhdGljIHZvaWQgaWxrX3VwZGF0ZV93bShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJ c3RydWN0IGludGVsX3BpcGVfd20gcGlwZV93bSA9IHt9OwogCiAJaWxrX2NvbXB1dGVfcGlwZV93 bShjcnRjLCBOVUxMLCAmcGlwZV93bSk7CisJV0FSTihtZW1jbXAoJmNzdGF0ZS0+d20udG1wLCAm cGlwZV93bSwgc2l6ZW9mKHBpcGVfd20pKSAhPSAwLAorCSAgICAgIlByZS1jb21wdXRlZCBhdG9t aWMgd2F0ZXJtYXJrIHZhbHVlcyBkbyBub3QgbWF0Y2ggZmluYWwgdmFsdWVzISIpOwogCiAJaWYg KCFtZW1jbXAoJmNzdGF0ZS0+d20udGFyZ2V0LmlsaywgJnBpcGVfd20sIHNpemVvZihwaXBlX3dt KSkpCiAJCXJldHVybjsKQEAgLTY2NTUsNiArNjY1OCw3IEBAIHZvaWQgaW50ZWxfaW5pdF9wbShz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkgICAgIGRldl9wcml2LT53bS5zcHJfbGF0ZW5jeVsw XSAmJiBkZXZfcHJpdi0+d20uY3VyX2xhdGVuY3lbMF0pKSB7CiAJCQlkZXZfcHJpdi0+ZGlzcGxh eS51cGRhdGVfd20gPSBpbGtfdXBkYXRlX3dtOwogCQkJZGV2X3ByaXYtPmRpc3BsYXkudXBkYXRl X3Nwcml0ZV93bSA9IGlsa191cGRhdGVfc3ByaXRlX3dtOworCQkJZGV2X3ByaXYtPmRpc3BsYXku Y29tcHV0ZV9waXBlX3dtID0gaWxrX2NvbXB1dGVfcGlwZV93bTsKIAkJfSBlbHNlIHsKIAkJCURS TV9ERUJVR19LTVMoIkZhaWxlZCB0byByZWFkIGRpc3BsYXkgcGxhbmUgbGF0ZW5jeS4gIgogCQkJ CSAgICAgICJEaXNhYmxlIEN4U1JcbiIpOwotLSAKMS44LjUuMQoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRl bC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK