From: Tvrtko Ursulin Subject: [PATCH v3] drm/i915: Simplify and fix object to display tracking Date: Tue, 31 Mar 2015 13:55:41 +0100 Message-ID: <1427806541-18485-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id A0C326E372 for ; Tue, 31 Mar 2015 05:56:10 -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 ZW4KdGhlIENQVSBhbmQgdGhlIG5vbi1jb2hlcmVudCBkaXNwbGF5IGVuZ2luZS4gUHJpb3IgdG86 CgogICBjb21taXQgMTIxOTIwZmFmMmNjY2U5YWE2NmE3ZTI1ODg0MTVjOTY0N2I2NjEwNAogICBB dXRob3I6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+CiAgIERhdGU6 ICAgTW9uIE1hciAyMyAxMToxMDozNyAyMDE1ICswMDAwCgogICAgICAgZHJtL2k5MTUvc2tsOiBR dWVyeSBkaXNwbGF5IGFkZHJlc3MgdGhyb3VnaCBhIHdyYXBwZXIKClRoaXMgd29ya2VkIGJ5IGEg bWl4IG9mIGRpcmVjdCBmbGFnIG1hbmlwdWxhdGlvbiBhbmQgY2hlY2tpbmcgZm9yCmV4aXN0ZW5j ZSBvZiBhIHBpbm5lZCBHR1RUIFZNQS4KCldpdGggdGhlIGludHJvZHVjdGlvbiBvZiByb3RhdGVk IGRpc3BsYXkgbWFwcGluZ3MgdGhpcyBhcHByb2FjaCBpcwpubyBsb25nZXIgY29ycmVjdC4KCk5l dyBzaW1wbGVyIGFwcHJvYWNoIGlzIHRvIGp1c3Qga2VlcCB0aGlzIGNvdW50IG92ZXIgY2FsbHMg d2hpY2ggcGluCmFuZCB1bnBpbiBvYmplY3RzIHRvIGFuZCBmcm9tIGRpc3BsYXksIGF0IHRoZSBz bGlnaHQgY29zdCBvZiBleHRyYQpzcGFjZSBpbiBldmVyeSBiby4KCihJbnNwaXJlZCBhbmQgZXh0 cmFjdGVkIGNvZGUgZnJvbSBhIGxhcmdlciByZXdvcmsgYnkgQ2hyaXMgV2lsc29uLikKCnYyOiBS ZW1vdmUgdGhlIGxpbWl0IHNpbmNlIGl0IGlzIG5vdCB3ZWxsIGRlZmluZWQuIChDaHJpcyBXaWxz b24sIFZpbGxlIFN5cmrDpGzDpCkKdjM6IENvbW1pdCBtZXNzYWdlIGNvcnJlY3Rpb25zLiAoQ2hy aXMgV2lsc29uKQoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGlu QGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29u LmNvLnVrPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCB8ICAzICsrLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW0uYyB8IDMwICsrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMiBm aWxlcyBjaGFuZ2VkLCA4IGluc2VydGlvbnMoKyksIDI1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oCmluZGV4IDRlZjMyMGMuLjM3YWJkNTggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaApAQCAtMTk2OSw3ICsxOTY5LDYgQEAgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3Qgewog CSAqLwogCXVuc2lnbmVkIGludCBmYXVsdF9tYXBwYWJsZToxOwogCXVuc2lnbmVkIGludCBwaW5f bWFwcGFibGU6MTsKLQl1bnNpZ25lZCBpbnQgcGluX2Rpc3BsYXk6MTsKIAogCS8qCiAJICogSXMg dGhlIG9iamVjdCB0byBiZSBtYXBwZWQgYXMgcmVhZC1vbmx5IHRvIHRoZSBHUFUKQEAgLTE5ODMs NiArMTk4Miw4IEBAIHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0IHsKIAogCXVuc2lnbmVkIGlu dCBmcm9udGJ1ZmZlcl9iaXRzOklOVEVMX0ZST05UQlVGRkVSX0JJVFM7CiAKKwl1bnNpZ25lZCBp bnQgcGluX2Rpc3BsYXk7CisKIAlzdHJ1Y3Qgc2dfdGFibGUgKnBhZ2VzOwogCWludCBwYWdlc19w aW5fY291bnQ7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDNhOTEzNjUuLjhiNzVkYWIg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMzg0OSwyNCArMzg0OSw2IEBAIHVubG9jazoK IAlyZXR1cm4gcmV0OwogfQogCi1zdGF0aWMgYm9vbCBpc19waW5fZGlzcGxheShzdHJ1Y3QgZHJt X2k5MTVfZ2VtX29iamVjdCAqb2JqKQotewotCXN0cnVjdCBpOTE1X3ZtYSAqdm1hOwotCi0Jdm1h ID0gaTkxNV9nZW1fb2JqX3RvX2dndHQob2JqKTsKLQlpZiAoIXZtYSkKLQkJcmV0dXJuIGZhbHNl OwotCi0JLyogVGhlcmUgYXJlIDIgc291cmNlcyB0aGF0IHBpbiBvYmplY3RzOgotCSAqICAgMS4g VGhlIGRpc3BsYXkgZW5naW5lIChzY2Fub3V0cywgc3ByaXRlcywgY3Vyc29ycyk7Ci0JICogICAy LiBSZXNlcnZhdGlvbnMgZm9yIGV4ZWNidWZmZXI7Ci0JICoKLQkgKiBXZSBjYW4gaWdub3JlIHJl c2VydmF0aW9ucyBhcyB3ZSBob2xkIHRoZSBzdHJ1Y3RfbXV0ZXggYW5kCi0JICogYXJlIG9ubHkg Y2FsbGVkIG91dHNpZGUgb2YgdGhlIHJlc2VydmF0aW9uIHBhdGguCi0JICovCi0JcmV0dXJuIHZt YS0+cGluX2NvdW50OwotfQotCiAvKgogICogUHJlcGFyZSBidWZmZXIgZm9yIGRpc3BsYXkgcGxh bmUgKHNjYW5vdXQsIGN1cnNvcnMsIGV0YykuCiAgKiBDYW4gYmUgY2FsbGVkIGZyb20gYW4gdW5p bnRlcnJ1cHRpYmxlIHBoYXNlIChtb2Rlc2V0dGluZykgYW5kIGFsbG93cwpAQCAtMzg3OSw3ICsz ODYxLDYgQEAgaTkxNV9nZW1fb2JqZWN0X3Bpbl90b19kaXNwbGF5X3BsYW5lKHN0cnVjdCBkcm1f aTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJCQkJICAgICBjb25zdCBzdHJ1Y3QgaTkxNV9nZ3R0X3Zp ZXcgKnZpZXcpCiB7CiAJdTMyIG9sZF9yZWFkX2RvbWFpbnMsIG9sZF93cml0ZV9kb21haW47Ci0J Ym9vbCB3YXNfcGluX2Rpc3BsYXk7CiAJaW50IHJldDsKIAogCWlmIChwaXBlbGluZWQgIT0gaTkx NV9nZW1fcmVxdWVzdF9nZXRfcmluZyhvYmotPmxhc3RfcmVhZF9yZXEpKSB7CkBAIC0zODkxLDgg KzM4NzIsNyBAQCBpOTE1X2dlbV9vYmplY3RfcGluX3RvX2Rpc3BsYXlfcGxhbmUoc3RydWN0IGRy bV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAkvKiBNYXJrIHRoZSBwaW5fZGlzcGxheSBlYXJseSBz byB0aGF0IHdlIGFjY291bnQgZm9yIHRoZQogCSAqIGRpc3BsYXkgY29oZXJlbmN5IHdoaWxzdCBz ZXR0aW5nIHVwIHRoZSBjYWNoZSBkb21haW5zLgogCSAqLwotCXdhc19waW5fZGlzcGxheSA9IG9i ai0+cGluX2Rpc3BsYXk7Ci0Jb2JqLT5waW5fZGlzcGxheSA9IHRydWU7CisJb2JqLT5waW5fZGlz cGxheSsrOwogCiAJLyogVGhlIGRpc3BsYXkgZW5naW5lIGlzIG5vdCBjb2hlcmVudCB3aXRoIHRo ZSBMTEMgY2FjaGUgb24gZ2VuNi4gIEFzCiAJICogYSByZXN1bHQsIHdlIG1ha2Ugc3VyZSB0aGF0 IHRoZSBwaW5uaW5nIHRoYXQgaXMgYWJvdXQgdG8gb2NjdXIgaXMKQEAgLTM5MzYsOCArMzkxNiw3 IEBAIGk5MTVfZ2VtX29iamVjdF9waW5fdG9fZGlzcGxheV9wbGFuZShzdHJ1Y3QgZHJtX2k5MTVf Z2VtX29iamVjdCAqb2JqLAogCXJldHVybiAwOwogCiBlcnJfdW5waW5fZGlzcGxheToKLQlXQVJO X09OKHdhc19waW5fZGlzcGxheSAhPSBpc19waW5fZGlzcGxheShvYmopKTsKLQlvYmotPnBpbl9k aXNwbGF5ID0gd2FzX3Bpbl9kaXNwbGF5OworCW9iai0+cGluX2Rpc3BsYXktLTsKIAlyZXR1cm4g cmV0OwogfQogCkBAIC0zOTQ1LDkgKzM5MjQsMTIgQEAgdm9pZAogaTkxNV9nZW1fb2JqZWN0X3Vu cGluX2Zyb21fZGlzcGxheV9wbGFuZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAog CQkJCQkgY29uc3Qgc3RydWN0IGk5MTVfZ2d0dF92aWV3ICp2aWV3KQogeworCWlmIChXQVJOX09O KG9iai0+cGluX2Rpc3BsYXkgPT0gMCkpCisJCXJldHVybjsKKwogCWk5MTVfZ2VtX29iamVjdF9n Z3R0X3VucGluX3ZpZXcob2JqLCB2aWV3KTsKIAotCW9iai0+cGluX2Rpc3BsYXkgPSBpc19waW5f ZGlzcGxheShvYmopOworCW9iai0+cGluX2Rpc3BsYXktLTsKIH0KIAogaW50Ci0tIAoyLjMuMgoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK