From mboxrd@z Thu Jan 1 00:00:00 1970 From: oscar.mateo@intel.com Subject: [PATCH 6/6] drm/i915: Kill private_default_ctx off Date: Thu, 22 May 2014 14:13:38 +0100 Message-ID: <1400764418-30061-7-git-send-email-oscar.mateo@intel.com> References: <1400764418-30061-1-git-send-email-oscar.mateo@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [143.182.124.21]) by gabe.freedesktop.org (Postfix) with ESMTP id 05E686EBC5 for ; Thu, 22 May 2014 06:19:24 -0700 (PDT) In-Reply-To: <1400764418-30061-1-git-send-email-oscar.mateo@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 RnJvbTogT3NjYXIgTWF0ZW8gPG9zY2FyLm1hdGVvQGludGVsLmNvbT4KCkl0J3MgYmFyZWx5IGFs aXZlIG5vdyBhbnl3YXksIHNvIGdpdmUgaXQgdGhlICJjb3VwIGRlIGdyw6JjZSIuCgpTaWduZWQt b2ZmLWJ5OiBPc2NhciBNYXRlbyA8b3NjYXIubWF0ZW9AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jICAgICB8ICA3ICsrKystLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgICB8ICAxIC0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2NvbnRleHQuYyB8IDE0ICsrKystLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQs IDggaW5zZXJ0aW9ucygrKSwgMTQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rl YnVnZnMuYwppbmRleCA0ZjBmNjk3Li4zMzNkZDEyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2RlYnVnZnMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rl YnVnZnMuYwpAQCAtMTg1OCw2ICsxODU4LDEwIEBAIHN0YXRpYyBpbnQgcGVyX2ZpbGVfY3R4KGlu dCBpZCwgdm9pZCAqcHRyLCB2b2lkICpkYXRhKQogCXN0cnVjdCBzZXFfZmlsZSAqbSA9IGRhdGE7 CiAJc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0gY3R4X3RvX3BwZ3R0KGN0eCk7CiAKKwlp ZiAoaTkxNV9nZW1fY29udGV4dF9pc19kZWZhdWx0KGN0eCkpCisJCXNlcV9wdXRzKG0sICIgIGRl ZmF1bHQgY29udGV4dDpcbiIpOworCWVsc2UKKwkJc2VxX3ByaW50ZihtLCAiICBjb250ZXh0ICVk OlxuIiwgY3R4LT5pZCk7CiAJcHBndHQtPmRlYnVnX2R1bXAocHBndHQsIG0pOwogCiAJcmV0dXJu IDA7CkBAIC0xOTE3LDEyICsxOTIxLDkgQEAgc3RhdGljIHZvaWQgZ2VuNl9wcGd0dF9pbmZvKHN0 cnVjdCBzZXFfZmlsZSAqbSwgc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAogCWxpc3RfZm9yX2Vh Y2hfZW50cnlfcmV2ZXJzZShmaWxlLCAmZGV2LT5maWxlbGlzdCwgbGhlYWQpIHsKIAkJc3RydWN0 IGRybV9pOTE1X2ZpbGVfcHJpdmF0ZSAqZmlsZV9wcml2ID0gZmlsZS0+ZHJpdmVyX3ByaXY7Ci0J CXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwdnRfcHBndHQ7CiAKLQkJcHZ0X3BwZ3R0ID0gY3R4X3Rv X3BwZ3R0KGZpbGVfcHJpdi0+cHJpdmF0ZV9kZWZhdWx0X2N0eCk7CiAJCXNlcV9wcmludGYobSwg InByb2M6ICVzXG4iLAogCQkJICAgZ2V0X3BpZF90YXNrKGZpbGUtPnBpZCwgUElEVFlQRV9QSUQp LT5jb21tKTsKLQkJc2VxX3B1dHMobSwgIiAgZGVmYXVsdCBjb250ZXh0OlxuIik7CiAJCWlkcl9m b3JfZWFjaCgmZmlsZV9wcml2LT5jb250ZXh0X2lkciwgcGVyX2ZpbGVfY3R4LCBtKTsKIAl9CiAJ c2VxX3ByaW50ZihtLCAiRUNPQ0hLOiAweCUwOHhcbiIsIEk5MTVfUkVBRChHQU1fRUNPQ0hLKSk7 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCBiOWFiOTUwLi5kYWE5NGM1IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmgKQEAgLTE3NjUsNyArMTc2NSw2IEBAIHN0cnVjdCBkcm1faTkxNV9maWxl X3ByaXZhdGUgewogCX0gbW07CiAJc3RydWN0IGlkciBjb250ZXh0X2lkcjsKIAotCXN0cnVjdCBp bnRlbF9jb250ZXh0ICpwcml2YXRlX2RlZmF1bHRfY3R4OwogCWF0b21pY190IHJwc193YWl0X2Jv b3N0OwogCXN0cnVjdCAgaW50ZWxfZW5naW5lX2NzICpic2RfcmluZzsKIH07CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKaW5kZXggMjEwMGY2ZS4uM2ZmZTMwOCAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYwpAQCAtNDk3LDEwICs0OTcsNiBAQCBz dGF0aWMgaW50IGNvbnRleHRfaWRyX2NsZWFudXAoaW50IGlkLCB2b2lkICpwLCB2b2lkICpkYXRh KQogewogCXN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHggPSBwOwogCi0JLyogSWdub3JlIHRoZSBk ZWZhdWx0IGNvbnRleHQgYmVjYXVzZSBjbG9zZSB3aWxsIGhhbmRsZSBpdCAqLwotCWlmIChpOTE1 X2dlbV9jb250ZXh0X2lzX2RlZmF1bHQoY3R4KSkKLQkJcmV0dXJuIDA7Ci0KIAlpOTE1X2dlbV9j b250ZXh0X3VucmVmZXJlbmNlKGN0eCk7CiAJcmV0dXJuIDA7CiB9CkBAIC01MDgsMTcgKzUwNCwx NyBAQCBzdGF0aWMgaW50IGNvbnRleHRfaWRyX2NsZWFudXAoaW50IGlkLCB2b2lkICpwLCB2b2lk ICpkYXRhKQogaW50IGk5MTVfZ2VtX2NvbnRleHRfb3BlbihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpCiB7CiAJc3RydWN0IGRybV9pOTE1X2ZpbGVfcHJpdmF0 ZSAqZmlsZV9wcml2ID0gZmlsZS0+ZHJpdmVyX3ByaXY7CisJc3RydWN0IGludGVsX2NvbnRleHQg KmN0eDsKIAogCWlkcl9pbml0KCZmaWxlX3ByaXYtPmNvbnRleHRfaWRyKTsKIAogCW11dGV4X2xv Y2soJmRldi0+c3RydWN0X211dGV4KTsKLQlmaWxlX3ByaXYtPnByaXZhdGVfZGVmYXVsdF9jdHgg PQotCQlpOTE1X2dlbV9jcmVhdGVfY29udGV4dChkZXYsIGZpbGVfcHJpdiwgVVNFU19GVUxMX1BQ R1RUKGRldikpOworCWN0eCA9IGk5MTVfZ2VtX2NyZWF0ZV9jb250ZXh0KGRldiwgZmlsZV9wcml2 LCBVU0VTX0ZVTExfUFBHVFQoZGV2KSk7CiAJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRl eCk7CiAKLQlpZiAoSVNfRVJSKGZpbGVfcHJpdi0+cHJpdmF0ZV9kZWZhdWx0X2N0eCkpIHsKKwlp ZiAoSVNfRVJSKGN0eCkpIHsKIAkJaWRyX2Rlc3Ryb3koJmZpbGVfcHJpdi0+Y29udGV4dF9pZHIp OwotCQlyZXR1cm4gUFRSX0VSUihmaWxlX3ByaXYtPnByaXZhdGVfZGVmYXVsdF9jdHgpOworCQly ZXR1cm4gUFRSX0VSUihjdHgpOwogCX0KIAogCXJldHVybiAwOwpAQCAtNTMwLDggKzUyNiw2IEBA IHZvaWQgaTkxNV9nZW1fY29udGV4dF9jbG9zZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1 Y3QgZHJtX2ZpbGUgKmZpbGUpCiAKIAlpZHJfZm9yX2VhY2goJmZpbGVfcHJpdi0+Y29udGV4dF9p ZHIsIGNvbnRleHRfaWRyX2NsZWFudXAsIE5VTEwpOwogCWlkcl9kZXN0cm95KCZmaWxlX3ByaXYt PmNvbnRleHRfaWRyKTsKLQotCWk5MTVfZ2VtX2NvbnRleHRfdW5yZWZlcmVuY2UoZmlsZV9wcml2 LT5wcml2YXRlX2RlZmF1bHRfY3R4KTsKIH0KIAogc3RydWN0IGludGVsX2NvbnRleHQgKgotLSAK MS45LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==