From mboxrd@z Thu Jan  1 00:00:00 1970
From: ville.syrjala@linux.intel.com
Subject: [PATCH] drm/i915: Fix legacy cursor vs. watermarks for
	ILK-BDW
Date: Fri, 17 Feb 2017 17:01:59 +0200
Message-ID: <20170217150159.11683-1-ville.syrjala@linux.intel.com>
References: <0b3c8b9e-58c2-6efd-1dcd-2a78462ddff7@kleine-koenig.org>
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 mga06.intel.com (mga06.intel.com [134.134.136.31])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 2A09F6ED38
 for <intel-gfx@lists.freedesktop.org>; Fri, 17 Feb 2017 15:02:04 +0000 (UTC)
In-Reply-To: <0b3c8b9e-58c2-6efd-1dcd-2a78462ddff7@kleine-koenig.org>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://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: <https://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?Uwe=20Kleine-K=C3=B6nig?= <uwe@kleine-koenig.org>, Daniel Vetter <daniel.vetter@ffwll.ch>, Martin Peres <martin.peres@free.fr>
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCklu
IG9yZGVyIHRvIG1ha2UgY3Vyc29yIHVwZGF0ZXMgYWN0dWFsbHkgc2FmZSB3cnQuIHdhdGVybWFy
ayBwcm9ncmFtbWluZwp3ZSBoYXZlIHRvIGNsZWFyIHRoZSBsZWdhY3lfY3Vyc29yX3VwZGF0ZSBm
bGFnIGluIHRoZSBhdG9taWMgc3RhdGUuIFRoYXQKd2lsbCBjYXVzZSB0aGUgcmVndWxhciBhdG9t
aWMgdXBkYXRlIHBhdGggdG8gZG8gdGhlIG5lY2Vzc2FyeSB2YmxhbmsKd2FpdCBhZnRlciB0aGUg
cGxhbmUgdXBkYXRlIGlmIG5lZWRlZCwgb3RoZXJ3aXNlIHRoZSB2Ymxhbmsgd2FpdCB3b3VsZApi
ZSBza2lwcGVkIGFuZCB3ZSdkIGZlZWQgdGhlIG9wdGltYWwgd2F0ZXJtYXJrcyB0byB0aGUgaGFy
ZHdhcmUgYmVmb3JlCnRoZSBwbGFuZSB1cGRhdGUgaGFzIGFjdHVhbGx5IGhhcHBlbmVkLgoKVG8g
bWFrZSB0aGUgc2xvdyB2cy4gZmFzdCBwYXRoIGRldGVybWluYXRpb24gaW4KaW50ZWxfbGVnYWN5
X2N1cnNvcl91cGRhdGUoKSBhIGxpdHRsZSBzaW1wbGVyIHdlIGNhbiBpZ25vcmUgdGhlIGFjdHVh
bAp2aXNpYmlsaXR5IG9mIHRoZSBwbGFuZSAod2hpY2ggY2FuIG9ubHkgZ2V0IGNvbXB1dGVkIG9u
Y2Ugd2UndmUgYWxyZWFkeQpjaG9zZW4gb3V0IHBhdGgpIGFuZCBpbnN0ZWFkIHdlIHNpbXBseSBj
aGVjayB3aGV0aGVyIHRoZSBmYiBpcyBiZWluZwpzZXQgb3IgY2xlYXJlZCBieSB0aGUgdXNlci4g
VGhpcyBtZWFucyBhIGZ1bGx5IGNsaXBwZWQgYnV0IGxvZ2ljYWxseQp2aXNpYmxlIGN1cnNvciB3
aWxsIGJlIGNvbnNpZGVyZWQgdmlzaWJsZSBhcyBmYXIgYXMgd2F0ZXJtYXJrCnByb2dyYW1taW5n
IGlzIGNvbmNlcm5lZC4gV2UgY2FuIGRvIHRoYXQgZm9yIHRoZSBjdXJzb3Igc2luY2UgaXQncyBh
CmZpeGVkIHNpemUgcGxhbmUgYW5kIHRoZSBjbGlwcGVkIHNpemUgZG9lc24ndCBwbGF5IGEgcm9s
ZSBpbiB0aGUKd2F0ZXJtYXJrIGNvbXB1dGF0aW9uLgoKVGhpcyBzaG91bGQgZml4IHVuZGVycnVu
cyB0aGF0IGNhbiBvY2N1ciB3aGVuIHRoZSBjdXJzb3IgZ2V0cwplbmFibGUvZGlzYWJsZWQgb3Ig
dGhlIHNpemUgZ2V0cyBjaGFuZ2VkLiBIb3BlZnVsbHkgaXQncyBnb29kIGVub3VnaAp0aGF0IG9u
bHkgcHVyZSBjdXJzb3IgbW92ZW1lbnQgYW5kIGZsaXBzIGdvIHRocm91Z2ggdW50aHJvdHRsZWQu
CgpDYzogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNv
bT4KQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+CkNjOiBVd2UgS2xl
aW5lLUvDtm5pZyA8dXdlQGtsZWluZS1rb2VuaWcub3JnPgpSZXBvcnRlZC1ieTogVXdlIEtsZWlu
ZS1Lw7ZuaWcgPHV3ZUBrbGVpbmUta29lbmlnLm9yZz4KRml4ZXM6IGY3OWYyNjkyMWVlMSAoImRy
bS9pOTE1OiBBZGQgYSBjdXJzb3IgaGFjayB0byBhbGxvdyBjb252ZXJ0aW5nIGxlZ2FjeSBwYWdl
IGZsaXAgdG8gYXRvbWljLCB2My4iKQpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZp
bGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu
dGVsX2Rpc3BsYXkuYyB8IDI5ICsrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tCiBkcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgICAgfCAyMCArKysrKysrKysrKystLS0tLS0tLQog
MiBmaWxlcyBjaGFuZ2VkLCAzMCBpbnNlcnRpb25zKCspLCAxOSBkZWxldGlvbnMoLSkKCmRpZmYg
LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggYjA1ZDljODUzODRiLi4zNTZhYzA0MDkz
ZTggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysg
Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTEzMDMxLDYgKzEzMDMx
LDE3IEBAIHN0YXRpYyBpbnQgaW50ZWxfYXRvbWljX2NvbW1pdChzdHJ1Y3QgZHJtX2RldmljZSAq
ZGV2LAogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsK
IAlpbnQgcmV0ID0gMDsKIAorCS8qCisJICogVGhlIGludGVsX2xlZ2FjeV9jdXJzb3JfdXBkYXRl
KCkgZmFzdCBwYXRoIHRha2VzIGNhcmUKKwkgKiBvZiBhdm9pZGluZyB0aGUgdmJsYW5rIHdhaXRz
IGZvciBzaW1wbGUgY3Vyc29yCisJICogbW92ZW1lbnQgYW5kIGZsaXBzLiBGb3IgY3Vyc29yIG9u
L29mZiBhbmQgc2l6ZSBjaGFuZ2VzLAorCSAqIHdlIHdhbnQgdG8gcGVyZm9ybSB0aGUgdmJsYW5r
IHdhaXRzIHNvIHRoYXQgd2F0ZXJtYXJrCisJICogdXBkYXRlcyBoYXBwZW4gZHVyaW5nIHRoZSBj
b3JyZWN0IGZyYW1lcy4gR2VuOSsgaGF2ZQorCSAqIGRvdWJsZSBidWZmZXJlZCB3YXRlcm1hcmtz
IGFuZCBzbyBzaG91bGRuJ3QgbmVlZCB0aGlzLgorCSAqLworCWlmIChJTlRFTF9HRU4oZGV2X3By
aXYpIDwgOSkKKwkJc3RhdGUtPmxlZ2FjeV9jdXJzb3JfdXBkYXRlID0gZmFsc2U7CisKIAlyZXQg
PSBkcm1fYXRvbWljX2hlbHBlcl9zZXR1cF9jb21taXQoc3RhdGUsIG5vbmJsb2NrKTsKIAlpZiAo
cmV0KQogCQlyZXR1cm4gcmV0OwpAQCAtMTM0NTUsOCArMTM0NjYsNyBAQCBpbnRlbF9sZWdhY3lf
Y3Vyc29yX3VwZGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkgICAgb2xkX3BsYW5lX3N0
YXRlLT5zcmNfaCAhPSBzcmNfaCB8fAogCSAgICBvbGRfcGxhbmVfc3RhdGUtPmNydGNfdyAhPSBj
cnRjX3cgfHwKIAkgICAgb2xkX3BsYW5lX3N0YXRlLT5jcnRjX2ggIT0gY3J0Y19oIHx8Ci0JICAg
ICFvbGRfcGxhbmVfc3RhdGUtPnZpc2libGUgfHwKLQkgICAgb2xkX3BsYW5lX3N0YXRlLT5mYi0+
bW9kaWZpZXIgIT0gZmItPm1vZGlmaWVyKQorCSAgICAhb2xkX3BsYW5lX3N0YXRlLT5mYiAhPSAh
ZmIpCiAJCWdvdG8gc2xvdzsKIAogCW5ld19wbGFuZV9zdGF0ZSA9IGludGVsX3BsYW5lX2R1cGxp
Y2F0ZV9zdGF0ZShwbGFuZSk7CkBAIC0xMzQ3OSwxMCArMTM0ODksNiBAQCBpbnRlbF9sZWdhY3lf
Y3Vyc29yX3VwZGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAlpZiAocmV0KQogCQlnb3Rv
IG91dF9mcmVlOwogCi0JLyogVmlzaWJpbGl0eSBjaGFuZ2VkLCBtdXN0IHRha2Ugc2xvd3BhdGgu
ICovCi0JaWYgKCFuZXdfcGxhbmVfc3RhdGUtPnZpc2libGUpCi0JCWdvdG8gc2xvd19mcmVlOwot
CiAJcmV0ID0gbXV0ZXhfbG9ja19pbnRlcnJ1cHRpYmxlKCZkZXZfcHJpdi0+ZHJtLnN0cnVjdF9t
dXRleCk7CiAJaWYgKHJldCkKIAkJZ290byBvdXRfZnJlZTsKQEAgLTEzNTIyLDkgKzEzNTI4LDEy
IEBAIGludGVsX2xlZ2FjeV9jdXJzb3JfdXBkYXRlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAog
CW5ld19wbGFuZV9zdGF0ZS0+ZmIgPSBvbGRfZmI7CiAJdG9faW50ZWxfcGxhbmVfc3RhdGUobmV3
X3BsYW5lX3N0YXRlKS0+dm1hID0gb2xkX3ZtYTsKIAotCWludGVsX3BsYW5lLT51cGRhdGVfcGxh
bmUocGxhbmUsCi0JCQkJICB0b19pbnRlbF9jcnRjX3N0YXRlKGNydGMtPnN0YXRlKSwKLQkJCQkg
IHRvX2ludGVsX3BsYW5lX3N0YXRlKHBsYW5lLT5zdGF0ZSkpOworCWlmIChwbGFuZS0+c3RhdGUt
PnZpc2libGUpCisJCWludGVsX3BsYW5lLT51cGRhdGVfcGxhbmUocGxhbmUsCisJCQkJCSAgdG9f
aW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5zdGF0ZSksCisJCQkJCSAgdG9faW50ZWxfcGxhbmVfc3Rh
dGUocGxhbmUtPnN0YXRlKSk7CisJZWxzZQorCQlpbnRlbF9wbGFuZS0+ZGlzYWJsZV9wbGFuZShw
bGFuZSwgY3J0Yyk7CiAKIAlpbnRlbF9jbGVhbnVwX3BsYW5lX2ZiKHBsYW5lLCBuZXdfcGxhbmVf
c3RhdGUpOwogCkBAIC0xMzUzNCw4ICsxMzU0Myw2IEBAIGludGVsX2xlZ2FjeV9jdXJzb3JfdXBk
YXRlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCWludGVsX3BsYW5lX2Rlc3Ryb3lfc3RhdGUo
cGxhbmUsIG5ld19wbGFuZV9zdGF0ZSk7CiAJcmV0dXJuIHJldDsKIAotc2xvd19mcmVlOgotCWlu
dGVsX3BsYW5lX2Rlc3Ryb3lfc3RhdGUocGxhbmUsIG5ld19wbGFuZV9zdGF0ZSk7CiBzbG93Ogog
CXJldHVybiBkcm1fYXRvbWljX2hlbHBlcl91cGRhdGVfcGxhbmUocGxhbmUsIGNydGMsIGZiLAog
CQkJCQkgICAgICBjcnRjX3gsIGNydGNfeSwgY3J0Y193LCBjcnRjX2gsCmRpZmYgLS1naXQgYS9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfcG0uYwppbmRleCBmZTI0M2M2NWRlMWEuLjRkZThjNDBhY2M3ZSAxMDA2NDQKLS0tIGEvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
bnRlbF9wbS5jCkBAIC0xODMxLDIwICsxODMxLDI0IEBAIHN0YXRpYyB1aW50MzJfdCBpbGtfY29t
cHV0ZV9jdXJfd20oY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAkJCQkg
ICBjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBzdGF0ZSwKIAkJCQkgICB1aW50MzJf
dCBtZW1fdmFsdWUpCiB7CisJaW50IGNwcDsKKwogCS8qCi0JICogV2UgdHJlYXQgdGhlIGN1cnNv
ciBwbGFuZSBhcyBhbHdheXMtb24gZm9yIHRoZSBwdXJwb3NlcyBvZiB3YXRlcm1hcmsKLQkgKiBj
YWxjdWxhdGlvbi4gIFVudGlsIHdlIGhhdmUgdHdvLXN0YWdlIHdhdGVybWFyayBwcm9ncmFtbWlu
ZyBtZXJnZWQsCi0JICogdGhpcyBpcyBuZWNlc3NhcnkgdG8gYXZvaWQgZmxpY2tlcmluZy4KKwkg
KiBUcmVhdCBjdXJzb3Igd2l0aCBmYiBhcyBhbHdheXMgdmlzaWJsZSBzaW5jZSBjdXJzb3IgdXBk
YXRlcworCSAqIGNhbiBoYXBwZW4gZmFzdGVyIHRoYW4gdGhlIHZyZWZyZXNoIHJhdGUsIGFuZCB0
aGUgY3VycmVudAorCSAqIHdhdGVybWFyayBjb2RlIGRvZXNuJ3QgaGFuZGxlIHRoYXQgY29ycmVj
dGx5LiBDdXJzb3IgdXBkYXRlcworCSAqIHdoaWNoIHNldC9jbGVhciB0aGUgZmIgb3IgY2hhbmdl
IHRoZSBjdXJzb3Igc2l6ZSBhcmUgZ29pbmcKKwkgKiB0byBnZXQgdGhyb3R0bGVkIGJ5IGludGVs
X2xlZ2FjeV9jdXJzb3JfdXBkYXRlKCkgdG8gd29yaworCSAqIGFyb3VuZCB0aGlzIHByb2JsZW0g
d2l0aCB0aGUgd2F0ZXJtYXJrIGNvZGUuCiAJICovCi0JaW50IGNwcCA9IDQ7Ci0JaW50IHdpZHRo
ID0gcHN0YXRlLT5iYXNlLnZpc2libGUgPyBwc3RhdGUtPmJhc2UuY3J0Y193IDogNjQ7Ci0KLQlp
ZiAoIWNzdGF0ZS0+YmFzZS5hY3RpdmUpCisJaWYgKCFjc3RhdGUtPmJhc2UuYWN0aXZlIHx8ICFw
c3RhdGUtPmJhc2UuZmIpCiAJCXJldHVybiAwOwogCisJY3BwID0gcHN0YXRlLT5iYXNlLmZiLT5m
b3JtYXQtPmNwcFswXTsKKwogCXJldHVybiBpbGtfd21fbWV0aG9kMihjc3RhdGUtPnBpeGVsX3Jh
dGUsCiAJCQkgICAgICBjc3RhdGUtPmJhc2UuYWRqdXN0ZWRfbW9kZS5jcnRjX2h0b3RhbCwKLQkJ
CSAgICAgIHdpZHRoLCBjcHAsIG1lbV92YWx1ZSk7CisJCQkgICAgICBwc3RhdGUtPmJhc2UuY3J0
Y193LCBjcHAsIG1lbV92YWx1ZSk7CiB9CiAKIC8qIE9ubHkgZm9yIFdNX0xQLiAqLwotLSAKMi4x
MC4yCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl
bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6
Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK