From: John.C.Harrison@Intel.com Subject: [PATCH v6 14/34] drm/i915: Added tracking/locking of batch buffer objects Date: Wed, 20 Apr 2016 18:13:32 +0100 Message-ID: <1461172435-4256-15-git-send-email-John.C.Harrison@Intel.com> References: <1461172435-4256-1-git-send-email-John.C.Harrison@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 C092F6EA8B for ; Wed, 20 Apr 2016 17:14:13 +0000 (UTC) In-Reply-To: <1461172435-4256-1-git-send-email-John.C.Harrison@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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClRoZSBzY2hl ZHVsZXIgbmVlZHMgdG8gdHJhY2sgaW50ZXJkZXBlbmRlbmNpZXMgYmV0d2VlbiBiYXRjaCBidWZm ZXJzLgpUaGVzZSBhcmUgY2FsY3VsYXRlZCBieSBhbmFseXNpbmcgdGhlIG9iamVjdCBsaXN0cyBv ZiB0aGUgYnVmZmVycyBhbmQKbG9va2luZyBmb3IgY29tbW9uYWxpdHkuIFRoZSBzY2hlZHVsZXIg YWxzbyBuZWVkcyB0byBrZWVwIHRob3NlCmJ1ZmZlcnMgbG9ja2VkIGxvbmcgYWZ0ZXIgdGhlIGlu aXRpYWwgSU9DVEwgY2FsbCBoYXMgcmV0dXJuZWQgdG8gdXNlcgpsYW5kLgoKdjM6IFVwZGF0ZWQg dG8gc3VwcG9ydCByZWFkLXJlYWQgb3B0aW1pc2F0aW9uLgoKdjU6IFVwZGF0ZWQgZHVlIHRvIGNo YW5nZXMgdG8gZWFybGllciBwYXRjaGVzIGluIHNlcmllcyBmb3Igc3BsaXR0aW5nCmJ5cGFzcyBt b2RlIGludG8gYSBzZXBhcmF0ZSBmdW5jdGlvbiBhbmQgY29uc29saWRpbmcgdGhlIGNsZWFuIHVw IGNvZGUuCgp2NjogVXBkYXRlZCB0byBuZXdlciBuaWdodGx5IChsb3RzIG9mIHJpbmcgLT4gZW5n aW5lIHJlbmFtaW5nKS4KClJlbmFtZWQgJ3NhdmVkX29iamVjdHMnIHRvIGp1c3QgJ29ianMnLiBb cmV2aWV3IGZlZWRiYWNrIGZyb20gSm9vbmFzCkxhaHRpbmVuXQoKRm9yOiBWSVotMTU4NwpTaWdu ZWQtb2ZmLWJ5OiBKb2huIEhhcnJpc29uIDxKb2huLkMuSGFycmlzb25ASW50ZWwuY29tPgpSZXZp ZXdlZC1ieTogSmVzc2UgQmFybmVzIDxqYmFybmVzQHZpcnR1b3VzZ2Vlay5vcmc+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jIHwgNDUgKysrKysrKysrKysr KysrKysrKysrKysrKysrKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxlci5j ICAgICAgfCAxNSArKysrKysrKysrCiAyIGZpbGVzIGNoYW5nZWQsIDU4IGluc2VydGlvbnMoKyks IDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fZXhlY2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZl ci5jCmluZGV4IDVkZjdhZTIuLmUxMDVhYWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9leGVjYnVmZmVyLmMKQEAgLTE0NzksNyArMTQ3OSw3IEBAIGk5MTVfZ2VtX2RvX2V4ZWNi dWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAlzdHJ1Y3QgaTkxNV9l eGVjYnVmZmVyX3BhcmFtcyAqcGFyYW1zID0gJnFlLnBhcmFtczsKIAljb25zdCB1MzIgY3R4X2lk ID0gaTkxNV9leGVjYnVmZmVyMl9nZXRfY29udGV4dF9pZCgqYXJncyk7CiAJdTMyIGRpc3BhdGNo X2ZsYWdzOwotCWludCByZXQ7CisJaW50IHJldCwgaTsKIAlib29sIG5lZWRfcmVsb2NzOwogCiAJ aWYgKCFpOTE1X2dlbV9jaGVja19leGVjYnVmZmVyKGFyZ3MpKQpAQCAtMTU1Miw2ICsxNTUyLDEy IEBAIGk5MTVfZ2VtX2RvX2V4ZWNidWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAq ZGF0YSwKIAkJZ290byBwcmVfbXV0ZXhfZXJyOwogCX0KIAorCXFlLm9ianMgPSBremFsbG9jKHNp emVvZigqcWUub2JqcykgKiBhcmdzLT5idWZmZXJfY291bnQsIEdGUF9LRVJORUwpOworCWlmICgh cWUub2JqcykgeworCQlyZXQgPSAtRU5PTUVNOworCQlnb3RvIGVycjsKKwl9CisKIAkvKiBMb29r IHVwIG9iamVjdCBoYW5kbGVzICovCiAJcmV0ID0gZWJfbG9va3VwX3ZtYXMoZWIsIGV4ZWMsIGFy Z3MsIHZtLCBmaWxlKTsKIAlpZiAocmV0KQpAQCAtMTY3Niw5ICsxNjgyLDMyIEBAIGk5MTVfZ2Vt X2RvX2V4ZWNidWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAlwYXJh bXMtPmFyZ3NfRFIxICAgICAgICAgICAgICAgID0gYXJncy0+RFIxOwogCXBhcmFtcy0+YXJnc19E UjQgICAgICAgICAgICAgICAgPSBhcmdzLT5EUjQ7CiAJcGFyYW1zLT5iYXRjaF9vYmogICAgICAg ICAgICAgICA9IGJhdGNoX29iajsKLQlwYXJhbXMtPmN0eCAgICAgICAgICAgICAgICAgICAgID0g Y3R4OwogCXBhcmFtcy0+cmVxdWVzdCAgICAgICAgICAgICAgICAgPSByZXE7CiAKKwkvKgorCSAq IFNhdmUgYXdheSB0aGUgbGlzdCBvZiBvYmplY3RzIHVzZWQgYnkgdGhpcyBiYXRjaCBidWZmZXIg Zm9yIHRoZQorCSAqIHB1cnBvc2Ugb2YgdHJhY2tpbmcgaW50ZXItYnVmZmVyIGRlcGVuZGVuY2ll cy4KKwkgKi8KKwlmb3IgKGkgPSAwOyBpIDwgYXJncy0+YnVmZmVyX2NvdW50OyBpKyspIHsKKwkJ c3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iajsKKworCQkvKgorCQkgKiBOQjogJ2RybV9n ZW1fb2JqZWN0X2xvb2t1cCgpJyBpbmNyZW1lbnRzIHRoZSBvYmplY3QncworCQkgKiByZWZlcmVu Y2UgY291bnQgYW5kIHNvIG11c3QgYmUgbWF0Y2hlZCBieSBhCisJCSAqICdkcm1fZ2VtX29iamVj dF91bnJlZmVyZW5jZScgY2FsbC4KKwkJICovCisJCW9iaiA9IHRvX2ludGVsX2JvKGRybV9nZW1f b2JqZWN0X2xvb2t1cChkZXYsIGZpbGUsCisJCQkJCQkJICBleGVjW2ldLmhhbmRsZSkpOworCQlx ZS5vYmpzW2ldLm9iaiAgICAgICA9IG9iajsKKwkJcWUub2Jqc1tpXS5yZWFkX29ubHkgPSBvYmot PmJhc2UucGVuZGluZ193cml0ZV9kb21haW4gPT0gMDsKKworCX0KKwlxZS5udW1fb2JqcyA9IGk7 CisKKwkvKiBMb2NrIGFuZCBzYXZlIHRoZSBjb250ZXh0IG9iamVjdCBhcyB3ZWxsLiAqLworCWk5 MTVfZ2VtX2NvbnRleHRfcmVmZXJlbmNlKGN0eCk7CisJcGFyYW1zLT5jdHggPSBjdHg7CisKIAly ZXQgPSBkZXZfcHJpdi0+Z3QuZXhlY2J1Zl9zdWJtaXQocGFyYW1zLCBhcmdzLCAmZWItPnZtYXMp OwogCWlmIChyZXQpCiAJCWdvdG8gZXJyX2NsaWVudDsKQEAgLTE3MTQsNiArMTc0MywxOCBAQCBl cnI6CiAJaTkxNV9nZW1fY29udGV4dF91bnJlZmVyZW5jZShjdHgpOwogCWViX2Rlc3Ryb3koZWIp OwogCisJLyogTmVlZCB0byByZWxlYXNlIHRoZSBvYmplY3RzOiAqLworCWlmIChxZS5vYmpzKSB7 CisJCWZvciAoaSA9IDA7IGkgPCBxZS5udW1fb2JqczsgaSsrKQorCQkJZHJtX2dlbV9vYmplY3Rf dW5yZWZlcmVuY2UoJnFlLm9ianNbaV0ub2JqLT5iYXNlKTsKKworCQlrZnJlZShxZS5vYmpzKTsK Kwl9CisKKwkvKiBDb250ZXh0IHRvbyAqLworCWlmIChwYXJhbXMtPmN0eCkKKwkJaTkxNV9nZW1f Y29udGV4dF91bnJlZmVyZW5jZShwYXJhbXMtPmN0eCk7CisKIAkvKgogCSAqIElmIHRoZSByZXF1 ZXN0IHdhcyBjcmVhdGVkIGJ1dCBub3Qgc3VjY2Vzc2Z1bGx5IHN1Ym1pdHRlZCB0aGVuIGl0CiAJ ICogbXVzdCBiZSBmcmVlZCBhZ2Fpbi4gSWYgaXQgd2FzIHN1Ym1pdHRlZCB0aGVuIGl0IGlzIGJl aW5nIHRyYWNrZWQKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1 bGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxlci5jCmluZGV4IDJmYjNm NTIuLmNkYjg2ZGEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1 bGVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIuYwpAQCAtNzYy LDYgKzc2Miw4IEBAIHZvaWQgaTkxNV9zY2hlZHVsZXJfd2FrZXVwKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCiAgKi8KIHZvaWQgaTkxNV9zY2hlZHVsZXJfY2xlYW5fbm9kZShzdHJ1Y3QgaTkxNV9z Y2hlZHVsZXJfcXVldWVfZW50cnkgKm5vZGUpCiB7CisJaW50IGk7CisKIAlpZiAoIUk5MTVfU1FT X0lTX0NPTVBMRVRFKG5vZGUpKSB7CiAJCVdBUk4oIW5vZGUtPnBhcmFtcy5yZXF1ZXN0LT5jYW5j ZWxsZWQsCiAJCSAgICAgIkNsZWFuaW5nIGFjdGl2ZSBub2RlOiAlZCFcbiIsIG5vZGUtPnN0YXR1 cyk7CkBAIC03NzksNiArNzgxLDE5IEBAIHZvaWQgaTkxNV9zY2hlZHVsZXJfY2xlYW5fbm9kZShz dHJ1Y3QgaTkxNV9zY2hlZHVsZXJfcXVldWVfZW50cnkgKm5vZGUpCiAJCW5vZGUtPnBhcmFtcy5i YXRjaF9vYmogPSBOVUxMOwogCX0KIAorCS8qIFJlbGVhc2UgdGhlIGxvY2tlZCBidWZmZXJzOiAq LworCWZvciAoaSA9IDA7IGkgPCBub2RlLT5udW1fb2JqczsgaSsrKQorCQlkcm1fZ2VtX29iamVj dF91bnJlZmVyZW5jZSgmbm9kZS0+b2Jqc1tpXS5vYmotPmJhc2UpOworCWtmcmVlKG5vZGUtPm9i anMpOworCW5vZGUtPm9ianMgPSBOVUxMOworCW5vZGUtPm51bV9vYmpzID0gMDsKKworCS8qIENv bnRleHQgdG9vOiAqLworCWlmIChub2RlLT5wYXJhbXMuY3R4KSB7CisJCWk5MTVfZ2VtX2NvbnRl eHRfdW5yZWZlcmVuY2Uobm9kZS0+cGFyYW1zLmN0eCk7CisJCW5vZGUtPnBhcmFtcy5jdHggPSBO VUxMOworCX0KKwogCS8qIEFuZCBhbnl0aGluZyBlbHNlIG93bmVkIGJ5IHRoZSBub2RlOiAqLwog CWlmIChub2RlLT5wYXJhbXMuY2xpcHJlY3RzKSB7CiAJCWtmcmVlKG5vZGUtPnBhcmFtcy5jbGlw cmVjdHMpOwotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu dGVsLWdmeAo=