From: Tvrtko Ursulin Subject: [PATCH v2] drm/i915: Simplify and fix object to display tracking Date: Tue, 31 Mar 2015 13:23:10 +0100 Message-ID: <1427804590-18077-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 7BAD06E13B for ; Tue, 31 Mar 2015 05:23:13 -0700 (PDT) In-Reply-To: <1427800204-17587-1-git-send-email-tvrtko.ursulin@linux.intel.com> 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 ZXh0cmFjdGVkIGNvZGUgZnJvbSBhIGxhcmdlciByZXdvcmsgYnkgQ2hyaXMgV2lsc29uLikKCnYy OiBSZW1vdmUgdGhlIGxpbWl0IHNpbmNlIGl0IGlzIG5vdCB3ZWxsIGRlZmluZWQuCgpTaWduZWQt b2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpDYzogQ2hy aXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaCB8ICAzICsrLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u YyB8IDMwICsrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA4 IGluc2VydGlvbnMoKyksIDI1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmlu ZGV4IDRlZjMyMGMuLjM3YWJkNTggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMTk2OSw3 ICsxOTY5LDYgQEAgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgewogCSAqLwogCXVuc2lnbmVk IGludCBmYXVsdF9tYXBwYWJsZToxOwogCXVuc2lnbmVkIGludCBwaW5fbWFwcGFibGU6MTsKLQl1 bnNpZ25lZCBpbnQgcGluX2Rpc3BsYXk6MTsKIAogCS8qCiAJICogSXMgdGhlIG9iamVjdCB0byBi ZSBtYXBwZWQgYXMgcmVhZC1vbmx5IHRvIHRoZSBHUFUKQEAgLTE5ODMsNiArMTk4Miw4IEBAIHN0 cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0IHsKIAogCXVuc2lnbmVkIGludCBmcm9udGJ1ZmZlcl9i aXRzOklOVEVMX0ZST05UQlVGRkVSX0JJVFM7CiAKKwl1bnNpZ25lZCBpbnQgcGluX2Rpc3BsYXk7 CisKIAlzdHJ1Y3Qgc2dfdGFibGUgKnBhZ2VzOwogCWludCBwYWdlc19waW5fY291bnQ7CiAKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDNhOTEzNjUuLjhiNzVkYWIgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW0uYwpAQCAtMzg0OSwyNCArMzg0OSw2IEBAIHVubG9jazoKIAlyZXR1cm4gcmV0Owog fQogCi1zdGF0aWMgYm9vbCBpc19waW5fZGlzcGxheShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVj dCAqb2JqKQotewotCXN0cnVjdCBpOTE1X3ZtYSAqdm1hOwotCi0Jdm1hID0gaTkxNV9nZW1fb2Jq X3RvX2dndHQob2JqKTsKLQlpZiAoIXZtYSkKLQkJcmV0dXJuIGZhbHNlOwotCi0JLyogVGhlcmUg YXJlIDIgc291cmNlcyB0aGF0IHBpbiBvYmplY3RzOgotCSAqICAgMS4gVGhlIGRpc3BsYXkgZW5n aW5lIChzY2Fub3V0cywgc3ByaXRlcywgY3Vyc29ycyk7Ci0JICogICAyLiBSZXNlcnZhdGlvbnMg Zm9yIGV4ZWNidWZmZXI7Ci0JICoKLQkgKiBXZSBjYW4gaWdub3JlIHJlc2VydmF0aW9ucyBhcyB3 ZSBob2xkIHRoZSBzdHJ1Y3RfbXV0ZXggYW5kCi0JICogYXJlIG9ubHkgY2FsbGVkIG91dHNpZGUg b2YgdGhlIHJlc2VydmF0aW9uIHBhdGguCi0JICovCi0JcmV0dXJuIHZtYS0+cGluX2NvdW50Owot fQotCiAvKgogICogUHJlcGFyZSBidWZmZXIgZm9yIGRpc3BsYXkgcGxhbmUgKHNjYW5vdXQsIGN1 cnNvcnMsIGV0YykuCiAgKiBDYW4gYmUgY2FsbGVkIGZyb20gYW4gdW5pbnRlcnJ1cHRpYmxlIHBo YXNlIChtb2Rlc2V0dGluZykgYW5kIGFsbG93cwpAQCAtMzg3OSw3ICszODYxLDYgQEAgaTkxNV9n ZW1fb2JqZWN0X3Bpbl90b19kaXNwbGF5X3BsYW5lKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0 ICpvYmosCiAJCQkJICAgICBjb25zdCBzdHJ1Y3QgaTkxNV9nZ3R0X3ZpZXcgKnZpZXcpCiB7CiAJ dTMyIG9sZF9yZWFkX2RvbWFpbnMsIG9sZF93cml0ZV9kb21haW47Ci0JYm9vbCB3YXNfcGluX2Rp c3BsYXk7CiAJaW50IHJldDsKIAogCWlmIChwaXBlbGluZWQgIT0gaTkxNV9nZW1fcmVxdWVzdF9n ZXRfcmluZyhvYmotPmxhc3RfcmVhZF9yZXEpKSB7CkBAIC0zODkxLDggKzM4NzIsNyBAQCBpOTE1 X2dlbV9vYmplY3RfcGluX3RvX2Rpc3BsYXlfcGxhbmUoc3RydWN0IGRybV9pOTE1X2dlbV9vYmpl Y3QgKm9iaiwKIAkvKiBNYXJrIHRoZSBwaW5fZGlzcGxheSBlYXJseSBzbyB0aGF0IHdlIGFjY291 bnQgZm9yIHRoZQogCSAqIGRpc3BsYXkgY29oZXJlbmN5IHdoaWxzdCBzZXR0aW5nIHVwIHRoZSBj YWNoZSBkb21haW5zLgogCSAqLwotCXdhc19waW5fZGlzcGxheSA9IG9iai0+cGluX2Rpc3BsYXk7 Ci0Jb2JqLT5waW5fZGlzcGxheSA9IHRydWU7CisJb2JqLT5waW5fZGlzcGxheSsrOwogCiAJLyog VGhlIGRpc3BsYXkgZW5naW5lIGlzIG5vdCBjb2hlcmVudCB3aXRoIHRoZSBMTEMgY2FjaGUgb24g Z2VuNi4gIEFzCiAJICogYSByZXN1bHQsIHdlIG1ha2Ugc3VyZSB0aGF0IHRoZSBwaW5uaW5nIHRo YXQgaXMgYWJvdXQgdG8gb2NjdXIgaXMKQEAgLTM5MzYsOCArMzkxNiw3IEBAIGk5MTVfZ2VtX29i amVjdF9waW5fdG9fZGlzcGxheV9wbGFuZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2Jq LAogCXJldHVybiAwOwogCiBlcnJfdW5waW5fZGlzcGxheToKLQlXQVJOX09OKHdhc19waW5fZGlz cGxheSAhPSBpc19waW5fZGlzcGxheShvYmopKTsKLQlvYmotPnBpbl9kaXNwbGF5ID0gd2FzX3Bp bl9kaXNwbGF5OworCW9iai0+cGluX2Rpc3BsYXktLTsKIAlyZXR1cm4gcmV0OwogfQogCkBAIC0z OTQ1LDkgKzM5MjQsMTIgQEAgdm9pZAogaTkxNV9nZW1fb2JqZWN0X3VucGluX2Zyb21fZGlzcGxh eV9wbGFuZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCQkJCQkgY29uc3Qgc3Ry dWN0IGk5MTVfZ2d0dF92aWV3ICp2aWV3KQogeworCWlmIChXQVJOX09OKG9iai0+cGluX2Rpc3Bs YXkgPT0gMCkpCisJCXJldHVybjsKKwogCWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluX3ZpZXco b2JqLCB2aWV3KTsKIAotCW9iai0+cGluX2Rpc3BsYXkgPSBpc19waW5fZGlzcGxheShvYmopOwor CW9iai0+cGluX2Rpc3BsYXktLTsKIH0KIAogaW50Ci0tIAoyLjMuMgoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJ bnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK