From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH 2/2] drm/i915: Make plane fb tracking work
	correctly.
Date: Wed,  2 Sep 2015 10:42:41 +0200
Message-ID: <1441183361-24507-2-git-send-email-maarten.lankhorst@linux.intel.com>
References: <1441183361-24507-1-git-send-email-maarten.lankhorst@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>
In-Reply-To: <1441183361-24507-1-git-send-email-maarten.lankhorst@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: dri-devel@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org
List-Id: dri-devel@lists.freedesktop.org

YXRvbWljLT5kaXNhYmxlZF9wbGFuZXMgaXMgYSBoYWNrIHRoYXQgaGFkIHRvIGV4aXN0IGJlY2F1
c2UKcHJlcGFyZV9mYiB3YXMgb25seSBjYWxsZWQgd2hlbiBhIG5ldyBmYiB3YXMgc2V0LiBUaGlz
IG1lc3NlZAp1cCBmYiB0cmFja2luZyBpbiBzb21lIGNpcmN1bXN0YW5jZXMgbGlrZSBhYm9ydHMg
ZnJvbQppbnRlcnJ1cHRpYmxlIHdhaXRzLiBBcyBhIHJlc3VsdCBpbnRlcnJ1cHRpYmxlIHdhaXRp
bmcgaW4KcHJlcGFyZV9wbGFuZV9mYiB3YXMgZm9yYmlkZGVuLCBidXQgb3RoZXIgZXJyb3JzIGNv
dWxkIHN0aWxsCmNhdXNlIGZyb250YnVmZmVyIHRyYWNraW5nIHRvIGJlIG1lc3NlZCB1cC4KCk5v
dyB0aGF0IHByZXBhcmVfZmIgaXMgYWx3YXlzIGNhbGxlZCwgdGhpcyBoYWNrIGlzIG5vIGxvbmdl
cgpyZXF1aXJlZCBhbmQgcHJlcGFyZV9mYiBtYXkgZmFpbCB3aXRob3V0IGNvbnNlcXVlbmNlcy4K
ClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51
eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwg
NDcgKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgMSAtCiAyIGZpbGVzIGNoYW5nZWQsIDE4IGluc2VydGlv
bnMoKyksIDMwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpp
bmRleCBlZGNmODc0NjQ0MGUuLjZlYmM3NjYxZWM4YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs
X2Rpc3BsYXkuYwpAQCAtNDcxOCwxNyArNDcxOCw2IEBAIHN0YXRpYyB2b2lkIGludGVsX3ByZV9w
bGFuZV91cGRhdGUoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJc3RydWN0IGRybV9kZXZpY2Ug
KmRldiA9IGNydGMtPmJhc2UuZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp
diA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2NydGNfYXRvbWljX2NvbW1pdCAq
YXRvbWljID0gJmNydGMtPmF0b21pYzsKLQlzdHJ1Y3QgZHJtX3BsYW5lICpwOwotCi0JLyogVHJh
Y2sgZmIncyBmb3IgYW55IHBsYW5lcyBiZWluZyBkaXNhYmxlZCAqLwotCWRybV9mb3JfZWFjaF9w
bGFuZV9tYXNrKHAsIGRldiwgYXRvbWljLT5kaXNhYmxlZF9wbGFuZXMpIHsKLQkJc3RydWN0IGlu
dGVsX3BsYW5lICpwbGFuZSA9IHRvX2ludGVsX3BsYW5lKHApOwotCi0JCW11dGV4X2xvY2soJmRl
di0+c3RydWN0X211dGV4KTsKLQkJaTkxNV9nZW1fdHJhY2tfZmIoaW50ZWxfZmJfb2JqKHBsYW5l
LT5iYXNlLmZiKSwgTlVMTCwKLQkJCQkgIHBsYW5lLT5mcm9udGJ1ZmZlcl9iaXQpOwotCQltdXRl
eF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKLQl9CiAKIAlpZiAoYXRvbWljLT53YWl0X2Zv
cl9mbGlwcykKIAkJaW50ZWxfY3J0Y193YWl0X2Zvcl9wZW5kaW5nX2ZsaXBzKCZjcnRjLT5iYXNl
KTsKQEAgLTExNTExLDE0ICsxMTUwMCw2IEBAIGludCBpbnRlbF9wbGFuZV9hdG9taWNfY2FsY19j
aGFuZ2VzKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJCXJldHVybiByZXQ7
CiAJfQogCi0JLyoKLQkgKiBEaXNhYmxpbmcgYSBwbGFuZSBpcyBhbHdheXMgb2theTsgd2UganVz
dCBuZWVkIHRvIHVwZGF0ZQotCSAqIGZiIHRyYWNraW5nIGluIGEgc3BlY2lhbCB3YXkgc2luY2Ug
Y2xlYW51cF9mYigpIHdvbid0Ci0JICogZ2V0IGNhbGxlZCBieSB0aGUgcGxhbmUgaGVscGVycy4K
LQkgKi8KLQlpZiAob2xkX3BsYW5lX3N0YXRlLT5iYXNlLmZiICYmICFmYikKLQkJaW50ZWxfY3J0
Yy0+YXRvbWljLmRpc2FibGVkX3BsYW5lcyB8PSAxIDw8IGk7Ci0KIAl3YXNfdmlzaWJsZSA9IG9s
ZF9wbGFuZV9zdGF0ZS0+dmlzaWJsZTsKIAl2aXNpYmxlID0gdG9faW50ZWxfcGxhbmVfc3RhdGUo
cGxhbmVfc3RhdGUpLT52aXNpYmxlOwogCkBAIC0xMzI3MiwxNSArMTMyNTMsMTcgQEAgaW50ZWxf
cHJlcGFyZV9wbGFuZV9mYihzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAlzdHJ1Y3QgZHJtX2Zy
YW1lYnVmZmVyICpmYiA9IG5ld19zdGF0ZS0+ZmI7CiAJc3RydWN0IGludGVsX3BsYW5lICppbnRl
bF9wbGFuZSA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKTsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29i
amVjdCAqb2JqID0gaW50ZWxfZmJfb2JqKGZiKTsKLQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVj
dCAqb2xkX29iaiA9IGludGVsX2ZiX29iaihwbGFuZS0+ZmIpOworCXN0cnVjdCBkcm1faTkxNV9n
ZW1fb2JqZWN0ICpvbGRfb2JqID0gaW50ZWxfZmJfb2JqKHBsYW5lLT5zdGF0ZS0+ZmIpOwogCWlu
dCByZXQgPSAwOwogCi0JaWYgKCFvYmopCisJaWYgKCFvYmogJiYgIW9sZF9vYmopCiAJCXJldHVy
biAwOwogCiAJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCi0JaWYgKHBsYW5lLT50
eXBlID09IERSTV9QTEFORV9UWVBFX0NVUlNPUiAmJgorCWlmICghb2JqKSB7CisJCXJldCA9IDA7
CisJfSBlbHNlIGlmIChwbGFuZS0+dHlwZSA9PSBEUk1fUExBTkVfVFlQRV9DVVJTT1IgJiYKIAkg
ICAgSU5URUxfSU5GTyhkZXYpLT5jdXJzb3JfbmVlZHNfcGh5c2ljYWwpIHsKIAkJaW50IGFsaWdu
ID0gSVNfSTgzMChkZXYpID8gMTYgKiAxMDI0IDogMjU2OwogCQlyZXQgPSBpOTE1X2dlbV9vYmpl
Y3RfYXR0YWNoX3BoeXMob2JqLCBhbGlnbik7CkBAIC0xMzMxMCwxNyArMTMyOTMsMjMgQEAgaW50
ZWxfY2xlYW51cF9wbGFuZV9mYihzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJICAgICAgIGNv
bnN0IHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKm9sZF9zdGF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2Rl
dmljZSAqZGV2ID0gcGxhbmUtPmRldjsKLQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2Jq
ID0gaW50ZWxfZmJfb2JqKG9sZF9zdGF0ZS0+ZmIpOworCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50
ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZSk7CisJc3RydWN0IGRybV9pOTE1X2dlbV9v
YmplY3QgKm9sZF9vYmogPSBpbnRlbF9mYl9vYmoob2xkX3N0YXRlLT5mYik7CisJc3RydWN0IGRy
bV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9IGludGVsX2ZiX29iaihwbGFuZS0+ZmIpOwogCi0JaWYg
KCFvYmopCisJaWYgKCFvYmogJiYgIW9sZF9vYmopCiAJCXJldHVybjsKIAotCWlmIChwbGFuZS0+
dHlwZSAhPSBEUk1fUExBTkVfVFlQRV9DVVJTT1IgfHwKLQkgICAgIUlOVEVMX0lORk8oZGV2KS0+
Y3Vyc29yX25lZWRzX3BoeXNpY2FsKSB7Ci0JCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4
KTsKKwltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CisJaWYgKG9sZF9vYmogJiYgKHBs
YW5lLT50eXBlICE9IERSTV9QTEFORV9UWVBFX0NVUlNPUiB8fAorCSAgICAhSU5URUxfSU5GTyhk
ZXYpLT5jdXJzb3JfbmVlZHNfcGh5c2ljYWwpKQogCQlpbnRlbF91bnBpbl9mYl9vYmoob2xkX3N0
YXRlLT5mYiwgb2xkX3N0YXRlKTsKLQkJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7
Ci0JfQorCisJLyogcHJlcGFyZV9mYiBhYm9ydGVkPyAqLworCWlmICgob2xkX29iaiAmJiAob2xk
X29iai0+ZnJvbnRidWZmZXJfYml0cyAmIGludGVsX3BsYW5lLT5mcm9udGJ1ZmZlcl9iaXQpKSB8
fAorCSAgICAob2JqICYmICEob2JqLT5mcm9udGJ1ZmZlcl9iaXRzICYgaW50ZWxfcGxhbmUtPmZy
b250YnVmZmVyX2JpdCkpKQorCQlpOTE1X2dlbV90cmFja19mYihvbGRfb2JqLCBvYmosIGludGVs
X3BsYW5lLT5mcm9udGJ1ZmZlcl9iaXQpOworCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0
ZXgpOwogfQogCiBpbnQKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Ry
di5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggMTA0YTdmOGI2NTBk
Li4xNzZmMGExNWU0MWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Ry
di5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC01MDUsNyArNTA1
LDYgQEAgc3RydWN0IGludGVsX2NydGNfYXRvbWljX2NvbW1pdCB7CiAJYm9vbCBkaXNhYmxlX2N4
c3I7CiAJYm9vbCBwcmVfZGlzYWJsZV9wcmltYXJ5OwogCWJvb2wgdXBkYXRlX3dtX3ByZSwgdXBk
YXRlX3dtX3Bvc3Q7Ci0JdW5zaWduZWQgZGlzYWJsZWRfcGxhbmVzOwogCiAJLyogU2xlZXBhYmxl
IG9wZXJhdGlvbnMgdG8gcGVyZm9ybSBhZnRlciBjb21taXQgKi8KIAl1bnNpZ25lZCBmYl9iaXRz
OwotLSAKMi4xLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y
ZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4
Cg==