From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH v2 3/4] drm/i915: Extract context unpinning to its own function Date: Mon, 25 Jan 2016 11:25:49 +0000 Message-ID: <1453721150-36705-3-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1453721150-36705-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id E0F1D6E1D4 for ; Mon, 25 Jan 2016 03:25:55 -0800 (PST) In-Reply-To: <1453721150-36705-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 aWxzb24uCgp2MjogRG8gbm90IHJldHVybiBiZWZvcmUgbGFzdF9jb250ZXh0cyBvbiBlbmdpbmVz IGFyZSB1bnBpbm5lZC4KClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJz dWxpbkBpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdp bHNvbi5jby51az4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgot LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYyB8IDMwICsrKysrKysr KysrKy0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEyIGluc2VydGlvbnMoKyks IDE4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX2NvbnRleHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYwpp bmRleCA2YTRmNjRiMDNkYjYuLmJiYTE3YjlmMWJlNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2NvbnRleHQuYwpAQCAtMzIxLDYgKzMyMSwxNCBAQCBlcnJfZGVzdHJveToKIAlyZXR1 cm4gRVJSX1BUUihyZXQpOwogfQogCitzdGF0aWMgdm9pZCBpOTE1X2dlbV9jb250ZXh0X3VucGlu KHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCisJCQkJICAgc3RydWN0IGludGVsX2VuZ2luZV9j cyAqZW5naW5lKQoreworCWlmIChlbmdpbmUtPmlkID09IFJDUyAmJiBjdHgtPmxlZ2FjeV9od19j dHgucmNzX3N0YXRlKQorCQlpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBpbihjdHgtPmxlZ2FjeV9o d19jdHgucmNzX3N0YXRlKTsKKwlpOTE1X2dlbV9jb250ZXh0X3VucmVmZXJlbmNlKGN0eCk7Cit9 CisKIHZvaWQgaTkxNV9nZW1fY29udGV4dF9yZXNldChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQog ewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7 CkBAIC0zMjksMjIgKzMzNywxNSBAQCB2b2lkIGk5MTVfZ2VtX2NvbnRleHRfcmVzZXQoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKIAlpZiAoaTkxNS5lbmFibGVfZXhlY2xpc3RzKSB7CiAJCXN0cnVj dCBpbnRlbF9jb250ZXh0ICpjdHg7CiAKLQkJbGlzdF9mb3JfZWFjaF9lbnRyeShjdHgsICZkZXZf cHJpdi0+Y29udGV4dF9saXN0LCBsaW5rKSB7CisJCWxpc3RfZm9yX2VhY2hfZW50cnkoY3R4LCAm ZGV2X3ByaXYtPmNvbnRleHRfbGlzdCwgbGluaykKIAkJCWludGVsX2xyX2NvbnRleHRfcmVzZXQo ZGV2LCBjdHgpOwotCQl9Ci0KLQkJcmV0dXJuOwogCX0KIAogCWZvciAoaSA9IDA7IGkgPCBJOTE1 X05VTV9SSU5HUzsgaSsrKSB7CiAJCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcgPSAmZGV2 X3ByaXYtPnJpbmdbaV07Ci0JCXN0cnVjdCBpbnRlbF9jb250ZXh0ICpsY3R4ID0gcmluZy0+bGFz dF9jb250ZXh0OwotCi0JCWlmIChsY3R4KSB7Ci0JCQlpZiAobGN0eC0+bGVnYWN5X2h3X2N0eC5y Y3Nfc3RhdGUgJiYgaSA9PSBSQ1MpCi0JCQkJaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5waW4obGN0 eC0+bGVnYWN5X2h3X2N0eC5yY3Nfc3RhdGUpOwogCi0JCQlpOTE1X2dlbV9jb250ZXh0X3VucmVm ZXJlbmNlKGxjdHgpOworCQlpZiAocmluZy0+bGFzdF9jb250ZXh0KSB7CisJCQlpOTE1X2dlbV9j b250ZXh0X3VucGluKHJpbmctPmxhc3RfY29udGV4dCwgcmluZyk7CiAJCQlyaW5nLT5sYXN0X2Nv bnRleHQgPSBOVUxMOwogCQl9CiAJfQpAQCAtNDE3LDEzICs0MTgsNiBAQCB2b2lkIGk5MTVfZ2Vt X2NvbnRleHRfZmluaShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkgKiB0byBvZmZzZXQgdGhl IGRvX3N3aXRjaCBwYXJ0LCBzbyB0aGF0IGk5MTVfZ2VtX2NvbnRleHRfdW5yZWZlcmVuY2UoKQog CQkgKiBjYW4gdGhlbiBmcmVlIHRoZSBiYXNlIG9iamVjdCBjb3JyZWN0bHkuICovCiAJCVdBUk5f T04oIWRldl9wcml2LT5yaW5nW1JDU10ubGFzdF9jb250ZXh0KTsKLQkJaWYgKGRldl9wcml2LT5y aW5nW1JDU10ubGFzdF9jb250ZXh0ID09IGRjdHgpIHsKLQkJCS8qIEZha2Ugc3dpdGNoIHRvIE5V TEwgY29udGV4dCAqLwotCQkJV0FSTl9PTihkY3R4LT5sZWdhY3lfaHdfY3R4LnJjc19zdGF0ZS0+ YWN0aXZlKTsKLQkJCWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKGRjdHgtPmxlZ2FjeV9od19j dHgucmNzX3N0YXRlKTsKLQkJCWk5MTVfZ2VtX2NvbnRleHRfdW5yZWZlcmVuY2UoZGN0eCk7Ci0J CQlkZXZfcHJpdi0+cmluZ1tSQ1NdLmxhc3RfY29udGV4dCA9IE5VTEw7Ci0JCX0KIAogCQlpOTE1 X2dlbV9vYmplY3RfZ2d0dF91bnBpbihkY3R4LT5sZWdhY3lfaHdfY3R4LnJjc19zdGF0ZSk7CiAJ fQpAQCAtNDMyLDcgKzQyNiw3IEBAIHZvaWQgaTkxNV9nZW1fY29udGV4dF9maW5pKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCiAJCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcgPSAmZGV2X3By aXYtPnJpbmdbaV07CiAKIAkJaWYgKHJpbmctPmxhc3RfY29udGV4dCkgewotCQkJaTkxNV9nZW1f Y29udGV4dF91bnJlZmVyZW5jZShyaW5nLT5sYXN0X2NvbnRleHQpOworCQkJaTkxNV9nZW1fY29u dGV4dF91bnBpbihyaW5nLT5sYXN0X2NvbnRleHQsIHJpbmcpOwogCQkJcmluZy0+bGFzdF9jb250 ZXh0ID0gTlVMTDsKIAkJfQogCX0KLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo=