From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v2 02/12] drm/i915: Calculate watermark related members in the crtc_state, v4. Date: Thu, 3 Dec 2015 13:49:13 +0100 Message-ID: <56603A49.5000507@linux.intel.com> References: <1447945645-32005-1-git-send-email-maarten.lankhorst@linux.intel.com> <1447945645-32005-3-git-send-email-maarten.lankhorst@linux.intel.com> <1448373813.2672.19.camel@gmail.com> <56547A50.9010606@linux.intel.com> <1448443379.2907.10.camel@gmail.com> <565C0E34.2040305@linux.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 A2C2C6E223 for ; Thu, 3 Dec 2015 04:49:17 -0800 (PST) In-Reply-To: <565C0E34.2040305@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Ander Conselvan De Oliveira , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org VGhpcyByZW1vdmVzIHByZS9wb3N0X3dtX3VwZGF0ZSBmcm9tIGludGVsX2NydGMtPmF0b21pYywg YW5kCmNyZWF0ZXMgYXRvbWljIHN0YXRlIGZvciBpdCBpbiBpbnRlbF9jcnRjLgogICAgCkNoYW5n ZXMgc2luY2UgdjE6Ci0gUmViYXNlIG9uIHRvcCBvZiB3bSBjaGFuZ2VzLgpDaGFuZ2VzIHNpbmNl IHYyOgotIFNwbGl0IGRpc2FibGVfY3hzciBpbnRvIGEgc2VwYXJhdGUgcGF0Y2guCkNoYW5nZXMg c2luY2UgdjM6Ci0gTW92ZSBzb21lIG9mIHRoZSBjaGFuZ2VzIHRvIGludGVsX3dtX25lZWRfdXBk YXRlLgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0 QGxpbnV4LmludGVsLmNvbT4KLS0tCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9hdG9taWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pYy5jCmluZGV4 IDlmMDYzOGEzN2I2ZC4uNDYyNWY4YTliYTEyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9hdG9taWMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9t aWMuYwpAQCAtOTYsNiArOTYsNyBAQCBpbnRlbF9jcnRjX2R1cGxpY2F0ZV9zdGF0ZShzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMpCiAJY3J0Y19zdGF0ZS0+dXBkYXRlX3BpcGUgPSBmYWxzZTsKIAljcnRj X3N0YXRlLT5kaXNhYmxlX2xwX3dtID0gZmFsc2U7CiAJY3J0Y19zdGF0ZS0+ZGlzYWJsZV9jeHNy ID0gZmFsc2U7CisJY3J0Y19zdGF0ZS0+d21fY2hhbmdlZCA9IGZhbHNlOwogCiAJcmV0dXJuICZj cnRjX3N0YXRlLT5iYXNlOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4 IDAyOTc3N2Y3NWRlOC4uYjk2NDE5ZmQ0YzllIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCkBAIC00NzY3LDYgKzQ3NjcsOCBAQCBpbnRlbF9wcmVfZGlzYWJsZV9wcmltYXJ5KHN0 cnVjdCBkcm1fY3J0YyAqY3J0YykKIHN0YXRpYyB2b2lkIGludGVsX3Bvc3RfcGxhbmVfdXBkYXRl KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogewogCXN0cnVjdCBpbnRlbF9jcnRjX2F0b21pY19j b21taXQgKmF0b21pYyA9ICZjcnRjLT5hdG9taWM7CisJc3RydWN0IGludGVsX2NydGNfc3RhdGUg KnBpcGVfY29uZmlnID0KKwkJdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5iYXNlLnN0YXRlKTsK IAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+YmFzZS5kZXY7CiAJc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIApAQCAtNDc3Nyw3ICs0 Nzc5LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfcG9zdF9wbGFuZV91cGRhdGUoc3RydWN0IGludGVs X2NydGMgKmNydGMpCiAKIAljcnRjLT53bS5jeHNyX2FsbG93ZWQgPSB0cnVlOwogCi0JaWYgKGNy dGMtPmF0b21pYy51cGRhdGVfd21fcG9zdCkKKwlpZiAocGlwZV9jb25maWctPndtX2NoYW5nZWQp CiAJCWludGVsX3VwZGF0ZV93YXRlcm1hcmtzKCZjcnRjLT5iYXNlKTsKIAogCWlmIChhdG9taWMt PnVwZGF0ZV9mYmMpCkBAIC00ODEwLDYgKzQ4MTIsOSBAQCBzdGF0aWMgdm9pZCBpbnRlbF9wcmVf cGxhbmVfdXBkYXRlKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCQljcnRjLT53bS5jeHNyX2Fs bG93ZWQgPSBmYWxzZTsKIAkJaW50ZWxfc2V0X21lbW9yeV9jeHNyKGRldl9wcml2LCBmYWxzZSk7 CiAJfQorCisJaWYgKCFuZWVkc19tb2Rlc2V0KCZwaXBlX2NvbmZpZy0+YmFzZSkgJiYgcGlwZV9j b25maWctPndtX2NoYW5nZWQpCisJCWludGVsX3VwZGF0ZV93YXRlcm1hcmtzKCZjcnRjLT5iYXNl KTsKIH0KIAogc3RhdGljIHZvaWQgaW50ZWxfY3J0Y19kaXNhYmxlX3BsYW5lcyhzdHJ1Y3QgZHJt X2NydGMgKmNydGMsIHVuc2lnbmVkIHBsYW5lX21hc2spCkBAIC0xMTY3NCw5ICsxMTY3OSwxNCBA QCBzdGF0aWMgYm9vbCBpbnRlbF93bV9uZWVkX3VwZGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFu ZSwKIAlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKmN1ciA9IHRvX2ludGVsX3BsYW5lX3N0YXRl KHBsYW5lLT5zdGF0ZSk7CiAKIAkvKiBVcGRhdGUgd2F0ZXJtYXJrcyBvbiB0aWxpbmcgb3Igc2l6 ZSBjaGFuZ2VzLiAqLwotCWlmICghcGxhbmUtPnN0YXRlLT5mYiB8fCAhc3RhdGUtPmZiIHx8Ci0J ICAgIHBsYW5lLT5zdGF0ZS0+ZmItPm1vZGlmaWVyWzBdICE9IHN0YXRlLT5mYi0+bW9kaWZpZXJb MF0gfHwKLQkgICAgcGxhbmUtPnN0YXRlLT5yb3RhdGlvbiAhPSBzdGF0ZS0+cm90YXRpb24gfHwK KwlpZiAobmV3LT52aXNpYmxlICE9IGN1ci0+dmlzaWJsZSkKKwkJcmV0dXJuIHRydWU7CisKKwlp ZiAoIWN1ci0+YmFzZS5mYiB8fCAhbmV3LT5iYXNlLmZiKQorCQlyZXR1cm4gZmFsc2U7CisKKwlp ZiAoY3VyLT5iYXNlLmZiLT5tb2RpZmllclswXSAhPSBuZXctPmJhc2UuZmItPm1vZGlmaWVyWzBd IHx8CisJICAgIGN1ci0+YmFzZS5yb3RhdGlvbiAhPSBuZXctPmJhc2Uucm90YXRpb24gfHwKIAkg ICAgZHJtX3JlY3Rfd2lkdGgoJm5ldy0+c3JjKSAhPSBkcm1fcmVjdF93aWR0aCgmY3VyLT5zcmMp IHx8CiAJICAgIGRybV9yZWN0X2hlaWdodCgmbmV3LT5zcmMpICE9IGRybV9yZWN0X2hlaWdodCgm Y3VyLT5zcmMpIHx8CiAJICAgIGRybV9yZWN0X3dpZHRoKCZuZXctPmRzdCkgIT0gZHJtX3JlY3Rf d2lkdGgoJmN1ci0+ZHN0KSB8fApAQCAtMTE3NDYsMTcgKzExNzU2LDkgQEAgaW50IGludGVsX3Bs YW5lX2F0b21pY19jYWxjX2NoYW5nZXMoc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRl LAogCQkJIHBsYW5lLT5iYXNlLmlkLCB3YXNfdmlzaWJsZSwgdmlzaWJsZSwKIAkJCSB0dXJuX29m ZiwgdHVybl9vbiwgbW9kZV9jaGFuZ2VkKTsKIAotCWlmICh0dXJuX29uKSB7Ci0JCWludGVsX2Ny dGMtPmF0b21pYy51cGRhdGVfd21fcHJlID0gdHJ1ZTsKLQkJLyogbXVzdCBkaXNhYmxlIGN4c3Ig YXJvdW5kIHBsYW5lIGVuYWJsZS9kaXNhYmxlICovCi0JCWlmIChwbGFuZS0+dHlwZSAhPSBEUk1f UExBTkVfVFlQRV9DVVJTT1IpIHsKLQkJCXBpcGVfY29uZmlnLT5kaXNhYmxlX2N4c3IgPSB0cnVl OwotCQkJLyogdG8gcG90ZW50aWFsbHkgcmUtZW5hYmxlIGN4c3IgKi8KLQkJCWludGVsX2NydGMt PmF0b21pYy53YWl0X3ZibGFuayA9IHRydWU7Ci0JCQlpbnRlbF9jcnRjLT5hdG9taWMudXBkYXRl X3dtX3Bvc3QgPSB0cnVlOwotCQl9Ci0JfSBlbHNlIGlmICh0dXJuX29mZikgewotCQlpbnRlbF9j cnRjLT5hdG9taWMudXBkYXRlX3dtX3Bvc3QgPSB0cnVlOworCWlmICh0dXJuX29uIHx8IHR1cm5f b2ZmKSB7CisJCXBpcGVfY29uZmlnLT53bV9jaGFuZ2VkID0gdHJ1ZTsKKwogCQkvKiBtdXN0IGRp c2FibGUgY3hzciBhcm91bmQgcGxhbmUgZW5hYmxlL2Rpc2FibGUgKi8KIAkJaWYgKHBsYW5lLT50 eXBlICE9IERSTV9QTEFORV9UWVBFX0NVUlNPUikgewogCQkJaWYgKGlzX2NydGNfZW5hYmxlZCkK QEAgLTExNzY0LDcgKzExNzY2LDcgQEAgaW50IGludGVsX3BsYW5lX2F0b21pY19jYWxjX2NoYW5n ZXMoc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCQkJcGlwZV9jb25maWctPmRp c2FibGVfY3hzciA9IHRydWU7CiAJCX0KIAl9IGVsc2UgaWYgKGludGVsX3dtX25lZWRfdXBkYXRl KHBsYW5lLCBwbGFuZV9zdGF0ZSkpIHsKLQkJaW50ZWxfY3J0Yy0+YXRvbWljLnVwZGF0ZV93bV9w cmUgPSB0cnVlOworCQlwaXBlX2NvbmZpZy0+d21fY2hhbmdlZCA9IHRydWU7CiAJfQogCiAJaWYg KHZpc2libGUgfHwgd2FzX3Zpc2libGUpCkBAIC0xMTkwOSw3ICsxMTkxMSw3IEBAIHN0YXRpYyBp bnQgaW50ZWxfY3J0Y19hdG9taWNfY2hlY2soc3RydWN0IGRybV9jcnRjICpjcnRjLAogCX0KIAog CWlmIChtb2RlX2NoYW5nZWQgJiYgIWNydGNfc3RhdGUtPmFjdGl2ZSkKLQkJaW50ZWxfY3J0Yy0+ YXRvbWljLnVwZGF0ZV93bV9wb3N0ID0gdHJ1ZTsKKwkJcGlwZV9jb25maWctPndtX2NoYW5nZWQg PSB0cnVlOwogCiAJaWYgKG1vZGVfY2hhbmdlZCAmJiBjcnRjX3N0YXRlLT5lbmFibGUgJiYKIAkg ICAgZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19jb21wdXRlX2Nsb2NrICYmCkBAIC0xMzgwOSw5ICsx MzgxMSw2IEBAIHN0YXRpYyB2b2lkIGludGVsX2JlZ2luX2NydGNfY29tbWl0KHN0cnVjdCBkcm1f Y3J0YyAqY3J0YywKIAkJdG9faW50ZWxfY3J0Y19zdGF0ZShvbGRfY3J0Y19zdGF0ZSk7CiAJYm9v bCBtb2Rlc2V0ID0gbmVlZHNfbW9kZXNldChjcnRjLT5zdGF0ZSk7CiAKLQlpZiAoaW50ZWxfY3J0 Yy0+YXRvbWljLnVwZGF0ZV93bV9wcmUpCi0JCWludGVsX3VwZGF0ZV93YXRlcm1hcmtzKGNydGMp OwotCiAJLyogUGVyZm9ybSB2YmxhbmsgZXZhc2lvbiBhcm91bmQgY29tbWl0IG9wZXJhdGlvbiAq LwogCWludGVsX3BpcGVfdXBkYXRlX3N0YXJ0KGludGVsX2NydGMpOwogCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rydi5oCmluZGV4IDUzNDA1Y2RjMDFmNC4uNGY1ZDA5NDkxMzdlIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcnYuaApAQCAtMzcyLDYgKzM3Miw3IEBAIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl IHsKIAogCWJvb2wgdXBkYXRlX3BpcGU7IC8qIGNhbiBhIGZhc3QgbW9kZXNldCBiZSBwZXJmb3Jt ZWQ/ICovCiAJYm9vbCBkaXNhYmxlX2N4c3I7CisJYm9vbCB3bV9jaGFuZ2VkOyAvKiB3YXRlcm1h cmtzIGFyZSB1cGRhdGVkICovCiAKIAkvKiBQaXBlIHNvdXJjZSBzaXplIChpZS4gcGFuZWwgZml0 dGVyIGlucHV0IHNpemUpCiAJICogQWxsIHBsYW5lcyB3aWxsIGJlIHBvc2l0aW9uZWQgaW5zaWRl IHRoaXMgc3BhY2UsCkBAIC01MzUsNyArNTM2LDYgQEAgc3RydWN0IGludGVsX2NydGNfYXRvbWlj X2NvbW1pdCB7CiAJYm9vbCBkaXNhYmxlX2ZiYzsKIAlib29sIGRpc2FibGVfaXBzOwogCWJvb2wg cHJlX2Rpc2FibGVfcHJpbWFyeTsKLQlib29sIHVwZGF0ZV93bV9wcmUsIHVwZGF0ZV93bV9wb3N0 OwogCiAJLyogU2xlZXBhYmxlIG9wZXJhdGlvbnMgdG8gcGVyZm9ybSBhZnRlciBjb21taXQgKi8K IAl1bnNpZ25lZCBmYl9iaXRzOwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK