From: John.C.Harrison@Intel.com Subject: [PATCH 16/39] drm/i915: Added tracking/locking of batch buffer objects Date: Mon, 23 Nov 2015 11:39:11 +0000 Message-ID: <1448278774-31376-17-git-send-email-John.C.Harrison@Intel.com> References: <1448278774-31376-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id DC4B572203 for ; Mon, 23 Nov 2015 03:39:51 -0800 (PST) In-Reply-To: <1448278774-31376-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 ZXJzLiBUaGVzZSBhcmUKY2FsY3VsYXRlZCBieSBhbmFseXNpbmcgdGhlIG9iamVjdCBsaXN0cyBv ZiB0aGUgYnVmZmVycyBhbmQgbG9va2luZyBmb3IKY29tbW9uYWxpdHkuIFRoZSBzY2hlZHVsZXIg YWxzbyBuZWVkcyB0byBrZWVwIHRob3NlIGJ1ZmZlcnMgbG9ja2VkIGxvbmcgYWZ0ZXIKdGhlIGlu aXRpYWwgSU9DVEwgY2FsbCBoYXMgcmV0dXJuZWQgdG8gdXNlciBsYW5kLgoKQ2hhbmdlLUlkOiBJ MzFlMzY3N2VjZmMyYzliNWE5MDhiZGE2YWNjNDg1MDQzMmQ1NWYxZQpGb3I6IFZJWi0xNTg3ClNp Z25lZC1vZmYtYnk6IEpvaG4gSGFycmlzb24gPEpvaG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jIHwgNDggKysrKysr KysrKysrKysrKysrKysrKysrKysrKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVk dWxlci5jICAgICAgfCAzMyArKysrKysrKysrKysrKysrKystLQogMiBmaWxlcyBjaGFuZ2VkLCA3 NiBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2V4ZWNidWZmZXIuYwppbmRleCAxMmIzNGQ3Li5mZTkwNTcxIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCkBAIC0xNDE3LDcgKzE0MTcsNyBAQCBp OTE1X2dlbV9kb19leGVjYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEs CiAJc3RydWN0IGk5MTVfZXhlY2J1ZmZlcl9wYXJhbXMgKnBhcmFtcyA9ICZxZS5wYXJhbXM7CiAJ Y29uc3QgdTMyIGN0eF9pZCA9IGk5MTVfZXhlY2J1ZmZlcjJfZ2V0X2NvbnRleHRfaWQoKmFyZ3Mp OwogCXUzMiBkaXNwYXRjaF9mbGFnczsKLQlpbnQgcmV0OworCWludCByZXQsIGk7CiAJYm9vbCBu ZWVkX3JlbG9jczsKIAlpbnQgZmRfZmVuY2VfY29tcGxldGUgPSAtMTsKIAlpbnQgZmRfZmVuY2Vf d2FpdCA9IGxvd2VyXzMyX2JpdHMoYXJncy0+cnN2ZDIpOwpAQCAtMTU1Miw2ICsxNTUyLDE0IEBA IGk5MTVfZ2VtX2RvX2V4ZWNidWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0 YSwKIAkJZ290byBwcmVfbXV0ZXhfZXJyOwogCX0KIAorCXFlLnNhdmVkX29iamVjdHMgPSBremFs bG9jKAorCQkJc2l6ZW9mKCpxZS5zYXZlZF9vYmplY3RzKSAqIGFyZ3MtPmJ1ZmZlcl9jb3VudCwK KwkJCUdGUF9LRVJORUwpOworCWlmICghcWUuc2F2ZWRfb2JqZWN0cykgeworCQlyZXQgPSAtRU5P TUVNOworCQlnb3RvIGVycjsKKwl9CisKIAkvKiBMb29rIHVwIG9iamVjdCBoYW5kbGVzICovCiAJ cmV0ID0gZWJfbG9va3VwX3ZtYXMoZWIsIGV4ZWMsIGFyZ3MsIHZtLCBmaWxlKTsKIAlpZiAocmV0 KQpAQCAtMTY3Miw3ICsxNjgwLDI2IEBAIGk5MTVfZ2VtX2RvX2V4ZWNidWZmZXIoc3RydWN0IGRy bV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAlwYXJhbXMtPmFyZ3NfRFIxICAgICAgICAgICAg ICAgID0gYXJncy0+RFIxOwogCXBhcmFtcy0+YXJnc19EUjQgICAgICAgICAgICAgICAgPSBhcmdz LT5EUjQ7CiAJcGFyYW1zLT5iYXRjaF9vYmogICAgICAgICAgICAgICA9IGJhdGNoX29iajsKLQlw YXJhbXMtPmN0eCAgICAgICAgICAgICAgICAgICAgID0gY3R4OworCisJLyoKKwkgKiBTYXZlIGF3 YXkgdGhlIGxpc3Qgb2Ygb2JqZWN0cyB1c2VkIGJ5IHRoaXMgYmF0Y2ggYnVmZmVyIGZvciB0aGUK KwkgKiBwdXJwb3NlIG9mIHRyYWNraW5nIGludGVyLWJ1ZmZlciBkZXBlbmRlbmNpZXMuCisJICov CisJZm9yIChpID0gMDsgaSA8IGFyZ3MtPmJ1ZmZlcl9jb3VudDsgaSsrKSB7CisJCS8qCisJCSAq IE5COiAnZHJtX2dlbV9vYmplY3RfbG9va3VwKCknIGluY3JlbWVudHMgdGhlIG9iamVjdCdzCisJ CSAqIHJlZmVyZW5jZSBjb3VudCBhbmQgc28gbXVzdCBiZSBtYXRjaGVkIGJ5IGEKKwkJICogJ2Ry bV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlJyBjYWxsLgorCQkgKi8KKwkJcWUuc2F2ZWRfb2JqZWN0 c1tpXS5vYmogPQorCQkJdG9faW50ZWxfYm8oZHJtX2dlbV9vYmplY3RfbG9va3VwKGRldiwgZmls ZSwKKwkJCQkJCQkgIGV4ZWNbaV0uaGFuZGxlKSk7CisJfQorCXFlLm51bV9vYmpzID0gaTsKKwor CS8qIExvY2sgYW5kIHNhdmUgdGhlIGNvbnRleHQgb2JqZWN0IGFzIHdlbGwuICovCisJaTkxNV9n ZW1fY29udGV4dF9yZWZlcmVuY2UoY3R4KTsKKwlwYXJhbXMtPmN0eCA9IGN0eDsKIAogCWlmIChh cmdzLT5mbGFncyAmIEk5MTVfRVhFQ19DUkVBVEVfRkVOQ0UpIHsKIAkJLyoKQEAgLTE3MzcsNiAr MTc2NCwyMyBAQCBlcnI6CiAJaTkxNV9nZW1fY29udGV4dF91bnJlZmVyZW5jZShjdHgpOwogCWVi X2Rlc3Ryb3koZWIpOwogCisJaWYgKHFlLnNhdmVkX29iamVjdHMpIHsKKwkJLyogTmVlZCB0byBy ZWxlYXNlIHRoZSBvYmplY3RzOiAqLworCQlmb3IgKGkgPSAwOyBpIDwgcWUubnVtX29ianM7IGkr KykgeworCQkJaWYgKCFxZS5zYXZlZF9vYmplY3RzW2ldLm9iaikKKwkJCQljb250aW51ZTsKKwor CQkJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2UoCisJCQkJCSZxZS5zYXZlZF9vYmplY3RzW2ld Lm9iai0+YmFzZSk7CisJCX0KKworCQlrZnJlZShxZS5zYXZlZF9vYmplY3RzKTsKKworCQkvKiBD b250ZXh0IHRvbyAqLworCQlpZiAocGFyYW1zLT5jdHgpCisJCQlpOTE1X2dlbV9jb250ZXh0X3Vu cmVmZXJlbmNlKHBhcmFtcy0+Y3R4KTsKKwl9CisKIAkvKgogCSAqIElmIHRoZSByZXF1ZXN0IHdh cyBjcmVhdGVkIGJ1dCBub3Qgc3VjY2Vzc2Z1bGx5IHN1Ym1pdHRlZCB0aGVuIGl0CiAJICogbXVz dCBiZSBmcmVlZCBhZ2Fpbi4gSWYgaXQgd2FzIHN1Ym1pdHRlZCB0aGVuIGl0IGlzIGJlaW5nIHRy YWNrZWQKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxlci5jCmluZGV4IDc5ZDAyZDcuLmNk NjlmNTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIuYwpAQCAtMTA0LDcgKzEw NCwyMyBAQCBpbnQgaTkxNV9zY2hlZHVsZXJfcXVldWVfZXhlY2J1ZmZlcihzdHJ1Y3QgaTkxNV9z Y2hlZHVsZXJfcXVldWVfZW50cnkgKnFlKQogCQlpZiAocmV0KQogCQkJcmV0dXJuIHJldDsKIAot CQkvKiBGcmVlIGV2ZXJ5dGhpbmcgdGhhdCBpcyBvd25lZCBieSB0aGUgUUUgc3RydWN0dXJlOiAq LworCQkvKiBOZWVkIHRvIHJlbGVhc2UgdGhlIG9iamVjdHM6ICovCisJCWZvciAoaSA9IDA7IGkg PCBxZS0+bnVtX29ianM7IGkrKykgeworCQkJaWYgKCFxZS0+c2F2ZWRfb2JqZWN0c1tpXS5vYmop CisJCQkJY29udGludWU7CisKKwkJCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlKCZxZS0+c2F2 ZWRfb2JqZWN0c1tpXS5vYmotPmJhc2UpOworCQl9CisKKwkJa2ZyZWUocWUtPnNhdmVkX29iamVj dHMpOworCQlxZS0+c2F2ZWRfb2JqZWN0cyA9IE5VTEw7CisJCXFlLT5udW1fb2JqcyA9IDA7CisK KwkJLyogRnJlZSB0aGUgY29udGV4dCBvYmplY3QgdG9vOiAqLworCQlpZiAocWUtPnBhcmFtcy5j dHgpCisJCQlpOTE1X2dlbV9jb250ZXh0X3VucmVmZXJlbmNlKHFlLT5wYXJhbXMuY3R4KTsKKwor CQkvKiBBbmQgYW55dGhpbmcgZWxzZSBvd25lZCBieSB0aGUgUUUgc3RydWN0dXJlOiAqLwogCQlr ZnJlZShxZS0+cGFyYW1zLmNsaXByZWN0cyk7CiAJCWlmIChxZS0+cGFyYW1zLmRpc3BhdGNoX2Zs YWdzICYgSTkxNV9ESVNQQVRDSF9TRUNVUkUpCiAJCQlpOTE1X2dlbV9leGVjYnVmZl9yZWxlYXNl X2JhdGNoX29iaihxZS0+cGFyYW1zLmJhdGNoX29iaik7CkBAIC0zNzYsNyArMzkyLDcgQEAgc3Rh dGljIGludCBpOTE1X3NjaGVkdWxlcl9yZW1vdmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmlu ZykKIAlpbnQgICAgICAgICAgICAgICAgIGZseWluZyA9IDAsIHF1ZXVlZCA9IDA7CiAJaW50ICAg ICAgICAgICAgICAgICByZXQgPSAwOwogCWJvb2wgICAgICAgICAgICAgICAgZG9fc3VibWl0Owot CXVpbnQzMl90ICAgICAgICAgICAgbWluX3NlcW5vOworCXVpbnQzMl90ICAgICAgICAgICAgaSwg bWluX3NlcW5vOwogCXN0cnVjdCBsaXN0X2hlYWQgICAgcmVtb3ZlOwogCiAJaWYgKGxpc3RfZW1w dHkoJnNjaGVkdWxlci0+bm9kZV9xdWV1ZVtyaW5nLT5pZF0pKQpAQCAtNDgwLDcgKzQ5NiwxOCBA QCBzdGF0aWMgaW50IGk5MTVfc2NoZWR1bGVyX3JlbW92ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICpyaW5nKQogCQlpZiAobm9kZS0+cGFyYW1zLmRpc3BhdGNoX2ZsYWdzICYgSTkxNV9ESVNQQVRD SF9TRUNVUkUpCiAJCQlpOTE1X2dlbV9leGVjYnVmZl9yZWxlYXNlX2JhdGNoX29iaihub2RlLT5w YXJhbXMuYmF0Y2hfb2JqKTsKIAotCQkvKiBGcmVlIGV2ZXJ5dGhpbmcgdGhhdCBpcyBvd25lZCBi eSB0aGUgbm9kZTogKi8KKwkJLyogUmVsZWFzZSB0aGUgbG9ja2VkIGJ1ZmZlcnM6ICovCisJCWZv ciAoaSA9IDA7IGkgPCBub2RlLT5udW1fb2JqczsgaSsrKSB7CisJCQlkcm1fZ2VtX29iamVjdF91 bnJlZmVyZW5jZSgKKwkJCQkJICAgICZub2RlLT5zYXZlZF9vYmplY3RzW2ldLm9iai0+YmFzZSk7 CisJCX0KKwkJa2ZyZWUobm9kZS0+c2F2ZWRfb2JqZWN0cyk7CisKKwkJLyogQ29udGV4dCB0b286 ICovCisJCWlmIChub2RlLT5wYXJhbXMuY3R4KQorCQkJaTkxNV9nZW1fY29udGV4dF91bnJlZmVy ZW5jZShub2RlLT5wYXJhbXMuY3R4KTsKKworCQkvKiBBbmQgYW55dGhpbmcgZWxzZSBvd25lZCBi eSB0aGUgbm9kZTogKi8KIAkJbm9kZS0+cGFyYW1zLnJlcXVlc3QtPnNjaGVkdWxlcl9xZSA9IE5V TEw7CiAJCWk5MTVfZ2VtX3JlcXVlc3RfdW5yZWZlcmVuY2Uobm9kZS0+cGFyYW1zLnJlcXVlc3Qp OwogCQlrZnJlZShub2RlLT5wYXJhbXMuY2xpcHJlY3RzKTsKLS0gCjEuOS4xCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=