From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 4/4] drm/i915: Pull the context->pin_count dec into the common intel_context_unpin Date: Thu, 17 May 2018 22:26:33 +0100 Message-ID: <20180517212633.24934-4-chris@chris-wilson.co.uk> References: <20180517212633.24934-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id 10A956EBBC for ; Thu, 17 May 2018 21:26:55 +0000 (UTC) In-Reply-To: <20180517212633.24934-1-chris@chris-wilson.co.uk> 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 Cc: yan.y.zhao@intel.com List-Id: intel-gfx@lists.freedesktop.org QXMgYWxsIGJhY2tlbmRzIGltcGxlbWVudCB0aGUgc2FtZSBwaW5fY291bnQgbWVjaGFuaXNtIGFu ZCBkbyBhCmRlYy1hbmQtdGVzdCBhcyB0aGVpciBmaXJzdCBzdGVwLCBwdWxsIHRoYXQgaW50byB0 aGUgY29tbW9uCmludGVsX2NvbnRleHRfdW5waW4oKS4gVGhpcyBhbHNvIHB1bGxzIGludG8gdGhl IGNhbGxlciwgZWxpbWluYXRpbmcgdGhlCmluZGlyZWN0IGNhbGwgaW4gdGhlIHVzdWFsIHN0ZWFk eSBzdGF0ZSBjYXNlLiBUaGUgaW50ZWxfY29udGV4dF9waW4oKQpzaWRlIGlzIGEgbGl0dGxlIG1v cmUgY29tcGxpY2F0ZWQgYXMgaXQgY29tYmluZXMgdGhlIGxvb2t1cC9hbGxvYyBhcwp3ZWxsIGFz IHBpbm5pbmcgdGhlIHN0YXRlLCBhbmQgc28gaXMgbGVmdCBmb3IgYSBsYXRlciBkYXRlLgoKU2ln bmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBU dnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogVHZy dGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmggICAgICB8ICA0ICsrKysKIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2xyYy5jICAgICAgICAgICAgIHwgMTMgKy0tLS0tLS0tLS0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jICAgICAgfCAgNiAtLS0tLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9tb2NrX2VuZ2luZS5jIHwgIDMgLS0tCiA0IGZpbGVz IGNoYW5nZWQsIDUgaW5zZXJ0aW9ucygrKSwgMjEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5oIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fY29udGV4dC5oCmluZGV4IDc0OWE0ZmY1NjZmNS4uYzMyNjJiNGRkMmVl IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmgKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5oCkBAIC0yODUsNiArMjg1 LDEwIEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBfX2ludGVsX2NvbnRleHRfcGluKHN0cnVjdCBpbnRl bF9jb250ZXh0ICpjZSkKIAogc3RhdGljIGlubGluZSB2b2lkIGludGVsX2NvbnRleHRfdW5waW4o c3RydWN0IGludGVsX2NvbnRleHQgKmNlKQogeworCUdFTV9CVUdfT04oIWNlLT5waW5fY291bnQp OworCWlmICgtLWNlLT5waW5fY291bnQpCisJCXJldHVybjsKKwogCUdFTV9CVUdfT04oIWNlLT5v cHMpOwogCWNlLT5vcHMtPnVucGluKGNlKTsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5k ZXggODlhM2EzMTcyMWRhLi4zNzQ0ZjU3NTA2MjQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5j CkBAIC0xMzQyLDcgKzEzNDIsNyBAQCBzdGF0aWMgdm9pZCBleGVjbGlzdHNfY29udGV4dF9kZXN0 cm95KHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjZSkKIAlfX2k5MTVfZ2VtX29iamVjdF9yZWxlYXNl X3VubGVzc19hY3RpdmUoY2UtPnN0YXRlLT5vYmopOwogfQogCi1zdGF0aWMgdm9pZCBfX2V4ZWNs aXN0c19jb250ZXh0X3VucGluKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjZSkKK3N0YXRpYyB2b2lk IGV4ZWNsaXN0c19jb250ZXh0X3VucGluKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjZSkKIHsKIAlp bnRlbF9yaW5nX3VucGluKGNlLT5yaW5nKTsKIApAQCAtMTM1MywxNyArMTM1Myw2IEBAIHN0YXRp YyB2b2lkIF9fZXhlY2xpc3RzX2NvbnRleHRfdW5waW4oc3RydWN0IGludGVsX2NvbnRleHQgKmNl KQogCWk5MTVfZ2VtX2NvbnRleHRfcHV0KGNlLT5nZW1fY29udGV4dCk7CiB9CiAKLXN0YXRpYyB2 b2lkIGV4ZWNsaXN0c19jb250ZXh0X3VucGluKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjZSkKLXsK LQlsb2NrZGVwX2Fzc2VydF9oZWxkKCZjZS0+Z2VtX2NvbnRleHQtPmk5MTUtPmRybS5zdHJ1Y3Rf bXV0ZXgpOwotCUdFTV9CVUdfT04oY2UtPnBpbl9jb3VudCA9PSAwKTsKLQotCWlmICgtLWNlLT5w aW5fY291bnQpCi0JCXJldHVybjsKLQotCV9fZXhlY2xpc3RzX2NvbnRleHRfdW5waW4oY2UpOwot fQotCiBzdGF0aWMgaW50IF9fY29udGV4dF9waW4oc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQgKmN0 eCwgc3RydWN0IGk5MTVfdm1hICp2bWEpCiB7CiAJdW5zaWduZWQgaW50IGZsYWdzOwpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4IDBjMGM5ZjUzMWU0ZS4uMDAxY2Y2 YmNiMzQ5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVy LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCkBAIC0xMTk1 LDEyICsxMTk1LDYgQEAgc3RhdGljIHZvaWQgaW50ZWxfcmluZ19jb250ZXh0X2Rlc3Ryb3koc3Ry dWN0IGludGVsX2NvbnRleHQgKmNlKQogCiBzdGF0aWMgdm9pZCBpbnRlbF9yaW5nX2NvbnRleHRf dW5waW4oc3RydWN0IGludGVsX2NvbnRleHQgKmNlKQogewotCWxvY2tkZXBfYXNzZXJ0X2hlbGQo JmNlLT5nZW1fY29udGV4dC0+aTkxNS0+ZHJtLnN0cnVjdF9tdXRleCk7Ci0JR0VNX0JVR19PTihj ZS0+cGluX2NvdW50ID09IDApOwotCi0JaWYgKC0tY2UtPnBpbl9jb3VudCkKLQkJcmV0dXJuOwot CiAJaWYgKGNlLT5zdGF0ZSkgewogCQljZS0+c3RhdGUtPm9iai0+cGluX2dsb2JhbC0tOwogCQlp OTE1X3ZtYV91bnBpbihjZS0+c3RhdGUpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvc2VsZnRlc3RzL21vY2tfZW5naW5lLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVz dHMvbW9ja19lbmdpbmUuYwppbmRleCAzM2VkZGZjMWY4Y2UuLmYxYWM3NDUzMDUzZSAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL21vY2tfZW5naW5lLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL21vY2tfZW5naW5lLmMKQEAgLTc0LDkgKzc0 LDYgQEAgc3RhdGljIHZvaWQgaHdfZGVsYXlfY29tcGxldGUoc3RydWN0IHRpbWVyX2xpc3QgKnQp CiAKIHN0YXRpYyB2b2lkIG1vY2tfY29udGV4dF91bnBpbihzdHJ1Y3QgaW50ZWxfY29udGV4dCAq Y2UpCiB7Ci0JaWYgKC0tY2UtPnBpbl9jb3VudCkKLQkJcmV0dXJuOwotCiAJaTkxNV9nZW1fY29u dGV4dF9wdXQoY2UtPmdlbV9jb250ZXh0KTsKIH0KIAotLSAKMi4xNy4wCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK