From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 02/12] drm/i915: Calculate watermark related members in the crtc_state, v3. Date: Thu, 19 Nov 2015 16:07:15 +0100 Message-ID: <1447945645-32005-3-git-send-email-maarten.lankhorst@linux.intel.com> References: <1447945645-32005-1-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id DC6D66E981 for ; Thu, 19 Nov 2015 07:07:36 -0800 (PST) In-Reply-To: <1447945645-32005-1-git-send-email-maarten.lankhorst@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: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org VGhpcyByZW1vdmVzIHByZS9wb3N0X3dtX3VwZGF0ZSBmcm9tIGludGVsX2NydGMtPmF0b21pYywg YW5kCmNyZWF0ZXMgYXRvbWljIHN0YXRlIGZvciBpdCBpbiBpbnRlbF9jcnRjLgoKQ2hhbmdlcyBz aW5jZSB2MToKLSBSZWJhc2Ugb24gdG9wIG9mIHdtIGNoYW5nZXMuCkNoYW5nZXMgc2luY2UgdjI6 Ci0gU3BsaXQgZGlzYWJsZV9jeHNyIGludG8gYSBzZXBhcmF0ZSBwYXRjaC4KClNpZ25lZC1vZmYt Ynk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMgIHwgIDEgKwogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMzEgKysrKysrKysrKysrKy0tLS0tLS0t LS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgIDIgKy0K IDMgZmlsZXMgY2hhbmdlZCwgMTUgaW5zZXJ0aW9ucygrKSwgMTkgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYwppbmRleCA5ZjA2MzhhMzdiNmQuLjQ2MjVmOGE5YmEx MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMKQEAgLTk2LDYgKzk2LDcgQEAgaW50 ZWxfY3J0Y19kdXBsaWNhdGVfc3RhdGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCWNydGNfc3Rh dGUtPnVwZGF0ZV9waXBlID0gZmFsc2U7CiAJY3J0Y19zdGF0ZS0+ZGlzYWJsZV9scF93bSA9IGZh bHNlOwogCWNydGNfc3RhdGUtPmRpc2FibGVfY3hzciA9IGZhbHNlOworCWNydGNfc3RhdGUtPndt X2NoYW5nZWQgPSBmYWxzZTsKIAogCXJldHVybiAmY3J0Y19zdGF0ZS0+YmFzZTsKIH0KZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA1ZWU2NGU2N2FkOGEuLmRiNDk5NTQwNjI3 NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtNDc0MSw2ICs0NzQxLDgg QEAgaW50ZWxfcHJlX2Rpc2FibGVfcHJpbWFyeShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiBzdGF0 aWMgdm9pZCBpbnRlbF9wb3N0X3BsYW5lX3VwZGF0ZShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykK IHsKIAlzdHJ1Y3QgaW50ZWxfY3J0Y19hdG9taWNfY29tbWl0ICphdG9taWMgPSAmY3J0Yy0+YXRv bWljOworCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZyA9CisJCXRvX2ludGVs X2NydGNfc3RhdGUoY3J0Yy0+YmFzZS5zdGF0ZSk7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9 IGNydGMtPmJhc2UuZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRl di0+ZGV2X3ByaXZhdGU7CiAKQEAgLTQ3NTEsNyArNDc1Myw3IEBAIHN0YXRpYyB2b2lkIGludGVs X3Bvc3RfcGxhbmVfdXBkYXRlKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCiAJY3J0Yy0+d20u Y3hzcl9hbGxvd2VkID0gdHJ1ZTsKIAotCWlmIChjcnRjLT5hdG9taWMudXBkYXRlX3dtX3Bvc3Qp CisJaWYgKHBpcGVfY29uZmlnLT53bV9jaGFuZ2VkKQogCQlpbnRlbF91cGRhdGVfd2F0ZXJtYXJr cygmY3J0Yy0+YmFzZSk7CiAKIAlpZiAoYXRvbWljLT51cGRhdGVfZmJjKQpAQCAtNDc4NCw2ICs0 Nzg2LDkgQEAgc3RhdGljIHZvaWQgaW50ZWxfcHJlX3BsYW5lX3VwZGF0ZShzdHJ1Y3QgaW50ZWxf Y3J0YyAqY3J0YykKIAkJY3J0Yy0+d20uY3hzcl9hbGxvd2VkID0gZmFsc2U7CiAJCWludGVsX3Nl dF9tZW1vcnlfY3hzcihkZXZfcHJpdiwgZmFsc2UpOwogCX0KKworCWlmICghbmVlZHNfbW9kZXNl dCgmcGlwZV9jb25maWctPmJhc2UpICYmIHBpcGVfY29uZmlnLT53bV9jaGFuZ2VkKQorCQlpbnRl bF91cGRhdGVfd2F0ZXJtYXJrcygmY3J0Yy0+YmFzZSk7CiB9CiAKIHN0YXRpYyB2b2lkIGludGVs X2NydGNfZGlzYWJsZV9wbGFuZXMoc3RydWN0IGRybV9jcnRjICpjcnRjLCB1bnNpZ25lZCBwbGFu ZV9tYXNrKQpAQCAtMTE3MDYsMjUgKzExNzExLDE4IEBAIGludCBpbnRlbF9wbGFuZV9hdG9taWNf Y2FsY19jaGFuZ2VzKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJCSBwbGFu ZS0+YmFzZS5pZCwgd2FzX3Zpc2libGUsIHZpc2libGUsCiAJCQkgdHVybl9vZmYsIHR1cm5fb24s IG1vZGVfY2hhbmdlZCk7CiAKLQlpZiAodHVybl9vbikgewotCQlpbnRlbF9jcnRjLT5hdG9taWMu dXBkYXRlX3dtX3ByZSA9IHRydWU7Ci0JCS8qIG11c3QgZGlzYWJsZSBjeHNyIGFyb3VuZCBwbGFu ZSBlbmFibGUvZGlzYWJsZSAqLwotCQlpZiAocGxhbmUtPnR5cGUgIT0gRFJNX1BMQU5FX1RZUEVf Q1VSU09SKSB7Ci0JCQlwaXBlX2NvbmZpZy0+ZGlzYWJsZV9jeHNyID0gdHJ1ZTsKLQkJCS8qIHRv IHBvdGVudGlhbGx5IHJlLWVuYWJsZSBjeHNyICovCi0JCQlpbnRlbF9jcnRjLT5hdG9taWMud2Fp dF92YmxhbmsgPSB0cnVlOwotCQkJaW50ZWxfY3J0Yy0+YXRvbWljLnVwZGF0ZV93bV9wb3N0ID0g dHJ1ZTsKLQkJfQotCX0gZWxzZSBpZiAodHVybl9vZmYpIHsKLQkJaW50ZWxfY3J0Yy0+YXRvbWlj LnVwZGF0ZV93bV9wb3N0ID0gdHJ1ZTsKKwlpZiAodHVybl9vbiB8fCB0dXJuX29mZikgeworCQlw aXBlX2NvbmZpZy0+d21fY2hhbmdlZCA9IHRydWU7CisKIAkJLyogbXVzdCBkaXNhYmxlIGN4c3Ig YXJvdW5kIHBsYW5lIGVuYWJsZS9kaXNhYmxlICovCiAJCWlmIChwbGFuZS0+dHlwZSAhPSBEUk1f UExBTkVfVFlQRV9DVVJTT1IpIHsKIAkJCWlmIChpc19jcnRjX2VuYWJsZWQpCiAJCQkJaW50ZWxf Y3J0Yy0+YXRvbWljLndhaXRfdmJsYW5rID0gdHJ1ZTsKIAkJCXBpcGVfY29uZmlnLT5kaXNhYmxl X2N4c3IgPSB0cnVlOwogCQl9Ci0JfSBlbHNlIGlmIChpbnRlbF93bV9uZWVkX3VwZGF0ZShwbGFu ZSwgcGxhbmVfc3RhdGUpKSB7Ci0JCWludGVsX2NydGMtPmF0b21pYy51cGRhdGVfd21fcHJlID0g dHJ1ZTsKKwl9IGVsc2UgaWYgKCh3YXNfdmlzaWJsZSB8fCB2aXNpYmxlKSAmJgorCQkgICBpbnRl bF93bV9uZWVkX3VwZGF0ZShwbGFuZSwgcGxhbmVfc3RhdGUpKSB7CisJCXBpcGVfY29uZmlnLT53 bV9jaGFuZ2VkID0gdHJ1ZTsKIAl9CiAKIAlpZiAodmlzaWJsZSB8fCB3YXNfdmlzaWJsZSkKQEAg LTExODY5LDcgKzExODY3LDcgQEAgc3RhdGljIGludCBpbnRlbF9jcnRjX2F0b21pY19jaGVjayhz dHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJfQogCiAJaWYgKG1vZGVfY2hhbmdlZCAmJiAhY3J0Y19z dGF0ZS0+YWN0aXZlKQotCQlpbnRlbF9jcnRjLT5hdG9taWMudXBkYXRlX3dtX3Bvc3QgPSB0cnVl OworCQlwaXBlX2NvbmZpZy0+d21fY2hhbmdlZCA9IHRydWU7CiAKIAlpZiAobW9kZV9jaGFuZ2Vk ICYmIGNydGNfc3RhdGUtPmVuYWJsZSAmJgogCSAgICBkZXZfcHJpdi0+ZGlzcGxheS5jcnRjX2Nv bXB1dGVfY2xvY2sgJiYKQEAgLTEzNzYyLDkgKzEzNzYwLDYgQEAgc3RhdGljIHZvaWQgaW50ZWxf YmVnaW5fY3J0Y19jb21taXQoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQl0b19pbnRlbF9jcnRj X3N0YXRlKG9sZF9jcnRjX3N0YXRlKTsKIAlib29sIG1vZGVzZXQgPSBuZWVkc19tb2Rlc2V0KGNy dGMtPnN0YXRlKTsKIAotCWlmIChpbnRlbF9jcnRjLT5hdG9taWMudXBkYXRlX3dtX3ByZSkKLQkJ aW50ZWxfdXBkYXRlX3dhdGVybWFya3MoY3J0Yyk7Ci0KIAkvKiBQZXJmb3JtIHZibGFuayBldmFz aW9uIGFyb3VuZCBjb21taXQgb3BlcmF0aW9uICovCiAJaW50ZWxfcGlwZV91cGRhdGVfc3RhcnQo aW50ZWxfY3J0Yyk7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Ry di5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggZGQ4OTM0MjgzMmUy Li5kYjYxYzM3ZGJmMDkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Ry di5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC0zNzIsNiArMzcy LDcgQEAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgewogCiAJYm9vbCB1cGRhdGVfcGlwZTsgLyog Y2FuIGEgZmFzdCBtb2Rlc2V0IGJlIHBlcmZvcm1lZD8gKi8KIAlib29sIGRpc2FibGVfY3hzcjsK Kwlib29sIHdtX2NoYW5nZWQ7IC8qIHdhdGVybWFya3MgYXJlIHVwZGF0ZWQgKi8KIAogCS8qIFBp cGUgc291cmNlIHNpemUgKGllLiBwYW5lbCBmaXR0ZXIgaW5wdXQgc2l6ZSkKIAkgKiBBbGwgcGxh bmVzIHdpbGwgYmUgcG9zaXRpb25lZCBpbnNpZGUgdGhpcyBzcGFjZSwKQEAgLTUzNSw3ICs1MzYs NiBAQCBzdHJ1Y3QgaW50ZWxfY3J0Y19hdG9taWNfY29tbWl0IHsKIAlib29sIGRpc2FibGVfZmJj OwogCWJvb2wgZGlzYWJsZV9pcHM7CiAJYm9vbCBwcmVfZGlzYWJsZV9wcmltYXJ5OwotCWJvb2wg dXBkYXRlX3dtX3ByZSwgdXBkYXRlX3dtX3Bvc3Q7CiAKIAkvKiBTbGVlcGFibGUgb3BlcmF0aW9u cyB0byBwZXJmb3JtIGFmdGVyIGNvbW1pdCAqLwogCXVuc2lnbmVkIGZiX2JpdHM7Ci0tIAoyLjEu MAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK