From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 9/9] drm/i915: Tidy watermark computation local types Date: Fri, 7 Oct 2016 14:34:12 +0100 Message-ID: <1475847252-31580-10-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1475847252-31580-1-git-send-email-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id EA5266EB9A for ; Fri, 7 Oct 2016 13:34:30 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id f193so3026475wmg.2 for ; Fri, 07 Oct 2016 06:34:30 -0700 (PDT) In-Reply-To: <1475847252-31580-1-git-send-email-tvrtko.ursulin@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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkNvbnZlcnQg dG8gZnJvbSBzaWduZWQgdG8gdW5zaWduZWQgYW5kIGZyb20gbG9uZ3MKdG8gaW50ZWdlcnMgd2hl cmUgYXBwcm9wcmlhdGUuCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVy c3VsaW5AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgfCA2 MCArKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5n ZWQsIDI4IGluc2VydGlvbnMoKyksIDMyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w bS5jCmluZGV4IDMwOGVkYzQzNzhmYS4uMTIwM2E3YTgwZTllIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMKQEAgLTcxMSwxNCArNzExLDE0IEBAIHN0YXRpYyBib29sIGc0eF9jb21wdXRlX3dtMChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJICAgIHVuc2lnbmVkIGludCBkaXNwbGF5X2xhdGVu Y3lfbnMsCiAJCQkgICAgY29uc3Qgc3RydWN0IGludGVsX3dhdGVybWFya19wYXJhbXMgKmN1cnNv ciwKIAkJCSAgICB1bnNpZ25lZCBpbnQgY3Vyc29yX2xhdGVuY3lfbnMsCi0JCQkgICAgaW50ICpw bGFuZV93bSwKLQkJCSAgICBpbnQgKmN1cnNvcl93bSkKKwkJCSAgICB1bnNpZ25lZCBpbnQgKnBs YW5lX3dtLAorCQkJICAgIHVuc2lnbmVkIGludCAqY3Vyc29yX3dtKQogewogCXN0cnVjdCBkcm1f Y3J0YyAqY3J0YzsKIAljb25zdCBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqYWRqdXN0ZWRfbW9k ZTsKIAlpbnQgaHRvdGFsLCBoZGlzcGxheSwgY2xvY2ssIGNwcDsKLQlpbnQgbGluZV90aW1lX3Vz LCBsaW5lX2NvdW50OwotCWludCBlbnRyaWVzLCB0bGJfbWlzczsKKwl1bnNpZ25lZCBpbnQgbGlu ZV90aW1lX3VzLCBsaW5lX2NvdW50LCBlbnRyaWVzOworCWludCB0bGJfbWlzczsKIAogCWNydGMg PSBpbnRlbF9nZXRfY3J0Y19mb3JfcGxhbmUoZGV2LCBwbGFuZSk7CiAJaWYgKCFpbnRlbF9jcnRj X2FjdGl2ZShjcnRjKSkgewpAQCAtNzQwLDcgKzc0MCw3IEBAIHN0YXRpYyBib29sIGc0eF9jb21w dXRlX3dtMChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQllbnRyaWVzICs9IHRsYl9taXNzOwog CWVudHJpZXMgPSBESVZfUk9VTkRfVVAoZW50cmllcywgZGlzcGxheS0+Y2FjaGVsaW5lX3NpemUp OwogCSpwbGFuZV93bSA9IGVudHJpZXMgKyBkaXNwbGF5LT5ndWFyZF9zaXplOwotCWlmICgqcGxh bmVfd20gPiAoaW50KWRpc3BsYXktPm1heF93bSkKKwlpZiAoKnBsYW5lX3dtID4gZGlzcGxheS0+ bWF4X3dtKQogCQkqcGxhbmVfd20gPSBkaXNwbGF5LT5tYXhfd207CiAKIAkvKiBVc2UgdGhlIGxh cmdlIGJ1ZmZlciBtZXRob2QgdG8gY2FsY3VsYXRlIGN1cnNvciB3YXRlcm1hcmsgKi8KQEAgLTc1 Miw4ICs3NTIsOCBAQCBzdGF0aWMgYm9vbCBnNHhfY29tcHV0ZV93bTAoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwKIAkJZW50cmllcyArPSB0bGJfbWlzczsKIAllbnRyaWVzID0gRElWX1JPVU5EX1VQ KGVudHJpZXMsIGN1cnNvci0+Y2FjaGVsaW5lX3NpemUpOwogCSpjdXJzb3Jfd20gPSBlbnRyaWVz ICsgY3Vyc29yLT5ndWFyZF9zaXplOwotCWlmICgqY3Vyc29yX3dtID4gKGludCljdXJzb3ItPm1h eF93bSkKLQkJKmN1cnNvcl93bSA9IChpbnQpY3Vyc29yLT5tYXhfd207CisJaWYgKCpjdXJzb3Jf d20gPiBjdXJzb3ItPm1heF93bSkKKwkJKmN1cnNvcl93bSA9IGN1cnNvci0+bWF4X3dtOwogCiAJ cmV0dXJuIHRydWU7CiB9CkBAIC03NjYsMjEgKzc2NiwyMSBAQCBzdGF0aWMgYm9vbCBnNHhfY29t cHV0ZV93bTAoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKICAqIG11c3QgYmUgZGlzYWJsZWQuCiAg Ki8KIHN0YXRpYyBib29sIGc0eF9jaGVja19zcndtKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCi0J CQkgICBpbnQgZGlzcGxheV93bSwgaW50IGN1cnNvcl93bSwKKwkJCSAgIHVuc2lnbmVkIGludCBk aXNwbGF5X3dtLCB1bnNpZ25lZCBpbnQgY3Vyc29yX3dtLAogCQkJICAgY29uc3Qgc3RydWN0IGlu dGVsX3dhdGVybWFya19wYXJhbXMgKmRpc3BsYXksCiAJCQkgICBjb25zdCBzdHJ1Y3QgaW50ZWxf d2F0ZXJtYXJrX3BhcmFtcyAqY3Vyc29yKQogewotCURSTV9ERUJVR19LTVMoIlNSIHdhdGVybWFy azogZGlzcGxheSBwbGFuZSAlZCwgY3Vyc29yICVkXG4iLAorCURSTV9ERUJVR19LTVMoIlNSIHdh dGVybWFyazogZGlzcGxheSBwbGFuZSAldSwgY3Vyc29yICV1XG4iLAogCQkgICAgICBkaXNwbGF5 X3dtLCBjdXJzb3Jfd20pOwogCiAJaWYgKGRpc3BsYXlfd20gPiBkaXNwbGF5LT5tYXhfd20pIHsK LQkJRFJNX0RFQlVHX0tNUygiZGlzcGxheSB3YXRlcm1hcmsgaXMgdG9vIGxhcmdlKCVkLyV1KSwg ZGlzYWJsaW5nXG4iLAorCQlEUk1fREVCVUdfS01TKCJkaXNwbGF5IHdhdGVybWFyayBpcyB0b28g bGFyZ2UoJXUvJXUpLCBkaXNhYmxpbmdcbiIsCiAJCQkgICAgICBkaXNwbGF5X3dtLCBkaXNwbGF5 LT5tYXhfd20pOwogCQlyZXR1cm4gZmFsc2U7CiAJfQogCiAJaWYgKGN1cnNvcl93bSA+IGN1cnNv ci0+bWF4X3dtKSB7Ci0JCURSTV9ERUJVR19LTVMoImN1cnNvciB3YXRlcm1hcmsgaXMgdG9vIGxh cmdlKCVkLyV1KSwgZGlzYWJsaW5nXG4iLAorCQlEUk1fREVCVUdfS01TKCJjdXJzb3Igd2F0ZXJt YXJrIGlzIHRvbyBsYXJnZSgldS8ldSksIGRpc2FibGluZ1xuIiwKIAkJCSAgICAgIGN1cnNvcl93 bSwgY3Vyc29yLT5tYXhfd20pOwogCQlyZXR1cm4gZmFsc2U7CiAJfQpAQCAtNzk4LDE1ICs3OTgs MTMgQEAgc3RhdGljIGJvb2wgZzR4X2NvbXB1dGVfc3J3bShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LAogCQkJICAgICB1bnNpZ25lZCBpbnQgbGF0ZW5jeV9ucywKIAkJCSAgICAgY29uc3Qgc3RydWN0 IGludGVsX3dhdGVybWFya19wYXJhbXMgKmRpc3BsYXksCiAJCQkgICAgIGNvbnN0IHN0cnVjdCBp bnRlbF93YXRlcm1hcmtfcGFyYW1zICpjdXJzb3IsCi0JCQkgICAgIGludCAqZGlzcGxheV93bSwg aW50ICpjdXJzb3Jfd20pCisJCQkgICAgIHVuc2lnbmVkIGludCAqZGlzcGxheV93bSwgdW5zaWdu ZWQgaW50ICpjdXJzb3Jfd20pCiB7CiAJc3RydWN0IGRybV9jcnRjICpjcnRjOwogCWNvbnN0IHN0 cnVjdCBkcm1fZGlzcGxheV9tb2RlICphZGp1c3RlZF9tb2RlOwogCWludCBoZGlzcGxheSwgaHRv dGFsLCBjcHAsIGNsb2NrOwotCXVuc2lnbmVkIGxvbmcgbGluZV90aW1lX3VzOwotCWludCBsaW5l X2NvdW50LCBsaW5lX3NpemU7Ci0JaW50IHNtYWxsLCBsYXJnZTsKLQlpbnQgZW50cmllczsKKwl1 bnNpZ25lZCBpbnQgbGluZV90aW1lX3VzLCBsaW5lX2NvdW50LCBsaW5lX3NpemU7CisJdW5zaWdu ZWQgaW50IHNtYWxsLCBsYXJnZSwgZW50cmllczsKIAogCWlmICghbGF0ZW5jeV9ucykgewogCQkq ZGlzcGxheV93bSA9ICpjdXJzb3Jfd20gPSAwOwpAQCAtODM2LDkgKzgzNCw3IEBAIHN0YXRpYyBi b29sIGc0eF9jb21wdXRlX3Nyd20oc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAllbnRyaWVzID0g RElWX1JPVU5EX1VQKGVudHJpZXMsIGN1cnNvci0+Y2FjaGVsaW5lX3NpemUpOwogCSpjdXJzb3Jf d20gPSBlbnRyaWVzICsgY3Vyc29yLT5ndWFyZF9zaXplOwogCi0JcmV0dXJuIGc0eF9jaGVja19z cndtKGRldiwKLQkJCSAgICAgICpkaXNwbGF5X3dtLCAqY3Vyc29yX3dtLAotCQkJICAgICAgZGlz cGxheSwgY3Vyc29yKTsKKwlyZXR1cm4gZzR4X2NoZWNrX3Nyd20oZGV2LCAqZGlzcGxheV93bSwg KmN1cnNvcl93bSwgZGlzcGxheSwgY3Vyc29yKTsKIH0KIAogI2RlZmluZSBGV19XTV9WTFYodmFs dWUsIHBsYW5lKSBcCkBAIC0xMzg2LDggKzEzODIsOSBAQCBzdGF0aWMgdm9pZCBnNHhfdXBkYXRl X3dtKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0 Yy0+ZGV2OwogCXN0YXRpYyBjb25zdCB1bnNpZ25lZCBpbnQgc3JfbGF0ZW5jeV9ucyA9IDEyMDAw OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKLQlp bnQgcGxhbmVhX3dtLCBwbGFuZWJfd20sIGN1cnNvcmFfd20sIGN1cnNvcmJfd207Ci0JaW50IHBs YW5lX3NyLCBjdXJzb3Jfc3I7CisJdW5zaWduZWQgaW50IHBsYW5lYV93bSwgcGxhbmViX3dtOwor CXVuc2lnbmVkIGludCBjdXJzb3JhX3dtLCBjdXJzb3JiX3dtOworCXVuc2lnbmVkIGludCBwbGFu ZV9zciwgY3Vyc29yX3NyOwogCXVuc2lnbmVkIGludCBlbmFibGVkID0gMDsKIAlib29sIGN4c3Jf ZW5hYmxlZDsKIApAQCAtMTQxNiw4ICsxNDEzLDggQEAgc3RhdGljIHZvaWQgZzR4X3VwZGF0ZV93 bShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJCXBsYW5lX3NyID0gY3Vyc29yX3NyID0gMDsKIAl9 CiAKLQlEUk1fREVCVUdfS01TKCJTZXR0aW5nIEZJRk8gd2F0ZXJtYXJrcyAtIEE6IHBsYW5lPSVk LCBjdXJzb3I9JWQsICIKLQkJICAgICAgIkI6IHBsYW5lPSVkLCBjdXJzb3I9JWQsIFNSOiBwbGFu ZT0lZCwgY3Vyc29yPSVkXG4iLAorCURSTV9ERUJVR19LTVMoIlNldHRpbmcgRklGTyB3YXRlcm1h cmtzIC0gQTogcGxhbmU9JXUsIGN1cnNvcj0ldSwgIgorCQkgICAgICAiQjogcGxhbmU9JXUsIGN1 cnNvcj0ldSwgU1I6IHBsYW5lPSV1LCBjdXJzb3I9JXVcbiIsCiAJCSAgICAgIHBsYW5lYV93bSwg Y3Vyc29yYV93bSwKIAkJICAgICAgcGxhbmViX3dtLCBjdXJzb3JiX3dtLAogCQkgICAgICBwbGFu ZV9zciwgY3Vyc29yX3NyKTsKQEAgLTE0NTgsOCArMTQ1NSw3IEBAIHN0YXRpYyB2b2lkIGk5NjVf dXBkYXRlX3dtKHN0cnVjdCBkcm1fY3J0YyAqdW51c2VkX2NydGMpCiAJCWludCBodG90YWwgPSBh ZGp1c3RlZF9tb2RlLT5jcnRjX2h0b3RhbDsKIAkJaW50IGhkaXNwbGF5ID0gdG9faW50ZWxfY3J0 YyhjcnRjKS0+Y29uZmlnLT5waXBlX3NyY193OwogCQlpbnQgY3BwID0gZHJtX2Zvcm1hdF9wbGFu ZV9jcHAoY3J0Yy0+cHJpbWFyeS0+c3RhdGUtPmZiLT5waXhlbF9mb3JtYXQsIDApOwotCQl1bnNp Z25lZCBsb25nIGxpbmVfdGltZV91czsKLQkJaW50IGVudHJpZXM7CisJCXVuc2lnbmVkIGludCBs aW5lX3RpbWVfdXMsIGVudHJpZXM7CiAKIAkJbGluZV90aW1lX3VzID0gbWF4KGh0b3RhbCAqIDEw MDAgLyBjbG9jaywgMSk7CiAKQEAgLTE1MTgsOSArMTUxNCwxMCBAQCBzdGF0aWMgdm9pZCBpOXh4 X3VwZGF0ZV93bShzdHJ1Y3QgZHJtX2NydGMgKnVudXNlZF9jcnRjKQogCXN0cnVjdCBkcm1fZGV2 aWNlICpkZXYgPSB1bnVzZWRfY3J0Yy0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIAljb25zdCBzdHJ1Y3QgaW50ZWxfd2F0ZXJtYXJrX3Bh cmFtcyAqd21faW5mbzsKLQl1aW50MzJfdCBmd2F0ZXJfbG87Ci0JdWludDMyX3QgZndhdGVyX2hp OwotCWludCBjd20sIHNyd20gPSAxOworCXUzMiBmd2F0ZXJfbG87CisJdTMyIGZ3YXRlcl9oaTsK Kwl1bnNpZ25lZCBpbnQgY3dtOworCWludCBzcndtID0gMTsKIAl1bnNpZ25lZCBpbnQgZmlmb19z aXplLCBwbGFuZWFfd20sIHBsYW5lYl93bTsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGMsICplbmFi bGVkID0gTlVMTDsKIApAQCAtMTYwNCw4ICsxNjAxLDcgQEAgc3RhdGljIHZvaWQgaTl4eF91cGRh dGVfd20oc3RydWN0IGRybV9jcnRjICp1bnVzZWRfY3J0YykKIAkJaW50IGh0b3RhbCA9IGFkanVz dGVkX21vZGUtPmNydGNfaHRvdGFsOwogCQlpbnQgaGRpc3BsYXkgPSB0b19pbnRlbF9jcnRjKGVu YWJsZWQpLT5jb25maWctPnBpcGVfc3JjX3c7CiAJCWludCBjcHAgPSBkcm1fZm9ybWF0X3BsYW5l X2NwcChlbmFibGVkLT5wcmltYXJ5LT5zdGF0ZS0+ZmItPnBpeGVsX2Zvcm1hdCwgMCk7Ci0JCXVu c2lnbmVkIGxvbmcgbGluZV90aW1lX3VzOwotCQlpbnQgZW50cmllczsKKwkJdW5zaWduZWQgaW50 IGxpbmVfdGltZV91cywgZW50cmllczsKIAogCQlpZiAoSVNfSTkxNUdNKGRldikgfHwgSVNfSTk0 NUdNKGRldikpCiAJCQljcHAgPSA0OwpAQCAtMTYxNiw3ICsxNjEyLDcgQEAgc3RhdGljIHZvaWQg aTl4eF91cGRhdGVfd20oc3RydWN0IGRybV9jcnRjICp1bnVzZWRfY3J0YykKIAkJZW50cmllcyA9 ICgoKHNyX2xhdGVuY3lfbnMgLyBsaW5lX3RpbWVfdXMpICsgMTAwMCkgLyAxMDAwKSAqCiAJCQlj cHAgKiBoZGlzcGxheTsKIAkJZW50cmllcyA9IERJVl9ST1VORF9VUChlbnRyaWVzLCB3bV9pbmZv LT5jYWNoZWxpbmVfc2l6ZSk7Ci0JCURSTV9ERUJVR19LTVMoInNlbGYtcmVmcmVzaCBlbnRyaWVz OiAlZFxuIiwgZW50cmllcyk7CisJCURSTV9ERUJVR19LTVMoInNlbGYtcmVmcmVzaCBlbnRyaWVz OiAldVxuIiwgZW50cmllcyk7CiAJCXNyd20gPSB3bV9pbmZvLT5maWZvX3NpemUgLSBlbnRyaWVz OwogCQlpZiAoc3J3bSA8IDApCiAJCQlzcndtID0gMTsKQEAgLTE2MjgsNyArMTYyNCw3IEBAIHN0 YXRpYyB2b2lkIGk5eHhfdXBkYXRlX3dtKHN0cnVjdCBkcm1fY3J0YyAqdW51c2VkX2NydGMpCiAJ CQlJOTE1X1dSSVRFKEZXX0JMQ19TRUxGLCBzcndtICYgMHgzZik7CiAJfQogCi0JRFJNX0RFQlVH X0tNUygiU2V0dGluZyBGSUZPIHdhdGVybWFya3MgLSBBOiAlZCwgQjogJWQsIEM6ICVkLCBTUiAl ZFxuIiwKKwlEUk1fREVCVUdfS01TKCJTZXR0aW5nIEZJRk8gd2F0ZXJtYXJrcyAtIEE6ICV1LCBC OiAldSwgQzogJXUsIFNSICVkXG4iLAogCQkgICAgICBwbGFuZWFfd20sIHBsYW5lYl93bSwgY3dt LCBzcndtKTsKIAogCWZ3YXRlcl9sbyA9ICgocGxhbmViX3dtICYgMHgzZikgPDwgMTYpIHwgKHBs YW5lYV93bSAmIDB4M2YpOwotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeAo=