From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matt Roper <matthew.d.roper@intel.com>
Subject: [PATCH] drm/i915/skl: Use proper plane dimensions for
	DDB and WM calculations
Date: Mon, 21 Dec 2015 07:31:17 -0800
Message-ID: <1450711877-18753-1-git-send-email-matthew.d.roper@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 mga02.intel.com (mga02.intel.com [134.134.136.20])
 by gabe.freedesktop.org (Postfix) with ESMTP id 93DF26E027
 for <intel-gfx@lists.freedesktop.org>; Mon, 21 Dec 2015 07:31:18 -0800 (PST)
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
Cc: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@intel.com>, "Kondapally, Kalyan" <kalyan.kondapally@intel.com>
List-Id: intel-gfx@lists.freedesktop.org

SW4gY29tbWl0CgogICAgICAgIGNvbW1pdCAwMjRjOTA0NTIyMWZlNDU0ODI4NjNjNDdjNGI0YzQ3
ZDM3Zjk3Y2JmCiAgICAgICAgQXV0aG9yOiBNYXR0IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJAaW50
ZWwuY29tPgogICAgICAgIERhdGU6ICAgVGh1IFNlcCAyNCAxNTo1MzoxMSAyMDE1IC0wNzAwCgog
ICAgICAgICAgICBkcm0vaTkxNS9za2w6IEVsaW1pbmF0ZSB1c2FnZSBvZiBwaXBlX3dtX3BhcmFt
ZXRlcnMgZnJvbSBTS0wtc3R5bGUgV00gKHY0KQoKSSBmdW1ibGVkIHdoaWxlIGNvbnZlcnRpbmcg
dGhlIGRpbWVuc2lvbnMgc3RvcmVkIGluIHRoZSBwbGFuZV9wYXJhbWV0ZXJzCnN0cnVjdHVyZSB0
byB0aGUgdmFsdWVzIHN0b3JlZCBpbiBwbGFuZSBzdGF0ZSBhbmQgYWNjaWRlbnRhbGx5IHJlcGxh
Y2VkCnRoZSBwbGFuZSBkaW1lbnNpb25zIHdpdGggdGhlIHBpcGUgZGltZW5zaW9ucyBpbiBib3Ro
IHRoZSBEREIgYWxsb2NhdGlvbgpmdW5jdGlvbiBhbmQgdGhlIFdNIGNhbGN1bGF0aW9uIGZ1bmN0
aW9uLiAgT24gdGhlIEREQiBzaWRlIHRoaXMgaXMKaGFybWxlc3Mgc2luY2Ugd2UgZWZmZWN0aXZl
bHkgdHJlYXQgYWxsIG9mIG91ciBub24tY3Vyc29yIHBsYW5lcyBhcwpmdWxsLXNjcmVlbiB3aGlj
aCBtYXkgbm90IGJlIG9wdGltYWwsIGJ1dCBnZW5lcmFsbHkgd29uJ3QgY2F1c2UgYW55CnByb2Js
ZW1zIGVpdGhlciAoYW5kIGluIDk5JSBvZiB0aGUgY2FzZXMgd2hlcmUgdGhlcmUncyBubyBzcHJp
dGUgcGxhbmUKdXNhZ2Ugb3IgcHJpbWFyeSBwbGFuZSB3aW5kb3dpbmcsIHRoZXJlJ3Mgbm8gZWZm
ZWN0IGF0IGFsbCkuICBPbiB0aGUgV00KY2FsY3VsYXRpb24gc2lkZSB0aGVyZSdzIG1vcmUgcG90
ZW50aWFsIGZvciB0aGlzIGZ1bWJsZSB0byBjYXVzZSBhY3R1YWwKcHJvYmxlbXMgc2luY2UgY3Vy
c29ycyBhbHNvIGdldCBtaXNjYWxjdWxhdGVkLgoKQ2M6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUu
c3lyamFsYUBpbnRlbC5jb20+CkNjOiAiS29uZGFwYWxseSwgS2FseWFuIiA8a2FseWFuLmtvbmRh
cGFsbHlAaW50ZWwuY29tPgpDYzogUmFkaGFrcmlzaG5hIFNyaXBhZGEgPHJhZGhha3Jpc2huYS5z
cmlwYWRhQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogTWF0dCBSb3BlciA8bWF0dGhldy5kLnJv
cGVyQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIHwgMjQg
KysrKysrKysrKysrKy0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTMgaW5zZXJ0aW9ucygr
KSwgMTEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXggOGQwZDZmNS4u
ZjRkNGNjNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysg
Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC0yODQ1LDI1ICsyODQ1LDIyIEBA
IHNrbF9wbGFuZV9yZWxhdGl2ZV9kYXRhX3JhdGUoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3Rh
dGUgKmNzdGF0ZSwKIAkJCSAgICAgY29uc3Qgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcHN0YXRl
LAogCQkJICAgICBpbnQgeSkKIHsKLQlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRv
X2ludGVsX2NydGMoY3N0YXRlLT5iYXNlLmNydGMpOworCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0
ZSAqaW50ZWxfcHN0YXRlID0gdG9faW50ZWxfcGxhbmVfc3RhdGUocHN0YXRlKTsKIAlzdHJ1Y3Qg
ZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHBzdGF0ZS0+ZmI7CisJdW5zaWduZWQgdyA9IGRybV9yZWN0
X3dpZHRoKCZpbnRlbF9wc3RhdGUtPmRzdCk7CisJdW5zaWduZWQgaCA9IGRybV9yZWN0X2hlaWdo
dCgmaW50ZWxfcHN0YXRlLT5kc3QpOwogCiAJLyogZm9yIHBsYW5hciBmb3JtYXQgKi8KIAlpZiAo
ZmItPnBpeGVsX2Zvcm1hdCA9PSBEUk1fRk9STUFUX05WMTIpIHsKIAkJaWYgKHkpICAvKiB5LXBs
YW5lIGRhdGEgcmF0ZSAqLwotCQkJcmV0dXJuIGludGVsX2NydGMtPmNvbmZpZy0+cGlwZV9zcmNf
dyAqCi0JCQkJaW50ZWxfY3J0Yy0+Y29uZmlnLT5waXBlX3NyY19oICoKLQkJCQlkcm1fZm9ybWF0
X3BsYW5lX2NwcChmYi0+cGl4ZWxfZm9ybWF0LCAwKTsKKwkJCXJldHVybiB3ICogaCAqIGRybV9m
b3JtYXRfcGxhbmVfY3BwKGZiLT5waXhlbF9mb3JtYXQsIDApOwogCQllbHNlICAgIC8qIHV2LXBs
YW5lIGRhdGEgcmF0ZSAqLwotCQkJcmV0dXJuIChpbnRlbF9jcnRjLT5jb25maWctPnBpcGVfc3Jj
X3cvMikgKgotCQkJCShpbnRlbF9jcnRjLT5jb25maWctPnBpcGVfc3JjX2gvMikgKgorCQkJcmV0
dXJuICh3LzIpICogKGgvMikgKgogCQkJCWRybV9mb3JtYXRfcGxhbmVfY3BwKGZiLT5waXhlbF9m
b3JtYXQsIDEpOwogCX0KIAogCS8qIGZvciBwYWNrZWQgZm9ybWF0cyAqLwotCXJldHVybiBpbnRl
bF9jcnRjLT5jb25maWctPnBpcGVfc3JjX3cgKgotCQlpbnRlbF9jcnRjLT5jb25maWctPnBpcGVf
c3JjX2ggKgotCQlkcm1fZm9ybWF0X3BsYW5lX2NwcChmYi0+cGl4ZWxfZm9ybWF0LCAwKTsKKwly
ZXR1cm4gdyAqIGggKiBkcm1fZm9ybWF0X3BsYW5lX2NwcChmYi0+cGl4ZWxfZm9ybWF0LCAwKTsK
IH0KIAogLyoKQEAgLTI5NjAsNiArMjk1Nyw4IEBAIHNrbF9hbGxvY2F0ZV9waXBlX2RkYihzdHJ1
Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAogCSAqIEZJWE1FOiB3ZSBtYXkgbm90IGFsbG9j
YXRlIGV2ZXJ5IHNpbmdsZSBibG9jayBoZXJlLgogCSAqLwogCXRvdGFsX2RhdGFfcmF0ZSA9IHNr
bF9nZXRfdG90YWxfcmVsYXRpdmVfZGF0YV9yYXRlKGNzdGF0ZSk7CisJaWYgKCF0b3RhbF9kYXRh
X3JhdGUpCisJCXJldHVybjsKIAogCXN0YXJ0ID0gYWxsb2MtPnN0YXJ0OwogCWZvcl9lYWNoX2lu
dGVsX3BsYW5lX29uX2NydGMoZGV2LCBpbnRlbF9jcnRjLCBpbnRlbF9wbGFuZSkgewpAQCAtMzA5
MywxMiArMzA5MiwxNSBAQCBzdGF0aWMgYm9vbCBza2xfY29tcHV0ZV9wbGFuZV93bShjb25zdCBz
dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiB7CiAJc3RydWN0IGRybV9wbGFuZSAq
cGxhbmUgPSAmaW50ZWxfcGxhbmUtPmJhc2U7CiAJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIg
PSBwbGFuZS0+c3RhdGUtPmZiOworCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqaW50ZWxfcHN0
YXRlID0KKwkJdG9faW50ZWxfcGxhbmVfc3RhdGUocGxhbmUtPnN0YXRlKTsKIAl1aW50MzJfdCBs
YXRlbmN5ID0gZGV2X3ByaXYtPndtLnNrbF9sYXRlbmN5W2xldmVsXTsKIAl1aW50MzJfdCBtZXRo
b2QxLCBtZXRob2QyOwogCXVpbnQzMl90IHBsYW5lX2J5dGVzX3Blcl9saW5lLCBwbGFuZV9ibG9j
a3NfcGVyX2xpbmU7CiAJdWludDMyX3QgcmVzX2Jsb2NrcywgcmVzX2xpbmVzOwogCXVpbnQzMl90
IHNlbGVjdGVkX3Jlc3VsdDsKIAl1aW50OF90IGJ5dGVzX3Blcl9waXhlbDsKKwl1bnNpZ25lZCB3
ID0gZHJtX3JlY3Rfd2lkdGgoJmludGVsX3BzdGF0ZS0+ZHN0KTsKIAogCWlmIChsYXRlbmN5ID09
IDAgfHwgIWNzdGF0ZS0+YmFzZS5hY3RpdmUgfHwgIWZiKQogCQlyZXR1cm4gZmFsc2U7CkBAIC0z
MTA5LDEyICszMTExLDEyIEBAIHN0YXRpYyBib29sIHNrbF9jb21wdXRlX3BsYW5lX3dtKGNvbnN0
IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQkgbGF0ZW5jeSk7CiAJbWV0
aG9kMiA9IHNrbF93bV9tZXRob2QyKHNrbF9waXBlX3BpeGVsX3JhdGUoY3N0YXRlKSwKIAkJCQkg
Y3N0YXRlLT5iYXNlLmFkanVzdGVkX21vZGUuY3J0Y19odG90YWwsCi0JCQkJIGNzdGF0ZS0+cGlw
ZV9zcmNfdywKKwkJCQkgdywKIAkJCQkgYnl0ZXNfcGVyX3BpeGVsLAogCQkJCSBmYi0+bW9kaWZp
ZXJbMF0sCiAJCQkJIGxhdGVuY3kpOwogCi0JcGxhbmVfYnl0ZXNfcGVyX2xpbmUgPSBjc3RhdGUt
PnBpcGVfc3JjX3cgKiBieXRlc19wZXJfcGl4ZWw7CisJcGxhbmVfYnl0ZXNfcGVyX2xpbmUgPSB3
ICogYnl0ZXNfcGVyX3BpeGVsOwogCXBsYW5lX2Jsb2Nrc19wZXJfbGluZSA9IERJVl9ST1VORF9V
UChwbGFuZV9ieXRlc19wZXJfbGluZSwgNTEyKTsKIAogCWlmIChmYi0+bW9kaWZpZXJbMF0gPT0g
STkxNV9GT1JNQVRfTU9EX1lfVElMRUQgfHwKLS0gCjIuMS40CgpfX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs
LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t
YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=