From: Matt Roper Subject: [RFC 14/15] drm/i915: Program atomic watermarks via vblank job Date: Wed, 20 May 2015 19:12:26 -0700 Message-ID: <1432174347-19138-15-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id A219F6E809 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 VXNlIHRoZSBuZXcgdmJsYW5rIGpvYiBpbmZyYXN0cnVjdHVyZSB0byBzY2hlZHVsZSB3YXRlcm1h cmsgcHJvZ3JhbW1pbmcKdG8gaGFwcGVuIHdoZW4gdGhlIG5leHQgdmJsYW5rIG9jY3Vycy4KClNp Z25lZC1vZmYtYnk6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgIHwgIDcgKysrKysrKwogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMzggKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKy0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgICAgfCAg MSArCiAzIGZpbGVzIGNoYW5nZWQsIDQxIGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggZDU3N2ViYS4uNTEzNDEwMSAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oCkBAIC01NjksNiArNTY5LDcgQEAgc3RydWN0IGRybV9pOTE1X2Rpc3BsYXlf ZnVuY3MgewogCQkJCSBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCQkJIHVpbnQzMl90IHNwcml0 ZV93aWR0aCwgdWludDMyX3Qgc3ByaXRlX2hlaWdodCwKIAkJCQkgaW50IHBpeGVsX3NpemUsIGJv b2wgZW5hYmxlLCBib29sIHNjYWxlZCk7CisJdm9pZCAoKnByb2dyYW1fd2F0ZXJtYXJrcykoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIAl2b2lkICgqbW9kZXNldF9nbG9iYWxf cmVzb3VyY2VzKShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpOwogCS8qIFJldHVybnMg dGhlIGFjdGl2ZSBzdGF0ZSBvZiB0aGUgY3J0YywgYW5kIGlmIHRoZSBjcnRjIGlzIGFjdGl2ZSwK IAkgKiBmaWxscyBvdXQgdGhlIHBpcGUtY29uZmlnIHdpdGggdGhlIGh3IHN0YXRlLiAqLwpAQCAt MjQ5NCw2ICsyNDk1LDEyIEBAIHN0cnVjdCBkcm1faTkxNV9jbWRfdGFibGUgewogI2RlZmluZSBI QVNfTDNfRFBGKGRldikgKElTX0lWWUJSSURHRShkZXYpIHx8IElTX0hBU1dFTEwoZGV2KSkKICNk ZWZpbmUgTlVNX0wzX1NMSUNFUyhkZXYpIChJU19IU1dfR1QzKGRldikgPyAyIDogSEFTX0wzX0RQ RihkZXYpKQogCisvKgorICogRklYTUU6ICBPbmx5IHNvbWUgcGxhdGZvcm1zIGhhdmUgYmVlbiB0 cmFuc2l0aW9uZWQgdG8gYXRvbWljIHdhdGVybWFyaworICogdXBkYXRlcyBzbyBmYXIuCisgKi8K KyNkZWZpbmUgSEFTX0FUT01JQ19XTShkZXZfcHJpdikgKGRldl9wcml2LT5kaXNwbGF5LnByb2dy YW1fd2F0ZXJtYXJrcyAhPSBOVUxMKQorCiAjZGVmaW5lIEdUX0ZSRVFVRU5DWV9NVUxUSVBMSUVS IDUwCiAjZGVmaW5lIEdFTjlfRlJFUV9TQ0FMRVIgMwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKaW5kZXggOWI1NmQwNy4uYjIwMTJjOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYwpAQCAtMTMyMDksNiArMTMyMDksMjQgQEAgaW50ZWxfZGlzYWJsZV9wcmltYXJ5 X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCWRldl9wcml2LT5kaXNwbGF5LnVwZGF0 ZV9wcmltYXJ5X3BsYW5lKGNydGMsIE5VTEwsIDAsIDApOwogfQogCitzdGF0aWMgdm9pZAorZG9f dXBkYXRlX3dhdGVybWFya3Moc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMsCisJCSAgICAg dm9pZCAqZGF0YSwKKwkJICAgICBib29sIGVhcmx5LAorCQkgICAgIHUzMiBzZXEpCit7CisJc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShpbnRlbF9jcnRjLT5iYXNl LmRldik7CisKKwkvKgorCSAqIElmIHdlIGZpcmVkIGVhcmx5IGJlY2F1c2UgdGhlIENSVEMgaXMg dHVybmluZyBvZmYsIHRoZXJlJ3Mgbm8KKwkgKiBuZWVkIHRvIGFjdHVhbGx5IHByb2dyYW0gd2F0 ZXJtYXJrcy4KKwkgKi8KKwlpZiAoZWFybHkpCisJCXJldHVybjsKKworCWRldl9wcml2LT5kaXNw bGF5LnByb2dyYW1fd2F0ZXJtYXJrcyhkZXZfcHJpdik7Cit9CisKIHN0YXRpYyB2b2lkIGludGVs X2JlZ2luX2NydGNfY29tbWl0KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIHsKIAlzdHJ1Y3QgZHJt X2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwpAQCAtMTMyNTEsNyArMTMyNjksNyBAQCBzdGF0aWMg dm9pZCBpbnRlbF9iZWdpbl9jcnRjX2NvbW1pdChzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJaWYg KGludGVsX2NydGMtPmF0b21pYy5wcmVfZGlzYWJsZV9wcmltYXJ5KQogCQlpbnRlbF9wcmVfZGlz YWJsZV9wcmltYXJ5KGNydGMpOwogCi0JaWYgKGludGVsX2NydGMtPmF0b21pYy51cGRhdGVfd20p CisJaWYgKCFIQVNfQVRPTUlDX1dNKGRldl9wcml2KSAmJiBpbnRlbF9jcnRjLT5hdG9taWMudXBk YXRlX3dtKQogCQlpbnRlbF91cGRhdGVfd2F0ZXJtYXJrcyhjcnRjKTsKIAogCWludGVsX3J1bnRp bWVfcG1fZ2V0KGRldl9wcml2KTsKQEAgLTEzMjcwLDYgKzEzMjg4LDE1IEBAIHN0YXRpYyB2b2lk IGludGVsX2ZpbmlzaF9jcnRjX2NvbW1pdChzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJc3RydWN0 IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwogCXN0cnVjdCBk cm1fcGxhbmUgKnA7CiAKKwkvKgorCSAqIElmIHRoaXMgcGxhdGZvcm0gc3VwcG9ydHMgYXRvbWlj IHdhdGVybWFya3MsIHNjaGVkdWxlIGEgam9iIHRvCisJICogdXBkYXRlIHdhdGVybWFya3Mgd2hl biB0aGUgbmV4dCB2Ymxhbmsgb2NjdXJzLiAgT3RoZXJ3aXNlLCBqdXN0CisJICogdXBkYXRlIHdh dGVybWFya3MgdGhlIG9sZC1mYXNoaW9uZWQgd2F5LgorCSAqLworCWlmIChIQVNfQVRPTUlDX1dN KGRldl9wcml2KSkKKwkJaW50ZWxfc2NoZWR1bGVfdmJsYW5rX2pvYihpbnRlbF9jcnRjLCBkb191 cGRhdGVfd2F0ZXJtYXJrcywKKwkJCQkJICBOVUxMLCBkZXZfcHJpdi0+d3EsIDEpOworCiAJaWYg KGludGVsX2NydGMtPmF0b21pYy5ldmFkZSkKIAkJaW50ZWxfcGlwZV91cGRhdGVfZW5kKGludGVs X2NydGMsCiAJCQkJICAgICAgaW50ZWxfY3J0Yy0+YXRvbWljLnN0YXJ0X3ZibF9jb3VudCk7CkBA IC0xMzI5MCwxMCArMTMzMTcsMTEgQEAgc3RhdGljIHZvaWQgaW50ZWxfZmluaXNoX2NydGNfY29t bWl0KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlpZiAoaW50ZWxfY3J0Yy0+YXRvbWljLnBvc3Rf ZW5hYmxlX3ByaW1hcnkpCiAJCWludGVsX3Bvc3RfZW5hYmxlX3ByaW1hcnkoY3J0Yyk7CiAKLQlk cm1fZm9yX2VhY2hfbGVnYWN5X3BsYW5lKHAsICZkZXYtPm1vZGVfY29uZmlnLnBsYW5lX2xpc3Qp Ci0JCWlmIChpbnRlbF9jcnRjLT5hdG9taWMudXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzICYKLQkJ ICAgICgxIDw8IGRybV9wbGFuZV9pbmRleChwKSkpCi0JCQlpbnRlbF91cGRhdGVfc3ByaXRlX3dh dGVybWFya3MocCwgY3J0Yyk7CisJaWYgKCFIQVNfQVRPTUlDX1dNKGRldl9wcml2KSkKKwkJZHJt X2Zvcl9lYWNoX2xlZ2FjeV9wbGFuZShwLCAmZGV2LT5tb2RlX2NvbmZpZy5wbGFuZV9saXN0KQor CQkJaWYgKGludGVsX2NydGMtPmF0b21pYy51cGRhdGVfc3ByaXRlX3dhdGVybWFya3MgJgorCQkJ ICAgICgxIDw8IGRybV9wbGFuZV9pbmRleChwKSkpCisJCQkJaW50ZWxfdXBkYXRlX3Nwcml0ZV93 YXRlcm1hcmtzKHAsIGNydGMpOwogCiAJbWVtc2V0KCZpbnRlbF9jcnRjLT5hdG9taWMsIDAsIHNp emVvZihpbnRlbF9jcnRjLT5hdG9taWMpKTsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4 IDI3MzM3ZmUuLjdmMGEwYzEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtNjYyNiw2ICs2 NjI2LDcgQEAgdm9pZCBpbnRlbF9pbml0X3BtKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQlk ZXZfcHJpdi0+ZGlzcGxheS51cGRhdGVfd20gPSBpbGtfdXBkYXRlX3dtOwogCQkJZGV2X3ByaXYt PmRpc3BsYXkudXBkYXRlX3Nwcml0ZV93bSA9IGlsa191cGRhdGVfc3ByaXRlX3dtOwogCQkJZGV2 X3ByaXYtPmRpc3BsYXkuY29tcHV0ZV9waXBlX3dtID0gaWxrX2NvbXB1dGVfcGlwZV93bTsKKwkJ CWRldl9wcml2LT5kaXNwbGF5LnByb2dyYW1fd2F0ZXJtYXJrcyA9IGlsa19wcm9ncmFtX3dhdGVy bWFya3M7CiAJCX0gZWxzZSB7CiAJCQlEUk1fREVCVUdfS01TKCJGYWlsZWQgdG8gcmVhZCBkaXNw bGF5IHBsYW5lIGxhdGVuY3kuICIKIAkJCQkgICAgICAiRGlzYWJsZSBDeFNSXG4iKTsKLS0gCjEu OC41LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==