From: Peter Antoine Subject: [PATCH v2 2/2] drm: Make Legacy Context access functions optional. Date: Wed, 13 May 2015 07:54:48 +0100 Message-ID: <1431500088-15278-3-git-send-email-peter.antoine@intel.com> References: <1429798078-18987-1-git-send-email-peter.antoine@intel.com> <1431500088-15278-1-git-send-email-peter.antoine@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id F24026E6F8 for ; Tue, 12 May 2015 23:55:14 -0700 (PDT) In-Reply-To: <1431500088-15278-1-git-send-email-peter.antoine@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 Cc: daniel.vetter@ffwll.ch List-Id: intel-gfx@lists.freedesktop.org QXMgdGhlc2UgZnVuY3Rpb25zIGFyZSBvbmx5IHVzZWQgYnkgb25lIGRyaXZlciBhbmQgdGhlcmUg YXJlIHNlY3VyaXR5IGhvbGVzCmluIHRoZXNlIGZ1bmN0aW9ucy4gTWFrZSB0aGUgZnVuY3Rpb25z IG9wdGlvbmFsLgoKVGhlc2UgY2hhbmdlcyBhcmUgYmFzZWQgb24gdGhlIHR3byBwYXRjaGVzOgog IGNvbW1pdCBjMjFlYjIxY2I1MGQ1OGU3Y2JkY2I4YjllN2ZmNjhiODVjZmE1MDk1CiAgQXV0aG9y OiBEYXZlIEFpcmxpZSA8YWlybGllZEByZWRoYXQuY29tPgoKQW5kIHRoZSBjb21taXQgdGhhdCB0 aGUgYWJvdmUgcGF0Y2ggcmV2ZXJ0czoKICBjb21taXQgN2M1MTAxMzNkOTNkZDZmMTVjYTA0MDcz M2JhN2IyODkxZWQ2MWZkMQogIEF1dGhvcjogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBm ZndsbC5jaD4KClRoaXMgc2hvdWxkIG5vdyB0dXJuIG9mZiB0aGUgY29udGV4dCBmZWF0dXJlLgoK SXNzdWU6IFZJWi01NDg1ClNpZ25lZC1vZmYtYnk6IFBldGVyIEFudG9pbmUgPHBldGVyLmFudG9p bmVAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fY29udGV4dC5jIHwgMzYgKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vZHJtX2Ry di5jICAgICB8IDEyICsrKysrKystLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA0MyBpbnNlcnRpb25z KCspLCA1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fY29u dGV4dC5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9jb250ZXh0LmMKaW5kZXggOWIyMzUyNS4uNTc0 YmUyYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9jb250ZXh0LmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2RybV9jb250ZXh0LmMKQEAgLTUzLDYgKzUzLDkgQEAgc3RydWN0IGRybV9j dHhfbGlzdCB7CiAgKi8KIHZvaWQgZHJtX2xlZ2FjeV9jdHhiaXRtYXBfZnJlZShzdHJ1Y3QgZHJt X2RldmljZSAqIGRldiwgaW50IGN0eF9oYW5kbGUpCiB7CisJaWYgKCFkcm1fY29yZV9jaGVja19m ZWF0dXJlKGRldiwgRFJJVkVSX0tNU19MRUdBQ1lfQ09OVEVYVCkpCisJCXJldHVybiAtRUlOVkFM OworCiAJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCWlkcl9yZW1vdmUoJmRldi0+ Y3R4X2lkciwgY3R4X2hhbmRsZSk7CiAJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7 CkBAIC04Nyw2ICs5MCw5IEBAIHN0YXRpYyBpbnQgZHJtX2xlZ2FjeV9jdHhiaXRtYXBfbmV4dChz dHJ1Y3QgZHJtX2RldmljZSAqIGRldikKICAqLwogaW50IGRybV9sZWdhY3lfY3R4Yml0bWFwX2lu aXQoc3RydWN0IGRybV9kZXZpY2UgKiBkZXYpCiB7CisJaWYgKCFkcm1fY29yZV9jaGVja19mZWF0 dXJlKGRldiwgRFJJVkVSX0tNU19MRUdBQ1lfQ09OVEVYVCkpCisJCXJldHVybiAtRUlOVkFMOwor CiAJaWRyX2luaXQoJmRldi0+Y3R4X2lkcik7CiAJcmV0dXJuIDA7CiB9CkBAIC0xMDEsNiArMTA3 LDkgQEAgaW50IGRybV9sZWdhY3lfY3R4Yml0bWFwX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKiBk ZXYpCiAgKi8KIHZvaWQgZHJtX2xlZ2FjeV9jdHhiaXRtYXBfY2xlYW51cChzdHJ1Y3QgZHJtX2Rl dmljZSAqIGRldikKIHsKKwlpZiAoIWRybV9jb3JlX2NoZWNrX2ZlYXR1cmUoZGV2LCBEUklWRVJf S01TX0xFR0FDWV9DT05URVhUKSkKKwkJcmV0dXJuIC1FSU5WQUw7CisKIAltdXRleF9sb2NrKCZk ZXYtPnN0cnVjdF9tdXRleCk7CiAJaWRyX2Rlc3Ryb3koJmRldi0+Y3R4X2lkcik7CiAJbXV0ZXhf dW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CkBAIC0xMTksNiArMTI4LDkgQEAgdm9pZCBkcm1f bGVnYWN5X2N0eGJpdG1hcF9mbHVzaChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJt X2ZpbGUgKmZpbGUpCiB7CiAJc3RydWN0IGRybV9jdHhfbGlzdCAqcG9zLCAqdG1wOwogCisJaWYg KCFkcm1fY29yZV9jaGVja19mZWF0dXJlKGRldiwgRFJJVkVSX0tNU19MRUdBQ1lfQ09OVEVYVCkp CisJCXJldHVybiAtRUlOVkFMOworCiAJbXV0ZXhfbG9jaygmZGV2LT5jdHhsaXN0X211dGV4KTsK IAogCWxpc3RfZm9yX2VhY2hfZW50cnlfc2FmZShwb3MsIHRtcCwgJmRldi0+Y3R4bGlzdCwgaGVh ZCkgewpAQCAtMTYxLDYgKzE3Myw5IEBAIGludCBkcm1fbGVnYWN5X2dldHNhcmVhY3R4KHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJc3RydWN0IGRybV9sb2NhbF9tYXAgKm1h cDsKIAlzdHJ1Y3QgZHJtX21hcF9saXN0ICpfZW50cnk7CiAKKwlpZiAoIWRybV9jb3JlX2NoZWNr X2ZlYXR1cmUoZGV2LCBEUklWRVJfS01TX0xFR0FDWV9DT05URVhUKSkKKwkJcmV0dXJuIC1FSU5W QUw7CisKIAltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAKIAltYXAgPSBpZHJfZmlu ZCgmZGV2LT5jdHhfaWRyLCByZXF1ZXN0LT5jdHhfaWQpOwpAQCAtMjA1LDYgKzIyMCw5IEBAIGlu dCBkcm1fbGVnYWN5X3NldHNhcmVhY3R4KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRh dGEsCiAJc3RydWN0IGRybV9sb2NhbF9tYXAgKm1hcCA9IE5VTEw7CiAJc3RydWN0IGRybV9tYXBf bGlzdCAqcl9saXN0ID0gTlVMTDsKIAorCWlmICghZHJtX2NvcmVfY2hlY2tfZmVhdHVyZShkZXYs IERSSVZFUl9LTVNfTEVHQUNZX0NPTlRFWFQpKQorCQlyZXR1cm4gLUVJTlZBTDsKKwogCW11dGV4 X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KHJfbGlzdCwg JmRldi0+bWFwbGlzdCwgaGVhZCkgewogCQlpZiAocl9saXN0LT5tYXAKQEAgLTMwNSw2ICszMjMs OSBAQCBpbnQgZHJtX2xlZ2FjeV9yZXNjdHgoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAq ZGF0YSwKIAlzdHJ1Y3QgZHJtX2N0eCBjdHg7CiAJaW50IGk7CiAKKwlpZiAoIWRybV9jb3JlX2No ZWNrX2ZlYXR1cmUoZGV2LCBEUklWRVJfS01TX0xFR0FDWV9DT05URVhUKSkKKwkJcmV0dXJuIC1F SU5WQUw7CisKIAlpZiAocmVzLT5jb3VudCA+PSBEUk1fUkVTRVJWRURfQ09OVEVYVFMpIHsKIAkJ bWVtc2V0KCZjdHgsIDAsIHNpemVvZihjdHgpKTsKIAkJZm9yIChpID0gMDsgaSA8IERSTV9SRVNF UlZFRF9DT05URVhUUzsgaSsrKSB7CkBAIC0zMzUsNiArMzU2LDkgQEAgaW50IGRybV9sZWdhY3lf YWRkY3R4KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJc3RydWN0IGRybV9j dHhfbGlzdCAqY3R4X2VudHJ5OwogCXN0cnVjdCBkcm1fY3R4ICpjdHggPSBkYXRhOwogCisJaWYg KCFkcm1fY29yZV9jaGVja19mZWF0dXJlKGRldiwgRFJJVkVSX0tNU19MRUdBQ1lfQ09OVEVYVCkp CisJCXJldHVybiAtRUlOVkFMOworCiAJY3R4LT5oYW5kbGUgPSBkcm1fbGVnYWN5X2N0eGJpdG1h cF9uZXh0KGRldik7CiAJaWYgKGN0eC0+aGFuZGxlID09IERSTV9LRVJORUxfQ09OVEVYVCkgewog CQkvKiBTa2lwIGtlcm5lbCdzIGNvbnRleHQgYW5kIGdldCBhIG5ldyBvbmUuICovCkBAIC0zNzgs NiArNDAyLDkgQEAgaW50IGRybV9sZWdhY3lfZ2V0Y3R4KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs IHZvaWQgKmRhdGEsCiB7CiAJc3RydWN0IGRybV9jdHggKmN0eCA9IGRhdGE7CiAKKwlpZiAoIWRy bV9jb3JlX2NoZWNrX2ZlYXR1cmUoZGV2LCBEUklWRVJfS01TX0xFR0FDWV9DT05URVhUKSkKKwkJ cmV0dXJuIC1FSU5WQUw7CisKIAkvKiBUaGlzIGlzIDAsIGJlY2F1c2Ugd2UgZG9uJ3QgaGFuZGxl IGFueSBjb250ZXh0IGZsYWdzICovCiAJY3R4LT5mbGFncyA9IDA7CiAKQEAgLTQwMCw2ICs0Mjcs OSBAQCBpbnQgZHJtX2xlZ2FjeV9zd2l0Y2hjdHgoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9p ZCAqZGF0YSwKIHsKIAlzdHJ1Y3QgZHJtX2N0eCAqY3R4ID0gZGF0YTsKIAorCWlmICghZHJtX2Nv cmVfY2hlY2tfZmVhdHVyZShkZXYsIERSSVZFUl9LTVNfTEVHQUNZX0NPTlRFWFQpKQorCQlyZXR1 cm4gLUVJTlZBTDsKKwogCURSTV9ERUJVRygiJWRcbiIsIGN0eC0+aGFuZGxlKTsKIAlyZXR1cm4g ZHJtX2NvbnRleHRfc3dpdGNoKGRldiwgZGV2LT5sYXN0X2NvbnRleHQsIGN0eC0+aGFuZGxlKTsK IH0KQEAgLTQyMCw2ICs0NTAsOSBAQCBpbnQgZHJtX2xlZ2FjeV9uZXdjdHgoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIHsKIAlzdHJ1Y3QgZHJtX2N0eCAqY3R4ID0gZGF0YTsK IAorCWlmICghZHJtX2NvcmVfY2hlY2tfZmVhdHVyZShkZXYsIERSSVZFUl9LTVNfTEVHQUNZX0NP TlRFWFQpKQorCQlyZXR1cm4gLUVJTlZBTDsKKwogCURSTV9ERUJVRygiJWRcbiIsIGN0eC0+aGFu ZGxlKTsKIAlkcm1fY29udGV4dF9zd2l0Y2hfY29tcGxldGUoZGV2LCBmaWxlX3ByaXYsIGN0eC0+ aGFuZGxlKTsKIApAQCAtNDQyLDYgKzQ3NSw5IEBAIGludCBkcm1fbGVnYWN5X3JtY3R4KHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiB7CiAJc3RydWN0IGRybV9jdHggKmN0eCA9 IGRhdGE7CiAKKwlpZiAoIWRybV9jb3JlX2NoZWNrX2ZlYXR1cmUoZGV2LCBEUklWRVJfS01TX0xF R0FDWV9DT05URVhUKSkKKwkJcmV0dXJuIC1FSU5WQUw7CisKIAlEUk1fREVCVUcoIiVkXG4iLCBj dHgtPmhhbmRsZSk7CiAJaWYgKGN0eC0+aGFuZGxlICE9IERSTV9LRVJORUxfQ09OVEVYVCkgewog CQlpZiAoZGV2LT5kcml2ZXItPmNvbnRleHRfZHRvcikKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9kcm1fZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2Rydi5jCmluZGV4IDNiM2M0ZjUu LjFkZTJkZjggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fZHJ2LmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2RybV9kcnYuYwpAQCAtNTg0LDExICs1ODQsMTMgQEAgc3RydWN0IGRybV9k ZXZpY2UgKmRybV9kZXZfYWxsb2Moc3RydWN0IGRybV9kcml2ZXIgKmRyaXZlciwKIAlpZiAoZHJt X2h0X2NyZWF0ZSgmZGV2LT5tYXBfaGFzaCwgMTIpKQogCQlnb3RvIGVycl9taW5vcnM7CiAKLQly ZXQgPSBkcm1fbGVnYWN5X2N0eGJpdG1hcF9pbml0KGRldik7Ci0JaWYgKHJldCkgewotCQlEUk1f RVJST1IoIkNhbm5vdCBhbGxvY2F0ZSBtZW1vcnkgZm9yIGNvbnRleHQgYml0bWFwLlxuIik7Ci0J CWdvdG8gZXJyX2h0OwotCX0KKwlpZiAoZHJtX2NvcmVfY2hlY2tfZmVhdHVyZShkZXYsIERSSVZF Ul9LTVNfTEVHQUNZX0NPTlRFWFQpKQorCQlyZXQgPSBkcm1fbGVnYWN5X2N0eGJpdG1hcF9pbml0 KGRldik7CisJCWlmIChyZXQpIHsKKwkJCURSTV9FUlJPUigKKwkJCQkiQ2Fubm90IGFsbG9jYXRl IG1lbW9yeSBmb3IgY29udGV4dCBiaXRtYXAuXG4iKTsKKwkJCWdvdG8gZXJyX2h0OworCQl9CiAK IAlpZiAoZHJtX2NvcmVfY2hlY2tfZmVhdHVyZShkZXYsIERSSVZFUl9HRU0pKSB7CiAJCXJldCA9 IGRybV9nZW1faW5pdChkZXYpOwotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vaW50ZWwtZ2Z4Cg==