From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Roper Subject: [CI 12/17] drm/i915/gen9: Allow watermark calculation on in-flight atomic state (v3) Date: Thu, 12 May 2016 07:06:06 -0700 Message-ID: <1463061971-19638-13-git-send-email-matthew.d.roper@intel.com> References: <1463061971-19638-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 51FF16E8C2 for ; Thu, 12 May 2016 14:06:35 +0000 (UTC) In-Reply-To: <1463061971-19638-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 SW4gYW4gdXBjb21pbmcgcGF0Y2ggd2UnbGwgbW92ZSB0aGlzIGNhbGN1bGF0aW9uIHRvIHRoZSBh dG9taWMgJ2NoZWNrJwpwaGFzZSBzbyB0aGF0IHRoZSBkaXNwbGF5IHVwZGF0ZSBjYW4gYmUgcmVq ZWN0ZWQgZWFybHkgaWYgbm8gdmFsaWQKd2F0ZXJtYXJrIHByb2dyYW1taW5nIGlzIHBvc3NpYmxl LgoKdjI6CiAtIERyb3AgaW50ZWxfcHN0YXRlX2Zvcl9jc3RhdGVfcGxhbmUoKSBoZWxwZXIgYW5k IGFkZCBub3RlIGFib3V0IGhvdwogICB0aGUgY29kZSBuZWVkcyB0byBldm9sdmUgaW4gdGhlIGZ1 dHVyZSBpZiB3ZSBzdGFydCBhbGxvd2luZyBtb3JlIHRoYW4KICAgb25lIHBlbmRpbmcgY29tbWl0 IGFnYWluc3QgYSBDUlRDLiAgKE1hYXJ0ZW4pCgp2MzoKIC0gT25seSBoYXZlIHNrbF9jb21wdXRl X3dtX2xldmVsIGNhbGN1bGF0ZSB3YXRlcm1hcmtzIGZvciBlbmFibGVkCiAgIHBsYW5lczsgd2Ug Y2FuIGp1c3Qgc2V0IHRoZSBvdGhlciBwbGFuZXMgb24gYSBDUlRDIHRvIGRpc2FibGVkCiAgIHdp dGhvdXQgaGF2aW5nIHRvIGxvb2sgYXQgdGhlIHBsYW5lIHN0YXRlLiAgVGhpcyBpcyBpbXBvcnRh bnQgYmVjYXVzZQogICBkZXNwaXRlIG91ciBDUlRDIGxvY2sgd2UgY2FuIHN0aWxsIGhhdmUgcmFj aW5nIGNvbW1pdHMgdGhhdCBtb2RpZnkKICAgYSBkaXNhYmxlZCBwbGFuZSdzIHByb3BlcnR5IHdp dGhvdXQgdHVybmluZyBpdCBvbi4gIChNYWFydGVuKQoKU2lnbmVkLW9mZi1ieTogTWF0dCBSb3Bl ciA8bWF0dGhldy5kLnJvcGVyQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IE1hYXJ0ZW4gTGFua2hv cnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcG0uYyB8IDYxICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr LS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNDggaW5zZXJ0aW9ucygrKSwgMTMgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXggNjA3M2ZjYi4uNGQ1MjQwMiAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9wbS5jCkBAIC0zMzI3LDIzICszMzI3LDU2IEBAIHN0YXRpYyBib29sIHNr bF9jb21wdXRlX3BsYW5lX3dtKGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwKIAlyZXR1cm4gdHJ1ZTsKIH0KIAotc3RhdGljIHZvaWQgc2tsX2NvbXB1dGVfd21fbGV2ZWwo Y29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAotCQkJCSBzdHJ1Y3Qgc2ts X2RkYl9hbGxvY2F0aW9uICpkZGIsCi0JCQkJIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3Rh dGUsCi0JCQkJIGludCBsZXZlbCwKLQkJCQkgc3RydWN0IHNrbF93bV9sZXZlbCAqcmVzdWx0KQor c3RhdGljIGludAorc2tsX2NvbXB1dGVfd21fbGV2ZWwoY29uc3Qgc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LAorCQkgICAgIHN0cnVjdCBza2xfZGRiX2FsbG9jYXRpb24gKmRkYiwK KwkJICAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAorCQkgICAgIGludCBsZXZl bCwKKwkJICAgICBzdHJ1Y3Qgc2tsX3dtX2xldmVsICpyZXN1bHQpCiB7CiAJc3RydWN0IGRybV9k ZXZpY2UgKmRldiA9IGRldl9wcml2LT5kZXY7CisJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0 YXRlID0gY3N0YXRlLT5iYXNlLnN0YXRlOwogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRj ID0gdG9faW50ZWxfY3J0Yyhjc3RhdGUtPmJhc2UuY3J0Yyk7CisJc3RydWN0IGRybV9wbGFuZSAq cGxhbmU7CiAJc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZTsKIAlzdHJ1Y3QgaW50ZWxf cGxhbmVfc3RhdGUgKmludGVsX3BzdGF0ZTsKIAl1aW50MTZfdCBkZGJfYmxvY2tzOwogCWVudW0g cGlwZSBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsKIAotCWZvcl9lYWNoX2ludGVsX3BsYW5lX29u X2NydGMoZGV2LCBpbnRlbF9jcnRjLCBpbnRlbF9wbGFuZSkgeworCS8qCisJICogV2UnbGwgb25s eSBjYWxjdWxhdGUgd2F0ZXJtYXJrcyBmb3IgcGxhbmVzIHRoYXQgYXJlIGFjdHVhbGx5CisJICog ZW5hYmxlZCwgc28gbWFrZSBzdXJlIGFsbCBvdGhlciBwbGFuZXMgYXJlIHNldCBhcyBkaXNhYmxl ZC4KKwkgKi8KKwltZW1zZXQocmVzdWx0LCAwLCBzaXplb2YoKnJlc3VsdCkpOworCisJZm9yX2Vh Y2hfaW50ZWxfcGxhbmVfbWFzayhkZXYsIGludGVsX3BsYW5lLCBjc3RhdGUtPmJhc2UucGxhbmVf bWFzaykgewogCQlpbnQgaSA9IHNrbF93bV9wbGFuZV9pZChpbnRlbF9wbGFuZSk7CiAKLQkJaW50 ZWxfcHN0YXRlID0gdG9faW50ZWxfcGxhbmVfc3RhdGUoaW50ZWxfcGxhbmUtPmJhc2Uuc3RhdGUp OworCQlwbGFuZSA9ICZpbnRlbF9wbGFuZS0+YmFzZTsKKwkJaW50ZWxfcHN0YXRlID0gTlVMTDsK KwkJaWYgKHN0YXRlKQorCQkJaW50ZWxfcHN0YXRlID0KKwkJCQlpbnRlbF9hdG9taWNfZ2V0X2V4 aXN0aW5nX3BsYW5lX3N0YXRlKHN0YXRlLAorCQkJCQkJCQkgICAgICBpbnRlbF9wbGFuZSk7CisK KwkJLyoKKwkJICogTm90ZTogSWYgd2Ugc3RhcnQgc3VwcG9ydGluZyBtdWx0aXBsZSBwZW5kaW5n IGF0b21pYyBjb21taXRzCisJCSAqIGFnYWluc3QgdGhlIHNhbWUgcGxhbmVzL0NSVEMncyBpbiB0 aGUgZnV0dXJlLCBwbGFuZS0+c3RhdGUKKwkJICogd2lsbCBubyBsb25nZXIgYmUgdGhlIGNvcnJl Y3QgcHJlLXN0YXRlIHRvIHVzZSBmb3IgdGhlCisJCSAqIGNhbGN1bGF0aW9ucyBoZXJlIGFuZCB3 ZSdsbCBuZWVkIHRvIGNoYW5nZSB3aGVyZSB3ZSBnZXQgdGhlCisJCSAqICd1bmNoYW5nZWQnIHBs YW5lIGRhdGEgZnJvbS4KKwkJICoKKwkJICogRm9yIG5vdyB0aGlzIGlzIGZpbmUgYmVjYXVzZSB3 ZSBvbmx5IGFsbG93IG9uZSBxdWV1ZWQgY29tbWl0CisJCSAqIGFnYWluc3QgYSBDUlRDLiAgRXZl biBpZiB0aGUgcGxhbmUgaXNuJ3QgbW9kaWZpZWQgYnkgdGhpcworCQkgKiB0cmFuc2FjdGlvbiBh bmQgd2UgZG9uJ3QgaGF2ZSBhIHBsYW5lIGxvY2ssIHdlIHN0aWxsIGhhdmUKKwkJICogdGhlIENS VEMncyBsb2NrLCBzbyB3ZSBrbm93IHRoYXQgbm8gb3RoZXIgdHJhbnNhY3Rpb25zIGFyZQorCQkg KiByYWNpbmcgd2l0aCB1cyB0byB1cGRhdGUgaXQuCisJCSAqLworCQlpZiAoIWludGVsX3BzdGF0 ZSkKKwkJCWludGVsX3BzdGF0ZSA9IHRvX2ludGVsX3BsYW5lX3N0YXRlKHBsYW5lLT5zdGF0ZSk7 CisKKwkJV0FSTl9PTighaW50ZWxfcHN0YXRlLT5iYXNlLmZiKTsKKwogCQlkZGJfYmxvY2tzID0g c2tsX2RkYl9lbnRyeV9zaXplKCZkZGItPnBsYW5lW3BpcGVdW2ldKTsKIAogCQlyZXN1bHQtPnBs YW5lX2VuW2ldID0gc2tsX2NvbXB1dGVfcGxhbmVfd20oZGV2X3ByaXYsCkBAIC0zMzU0LDYgKzMz ODcsOCBAQCBzdGF0aWMgdm9pZCBza2xfY29tcHV0ZV93bV9sZXZlbChjb25zdCBzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkJCQkmcmVzdWx0LT5wbGFuZV9yZXNfYltpXSwK IAkJCQkJCSZyZXN1bHQtPnBsYW5lX3Jlc19sW2ldKTsKIAl9CisKKwlyZXR1cm4gMDsKIH0KIAog c3RhdGljIHVpbnQzMl90CkBAIC0zNjQ4LDE0ICszNjgzLDE0IEBAIHN0YXRpYyB2b2lkIHNrbF9m bHVzaF93bV92YWx1ZXMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCX0KIH0K IAotc3RhdGljIGJvb2wgc2tsX3VwZGF0ZV9waXBlX3dtKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywK K3N0YXRpYyBib29sIHNrbF91cGRhdGVfcGlwZV93bShzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNz dGF0ZSwKIAkJCSAgICAgICBzdHJ1Y3Qgc2tsX2RkYl9hbGxvY2F0aW9uICpkZGIsIC8qIG91dCAq LwogCQkJICAgICAgIHN0cnVjdCBza2xfcGlwZV93bSAqcGlwZV93bSAvKiBvdXQgKi8pCiB7Ci0J c3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwotCXN0 cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUgPSB0b19pbnRlbF9jcnRjX3N0YXRlKGNydGMt PnN0YXRlKTsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMo Y3N0YXRlLT5jcnRjKTsKKwlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqaW50ZWxfY3N0YXRlID0g dG9faW50ZWxfY3J0Y19zdGF0ZShjc3RhdGUpOwogCi0Jc2tsX2J1aWxkX3BpcGVfd20oY3N0YXRl LCBkZGIsIHBpcGVfd20pOworCXNrbF9idWlsZF9waXBlX3dtKGludGVsX2NzdGF0ZSwgZGRiLCBw aXBlX3dtKTsKIAogCWlmICghbWVtY21wKCZpbnRlbF9jcnRjLT53bS5hY3RpdmUuc2tsLCBwaXBl X3dtLCBzaXplb2YoKnBpcGVfd20pKSkKIAkJcmV0dXJuIGZhbHNlOwpAQCAtMzY5NSw3ICszNzMw LDcgQEAgc3RhdGljIHZvaWQgc2tsX3VwZGF0ZV9vdGhlcl9waXBlX3dtKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsCiAJCWlmICghaW50ZWxfY3J0Yy0+YWN0aXZlKQogCQkJY29udGludWU7CiAKLQkJ d21fY2hhbmdlZCA9IHNrbF91cGRhdGVfcGlwZV93bSgmaW50ZWxfY3J0Yy0+YmFzZSwKKwkJd21f Y2hhbmdlZCA9IHNrbF91cGRhdGVfcGlwZV93bShpbnRlbF9jcnRjLT5iYXNlLnN0YXRlLAogCQkJ CQkJJnItPmRkYiwgJnBpcGVfd20pOwogCiAJCS8qCkBAIC0zODEzLDcgKzM4NDgsNyBAQCBzdGF0 aWMgdm9pZCBza2xfdXBkYXRlX3dtKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAogCXNrbF9jbGVh cl93bShyZXN1bHRzLCBpbnRlbF9jcnRjLT5waXBlKTsKIAotCWlmICghc2tsX3VwZGF0ZV9waXBl X3dtKGNydGMsICZyZXN1bHRzLT5kZGIsIHBpcGVfd20pKQorCWlmICghc2tsX3VwZGF0ZV9waXBl X3dtKGNydGMtPnN0YXRlLCAmcmVzdWx0cy0+ZGRiLCBwaXBlX3dtKSkKIAkJcmV0dXJuOwogCiAJ c2tsX2NvbXB1dGVfd21fcmVzdWx0cyhkZXYsIHBpcGVfd20sIHJlc3VsdHMsIGludGVsX2NydGMp OwotLSAKMi4xLjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm eAo=