From: Tvrtko Ursulin Subject: [PATCH 3/4] drm/i915: Extract context unpinning to its own function Date: Thu, 21 Jan 2016 12:14:09 +0000 Message-ID: <1453378450-33327-3-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1453378450-33327-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 325C66EA84 for ; Thu, 21 Jan 2016 04:14:29 -0800 (PST) In-Reply-To: <1453378450-33327-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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCldpbGwgZW5h YmxlIGNsZWFuZXIgaW1wbGVtZW50YXRpb24gb2YgYSBmb2xsb3dpbmcgZml4IGFuZAplYXNpZXIg Y29kZSB1bmlmaWNhdGlvbiBpbiB0aGUgZnV0dXJlLgoKSWRlYSBhbmQgY29kZSBieSBDaHJpcyBX aWxzb24uCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50 ZWwuY29tPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jIHwgMjUgKysrKysrKysrKyst LS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDExIGluc2VydGlvbnMoKyksIDE0IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRl eHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYwppbmRleCA2YTRm NjRiMDNkYjYuLjFhNjdlMDdiOWU2YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fY29udGV4dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2Nv bnRleHQuYwpAQCAtMzIxLDYgKzMyMSwxNCBAQCBlcnJfZGVzdHJveToKIAlyZXR1cm4gRVJSX1BU UihyZXQpOwogfQogCitzdGF0aWMgdm9pZCBpOTE1X2dlbV9jb250ZXh0X3VucGluKHN0cnVjdCBp bnRlbF9jb250ZXh0ICpjdHgsCisJCQkJICAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l KQoreworCWlmIChlbmdpbmUtPmlkID09IFJDUyAmJiBjdHgtPmxlZ2FjeV9od19jdHgucmNzX3N0 YXRlKQorCQlpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBpbihjdHgtPmxlZ2FjeV9od19jdHgucmNz X3N0YXRlKTsKKwlpOTE1X2dlbV9jb250ZXh0X3VucmVmZXJlbmNlKGN0eCk7Cit9CisKIHZvaWQg aTkxNV9nZW1fY29udGV4dF9yZXNldChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CkBAIC0zMzgs MTMgKzM0Niw5IEBAIHZvaWQgaTkxNV9nZW1fY29udGV4dF9yZXNldChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogCiAJZm9yIChpID0gMDsgaSA8IEk5MTVfTlVNX1JJTkdTOyBpKyspIHsKIAkJc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9ICZkZXZfcHJpdi0+cmluZ1tpXTsKLQkJc3RydWN0 IGludGVsX2NvbnRleHQgKmxjdHggPSByaW5nLT5sYXN0X2NvbnRleHQ7Ci0KLQkJaWYgKGxjdHgp IHsKLQkJCWlmIChsY3R4LT5sZWdhY3lfaHdfY3R4LnJjc19zdGF0ZSAmJiBpID09IFJDUykKLQkJ CQlpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBpbihsY3R4LT5sZWdhY3lfaHdfY3R4LnJjc19zdGF0 ZSk7CiAKLQkJCWk5MTVfZ2VtX2NvbnRleHRfdW5yZWZlcmVuY2UobGN0eCk7CisJCWlmIChyaW5n LT5sYXN0X2NvbnRleHQpIHsKKwkJCWk5MTVfZ2VtX2NvbnRleHRfdW5waW4ocmluZy0+bGFzdF9j b250ZXh0LCByaW5nKTsKIAkJCXJpbmctPmxhc3RfY29udGV4dCA9IE5VTEw7CiAJCX0KIAl9CkBA IC00MTcsMTMgKzQyMSw2IEBAIHZvaWQgaTkxNV9nZW1fY29udGV4dF9maW5pKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiAJCSAqIHRvIG9mZnNldCB0aGUgZG9fc3dpdGNoIHBhcnQsIHNvIHRoYXQg aTkxNV9nZW1fY29udGV4dF91bnJlZmVyZW5jZSgpCiAJCSAqIGNhbiB0aGVuIGZyZWUgdGhlIGJh c2Ugb2JqZWN0IGNvcnJlY3RseS4gKi8KIAkJV0FSTl9PTighZGV2X3ByaXYtPnJpbmdbUkNTXS5s YXN0X2NvbnRleHQpOwotCQlpZiAoZGV2X3ByaXYtPnJpbmdbUkNTXS5sYXN0X2NvbnRleHQgPT0g ZGN0eCkgewotCQkJLyogRmFrZSBzd2l0Y2ggdG8gTlVMTCBjb250ZXh0ICovCi0JCQlXQVJOX09O KGRjdHgtPmxlZ2FjeV9od19jdHgucmNzX3N0YXRlLT5hY3RpdmUpOwotCQkJaTkxNV9nZW1fb2Jq ZWN0X2dndHRfdW5waW4oZGN0eC0+bGVnYWN5X2h3X2N0eC5yY3Nfc3RhdGUpOwotCQkJaTkxNV9n ZW1fY29udGV4dF91bnJlZmVyZW5jZShkY3R4KTsKLQkJCWRldl9wcml2LT5yaW5nW1JDU10ubGFz dF9jb250ZXh0ID0gTlVMTDsKLQkJfQogCiAJCWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKGRj dHgtPmxlZ2FjeV9od19jdHgucmNzX3N0YXRlKTsKIAl9CkBAIC00MzIsNyArNDI5LDcgQEAgdm9p ZCBpOTE1X2dlbV9jb250ZXh0X2Zpbmkoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqcmluZyA9ICZkZXZfcHJpdi0+cmluZ1tpXTsKIAogCQlpZiAocmlu Zy0+bGFzdF9jb250ZXh0KSB7Ci0JCQlpOTE1X2dlbV9jb250ZXh0X3VucmVmZXJlbmNlKHJpbmct Pmxhc3RfY29udGV4dCk7CisJCQlpOTE1X2dlbV9jb250ZXh0X3VucGluKHJpbmctPmxhc3RfY29u dGV4dCwgcmluZyk7CiAJCQlyaW5nLT5sYXN0X2NvbnRleHQgPSBOVUxMOwogCQl9CiAJfQotLSAK MS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==