From: Tvrtko Ursulin Subject: [PATCH] drm/i915: Simplify and fix object to display tracking Date: Tue, 31 Mar 2015 12:10:04 +0100 Message-ID: <1427800204-17587-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: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id D445F6E3E2 for ; Tue, 31 Mar 2015 04:10:25 -0700 (PDT) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClB1cnBvc2Ug b2YgdGhpcyB0cmFja2luZyBpcyB0byBrbm93IHdoZW4gdG8gZmx1c2ggdGhlIGNhY2hlIGJldHdl ZW4gdGhlCm5vbi1jb2hlcmVudCBkaXNwbGF5IGVuZ2luZS4gUHJldmlvdXNseSB0bzoKCiAgIGNv bW1pdCAxMjE5MjBmYWYyY2NjZTlhYTY2YTdlMjU4ODQxNWM5NjQ3YjY2MTA0CiAgIEF1dGhvcjog VHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KICAgRGF0ZTogICBNb24g TWFyIDIzIDExOjEwOjM3IDIwMTUgKzAwMDAKCiAgICAgICBkcm0vaTkxNS9za2w6IFF1ZXJ5IGRp c3BsYXkgYWRkcmVzcyB0aHJvdWdoIGEgd3JhcHBlcgoKVGhpcyB3b3JrZWQgYnkgYSBtaXggb2Yg ZGlyZWN0IGZsYWcgbWFuaXB1bGF0aW9uIGFuZCBjaGVja2luZyBmb3IKZXhpc3RlbmNlIG9mIGEg cGlubmVkIEdHVFQgVk1BLgoKV2l0aCB0aGUgaW50cm9kdWN0aW9uIG9mIHJvdGF0ZWQgZGlzcGxh eSBtYXBwaW5ncyB0aGlzIGFwcHJvYWNoIGlzCm5vIGxvbmdlciBjb3JyZWN0LgoKTmV3IHNpbXBs ZXIgYXBwcm9hY2ggaXMgdG8ganVzdCBrZWVwIHRoaXMgY291bnQgb3ZlciBjYWxscyB3aGljaCBw aW4gYW5kCnVucGluIG9iamVjdHMgdG8gYW5kIGZyb20gZGlzcGxheS4KCihJbnNwaXJlZCBhbmQg ZXh0cmFjdGVkIGNvZGUgZnJvbSBhIGxhcmdlciByZXdvcmsgYnkgQ2hyaXMgV2lsc29uLikKClNp Z25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+CkNj OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oIHwgIDMgKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbS5jIHwgMzMgKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNo YW5nZWQsIDExIGluc2VydGlvbnMoKyksIDI1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oCmluZGV4IDRlZjMyMGMuLjEyMzg4ZGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApA QCAtMTk2OSw3ICsxOTY5LDggQEAgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgewogCSAqLwog CXVuc2lnbmVkIGludCBmYXVsdF9tYXBwYWJsZToxOwogCXVuc2lnbmVkIGludCBwaW5fbWFwcGFi bGU6MTsKLQl1bnNpZ25lZCBpbnQgcGluX2Rpc3BsYXk6MTsKKwl1bnNpZ25lZCBpbnQgcGluX2Rp c3BsYXk6MzsKKyNkZWZpbmUgSTkxNV9NQVhfUElOX0RJU1BMQVkgNwogCiAJLyoKIAkgKiBJcyB0 aGUgb2JqZWN0IHRvIGJlIG1hcHBlZCBhcyByZWFkLW9ubHkgdG8gdGhlIEdQVQpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtLmMKaW5kZXggM2E5MTM2NS4uYjg1NzlkNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bS5jCkBAIC0zODQ5LDI0ICszODQ5LDYgQEAgdW5sb2NrOgogCXJldHVybiByZXQ7CiB9CiAKLXN0 YXRpYyBib29sIGlzX3Bpbl9kaXNwbGF5KHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmop Ci17Ci0Jc3RydWN0IGk5MTVfdm1hICp2bWE7Ci0KLQl2bWEgPSBpOTE1X2dlbV9vYmpfdG9fZ2d0 dChvYmopOwotCWlmICghdm1hKQotCQlyZXR1cm4gZmFsc2U7Ci0KLQkvKiBUaGVyZSBhcmUgMiBz b3VyY2VzIHRoYXQgcGluIG9iamVjdHM6Ci0JICogICAxLiBUaGUgZGlzcGxheSBlbmdpbmUgKHNj YW5vdXRzLCBzcHJpdGVzLCBjdXJzb3JzKTsKLQkgKiAgIDIuIFJlc2VydmF0aW9ucyBmb3IgZXhl Y2J1ZmZlcjsKLQkgKgotCSAqIFdlIGNhbiBpZ25vcmUgcmVzZXJ2YXRpb25zIGFzIHdlIGhvbGQg dGhlIHN0cnVjdF9tdXRleCBhbmQKLQkgKiBhcmUgb25seSBjYWxsZWQgb3V0c2lkZSBvZiB0aGUg cmVzZXJ2YXRpb24gcGF0aC4KLQkgKi8KLQlyZXR1cm4gdm1hLT5waW5fY291bnQ7Ci19Ci0KIC8q CiAgKiBQcmVwYXJlIGJ1ZmZlciBmb3IgZGlzcGxheSBwbGFuZSAoc2Nhbm91dCwgY3Vyc29ycywg ZXRjKS4KICAqIENhbiBiZSBjYWxsZWQgZnJvbSBhbiB1bmludGVycnVwdGlibGUgcGhhc2UgKG1v ZGVzZXR0aW5nKSBhbmQgYWxsb3dzCkBAIC0zODc5LDkgKzM4NjEsMTEgQEAgaTkxNV9nZW1fb2Jq ZWN0X3Bpbl90b19kaXNwbGF5X3BsYW5lKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmos CiAJCQkJICAgICBjb25zdCBzdHJ1Y3QgaTkxNV9nZ3R0X3ZpZXcgKnZpZXcpCiB7CiAJdTMyIG9s ZF9yZWFkX2RvbWFpbnMsIG9sZF93cml0ZV9kb21haW47Ci0JYm9vbCB3YXNfcGluX2Rpc3BsYXk7 CiAJaW50IHJldDsKIAorCWlmIChXQVJOX09OKG9iai0+cGluX2Rpc3BsYXkgPT0gSTkxNV9NQVhf UElOX0RJU1BMQVkpKQorCQlyZXR1cm4gLUVOT0RFVjsKKwogCWlmIChwaXBlbGluZWQgIT0gaTkx NV9nZW1fcmVxdWVzdF9nZXRfcmluZyhvYmotPmxhc3RfcmVhZF9yZXEpKSB7CiAJCXJldCA9IGk5 MTVfZ2VtX29iamVjdF9zeW5jKG9iaiwgcGlwZWxpbmVkKTsKIAkJaWYgKHJldCkKQEAgLTM4OTEs OCArMzg3NSw3IEBAIGk5MTVfZ2VtX29iamVjdF9waW5fdG9fZGlzcGxheV9wbGFuZShzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCS8qIE1hcmsgdGhlIHBpbl9kaXNwbGF5IGVhcmx5 IHNvIHRoYXQgd2UgYWNjb3VudCBmb3IgdGhlCiAJICogZGlzcGxheSBjb2hlcmVuY3kgd2hpbHN0 IHNldHRpbmcgdXAgdGhlIGNhY2hlIGRvbWFpbnMuCiAJICovCi0Jd2FzX3Bpbl9kaXNwbGF5ID0g b2JqLT5waW5fZGlzcGxheTsKLQlvYmotPnBpbl9kaXNwbGF5ID0gdHJ1ZTsKKwlvYmotPnBpbl9k aXNwbGF5Kys7CiAKIAkvKiBUaGUgZGlzcGxheSBlbmdpbmUgaXMgbm90IGNvaGVyZW50IHdpdGgg dGhlIExMQyBjYWNoZSBvbiBnZW42LiAgQXMKIAkgKiBhIHJlc3VsdCwgd2UgbWFrZSBzdXJlIHRo YXQgdGhlIHBpbm5pbmcgdGhhdCBpcyBhYm91dCB0byBvY2N1ciBpcwpAQCAtMzkzNiw4ICszOTE5 LDcgQEAgaTkxNV9nZW1fb2JqZWN0X3Bpbl90b19kaXNwbGF5X3BsYW5lKHN0cnVjdCBkcm1faTkx NV9nZW1fb2JqZWN0ICpvYmosCiAJcmV0dXJuIDA7CiAKIGVycl91bnBpbl9kaXNwbGF5OgotCVdB Uk5fT04od2FzX3Bpbl9kaXNwbGF5ICE9IGlzX3Bpbl9kaXNwbGF5KG9iaikpOwotCW9iai0+cGlu X2Rpc3BsYXkgPSB3YXNfcGluX2Rpc3BsYXk7CisJb2JqLT5waW5fZGlzcGxheS0tOwogCXJldHVy biByZXQ7CiB9CiAKQEAgLTM5NDUsOSArMzkyNywxMiBAQCB2b2lkCiBpOTE1X2dlbV9vYmplY3Rf dW5waW5fZnJvbV9kaXNwbGF5X3BsYW5lKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmos CiAJCQkJCSBjb25zdCBzdHJ1Y3QgaTkxNV9nZ3R0X3ZpZXcgKnZpZXcpCiB7CisJaWYgKFdBUk5f T04ob2JqLT5waW5fZGlzcGxheSA9PSAwKSkKKwkJcmV0dXJuOworCiAJaTkxNV9nZW1fb2JqZWN0 X2dndHRfdW5waW5fdmlldyhvYmosIHZpZXcpOwogCi0Jb2JqLT5waW5fZGlzcGxheSA9IGlzX3Bp bl9kaXNwbGF5KG9iaik7CisJb2JqLT5waW5fZGlzcGxheS0tOwogfQogCiBpbnQKLS0gCjIuMy4y CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=