From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH 1/5] drm/i915: Make plane fb tracking work
	correctly, v2.
Date: Wed, 23 Sep 2015 13:27:08 +0200
Message-ID: <1443007632-5573-2-git-send-email-maarten.lankhorst@linux.intel.com>
References: <1443007632-5573-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>
Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 2A1676ED3A
 for <intel-gfx@lists.freedesktop.org>; Wed, 23 Sep 2015 04:27:18 -0700 (PDT)
In-Reply-To: <1443007632-5573-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: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

YXRvbWljLT5kaXNhYmxlZF9wbGFuZXMgaXMgYSBoYWNrIHRoYXQgaGFkIHRvIGV4aXN0IGJlY2F1
c2UKcHJlcGFyZV9mYiB3YXMgb25seSBjYWxsZWQgd2hlbiBhIG5ldyBmYiB3YXMgc2V0LiBUaGlz
IG1lc3NlZAp1cCBmYiB0cmFja2luZyBpbiBzb21lIGNpcmN1bXN0YW5jZXMgbGlrZSBhYm9ydHMg
ZnJvbQppbnRlcnJ1cHRpYmxlIHdhaXRzLiBBcyBhIHJlc3VsdCBpbnRlcnJ1cHRpYmxlIHdhaXRp
bmcgaW4KcHJlcGFyZV9wbGFuZV9mYiB3YXMgZm9yYmlkZGVuLCBidXQgb3RoZXIgZXJyb3JzIGNv
dWxkIHN0aWxsCmNhdXNlIGZyb250YnVmZmVyIHRyYWNraW5nIHRvIGJlIG1lc3NlZCB1cC4KCk5v
dyB0aGF0IHByZXBhcmVfZmIgaXMgYWx3YXlzIGNhbGxlZCwgdGhpcyBoYWNrIGlzIG5vIGxvbmdl
cgpyZXF1aXJlZCBhbmQgcHJlcGFyZV9mYiBtYXkgZmFpbCB3aXRob3V0IGNvbnNlcXVlbmNlcy4K
CkNoYW5nZXMgc2luY2UgdjE6Ci0gQ2xlYW4gdXAgYSBmZXcgZmIgdHJhY2tpbmcgd2FybmluZ3Mg
YnkgY2hhbmdpbmcgcGxhbmUtPmZiIHRvCiAgcGxhbmUtPnN0YXRlLT5mYi4KClNpZ25lZC1vZmYt
Ynk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+
Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgNDcgKysrKysrKysr
KysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k
cnYuaCAgICAgfCAgMSAtCiAyIGZpbGVzIGNoYW5nZWQsIDE4IGluc2VydGlvbnMoKyksIDMwIGRl
bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs
YXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBmYzAwODY3
NDhiNzEuLmFjOTdhZjY5YmU2MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpA
QCAtNDc1MiwxNyArNDc1Miw2IEBAIHN0YXRpYyB2b2lkIGludGVsX3ByZV9wbGFuZV91cGRhdGUo
c3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMt
PmJhc2UuZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2
X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2NydGNfYXRvbWljX2NvbW1pdCAqYXRvbWljID0gJmNy
dGMtPmF0b21pYzsKLQlzdHJ1Y3QgZHJtX3BsYW5lICpwOwotCi0JLyogVHJhY2sgZmIncyBmb3Ig
YW55IHBsYW5lcyBiZWluZyBkaXNhYmxlZCAqLwotCWRybV9mb3JfZWFjaF9wbGFuZV9tYXNrKHAs
IGRldiwgYXRvbWljLT5kaXNhYmxlZF9wbGFuZXMpIHsKLQkJc3RydWN0IGludGVsX3BsYW5lICpw
bGFuZSA9IHRvX2ludGVsX3BsYW5lKHApOwotCi0JCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211
dGV4KTsKLQkJaTkxNV9nZW1fdHJhY2tfZmIoaW50ZWxfZmJfb2JqKHBsYW5lLT5iYXNlLmZiKSwg
TlVMTCwKLQkJCQkgIHBsYW5lLT5mcm9udGJ1ZmZlcl9iaXQpOwotCQltdXRleF91bmxvY2soJmRl
di0+c3RydWN0X211dGV4KTsKLQl9CiAKIAlpZiAoYXRvbWljLT53YWl0X2Zvcl9mbGlwcykKIAkJ
aW50ZWxfY3J0Y193YWl0X2Zvcl9wZW5kaW5nX2ZsaXBzKCZjcnRjLT5iYXNlKTsKQEAgLTExNTYx
LDE0ICsxMTU1MCw2IEBAIGludCBpbnRlbF9wbGFuZV9hdG9taWNfY2FsY19jaGFuZ2VzKHN0cnVj
dCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJCXJldHVybiByZXQ7CiAJfQogCi0JLyoK
LQkgKiBEaXNhYmxpbmcgYSBwbGFuZSBpcyBhbHdheXMgb2theTsgd2UganVzdCBuZWVkIHRvIHVw
ZGF0ZQotCSAqIGZiIHRyYWNraW5nIGluIGEgc3BlY2lhbCB3YXkgc2luY2UgY2xlYW51cF9mYigp
IHdvbid0Ci0JICogZ2V0IGNhbGxlZCBieSB0aGUgcGxhbmUgaGVscGVycy4KLQkgKi8KLQlpZiAo
b2xkX3BsYW5lX3N0YXRlLT5iYXNlLmZiICYmICFmYikKLQkJaW50ZWxfY3J0Yy0+YXRvbWljLmRp
c2FibGVkX3BsYW5lcyB8PSAxIDw8IGk7Ci0KIAl3YXNfdmlzaWJsZSA9IG9sZF9wbGFuZV9zdGF0
ZS0+dmlzaWJsZTsKIAl2aXNpYmxlID0gdG9faW50ZWxfcGxhbmVfc3RhdGUocGxhbmVfc3RhdGUp
LT52aXNpYmxlOwogCkBAIC0xMzMxOCwxNSArMTMyOTksMTcgQEAgaW50ZWxfcHJlcGFyZV9wbGFu
ZV9mYihzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpm
YiA9IG5ld19zdGF0ZS0+ZmI7CiAJc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRv
X2ludGVsX3BsYW5lKHBsYW5lKTsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqID0g
aW50ZWxfZmJfb2JqKGZiKTsKLQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2xkX29iaiA9
IGludGVsX2ZiX29iaihwbGFuZS0+ZmIpOworCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpv
bGRfb2JqID0gaW50ZWxfZmJfb2JqKHBsYW5lLT5zdGF0ZS0+ZmIpOwogCWludCByZXQgPSAwOwog
Ci0JaWYgKCFvYmopCisJaWYgKCFvYmogJiYgIW9sZF9vYmopCiAJCXJldHVybiAwOwogCiAJbXV0
ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCi0JaWYgKHBsYW5lLT50eXBlID09IERSTV9Q
TEFORV9UWVBFX0NVUlNPUiAmJgorCWlmICghb2JqKSB7CisJCXJldCA9IDA7CisJfSBlbHNlIGlm
IChwbGFuZS0+dHlwZSA9PSBEUk1fUExBTkVfVFlQRV9DVVJTT1IgJiYKIAkgICAgSU5URUxfSU5G
TyhkZXYpLT5jdXJzb3JfbmVlZHNfcGh5c2ljYWwpIHsKIAkJaW50IGFsaWduID0gSVNfSTgzMChk
ZXYpID8gMTYgKiAxMDI0IDogMjU2OwogCQlyZXQgPSBpOTE1X2dlbV9vYmplY3RfYXR0YWNoX3Bo
eXMob2JqLCBhbGlnbik7CkBAIC0xMzM1NiwxNyArMTMzMzksMjMgQEAgaW50ZWxfY2xlYW51cF9w
bGFuZV9mYihzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJICAgICAgIGNvbnN0IHN0cnVjdCBk
cm1fcGxhbmVfc3RhdGUgKm9sZF9zdGF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0g
cGxhbmUtPmRldjsKLQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqID0gaW50ZWxfZmJf
b2JqKG9sZF9zdGF0ZS0+ZmIpOworCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUgPSB0
b19pbnRlbF9wbGFuZShwbGFuZSk7CisJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9sZF9v
YmogPSBpbnRlbF9mYl9vYmoob2xkX3N0YXRlLT5mYik7CisJc3RydWN0IGRybV9pOTE1X2dlbV9v
YmplY3QgKm9iaiA9IGludGVsX2ZiX29iaihwbGFuZS0+c3RhdGUtPmZiKTsKIAotCWlmICghb2Jq
KQorCWlmICghb2JqICYmICFvbGRfb2JqKQogCQlyZXR1cm47CiAKLQlpZiAocGxhbmUtPnR5cGUg
IT0gRFJNX1BMQU5FX1RZUEVfQ1VSU09SIHx8Ci0JICAgICFJTlRFTF9JTkZPKGRldiktPmN1cnNv
cl9uZWVkc19waHlzaWNhbCkgewotCQltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CisJ
bXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOworCWlmIChvbGRfb2JqICYmIChwbGFuZS0+
dHlwZSAhPSBEUk1fUExBTkVfVFlQRV9DVVJTT1IgfHwKKwkgICAgIUlOVEVMX0lORk8oZGV2KS0+
Y3Vyc29yX25lZWRzX3BoeXNpY2FsKSkKIAkJaW50ZWxfdW5waW5fZmJfb2JqKG9sZF9zdGF0ZS0+
ZmIsIG9sZF9zdGF0ZSk7Ci0JCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCX0K
KworCS8qIHByZXBhcmVfZmIgYWJvcnRlZD8gKi8KKwlpZiAoKG9sZF9vYmogJiYgKG9sZF9vYmot
PmZyb250YnVmZmVyX2JpdHMgJiBpbnRlbF9wbGFuZS0+ZnJvbnRidWZmZXJfYml0KSkgfHwKKwkg
ICAgKG9iaiAmJiAhKG9iai0+ZnJvbnRidWZmZXJfYml0cyAmIGludGVsX3BsYW5lLT5mcm9udGJ1
ZmZlcl9iaXQpKSkKKwkJaTkxNV9nZW1fdHJhY2tfZmIob2xkX29iaiwgb2JqLCBpbnRlbF9wbGFu
ZS0+ZnJvbnRidWZmZXJfYml0KTsKKwltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsK
IH0KIAogaW50CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBi
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IGEzYmVkODVhYjU2NC4uYTJm
MGI5ODFlMjZjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAor
KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtNTA1LDcgKzUwNSw2IEBA
IHN0cnVjdCBpbnRlbF9jcnRjX2F0b21pY19jb21taXQgewogCWJvb2wgZGlzYWJsZV9jeHNyOwog
CWJvb2wgcHJlX2Rpc2FibGVfcHJpbWFyeTsKIAlib29sIHVwZGF0ZV93bV9wcmUsIHVwZGF0ZV93
bV9wb3N0OwotCXVuc2lnbmVkIGRpc2FibGVkX3BsYW5lczsKIAogCS8qIFNsZWVwYWJsZSBvcGVy
YXRpb25zIHRvIHBlcmZvcm0gYWZ0ZXIgY29tbWl0ICovCiAJdW5zaWduZWQgZmJfYml0czsKLS0g
CjIuMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ
bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0
cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=