From: Tvrtko Ursulin Subject: [PATCH v2] drm/i915: Extract context unpinning to its own function Date: Fri, 22 Jan 2016 16:19:36 +0000 Message-ID: <1453479576-14642-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1453378450-33327-3-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 8EDAE6E320 for ; Fri, 22 Jan 2016 08:19:41 -0800 (PST) In-Reply-To: <1453378450-33327-3-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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCldpbGwgZW5h YmxlIGNsZWFuZXIgaW1wbGVtZW50YXRpb24gb2YgYSBmb2xsb3dpbmcgZml4IGFuZAplYXNpZXIg Y29kZSB1bmlmaWNhdGlvbiBpbiB0aGUgZnV0dXJlLgoKSWRlYSBhbmQgY29kZSBieSBDaHJpcyBX aWxzb24uCgp2MjogRG8gbm90IHJldHVybiBiZWZvcmUgbGFzdF9jb250ZXh0cyBvbiBlbmdpbmVz IGFyZSB1bnBpbm5lZC4KClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJz dWxpbkBpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdp bHNvbi5jby51az4gKHYxKQpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28u dWs+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jIHwgMzAgKysr KysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTIgaW5zZXJ0aW9u cygrKSwgMTggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fY29udGV4dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4 dC5jCmluZGV4IDZhNGY2NGIwM2RiNi4uYmJhMTdiOWYxYmU1IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fY29udGV4dC5jCkBAIC0zMjEsNiArMzIxLDE0IEBAIGVycl9kZXN0cm95Ogog CXJldHVybiBFUlJfUFRSKHJldCk7CiB9CiAKK3N0YXRpYyB2b2lkIGk5MTVfZ2VtX2NvbnRleHRf dW5waW4oc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKKwkJCQkgICBzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICplbmdpbmUpCit7CisJaWYgKGVuZ2luZS0+aWQgPT0gUkNTICYmIGN0eC0+bGVnYWN5 X2h3X2N0eC5yY3Nfc3RhdGUpCisJCWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKGN0eC0+bGVn YWN5X2h3X2N0eC5yY3Nfc3RhdGUpOworCWk5MTVfZ2VtX2NvbnRleHRfdW5yZWZlcmVuY2UoY3R4 KTsKK30KKwogdm9pZCBpOTE1X2dlbV9jb250ZXh0X3Jlc2V0KHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJp dmF0ZTsKQEAgLTMyOSwyMiArMzM3LDE1IEBAIHZvaWQgaTkxNV9nZW1fY29udGV4dF9yZXNldChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWlmIChpOTE1LmVuYWJsZV9leGVjbGlzdHMpIHsKIAkJ c3RydWN0IGludGVsX2NvbnRleHQgKmN0eDsKIAotCQlsaXN0X2Zvcl9lYWNoX2VudHJ5KGN0eCwg JmRldl9wcml2LT5jb250ZXh0X2xpc3QsIGxpbmspIHsKKwkJbGlzdF9mb3JfZWFjaF9lbnRyeShj dHgsICZkZXZfcHJpdi0+Y29udGV4dF9saXN0LCBsaW5rKQogCQkJaW50ZWxfbHJfY29udGV4dF9y ZXNldChkZXYsIGN0eCk7Ci0JCX0KLQotCQlyZXR1cm47CiAJfQogCiAJZm9yIChpID0gMDsgaSA8 IEk5MTVfTlVNX1JJTkdTOyBpKyspIHsKIAkJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9 ICZkZXZfcHJpdi0+cmluZ1tpXTsKLQkJc3RydWN0IGludGVsX2NvbnRleHQgKmxjdHggPSByaW5n LT5sYXN0X2NvbnRleHQ7Ci0KLQkJaWYgKGxjdHgpIHsKLQkJCWlmIChsY3R4LT5sZWdhY3lfaHdf Y3R4LnJjc19zdGF0ZSAmJiBpID09IFJDUykKLQkJCQlpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBp bihsY3R4LT5sZWdhY3lfaHdfY3R4LnJjc19zdGF0ZSk7CiAKLQkJCWk5MTVfZ2VtX2NvbnRleHRf dW5yZWZlcmVuY2UobGN0eCk7CisJCWlmIChyaW5nLT5sYXN0X2NvbnRleHQpIHsKKwkJCWk5MTVf Z2VtX2NvbnRleHRfdW5waW4ocmluZy0+bGFzdF9jb250ZXh0LCByaW5nKTsKIAkJCXJpbmctPmxh c3RfY29udGV4dCA9IE5VTEw7CiAJCX0KIAl9CkBAIC00MTcsMTMgKzQxOCw2IEBAIHZvaWQgaTkx NV9nZW1fY29udGV4dF9maW5pKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCSAqIHRvIG9mZnNl dCB0aGUgZG9fc3dpdGNoIHBhcnQsIHNvIHRoYXQgaTkxNV9nZW1fY29udGV4dF91bnJlZmVyZW5j ZSgpCiAJCSAqIGNhbiB0aGVuIGZyZWUgdGhlIGJhc2Ugb2JqZWN0IGNvcnJlY3RseS4gKi8KIAkJ V0FSTl9PTighZGV2X3ByaXYtPnJpbmdbUkNTXS5sYXN0X2NvbnRleHQpOwotCQlpZiAoZGV2X3By aXYtPnJpbmdbUkNTXS5sYXN0X2NvbnRleHQgPT0gZGN0eCkgewotCQkJLyogRmFrZSBzd2l0Y2gg dG8gTlVMTCBjb250ZXh0ICovCi0JCQlXQVJOX09OKGRjdHgtPmxlZ2FjeV9od19jdHgucmNzX3N0 YXRlLT5hY3RpdmUpOwotCQkJaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5waW4oZGN0eC0+bGVnYWN5 X2h3X2N0eC5yY3Nfc3RhdGUpOwotCQkJaTkxNV9nZW1fY29udGV4dF91bnJlZmVyZW5jZShkY3R4 KTsKLQkJCWRldl9wcml2LT5yaW5nW1JDU10ubGFzdF9jb250ZXh0ID0gTlVMTDsKLQkJfQogCiAJ CWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKGRjdHgtPmxlZ2FjeV9od19jdHgucmNzX3N0YXRl KTsKIAl9CkBAIC00MzIsNyArNDI2LDcgQEAgdm9pZCBpOTE1X2dlbV9jb250ZXh0X2Zpbmkoc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKIAkJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9ICZk ZXZfcHJpdi0+cmluZ1tpXTsKIAogCQlpZiAocmluZy0+bGFzdF9jb250ZXh0KSB7Ci0JCQlpOTE1 X2dlbV9jb250ZXh0X3VucmVmZXJlbmNlKHJpbmctPmxhc3RfY29udGV4dCk7CisJCQlpOTE1X2dl bV9jb250ZXh0X3VucGluKHJpbmctPmxhc3RfY29udGV4dCwgcmluZyk7CiAJCQlyaW5nLT5sYXN0 X2NvbnRleHQgPSBOVUxMOwogCQl9CiAJfQotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==