From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Subject: [PATCH 7/7] drm/i915/skl: Take 90/270 rotation into
	account in watermark calculations
Date: Mon, 23 Mar 2015 11:10:38 +0000
Message-ID: <1427109038-19597-8-git-send-email-tvrtko.ursulin@linux.intel.com>
References: <1427109038-19597-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga03.intel.com (mga03.intel.com [134.134.136.65])
 by gabe.freedesktop.org (Postfix) with ESMTP id B482072029
 for <Intel-gfx@lists.freedesktop.org>; Mon, 23 Mar 2015 04:10:57 -0700 (PDT)
In-Reply-To: <1427109038-19597-1-git-send-email-tvrtko.ursulin@linux.intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: Intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCnYyOiBQYXNz
IGluIHJvdGF0aW9uIGluZm8gdG8gc3ByaXRlIHBsYW5lIHVwZGF0ZXMgYXMgd2VsbC4KCnYzOiBV
c2UgaGVscGVyIHRvIGRldGVybWluZSA5MC8yNzAgcm90YXRpb24uIChNaWNoZWwgVGhpZXJyeSkK
CnY0OiBSZWJhc2VkIGZvciBmYiBtb2RpZmllcnMgYW5kIGF0b21pYyBjaGFuZ2VzLgoKRm9yOiBW
SVotNDU0NgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50
ZWwuY29tPgpSZXZpZXdlZC1ieTogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGludGVs
LmNvbT4gKHYzKQpSZXZpZXdlZC1ieTogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5A
bGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku
YyB8IDI3ICsrKysrKysrKysrKysrKysrKysrKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv
aW50ZWxfZHJ2LmggICAgIHwgIDQgKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0u
YyAgICAgIHwgMTggKysrKysrKysrKysrKysrKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl
bF9zcHJpdGUuYyAgfCAgNSArLS0tLQogNCBmaWxlcyBjaGFuZ2VkLCA0NSBpbnNlcnRpb25zKCsp
LCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs
X2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBk
MWY5MDk5Li4zNWNkYjQ4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k
aXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0x
MjAzNCw2ICsxMjAzNCwyOCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9zaGFyZWRfZHBsbF9pbml0KHN0
cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB9CiAKIC8qKgorICogaW50ZWxfd21fbmVlZF91cGRhdGUg
LSBDaGVjayB3aGV0aGVyIHdhdGVybWFya3MgbmVlZCB1cGRhdGluZworICogQHBsYW5lOiBkcm0g
cGxhbmUKKyAqIEBzdGF0ZTogbmV3IHBsYW5lIHN0YXRlCisgKgorICogQ2hlY2sgY3VycmVudCBw
bGFuZSBzdGF0ZSB2ZXJzdXMgdGhlIG5ldyBvbmUgdG8gZGV0ZXJtaW5lIHdoZXRoZXIKKyAqIHdh
dGVybWFya3MgbmVlZCB0byBiZSByZWNhbGN1bGF0ZWQuCisgKgorICogUmV0dXJucyB0cnVlIG9y
IGZhbHNlLgorICovCitib29sIGludGVsX3dtX25lZWRfdXBkYXRlKHN0cnVjdCBkcm1fcGxhbmUg
KnBsYW5lLAorCQkJICBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpzdGF0ZSkKK3sKKwkvKiBVcGRh
dGUgd2F0ZXJtYXJrcyBvbiB0aWxpbmcgY2hhbmdlcy4gKi8KKwlpZiAoIXBsYW5lLT5zdGF0ZS0+
ZmIgfHwgIXN0YXRlLT5mYiB8fAorCSAgICBwbGFuZS0+c3RhdGUtPmZiLT5tb2RpZmllclswXSAh
PSBzdGF0ZS0+ZmItPm1vZGlmaWVyWzBdIHx8CisJICAgIHBsYW5lLT5zdGF0ZS0+cm90YXRpb24g
IT0gc3RhdGUtPnJvdGF0aW9uKQorCQlyZXR1cm4gdHJ1ZTsKKworCXJldHVybiBmYWxzZTsKK30K
KworLyoqCiAgKiBpbnRlbF9wcmVwYXJlX3BsYW5lX2ZiIC0gUHJlcGFyZSBmYiBmb3IgdXNhZ2Ug
b24gcGxhbmUKICAqIEBwbGFuZTogZHJtIHBsYW5lIHRvIHByZXBhcmUgZm9yCiAgKiBAZmI6IGZy
YW1lYnVmZmVyIHRvIHByZXBhcmUgZm9yIHByZXNlbnRhdGlvbgpAQCAtMTIxNzksMTAgKzEyMjAx
LDcgQEAgaW50ZWxfY2hlY2tfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwK
IAogCQlpbnRlbF9jcnRjLT5hdG9taWMudXBkYXRlX2ZiYyA9IHRydWU7CiAKLQkJLyogVXBkYXRl
IHdhdGVybWFya3Mgb24gdGlsaW5nIGNoYW5nZXMuICovCi0JCWlmICghcGxhbmUtPnN0YXRlLT5m
YiB8fCAhc3RhdGUtPmJhc2UuZmIgfHwKLQkJICAgIHBsYW5lLT5zdGF0ZS0+ZmItPm1vZGlmaWVy
WzBdICE9Ci0JCSAgICBzdGF0ZS0+YmFzZS5mYi0+bW9kaWZpZXJbMF0pCisJCWlmIChpbnRlbF93
bV9uZWVkX3VwZGF0ZShwbGFuZSwgJnN0YXRlLT5iYXNlKSkKIAkJCWludGVsX2NydGMtPmF0b21p
Yy51cGRhdGVfd20gPSB0cnVlOwogCX0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCBk
YjBlN2JmLi44MTFhMWRiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k
cnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtNTAxLDYgKzUw
MSw3IEBAIHN0cnVjdCBpbnRlbF9wbGFuZV93bV9wYXJhbWV0ZXJzIHsKIAlib29sIGVuYWJsZWQ7
CiAJYm9vbCBzY2FsZWQ7CiAJdTY0IHRpbGluZzsKKwl1bnNpZ25lZCBpbnQgcm90YXRpb247CiB9
OwogCiBzdHJ1Y3QgaW50ZWxfcGxhbmUgewpAQCAtOTk0LDYgKzk5NSw5IEBAIGludGVsX3JvdGF0
aW9uXzkwX29yXzI3MCh1bnNpZ25lZCBpbnQgcm90YXRpb24pCiAJcmV0dXJuIHJvdGF0aW9uICYg
KEJJVChEUk1fUk9UQVRFXzkwKSB8IEJJVChEUk1fUk9UQVRFXzI3MCkpOwogfQogCitib29sIGlu
dGVsX3dtX25lZWRfdXBkYXRlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAorCQkJICBzdHJ1Y3Qg
ZHJtX3BsYW5lX3N0YXRlICpzdGF0ZSk7CisKIC8qIHNoYXJlZCBkcGxsIGZ1bmN0aW9ucyAqLwog
c3RydWN0IGludGVsX3NoYXJlZF9kcGxsICppbnRlbF9jcnRjX3RvX3NoYXJlZF9kcGxsKHN0cnVj
dCBpbnRlbF9jcnRjICpjcnRjKTsKIHZvaWQgYXNzZXJ0X3NoYXJlZF9kcGxsKHN0cnVjdCBkcm1f
aTkxNV9wcml2YXRlICpkZXZfcHJpdiwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IGUxOGYw
ZmQuLjc1M2EzYWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMK
KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtMjg0MCw2ICsyODQwLDcg
QEAgc3RhdGljIHZvaWQgc2tsX2NvbXB1dGVfd21fcGlwZV9wYXJhbWV0ZXJzKHN0cnVjdCBkcm1f
Y3J0YyAqY3J0YywKIAkJfQogCQlwLT5wbGFuZVswXS5ob3Jpel9waXhlbHMgPSBpbnRlbF9jcnRj
LT5jb25maWctPnBpcGVfc3JjX3c7CiAJCXAtPnBsYW5lWzBdLnZlcnRfcGl4ZWxzID0gaW50ZWxf
Y3J0Yy0+Y29uZmlnLT5waXBlX3NyY19oOworCQlwLT5wbGFuZVswXS5yb3RhdGlvbiA9IGNydGMt
PnByaW1hcnktPnN0YXRlLT5yb3RhdGlvbjsKIAogCQlmYiA9IGNydGMtPmN1cnNvci0+c3RhdGUt
PmZiOwogCQlpZiAoZmIpIHsKQEAgLTI4OTcsNyArMjg5OCwyMSBAQCBzdGF0aWMgYm9vbCBza2xf
Y29tcHV0ZV9wbGFuZV93bShjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYs
CiAKIAlpZiAocF9wYXJhbXMtPnRpbGluZyA9PSBJOTE1X0ZPUk1BVF9NT0RfWV9USUxFRCB8fAog
CSAgICBwX3BhcmFtcy0+dGlsaW5nID09IEk5MTVfRk9STUFUX01PRF9ZZl9USUxFRCkgewotCQl1
aW50MzJfdCB5X3RpbGVfbWluaW11bSA9IHBsYW5lX2Jsb2Nrc19wZXJfbGluZSAqIDQ7CisJCXVp
bnQzMl90IG1pbl9zY2FubGluZXMgPSA0OworCQl1aW50MzJfdCB5X3RpbGVfbWluaW11bTsKKwkJ
aWYgKGludGVsX3JvdGF0aW9uXzkwX29yXzI3MChwX3BhcmFtcy0+cm90YXRpb24pKSB7CisJCQlz
d2l0Y2ggKHBfcGFyYW1zLT5ieXRlc19wZXJfcGl4ZWwpIHsKKwkJCWNhc2UgMToKKwkJCQltaW5f
c2NhbmxpbmVzID0gMTY7CisJCQkJYnJlYWs7CisJCQljYXNlIDI6CisJCQkJbWluX3NjYW5saW5l
cyA9IDg7CisJCQkJYnJlYWs7CisJCQljYXNlIDg6CisJCQkJV0FSTigxLCAiVW5zdXBwb3J0ZWQg
cGl4ZWwgZGVwdGggZm9yIHJvdGF0aW9uIik7CisJCQl9OworCQl9CisJCXlfdGlsZV9taW5pbXVt
ID0gcGxhbmVfYmxvY2tzX3Blcl9saW5lICogbWluX3NjYW5saW5lczsKIAkJc2VsZWN0ZWRfcmVz
dWx0ID0gbWF4KG1ldGhvZDIsIHlfdGlsZV9taW5pbXVtKTsKIAl9IGVsc2UgewogCQlpZiAoKGRk
Yl9hbGxvY2F0aW9uIC8gcGxhbmVfYmxvY2tzX3Blcl9saW5lKSA+PSAxKQpAQCAtMzM1Nyw2ICsz
MzcyLDcgQEAgc2tsX3VwZGF0ZV9zcHJpdGVfd20oc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0
cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkgKi8KIAlpZiAoZmIpCiAJCWludGVsX3BsYW5lLT53bS50
aWxpbmcgPSBmYi0+bW9kaWZpZXJbMF07CisJaW50ZWxfcGxhbmUtPndtLnJvdGF0aW9uID0gcGxh
bmUtPnN0YXRlLT5yb3RhdGlvbjsKIAogCXNrbF91cGRhdGVfd20oY3J0Yyk7CiB9CmRpZmYgLS1n
aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX3Nwcml0ZS5jCmluZGV4IDAwNWE2ZmQuLmY0MWU4NzIgMTAwNjQ0Ci0tLSBh
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX3Nwcml0ZS5jCkBAIC0xMDM5LDEwICsxMDM5LDcgQEAgZmluaXNoOgogCQlp
ZiAoIWludGVsX2NydGMtPnByaW1hcnlfZW5hYmxlZCAmJiAhc3RhdGUtPmhpZGVzX3ByaW1hcnkp
CiAJCQlpbnRlbF9jcnRjLT5hdG9taWMucG9zdF9lbmFibGVfcHJpbWFyeSA9IHRydWU7CiAKLQkJ
LyogVXBkYXRlIHdhdGVybWFya3Mgb24gdGlsaW5nIGNoYW5nZXMuICovCi0JCWlmICghcGxhbmUt
PnN0YXRlLT5mYiB8fCAhc3RhdGUtPmJhc2UuZmIgfHwKLQkJICAgIHBsYW5lLT5zdGF0ZS0+ZmIt
Pm1vZGlmaWVyWzBdICE9Ci0JCSAgICBzdGF0ZS0+YmFzZS5mYi0+bW9kaWZpZXJbMF0pCisJCWlm
IChpbnRlbF93bV9uZWVkX3VwZGF0ZShwbGFuZSwgJnN0YXRlLT5iYXNlKSkKIAkJCWludGVsX2Ny
dGMtPmF0b21pYy51cGRhdGVfd20gPSB0cnVlOwogCiAJCWlmICghc3RhdGUtPnZpc2libGUpIHsK
LS0gCjIuMy4yCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK
aHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=