From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 04/11] drm/i915: Update watermark related members in the crtc_state. Date: Thu, 22 Oct 2015 13:56:29 +0200 Message-ID: <1445514996-18733-5-git-send-email-maarten.lankhorst@linux.intel.com> References: <1445514996-18733-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 493536E336 for ; Thu, 22 Oct 2015 04:56:41 -0700 (PDT) In-Reply-To: <1445514996-18733-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 VGhpcyByZW1vdmVzIGFub3RoZXIgY291cGxlIG9mIGhhY2tzIGZyb20gaW50ZWxfY3J0Yy0+YXRv bWljLCBhbmQKY3JlYXRlcyBwcm9wZXIgYXRvbWljIHN0YXRlIGZvciBpdC4KClNpZ25lZC1vZmYt Ynk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMgIHwgIDIgKysKIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDQ5ICsrKysrKysrKysrKysrKysrLS0t LS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwg IDYgKystLS0KIDMgZmlsZXMgY2hhbmdlZCwgMjggaW5zZXJ0aW9ucygrKSwgMjkgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYwppbmRleCAyNWE4OTFhYTM4MjQuLjlk NjljZjI1ZDdjNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWlj LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMKQEAgLTk0LDYgKzk0 LDggQEAgaW50ZWxfY3J0Y19kdXBsaWNhdGVfc3RhdGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQog CV9fZHJtX2F0b21pY19oZWxwZXJfY3J0Y19kdXBsaWNhdGVfc3RhdGUoY3J0YywgJmNydGNfc3Rh dGUtPmJhc2UpOwogCiAJY3J0Y19zdGF0ZS0+dXBkYXRlX3BpcGUgPSBmYWxzZTsKKwljcnRjX3N0 YXRlLT52aXNpYmxlX2NoYW5nZWQgPSBmYWxzZTsKKwljcnRjX3N0YXRlLT53bV9jaGFuZ2VkID0g ZmFsc2U7CiAKIAlyZXR1cm4gJmNydGNfc3RhdGUtPmJhc2U7CiB9CmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMKaW5kZXggYjhlMWE1NDcxYmVkLi41NDY2YTBiMjhmOWQgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTQ3NDgsMTYgKzQ3NDgsMTcgQEAgaW50ZWxf cHJlX2Rpc2FibGVfcHJpbWFyeShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiBzdGF0aWMgdm9pZCBp bnRlbF9wb3N0X3BsYW5lX3VwZGF0ZShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIHsKIAlzdHJ1 Y3QgaW50ZWxfY3J0Y19hdG9taWNfY29tbWl0ICphdG9taWMgPSAmY3J0Yy0+YXRvbWljOworCXN0 cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZyA9CisJCXRvX2ludGVsX2NydGNfc3Rh dGUoY3J0Yy0+YmFzZS5zdGF0ZSk7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJh c2UuZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3By aXZhdGU7CiAJc3RydWN0IGRybV9wbGFuZSAqcGxhbmU7CiAKIAlpbnRlbF9mcm9udGJ1ZmZlcl9m bGlwKGRldiwgYXRvbWljLT5mYl9iaXRzKTsKIAotCWlmIChhdG9taWMtPmRpc2FibGVfY3hzcikK LQkJY3J0Yy0+d20uY3hzcl9hbGxvd2VkID0gdHJ1ZTsKKwljcnRjLT53bS5jeHNyX2FsbG93ZWQg PSB0cnVlOwogCi0JaWYgKGNydGMtPmF0b21pYy51cGRhdGVfd21fcG9zdCkKKwlpZiAocGlwZV9j b25maWctPndtX2NoYW5nZWQpCiAJCWludGVsX3VwZGF0ZV93YXRlcm1hcmtzKCZjcnRjLT5iYXNl KTsKIAogCWlmIChhdG9taWMtPnVwZGF0ZV9mYmMpCkBAIC00Nzc4LDYgKzQ3NzksOCBAQCBzdGF0 aWMgdm9pZCBpbnRlbF9wcmVfcGxhbmVfdXBkYXRlKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQog CXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5iYXNlLmRldjsKIAlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9j cnRjX2F0b21pY19jb21taXQgKmF0b21pYyA9ICZjcnRjLT5hdG9taWM7CisJc3RydWN0IGludGVs X2NydGNfc3RhdGUgKnBpcGVfY29uZmlnID0KKwkJdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5i YXNlLnN0YXRlKTsKIAogCWlmIChhdG9taWMtPmRpc2FibGVfZmJjKQogCQlpbnRlbF9mYmNfZGlz YWJsZV9jcnRjKGNydGMpOwpAQCAtNDc4OCwxMCArNDc5MSwxMyBAQCBzdGF0aWMgdm9pZCBpbnRl bF9wcmVfcGxhbmVfdXBkYXRlKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCWlmIChhdG9taWMt PnByZV9kaXNhYmxlX3ByaW1hcnkpCiAJCWludGVsX3ByZV9kaXNhYmxlX3ByaW1hcnkoJmNydGMt PmJhc2UpOwogCi0JaWYgKGF0b21pYy0+ZGlzYWJsZV9jeHNyKSB7CisJaWYgKHBpcGVfY29uZmln LT52aXNpYmxlX2NoYW5nZWQpIHsKIAkJY3J0Yy0+d20uY3hzcl9hbGxvd2VkID0gZmFsc2U7CiAJ CWludGVsX3NldF9tZW1vcnlfY3hzcihkZXZfcHJpdiwgZmFsc2UpOwogCX0KKworCWlmICghbmVl ZHNfbW9kZXNldCgmcGlwZV9jb25maWctPmJhc2UpICYmIHBpcGVfY29uZmlnLT53bV9jaGFuZ2Vk KQorCQlpbnRlbF91cGRhdGVfd2F0ZXJtYXJrcygmY3J0Yy0+YmFzZSk7CiB9CiAKIHN0YXRpYyB2 b2lkIGludGVsX2NydGNfZGlzYWJsZV9wbGFuZXMoc3RydWN0IGRybV9jcnRjICpjcnRjLCB1bnNp Z25lZCBwbGFuZV9tYXNrKQpAQCAtMTE1OTcsNiArMTE2MDMsNyBAQCBzdGF0aWMgYm9vbCBpbnRl bF93bV9uZWVkX3VwZGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIGludCBpbnRlbF9wbGFu ZV9hdG9taWNfY2FsY19jaGFuZ2VzKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwK IAkJCQkgICAgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUpCiB7CisJc3RydWN0 IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnID0gdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRj X3N0YXRlKTsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBjcnRjX3N0YXRlLT5jcnRjOwogCXN0 cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKIAlzdHJ1 Y3QgZHJtX3BsYW5lICpwbGFuZSA9IHBsYW5lX3N0YXRlLT5wbGFuZTsKQEAgLTExNjM3LDYgKzEx NjQ0LDE3IEBAIGludCBpbnRlbF9wbGFuZV9hdG9taWNfY2FsY19jaGFuZ2VzKHN0cnVjdCBkcm1f Y3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAl0dXJuX29mZiA9IHdhc192aXNpYmxlICYmICghdmlz aWJsZSB8fCBtb2RlX2NoYW5nZWQpOwogCXR1cm5fb24gPSB2aXNpYmxlICYmICghd2FzX3Zpc2li bGUgfHwgbW9kZV9jaGFuZ2VkKTsKIAorCWlmICh0dXJuX29uIHx8IHR1cm5fb2ZmKSB7CisJCXBp cGVfY29uZmlnLT53bV9jaGFuZ2VkID0gdHJ1ZTsKKworCQkvKiBtdXN0IGRpc2FibGUgY3hzciBh cm91bmQgcGxhbmUgZW5hYmxlL2Rpc2FibGUgKi8KKwkJaWYgKHBsYW5lLT50eXBlICE9IERSTV9Q TEFORV9UWVBFX0NVUlNPUikKKwkJCXBpcGVfY29uZmlnLT52aXNpYmxlX2NoYW5nZWQgPSB0cnVl OworCX0gZWxzZSBpZiAoKHdhc192aXNpYmxlIHx8IHZpc2libGUpICYmCisJCSAgIGludGVsX3dt X25lZWRfdXBkYXRlKHBsYW5lLCBwbGFuZV9zdGF0ZSkpIHsKKwkJcGlwZV9jb25maWctPndtX2No YW5nZWQgPSB0cnVlOworCX0KKwogCURSTV9ERUJVR19BVE9NSUMoIltDUlRDOiVpXSBoYXMgW1BM QU5FOiVpXSB3aXRoIGZiICVpXG4iLCBpZHgsCiAJCQkgcGxhbmUtPmJhc2UuaWQsIGZiID8gZmIt PmJhc2UuaWQgOiAtMSk7CiAKQEAgLTExNjQ0LDI0ICsxMTY2Miw2IEBAIGludCBpbnRlbF9wbGFu ZV9hdG9taWNfY2FsY19jaGFuZ2VzKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwK IAkJCSBwbGFuZS0+YmFzZS5pZCwgd2FzX3Zpc2libGUsIHZpc2libGUsCiAJCQkgdHVybl9vZmYs IHR1cm5fb24sIG1vZGVfY2hhbmdlZCk7CiAKLQlpZiAodHVybl9vbikgewotCQlpbnRlbF9jcnRj LT5hdG9taWMudXBkYXRlX3dtX3ByZSA9IHRydWU7Ci0JCS8qIG11c3QgZGlzYWJsZSBjeHNyIGFy b3VuZCBwbGFuZSBlbmFibGUvZGlzYWJsZSAqLwotCQlpZiAocGxhbmUtPnR5cGUgIT0gRFJNX1BM QU5FX1RZUEVfQ1VSU09SKSB7Ci0JCQlpbnRlbF9jcnRjLT5hdG9taWMuZGlzYWJsZV9jeHNyID0g dHJ1ZTsKLQkJCS8qIHRvIHBvdGVudGlhbGx5IHJlLWVuYWJsZSBjeHNyICovCi0JCQlpbnRlbF9j cnRjLT5hdG9taWMudXBkYXRlX3dtX3Bvc3QgPSB0cnVlOwotCQl9Ci0JfSBlbHNlIGlmICh0dXJu X29mZikgewotCQlpbnRlbF9jcnRjLT5hdG9taWMudXBkYXRlX3dtX3Bvc3QgPSB0cnVlOwotCQkv KiBtdXN0IGRpc2FibGUgY3hzciBhcm91bmQgcGxhbmUgZW5hYmxlL2Rpc2FibGUgKi8KLQkJaWYg KHBsYW5lLT50eXBlICE9IERSTV9QTEFORV9UWVBFX0NVUlNPUikgewotCQkJaW50ZWxfY3J0Yy0+ YXRvbWljLmRpc2FibGVfY3hzciA9IHRydWU7Ci0JCX0KLQl9IGVsc2UgaWYgKGludGVsX3dtX25l ZWRfdXBkYXRlKHBsYW5lLCBwbGFuZV9zdGF0ZSkpIHsKLQkJaW50ZWxfY3J0Yy0+YXRvbWljLnVw ZGF0ZV93bV9wcmUgPSB0cnVlOwotCX0KLQogCWlmICh2aXNpYmxlIHx8IHdhc192aXNpYmxlKQog CQlpbnRlbF9jcnRjLT5hdG9taWMuZmJfYml0cyB8PQogCQkJdG9faW50ZWxfcGxhbmUocGxhbmUp LT5mcm9udGJ1ZmZlcl9iaXQ7CkBAIC0xMTc4Myw3ICsxMTc4Myw3IEBAIHN0YXRpYyBpbnQgaW50 ZWxfY3J0Y19hdG9taWNfY2hlY2soc3RydWN0IGRybV9jcnRjICpjcnRjLAogCX0KIAogCWlmICht b2RlX2NoYW5nZWQgJiYgIWNydGNfc3RhdGUtPmFjdGl2ZSkKLQkJaW50ZWxfY3J0Yy0+YXRvbWlj LnVwZGF0ZV93bV9wb3N0ID0gdHJ1ZTsKKwkJcGlwZV9jb25maWctPndtX2NoYW5nZWQgPSB0cnVl OwogCiAJaWYgKG1vZGVfY2hhbmdlZCAmJiBjcnRjX3N0YXRlLT5lbmFibGUgJiYKIAkgICAgZGV2 X3ByaXYtPmRpc3BsYXkuY3J0Y19jb21wdXRlX2Nsb2NrICYmCkBAIC0xMzYyMiw5ICsxMzYyMiw2 IEBAIHN0YXRpYyB2b2lkIGludGVsX2JlZ2luX2NydGNfY29tbWl0KHN0cnVjdCBkcm1fY3J0YyAq Y3J0YywKIAkJdG9faW50ZWxfY3J0Y19zdGF0ZShvbGRfY3J0Y19zdGF0ZSk7CiAJYm9vbCBtb2Rl c2V0ID0gbmVlZHNfbW9kZXNldChjcnRjLT5zdGF0ZSk7CiAKLQlpZiAoaW50ZWxfY3J0Yy0+YXRv bWljLnVwZGF0ZV93bV9wcmUpCi0JCWludGVsX3VwZGF0ZV93YXRlcm1hcmtzKGNydGMpOwotCiAJ LyogUGVyZm9ybSB2YmxhbmsgZXZhc2lvbiBhcm91bmQgY29tbWl0IG9wZXJhdGlvbiAqLwogCWlu dGVsX3BpcGVfdXBkYXRlX3N0YXJ0KGludGVsX2NydGMpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Ry di5oCmluZGV4IDRiNmJiMWFkZmRkZC4uYTZiODU2NTVkNzE3IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcnYuaApAQCAtMzUyLDcgKzM1Miw5IEBAIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlIHsKICNk ZWZpbmUgUElQRV9DT05GSUdfUVVJUktfTU9ERV9TWU5DX0ZMQUdTCSgxPDwwKSAvKiB1bnJlbGlh YmxlIHN5bmMgbW9kZS5mbGFncyAqLwogCXVuc2lnbmVkIGxvbmcgcXVpcmtzOwogCi0JYm9vbCB1 cGRhdGVfcGlwZTsKKwlib29sIHVwZGF0ZV9waXBlOyAvKiBjYW4gYSBmYXN0IG1vZGVzZXQgYmUg cGVyZm9ybWVkPyAqLworCWJvb2wgdmlzaWJsZV9jaGFuZ2VkOyAvKiBwbGFuZSB2aXNpYmlsaXR5 IGNoYW5nZWQgKi8KKwlib29sIHdtX2NoYW5nZWQ7IC8qIHdtIGNoYW5nZWQgKi8KIAogCS8qIFBp cGUgc291cmNlIHNpemUgKGllLiBwYW5lbCBmaXR0ZXIgaW5wdXQgc2l6ZSkKIAkgKiBBbGwgcGxh bmVzIHdpbGwgYmUgcG9zaXRpb25lZCBpbnNpZGUgdGhpcyBzcGFjZSwKQEAgLTUxNiw5ICs1MTgs NyBAQCBzdHJ1Y3QgaW50ZWxfY3J0Y19hdG9taWNfY29tbWl0IHsKIAkvKiBTbGVlcGFibGUgb3Bl cmF0aW9ucyB0byBwZXJmb3JtIGJlZm9yZSBjb21taXQgKi8KIAlib29sIGRpc2FibGVfZmJjOwog CWJvb2wgZGlzYWJsZV9pcHM7Ci0JYm9vbCBkaXNhYmxlX2N4c3I7CiAJYm9vbCBwcmVfZGlzYWJs ZV9wcmltYXJ5OwotCWJvb2wgdXBkYXRlX3dtX3ByZSwgdXBkYXRlX3dtX3Bvc3Q7CiAKIAkvKiBT bGVlcGFibGUgb3BlcmF0aW9ucyB0byBwZXJmb3JtIGFmdGVyIGNvbW1pdCAqLwogCXVuc2lnbmVk IGZiX2JpdHM7Ci0tIAoyLjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK