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: Thu, 5 Mar 2015 14:07:36 +0000 Message-ID: <1425564456-3660-8-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1425564456-3660-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id DC2506E7D2 for ; Thu, 5 Mar 2015 06:08:05 -0800 (PST) In-Reply-To: <1425564456-3660-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 YXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBjN2VhZDM1 Li42NDI1ZjMxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xMTk0Miw2 ICsxMTk0MiwyOCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9zaGFyZWRfZHBsbF9pbml0KHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCiB9CiAKIC8qKgorICogaW50ZWxfd21fbmVlZF91cGRhdGUgLSBDaGVj ayB3aGV0aGVyIHdhdGVybWFya3MgbmVlZCB1cGRhdGluZworICogQHBsYW5lOiBkcm0gcGxhbmUK KyAqIEBzdGF0ZTogbmV3IHBsYW5lIHN0YXRlCisgKgorICogQ2hlY2sgY3VycmVudCBwbGFuZSBz dGF0ZSB2ZXJzdXMgdGhlIG5ldyBvbmUgdG8gZGV0ZXJtaW5lIHdoZXRoZXIKKyAqIHdhdGVybWFy a3MgbmVlZCB0byBiZSByZWNhbGN1bGF0ZWQuCisgKgorICogUmV0dXJucyB0cnVlIG9yIGZhbHNl LgorICovCitib29sIGludGVsX3dtX25lZWRfdXBkYXRlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5l LAorCQkJICBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpzdGF0ZSkKK3sKKwkvKiBVcGRhdGUgd2F0 ZXJtYXJrcyBvbiB0aWxpbmcgY2hhbmdlcy4gKi8KKwlpZiAoIXBsYW5lLT5zdGF0ZS0+ZmIgfHwg IXN0YXRlLT5mYiB8fAorCSAgICBwbGFuZS0+c3RhdGUtPmZiLT5tb2RpZmllclswXSAhPSBzdGF0 ZS0+ZmItPm1vZGlmaWVyWzBdIHx8CisJICAgIHBsYW5lLT5zdGF0ZS0+cm90YXRpb24gIT0gc3Rh dGUtPnJvdGF0aW9uKQorCQlyZXR1cm4gdHJ1ZTsKKworCXJldHVybiBmYWxzZTsKK30KKworLyoq CiAgKiBpbnRlbF9wcmVwYXJlX3BsYW5lX2ZiIC0gUHJlcGFyZSBmYiBmb3IgdXNhZ2Ugb24gcGxh bmUKICAqIEBwbGFuZTogZHJtIHBsYW5lIHRvIHByZXBhcmUgZm9yCiAgKiBAZmI6IGZyYW1lYnVm ZmVyIHRvIHByZXBhcmUgZm9yIHByZXNlbnRhdGlvbgpAQCAtMTIwODcsMTAgKzEyMTA5LDcgQEAg aW50ZWxfY2hlY2tfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAogCQlp bnRlbF9jcnRjLT5hdG9taWMudXBkYXRlX2ZiYyA9IHRydWU7CiAKLQkJLyogVXBkYXRlIHdhdGVy bWFya3Mgb24gdGlsaW5nIGNoYW5nZXMuICovCi0JCWlmICghcGxhbmUtPnN0YXRlLT5mYiB8fCAh c3RhdGUtPmJhc2UuZmIgfHwKLQkJICAgIHBsYW5lLT5zdGF0ZS0+ZmItPm1vZGlmaWVyWzBdICE9 Ci0JCSAgICBzdGF0ZS0+YmFzZS5mYi0+bW9kaWZpZXJbMF0pCisJCWlmIChpbnRlbF93bV9uZWVk X3VwZGF0ZShwbGFuZSwgJnN0YXRlLT5iYXNlKSkKIAkJCWludGVsX2NydGMtPmF0b21pYy51cGRh dGVfd20gPSB0cnVlOwogCX0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCBkNTdiOWI3 Li5kMDNkM2JkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtNTAxLDYgKzUwMSw3IEBA IHN0cnVjdCBpbnRlbF9wbGFuZV93bV9wYXJhbWV0ZXJzIHsKIAlib29sIGVuYWJsZWQ7CiAJYm9v bCBzY2FsZWQ7CiAJdTY0IHRpbGluZzsKKwl1bnNpZ25lZCBpbnQgcm90YXRpb247CiB9OwogCiBz dHJ1Y3QgaW50ZWxfcGxhbmUgewpAQCAtOTkzLDYgKzk5NCw5IEBAIGludGVsX3JvdGF0aW9uXzkw X29yXzI3MCh1bnNpZ25lZCBpbnQgcm90YXRpb24pCiAJcmV0dXJuIHJvdGF0aW9uICYgKEJJVChE Uk1fUk9UQVRFXzkwKSB8IEJJVChEUk1fUk9UQVRFXzI3MCkpOwogfQogCitib29sIGludGVsX3dt X25lZWRfdXBkYXRlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAorCQkJICBzdHJ1Y3QgZHJtX3Bs YW5lX3N0YXRlICpzdGF0ZSk7CisKIC8qIHNoYXJlZCBkcGxsIGZ1bmN0aW9ucyAqLwogc3RydWN0 IGludGVsX3NoYXJlZF9kcGxsICppbnRlbF9jcnRjX3RvX3NoYXJlZF9kcGxsKHN0cnVjdCBpbnRl bF9jcnRjICpjcnRjKTsKIHZvaWQgYXNzZXJ0X3NoYXJlZF9kcGxsKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IGU3MTBiNDMuLjQ5 ZTdkNGUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtMjcxMiw2ICsyNzEyLDcgQEAgc3Rh dGljIHZvaWQgc2tsX2NvbXB1dGVfd21fcGlwZV9wYXJhbWV0ZXJzKHN0cnVjdCBkcm1fY3J0YyAq Y3J0YywKIAkJICovCiAJCWlmIChmYikKIAkJCXAtPnBsYW5lWzBdLnRpbGluZyA9IGZiLT5tb2Rp ZmllclswXTsKKwkJcC0+cGxhbmVbMF0ucm90YXRpb24gPSBjcnRjLT5wcmltYXJ5LT5zdGF0ZS0+ cm90YXRpb247CiAKIAkJcC0+Y3Vyc29yLmVuYWJsZWQgPSB0cnVlOwogCQlwLT5jdXJzb3IuYnl0 ZXNfcGVyX3BpeGVsID0gNDsKQEAgLTI3NjEsNyArMjc2MiwyMSBAQCBzdGF0aWMgYm9vbCBza2xf Y29tcHV0ZV9wbGFuZV93bShjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYs CiAKIAlpZiAocF9wYXJhbXMtPnRpbGluZyA9PSBJOTE1X0ZPUk1BVF9NT0RfWV9USUxFRCB8fAog CSAgICBwX3BhcmFtcy0+dGlsaW5nID09IEk5MTVfRk9STUFUX01PRF9ZZl9USUxFRCkgewotCQl1 aW50MzJfdCB5X3RpbGVfbWluaW11bSA9IHBsYW5lX2Jsb2Nrc19wZXJfbGluZSAqIDQ7CisJCXVp bnQzMl90IG1pbl9zY2FubGluZXMgPSA0OworCQl1aW50MzJfdCB5X3RpbGVfbWluaW11bTsKKwkJ aWYgKGludGVsX3JvdGF0aW9uXzkwX29yXzI3MChwX3BhcmFtcy0+cm90YXRpb24pKSB7CisJCQlz d2l0Y2ggKHBfcGFyYW1zLT5ieXRlc19wZXJfcGl4ZWwpIHsKKwkJCWNhc2UgMToKKwkJCQltaW5f c2NhbmxpbmVzID0gMTY7CisJCQkJYnJlYWs7CisJCQljYXNlIDI6CisJCQkJbWluX3NjYW5saW5l cyA9IDg7CisJCQkJYnJlYWs7CisJCQljYXNlIDg6CisJCQkJV0FSTigxLCAiVW5zdXBwb3J0ZWQg cGl4ZWwgZGVwdGggZm9yIHJvdGF0aW9uIik7CisJCQl9OworCQl9CisJCXlfdGlsZV9taW5pbXVt ID0gcGxhbmVfYmxvY2tzX3Blcl9saW5lICogbWluX3NjYW5saW5lczsKIAkJc2VsZWN0ZWRfcmVz dWx0ID0gbWF4KG1ldGhvZDIsIHlfdGlsZV9taW5pbXVtKTsKIAl9IGVsc2UgewogCQlpZiAoKGRk Yl9hbGxvY2F0aW9uIC8gcGxhbmVfYmxvY2tzX3Blcl9saW5lKSA+PSAxKQpAQCAtMzIyMSw2ICsz MjM2LDcgQEAgc2tsX3VwZGF0ZV9zcHJpdGVfd20oc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0 cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkgKi8KIAlpZiAoZmIpCiAJCWludGVsX3BsYW5lLT53bS50 aWxpbmcgPSBmYi0+bW9kaWZpZXJbMF07CisJaW50ZWxfcGxhbmUtPndtLnJvdGF0aW9uID0gcGxh bmUtPnN0YXRlLT5yb3RhdGlvbjsKIAogCXNrbF91cGRhdGVfd20oY3J0Yyk7CiB9CmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3Nwcml0ZS5jCmluZGV4IGNhYTBiY2MuLmFkZGM5MGUgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3Nwcml0ZS5jCkBAIC0xMjYwLDEwICsxMjYwLDcgQEAgZmluaXNoOgogCQlp ZiAoIWludGVsX2NydGMtPnByaW1hcnlfZW5hYmxlZCAmJiAhc3RhdGUtPmhpZGVzX3ByaW1hcnkp CiAJCQlpbnRlbF9jcnRjLT5hdG9taWMucG9zdF9lbmFibGVfcHJpbWFyeSA9IHRydWU7CiAKLQkJ LyogVXBkYXRlIHdhdGVybWFya3Mgb24gdGlsaW5nIGNoYW5nZXMuICovCi0JCWlmICghcGxhbmUt PnN0YXRlLT5mYiB8fCAhc3RhdGUtPmJhc2UuZmIgfHwKLQkJICAgIHBsYW5lLT5zdGF0ZS0+ZmIt Pm1vZGlmaWVyWzBdICE9Ci0JCSAgICBzdGF0ZS0+YmFzZS5mYi0+bW9kaWZpZXJbMF0pCisJCWlm IChpbnRlbF93bV9uZWVkX3VwZGF0ZShwbGFuZSwgJnN0YXRlLT5iYXNlKSkKIAkJCWludGVsX2Ny dGMtPmF0b21pYy51cGRhdGVfd20gPSB0cnVlOwogCX0KIAotLSAKMi4zLjAKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==