From: Matt Roper Subject: [RFC 10/15] drm/i915: Move active watermarks into CRTC state Date: Wed, 20 May 2015 19:12:22 -0700 Message-ID: <1432174347-19138-11-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id C63086E80A for ; Wed, 20 May 2015 19:12:29 -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 Tm90ZSB0aGF0IHdlIHJlbmFtZSB0aGVtIHRvICd0YXJnZXQnIHNpbmNlICdhY3RpdmUnIGlzbid0 IHJlYWxseSBhbgphY2N1cmF0ZSB0ZXJtIGdpdmVuIHRoYXQgd2UncmUgcHJlY29tcHV0aW5nIHRo ZXNlIHdlbGwgYmVmb3JlIHRoZXkgZ2V0CmNvbW1pdHRlZCBhbmQgYmVjb21lIGFjdGl2ZS4KClNp bmNlIHdlIGFsbG9jYXRlIGEgZmV3IENSVEMgc3RhdGVzIG9uIHRoZSBzdGFjaywgYWxzbyBzd2l0 Y2ggdGhlICd3bScKc3RydWN0IGhlcmUgdG8gYmUgYSB1bmlvbiBzbyB0aGF0IHdlJ3JlIG5vdCB3 YXN0aW5nIHN0YWNrIHNwYWNlIHdpdGgKb3RoZXIgcGxhdGZvcm1zJyB3YXRlcm1hcmsgdmFsdWVz LgoKU2lnbmVkLW9mZi1ieTogTWF0dCBSb3BlciA8bWF0dGhldy5kLnJvcGVyQGludGVsLmNvbT4K LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCB8IDQ0ICsrKysrKysrKysrKysr KysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bt LmMgIHwgMzMgKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQs IDQyIGluc2VydGlvbnMoKyksIDM1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2 LmgKaW5kZXggZWE2NzA5My4uNGFlMTA5YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAg LTMxOSw2ICszMTksMjEgQEAgc3RydWN0IGludGVsX2NydGNfc2NhbGVyX3N0YXRlIHsKIAlpbnQg c2NhbGVyX2lkOwogfTsKIAorc3RydWN0IGludGVsX3BpcGVfd20geworCXN0cnVjdCBpbnRlbF93 bV9sZXZlbCB3bVs1XTsKKwl1aW50MzJfdCBsaW5ldGltZTsKKwlib29sIGZiY193bV9lbmFibGVk OworCWJvb2wgcGlwZV9lbmFibGVkOworCWJvb2wgc3ByaXRlc19lbmFibGVkOworCWJvb2wgc3By aXRlc19zY2FsZWQ7Cit9OworCitzdHJ1Y3Qgc2tsX3BpcGVfd20geworCXN0cnVjdCBza2xfd21f bGV2ZWwgd21bOF07CisJc3RydWN0IHNrbF93bV9sZXZlbCB0cmFuc193bTsKKwl1aW50MzJfdCBs aW5ldGltZTsKK307CisKIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlIHsKIAlzdHJ1Y3QgZHJtX2Ny dGNfc3RhdGUgYmFzZTsKIApAQCAtNDQ3LDE1ICs0NjIsMTQgQEAgc3RydWN0IGludGVsX2NydGNf c3RhdGUgewogCWludCBwYm47CiAKIAlzdHJ1Y3QgaW50ZWxfY3J0Y19zY2FsZXJfc3RhdGUgc2Nh bGVyX3N0YXRlOwotfTsKIAotc3RydWN0IGludGVsX3BpcGVfd20gewotCXN0cnVjdCBpbnRlbF93 bV9sZXZlbCB3bVs1XTsKLQl1aW50MzJfdCBsaW5ldGltZTsKLQlib29sIGZiY193bV9lbmFibGVk OwotCWJvb2wgcGlwZV9lbmFibGVkOwotCWJvb2wgc3ByaXRlc19lbmFibGVkOwotCWJvb2wgc3By aXRlc19zY2FsZWQ7CisJc3RydWN0IHsKKwkJLyogZmluYWwsIHRhcmdldCB3YXRlcm1hcmtzIGZv ciBzdGF0ZSAqLworCQl1bmlvbiB7CisJCQlzdHJ1Y3QgaW50ZWxfcGlwZV93bSBpbGs7CisJCQlz dHJ1Y3Qgc2tsX3BpcGVfd20gc2tsOworCQl9IHRhcmdldDsKKwl9IHdtOwogfTsKIAogc3RydWN0 IGludGVsX21taW9fZmxpcCB7CkBAIC00NjQsMTIgKzQ3OCw2IEBAIHN0cnVjdCBpbnRlbF9tbWlv X2ZsaXAgewogCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjOwogfTsKIAotc3RydWN0IHNrbF9waXBl X3dtIHsKLQlzdHJ1Y3Qgc2tsX3dtX2xldmVsIHdtWzhdOwotCXN0cnVjdCBza2xfd21fbGV2ZWwg dHJhbnNfd207Ci0JdWludDMyX3QgbGluZXRpbWU7Ci19OwotCiAvKgogICogVHJhY2tpbmcgb2Yg b3BlcmF0aW9ucyB0aGF0IG5lZWQgdG8gYmUgcGVyZm9ybWVkIGF0IHRoZSBiZWdpbm5pbmcvZW5k IG9mIGFuCiAgKiBhdG9taWMgY29tbWl0LCBvdXRzaWRlIHRoZSBhdG9taWMgc2VjdGlvbiB3aGVy ZSBpbnRlcnJ1cHRzIGFyZSBkaXNhYmxlZC4KQEAgLTUzNiwxNCArNTQ0LDYgQEAgc3RydWN0IGlu dGVsX2NydGMgewogCWJvb2wgY3B1X2ZpZm9fdW5kZXJydW5fZGlzYWJsZWQ7CiAJYm9vbCBwY2hf Zmlmb191bmRlcnJ1bl9kaXNhYmxlZDsKIAotCS8qIHBlci1waXBlIHdhdGVybWFyayBzdGF0ZSAq LwotCXN0cnVjdCB7Ci0JCS8qIHdhdGVybWFya3MgY3VycmVudGx5IGJlaW5nIHVzZWQgICovCi0J CXN0cnVjdCBpbnRlbF9waXBlX3dtIGFjdGl2ZTsKLQkJLyogU0tMIHdtIHZhbHVlcyBjdXJyZW50 bHkgaW4gdXNlICovCi0JCXN0cnVjdCBza2xfcGlwZV93bSBza2xfYWN0aXZlOwotCX0gd207Ci0K IAlpbnQgc2NhbmxpbmVfb2Zmc2V0OwogCiAJc3RydWN0IGludGVsX2NydGNfYXRvbWljX2NvbW1p dCBhdG9taWM7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCBjM2I5Zjk5Li43ODliNGZlIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTIwNTgsNyArMjA1OCw5IEBAIHN0YXRpYyB2b2lk IGlsa19jb21wdXRlX3dtX2NvbmZpZyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCiAJLyogQ29t cHV0ZSB0aGUgY3VycmVudGx5IF9hY3RpdmVfIGNvbmZpZyAqLwogCWZvcl9lYWNoX2ludGVsX2Ny dGMoZGV2LCBpbnRlbF9jcnRjKSB7Ci0JCWNvbnN0IHN0cnVjdCBpbnRlbF9waXBlX3dtICp3bSA9 ICZpbnRlbF9jcnRjLT53bS5hY3RpdmU7CisJCWNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl ICpjc3RhdGUgPQorCQkJdG9faW50ZWxfY3J0Y19zdGF0ZShpbnRlbF9jcnRjLT5iYXNlLnN0YXRl KTsKKwkJY29uc3Qgc3RydWN0IGludGVsX3BpcGVfd20gKndtID0gJmNzdGF0ZS0+d20udGFyZ2V0 LmlsazsKIAogCQlpZiAoIXdtLT5waXBlX2VuYWJsZWQpCiAJCQljb250aW51ZTsKQEAgLTIxOTgs NyArMjIwMCw5IEBAIHN0YXRpYyB2b2lkIGlsa19tZXJnZV93bV9sZXZlbChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LAogCXJldF93bS0+ZW5hYmxlID0gdHJ1ZTsKIAogCWZvcl9lYWNoX2ludGVsX2Ny dGMoZGV2LCBpbnRlbF9jcnRjKSB7Ci0JCWNvbnN0IHN0cnVjdCBpbnRlbF9waXBlX3dtICphY3Rp dmUgPSAmaW50ZWxfY3J0Yy0+d20uYWN0aXZlOworCQljb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19z dGF0ZSAqY3N0YXRlID0KKwkJCXRvX2ludGVsX2NydGNfc3RhdGUoaW50ZWxfY3J0Yy0+YmFzZS5z dGF0ZSk7CisJCWNvbnN0IHN0cnVjdCBpbnRlbF9waXBlX3dtICphY3RpdmUgPSAmY3N0YXRlLT53 bS50YXJnZXQuaWxrOwogCQljb25zdCBzdHJ1Y3QgaW50ZWxfd21fbGV2ZWwgKndtID0gJmFjdGl2 ZS0+d21bbGV2ZWxdOwogCiAJCWlmICghYWN0aXZlLT5waXBlX2VuYWJsZWQpCkBAIC0yMzQ0LDE0 ICsyMzQ4LDE1IEBAIHN0YXRpYyB2b2lkIGlsa19jb21wdXRlX3dtX3Jlc3VsdHMoc3RydWN0IGRy bV9kZXZpY2UgKmRldiwKIAogCS8qIExQMCByZWdpc3RlciB2YWx1ZXMgKi8KIAlmb3JfZWFjaF9p bnRlbF9jcnRjKGRldiwgaW50ZWxfY3J0YykgeworCQljb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19z dGF0ZSAqY3N0YXRlID0KKwkJCXRvX2ludGVsX2NydGNfc3RhdGUoaW50ZWxfY3J0Yy0+YmFzZS5z dGF0ZSk7CiAJCWVudW0gcGlwZSBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsKLQkJY29uc3Qgc3Ry dWN0IGludGVsX3dtX2xldmVsICpyID0KLQkJCSZpbnRlbF9jcnRjLT53bS5hY3RpdmUud21bMF07 CisJCWNvbnN0IHN0cnVjdCBpbnRlbF93bV9sZXZlbCAqciA9ICZjc3RhdGUtPndtLnRhcmdldC5p bGsud21bMF07CiAKIAkJaWYgKFdBUk5fT04oIXItPmVuYWJsZSkpCiAJCQljb250aW51ZTsKIAot CQlyZXN1bHRzLT53bV9saW5ldGltZVtwaXBlXSA9IGludGVsX2NydGMtPndtLmFjdGl2ZS5saW5l dGltZTsKKwkJcmVzdWx0cy0+d21fbGluZXRpbWVbcGlwZV0gPSBjc3RhdGUtPndtLnRhcmdldC5p bGsubGluZXRpbWU7CiAKIAkJcmVzdWx0cy0+d21fcGlwZVtwaXBlXSA9CiAJCQkoci0+cHJpX3Zh bCA8PCBXTTBfUElQRV9QTEFORV9TSElGVCkgfApAQCAtMzM0NCwxNiArMzM0OSwxNiBAQCBzdGF0 aWMgYm9vbCBza2xfdXBkYXRlX3BpcGVfd20oc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkJICAg ICAgIHN0cnVjdCBza2xfZGRiX2FsbG9jYXRpb24gKmRkYiwgLyogb3V0ICovCiAJCQkgICAgICAg c3RydWN0IHNrbF9waXBlX3dtICpwaXBlX3dtIC8qIG91dCAqLykKIHsKLQlzdHJ1Y3QgaW50ZWxf Y3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CisJc3RydWN0IGludGVsX2Ny dGNfc3RhdGUgKmNzdGF0ZSA9IHRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+c3RhdGUpOwogCiAJ c2tsX2NvbXB1dGVfd21fcGlwZV9wYXJhbWV0ZXJzKGNydGMsIHBhcmFtcyk7CiAJc2tsX2FsbG9j YXRlX3BpcGVfZGRiKGNydGMsIGNvbmZpZywgcGFyYW1zLCBkZGIpOwogCXNrbF9jb21wdXRlX3Bp cGVfd20oY3J0YywgZGRiLCBwYXJhbXMsIHBpcGVfd20pOwogCi0JaWYgKCFtZW1jbXAoJmludGVs X2NydGMtPndtLnNrbF9hY3RpdmUsIHBpcGVfd20sIHNpemVvZigqcGlwZV93bSkpKQorCWlmICgh bWVtY21wKCZjc3RhdGUtPndtLnRhcmdldC5za2wsIHBpcGVfd20sIHNpemVvZigqcGlwZV93bSkp KQogCQlyZXR1cm4gZmFsc2U7CiAKLQlpbnRlbF9jcnRjLT53bS5za2xfYWN0aXZlID0gKnBpcGVf d207CisJY3N0YXRlLT53bS50YXJnZXQuc2tsID0gKnBpcGVfd207CiAKIAlyZXR1cm4gdHJ1ZTsK IH0KQEAgLTM1MDUsMTUgKzM1MTAsMTUgQEAgc3RhdGljIHZvaWQgaWxrX3Byb2dyYW1fd2F0ZXJt YXJrcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiBzdGF0aWMgdm9pZCBpbGtf dXBkYXRlX3dtKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGNydGMtPmRldik7Ci0Jc3RydWN0IGludGVsX2NydGMg KmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOworCXN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpjc3RhdGUgPSB0b19pbnRlbF9jcnRjX3N0YXRlKGNydGMtPnN0YXRlKTsKIAlzdHJ1Y3Qg aW50ZWxfcGlwZV93bSBwaXBlX3dtID0ge307CiAKIAlpbGtfY29tcHV0ZV9waXBlX3dtKGNydGMs IE5VTEwsICZwaXBlX3dtKTsKIAotCWlmICghbWVtY21wKCZpbnRlbF9jcnRjLT53bS5hY3RpdmUs ICZwaXBlX3dtLCBzaXplb2YocGlwZV93bSkpKQorCWlmICghbWVtY21wKCZjc3RhdGUtPndtLnRh cmdldC5pbGssICZwaXBlX3dtLCBzaXplb2YocGlwZV93bSkpKQogCQlyZXR1cm47CiAKLQlpbnRl bF9jcnRjLT53bS5hY3RpdmUgPSBwaXBlX3dtOworCWNzdGF0ZS0+d20udGFyZ2V0LmlsayA9IHBp cGVfd207CiAKIAlpbGtfcHJvZ3JhbV93YXRlcm1hcmtzKGRldl9wcml2KTsKIH0KQEAgLTM1OTAs NyArMzU5NSw4IEBAIHN0YXRpYyB2b2lkIHNrbF9waXBlX3dtX2dldF9od19zdGF0ZShzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMpCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2 LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3Qgc2tsX3dtX3ZhbHVlcyAqaHcgPSAmZGV2X3ByaXYtPndt LnNrbF9odzsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMo Y3J0Yyk7Ci0Jc3RydWN0IHNrbF9waXBlX3dtICphY3RpdmUgPSAmaW50ZWxfY3J0Yy0+d20uc2ts X2FjdGl2ZTsKKwlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlID0gdG9faW50ZWxfY3J0 Y19zdGF0ZShjcnRjLT5zdGF0ZSk7CisJc3RydWN0IHNrbF9waXBlX3dtICphY3RpdmUgPSAmY3N0 YXRlLT53bS50YXJnZXQuc2tsOwogCWVudW0gcGlwZSBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsK IAlpbnQgbGV2ZWwsIGksIG1heF9sZXZlbDsKIAl1aW50MzJfdCB0ZW1wOwpAQCAtMzY1Myw3ICsz NjU5LDggQEAgc3RhdGljIHZvaWQgaWxrX3BpcGVfd21fZ2V0X2h3X3N0YXRlKHN0cnVjdCBkcm1f Y3J0YyAqY3J0YykKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRl dl9wcml2YXRlOwogCXN0cnVjdCBpbGtfd21fdmFsdWVzICpodyA9ICZkZXZfcHJpdi0+d20uaHc7 CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwot CXN0cnVjdCBpbnRlbF9waXBlX3dtICphY3RpdmUgPSAmaW50ZWxfY3J0Yy0+d20uYWN0aXZlOwor CXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUgPSB0b19pbnRlbF9jcnRjX3N0YXRlKGNy dGMtPnN0YXRlKTsKKwlzdHJ1Y3QgaW50ZWxfcGlwZV93bSAqYWN0aXZlID0gJmNzdGF0ZS0+d20u dGFyZ2V0LmlsazsKIAllbnVtIHBpcGUgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7CiAJc3RhdGlj IGNvbnN0IHVuc2lnbmVkIGludCB3bTBfcGlwZV9yZWdbXSA9IHsKIAkJW1BJUEVfQV0gPSBXTTBf UElQRUFfSUxLLAotLSAKMS44LjUuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK