From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 7/7] drm/i915/skl: Take 90/270 rotation into account in watermark calculations Date: Tue, 17 Mar 2015 15:45:17 +0000 Message-ID: <1426607117-10626-8-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1426607117-10626-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 49E246E708 for ; Tue, 17 Mar 2015 08:45:30 -0700 (PDT) In-Reply-To: <1426607117-10626-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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCnYyOiBQYXNz IGluIHJvdGF0aW9uIGluZm8gdG8gc3ByaXRlIHBsYW5lIHVwZGF0ZXMgYXMgd2VsbC4KCnYzOiBV c2UgaGVscGVyIHRvIGRldGVybWluZSA5MC8yNzAgcm90YXRpb24uIChNaWNoZWwgVGhpZXJyeSkK CnY0OiBSZWJhc2VkIGZvciBmYiBtb2RpZmllcnMgYW5kIGF0b21pYyBjaGFuZ2VzLgoKRm9yOiBW SVotNDU0NgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50 ZWwuY29tPgpSZXZpZXdlZC1ieTogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGludGVs LmNvbT4gKHYzKQotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDI3 ICsrKysrKysrKysrKysrKysrKysrKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHJ2LmggICAgIHwgIDQgKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyAgICAg IHwgMTggKysrKysrKysrKysrKysrKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJp dGUuYyAgfCAgNSArLS0tLQogNCBmaWxlcyBjaGFuZ2VkLCA0NSBpbnNlcnRpb25zKCspLCA5IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA5YWY3M2Ix Li4xOWJlYzMzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xMTk5NCw2 ICsxMTk5NCwyOCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9zaGFyZWRfZHBsbF9pbml0KHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCiB9CiAKIC8qKgorICogaW50ZWxfd21fbmVlZF91cGRhdGUgLSBDaGVj ayB3aGV0aGVyIHdhdGVybWFya3MgbmVlZCB1cGRhdGluZworICogQHBsYW5lOiBkcm0gcGxhbmUK KyAqIEBzdGF0ZTogbmV3IHBsYW5lIHN0YXRlCisgKgorICogQ2hlY2sgY3VycmVudCBwbGFuZSBz dGF0ZSB2ZXJzdXMgdGhlIG5ldyBvbmUgdG8gZGV0ZXJtaW5lIHdoZXRoZXIKKyAqIHdhdGVybWFy a3MgbmVlZCB0byBiZSByZWNhbGN1bGF0ZWQuCisgKgorICogUmV0dXJucyB0cnVlIG9yIGZhbHNl LgorICovCitib29sIGludGVsX3dtX25lZWRfdXBkYXRlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5l LAorCQkJICBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpzdGF0ZSkKK3sKKwkvKiBVcGRhdGUgd2F0 ZXJtYXJrcyBvbiB0aWxpbmcgY2hhbmdlcy4gKi8KKwlpZiAoIXBsYW5lLT5zdGF0ZS0+ZmIgfHwg IXN0YXRlLT5mYiB8fAorCSAgICBwbGFuZS0+c3RhdGUtPmZiLT5tb2RpZmllclswXSAhPSBzdGF0 ZS0+ZmItPm1vZGlmaWVyWzBdIHx8CisJICAgIHBsYW5lLT5zdGF0ZS0+cm90YXRpb24gIT0gc3Rh dGUtPnJvdGF0aW9uKQorCQlyZXR1cm4gdHJ1ZTsKKworCXJldHVybiBmYWxzZTsKK30KKworLyoq CiAgKiBpbnRlbF9wcmVwYXJlX3BsYW5lX2ZiIC0gUHJlcGFyZSBmYiBmb3IgdXNhZ2Ugb24gcGxh bmUKICAqIEBwbGFuZTogZHJtIHBsYW5lIHRvIHByZXBhcmUgZm9yCiAgKiBAZmI6IGZyYW1lYnVm ZmVyIHRvIHByZXBhcmUgZm9yIHByZXNlbnRhdGlvbgpAQCAtMTIxMzksMTAgKzEyMTYxLDcgQEAg aW50ZWxfY2hlY2tfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAogCQlp bnRlbF9jcnRjLT5hdG9taWMudXBkYXRlX2ZiYyA9IHRydWU7CiAKLQkJLyogVXBkYXRlIHdhdGVy bWFya3Mgb24gdGlsaW5nIGNoYW5nZXMuICovCi0JCWlmICghcGxhbmUtPnN0YXRlLT5mYiB8fCAh c3RhdGUtPmJhc2UuZmIgfHwKLQkJICAgIHBsYW5lLT5zdGF0ZS0+ZmItPm1vZGlmaWVyWzBdICE9 Ci0JCSAgICBzdGF0ZS0+YmFzZS5mYi0+bW9kaWZpZXJbMF0pCisJCWlmIChpbnRlbF93bV9uZWVk X3VwZGF0ZShwbGFuZSwgJnN0YXRlLT5iYXNlKSkKIAkJCWludGVsX2NydGMtPmF0b21pYy51cGRh dGVfd20gPSB0cnVlOwogCX0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCBhZTI4ZmI0 Li5hN2VjZjk1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtNTAxLDYgKzUwMSw3IEBA IHN0cnVjdCBpbnRlbF9wbGFuZV93bV9wYXJhbWV0ZXJzIHsKIAlib29sIGVuYWJsZWQ7CiAJYm9v bCBzY2FsZWQ7CiAJdTY0IHRpbGluZzsKKwl1bnNpZ25lZCBpbnQgcm90YXRpb247CiB9OwogCiBz dHJ1Y3QgaW50ZWxfcGxhbmUgewpAQCAtOTk3LDYgKzk5OCw5IEBAIGludGVsX3JvdGF0aW9uXzkw X29yXzI3MCh1bnNpZ25lZCBpbnQgcm90YXRpb24pCiAJcmV0dXJuIHJvdGF0aW9uICYgKEJJVChE Uk1fUk9UQVRFXzkwKSB8IEJJVChEUk1fUk9UQVRFXzI3MCkpOwogfQogCitib29sIGludGVsX3dt X25lZWRfdXBkYXRlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAorCQkJICBzdHJ1Y3QgZHJtX3Bs YW5lX3N0YXRlICpzdGF0ZSk7CisKIC8qIHNoYXJlZCBkcGxsIGZ1bmN0aW9ucyAqLwogc3RydWN0 IGludGVsX3NoYXJlZF9kcGxsICppbnRlbF9jcnRjX3RvX3NoYXJlZF9kcGxsKHN0cnVjdCBpbnRl bF9jcnRjICpjcnRjKTsKIHZvaWQgYXNzZXJ0X3NoYXJlZF9kcGxsKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDI4OGM5ZDIuLjRl MDgwYTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtMjg0MCw2ICsyODQwLDcgQEAgc3Rh dGljIHZvaWQgc2tsX2NvbXB1dGVfd21fcGlwZV9wYXJhbWV0ZXJzKHN0cnVjdCBkcm1fY3J0YyAq Y3J0YywKIAkJfQogCQlwLT5wbGFuZVswXS5ob3Jpel9waXhlbHMgPSBpbnRlbF9jcnRjLT5jb25m aWctPnBpcGVfc3JjX3c7CiAJCXAtPnBsYW5lWzBdLnZlcnRfcGl4ZWxzID0gaW50ZWxfY3J0Yy0+ Y29uZmlnLT5waXBlX3NyY19oOworCQlwLT5wbGFuZVswXS5yb3RhdGlvbiA9IGNydGMtPnByaW1h cnktPnN0YXRlLT5yb3RhdGlvbjsKIAogCQlmYiA9IGNydGMtPmN1cnNvci0+c3RhdGUtPmZiOwog CQlpZiAoZmIpIHsKQEAgLTI4OTcsNyArMjg5OCwyMSBAQCBzdGF0aWMgYm9vbCBza2xfY29tcHV0 ZV9wbGFuZV93bShjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAKIAlp ZiAocF9wYXJhbXMtPnRpbGluZyA9PSBJOTE1X0ZPUk1BVF9NT0RfWV9USUxFRCB8fAogCSAgICBw X3BhcmFtcy0+dGlsaW5nID09IEk5MTVfRk9STUFUX01PRF9ZZl9USUxFRCkgewotCQl1aW50MzJf dCB5X3RpbGVfbWluaW11bSA9IHBsYW5lX2Jsb2Nrc19wZXJfbGluZSAqIDQ7CisJCXVpbnQzMl90 IG1pbl9zY2FubGluZXMgPSA0OworCQl1aW50MzJfdCB5X3RpbGVfbWluaW11bTsKKwkJaWYgKGlu dGVsX3JvdGF0aW9uXzkwX29yXzI3MChwX3BhcmFtcy0+cm90YXRpb24pKSB7CisJCQlzd2l0Y2gg KHBfcGFyYW1zLT5ieXRlc19wZXJfcGl4ZWwpIHsKKwkJCWNhc2UgMToKKwkJCQltaW5fc2Nhbmxp bmVzID0gMTY7CisJCQkJYnJlYWs7CisJCQljYXNlIDI6CisJCQkJbWluX3NjYW5saW5lcyA9IDg7 CisJCQkJYnJlYWs7CisJCQljYXNlIDg6CisJCQkJV0FSTigxLCAiVW5zdXBwb3J0ZWQgcGl4ZWwg ZGVwdGggZm9yIHJvdGF0aW9uIik7CisJCQl9OworCQl9CisJCXlfdGlsZV9taW5pbXVtID0gcGxh bmVfYmxvY2tzX3Blcl9saW5lICogbWluX3NjYW5saW5lczsKIAkJc2VsZWN0ZWRfcmVzdWx0ID0g bWF4KG1ldGhvZDIsIHlfdGlsZV9taW5pbXVtKTsKIAl9IGVsc2UgewogCQlpZiAoKGRkYl9hbGxv Y2F0aW9uIC8gcGxhbmVfYmxvY2tzX3Blcl9saW5lKSA+PSAxKQpAQCAtMzM1Nyw2ICszMzcyLDcg QEAgc2tsX3VwZGF0ZV9zcHJpdGVfd20oc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBk cm1fY3J0YyAqY3J0YywKIAkgKi8KIAlpZiAoZmIpCiAJCWludGVsX3BsYW5lLT53bS50aWxpbmcg PSBmYi0+bW9kaWZpZXJbMF07CisJaW50ZWxfcGxhbmUtPndtLnJvdGF0aW9uID0gcGxhbmUtPnN0 YXRlLT5yb3RhdGlvbjsKIAogCXNrbF91cGRhdGVfd20oY3J0Yyk7CiB9CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3Nwcml0ZS5jCmluZGV4IGQ5NjA1NzIuLmI5MTliMGEgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3Nwcml0ZS5jCkBAIC0xMjYwLDEwICsxMjYwLDcgQEAgZmluaXNoOgogCQlpZiAoIWlu dGVsX2NydGMtPnByaW1hcnlfZW5hYmxlZCAmJiAhc3RhdGUtPmhpZGVzX3ByaW1hcnkpCiAJCQlp bnRlbF9jcnRjLT5hdG9taWMucG9zdF9lbmFibGVfcHJpbWFyeSA9IHRydWU7CiAKLQkJLyogVXBk YXRlIHdhdGVybWFya3Mgb24gdGlsaW5nIGNoYW5nZXMuICovCi0JCWlmICghcGxhbmUtPnN0YXRl LT5mYiB8fCAhc3RhdGUtPmJhc2UuZmIgfHwKLQkJICAgIHBsYW5lLT5zdGF0ZS0+ZmItPm1vZGlm aWVyWzBdICE9Ci0JCSAgICBzdGF0ZS0+YmFzZS5mYi0+bW9kaWZpZXJbMF0pCisJCWlmIChpbnRl bF93bV9uZWVkX3VwZGF0ZShwbGFuZSwgJnN0YXRlLT5iYXNlKSkKIAkJCWludGVsX2NydGMtPmF0 b21pYy51cGRhdGVfd20gPSB0cnVlOwogCX0KIAotLSAKMi4zLjIKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==