From: Peter Antoine Subject: [PATCH 5/5] drm: Make Legacy Context access functions optional. Date: Thu, 23 Apr 2015 15:07:58 +0100 Message-ID: <1429798078-18987-6-git-send-email-peter.antoine@intel.com> References: <1429798078-18987-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: In-Reply-To: <1429798078-18987-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: airlied@redhat.com, dri-devel@lists.freedesktop.org, daniel.vetter@ffwll.ch List-Id: dri-devel@lists.freedesktop.org QXMgdGhlc2UgZnVuY3Rpb25zIGFyZSBvbmx5IHVzZWQgYnkgb25lIGRyaXZlciBhbmQgdGhlcmUg YXJlIHNlY3VyaXR5IGhvbGVzCmluIHRoZXNlIGZ1bmN0aW9ucy4gTWFrZSB0aGUgZnVuY3Rpb25z IG9wdGlvbmFsLgoKVGhlc2UgY2hhbmdlcyBhcmUgYmFzZWQgb24gdGhlIHR3byBwYXRjaGVzOgog IGNvbW1pdCBjMjFlYjIxY2I1MGQ1OGU3Y2JkY2I4YjllN2ZmNjhiODVjZmE1MDk1CiAgQXV0aG9y OiBEYXZlIEFpcmxpZSA8YWlybGllZEByZWRoYXQuY29tPgoKQW5kIHRoZSBjb21taXQgdGhhdCB0 aGUgYWJvdmUgcGF0Y2ggcmV2ZXJ0czoKICBjb21taXQgN2M1MTAxMzNkOTNkZDZmMTVjYTA0MDcz M2JhN2IyODkxZWQ2MWZkMQogIEF1dGhvcjogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBm ZndsbC5jaD4KClRoaXMgc2hvdWxkIG5vdyB0dXJuIG9mZiB0aGUgY29udGV4dCBmZWF0dXJlLgoK SXNzdWU6IFZJWi01NDg1ClNpZ25lZC1vZmYtYnk6IFBldGVyIEFudG9pbmUgPHBldGVyLmFudG9p bmVAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fY29udGV4dC5jIHwgMzYgKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vZHJtX2Ry di5jICAgICB8IDEyICsrKysrKystLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA0MyBpbnNlcnRpb25z KCspLCA1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fY29u dGV4dC5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9jb250ZXh0LmMKaW5kZXggMWZlYmNkMy4uMDlh ZjI2YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9jb250ZXh0LmMKKysrIGIvZHJp 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+bWFwbGlzdCwgaGVhZCkgewogCQlpZiAocl9saXN0LT5tYXAKQEAgLTMxMSw2ICszMjks OSBAQCBpbnQgZHJtX2xlZ2FjeV9yZXNjdHgoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAq ZGF0YSwKIAlzdHJ1Y3QgZHJtX2N0eCBjdHg7CiAJaW50IGk7CiAKKwlpZiAoIWRybV9jb3JlX2No ZWNrX2ZlYXR1cmUoZGV2LCBEUklWRVJfS01TX0xFR0FDWV9DT05URVhUKSkKKwkJcmV0dXJuIC1F SU5WQUw7CisKIAlpZiAocmVzLT5jb3VudCA+PSBEUk1fUkVTRVJWRURfQ09OVEVYVFMpIHsKIAkJ bWVtc2V0KCZjdHgsIDAsIHNpemVvZihjdHgpKTsKIAkJZm9yIChpID0gMDsgaSA8IERSTV9SRVNF UlZFRF9DT05URVhUUzsgaSsrKSB7CkBAIC0zNDEsNiArMzYyLDkgQEAgaW50IGRybV9sZWdhY3lf YWRkY3R4KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJc3RydWN0IGRybV9j dHhfbGlzdCAqY3R4X2VudHJ5OwogCXN0cnVjdCBkcm1fY3R4ICpjdHggPSBkYXRhOwogCisJaWYg KCFkcm1fY29yZV9jaGVja19mZWF0dXJlKGRldiwgRFJJVkVSX0tNU19MRUdBQ1lfQ09OVEVYVCkp CisJCXJldHVybiAtRUlOVkFMOworCiAJY3R4LT5oYW5kbGUgPSBkcm1fbGVnYWN5X2N0eGJpdG1h cF9uZXh0KGRldik7CiAJaWYgKF9EUk1fTE9DS0lOR19DT05URVhUKGN0eC0+aGFuZGxlKSA9PSBE Uk1fS0VSTkVMX0NPTlRFWFQpIHsKIAkJLyogU2tpcCBrZXJuZWwncyBjb250ZXh0IGFuZCBnZXQg YSBuZXcgb25lLiAqLwpAQCAtMzg0LDYgKzQwOCw5IEBAIGludCBkcm1fbGVnYWN5X2dldGN0eChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogewogCXN0cnVjdCBkcm1fY3R4ICpj dHggPSBkYXRhOwogCisJaWYgKCFkcm1fY29yZV9jaGVja19mZWF0dXJlKGRldiwgRFJJVkVSX0tN U19MRUdBQ1lfQ09OVEVYVCkpCisJCXJldHVybiAtRUlOVkFMOworCiAJLyogVGhpcyBpcyAwLCBi ZWNhdXNlIHdlIGRvbid0IGhhbmRsZSBhbnkgY29udGV4dCBmbGFncyAqLwogCWN0eC0+ZmxhZ3Mg PSAwOwogCkBAIC00MDYsNiArNDMzLDkgQEAgaW50IGRybV9sZWdhY3lfc3dpdGNoY3R4KHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiB7CiAJc3RydWN0IGRybV9jdHggKmN0eCA9 IGRhdGE7CiAKKwlpZiAoIWRybV9jb3JlX2NoZWNrX2ZlYXR1cmUoZGV2LCBEUklWRVJfS01TX0xF R0FDWV9DT05URVhUKSkKKwkJcmV0dXJuIC1FSU5WQUw7CisKIAlEUk1fREVCVUcoIiVkXG4iLCBj dHgtPmhhbmRsZSk7CiAJcmV0dXJuIGRybV9jb250ZXh0X3N3aXRjaChkZXYsIGRldi0+bGFzdF9j b250ZXh0LCBjdHgtPmhhbmRsZSk7CiB9CkBAIC00MjYsNiArNDU2LDkgQEAgaW50IGRybV9sZWdh Y3lfbmV3Y3R4KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiB7CiAJc3RydWN0 IGRybV9jdHggKmN0eCA9IGRhdGE7CiAKKwlpZiAoIWRybV9jb3JlX2NoZWNrX2ZlYXR1cmUoZGV2 LCBEUklWRVJfS01TX0xFR0FDWV9DT05URVhUKSkKKwkJcmV0dXJuIC1FSU5WQUw7CisKIAlEUk1f REVCVUcoIiVkXG4iLCBjdHgtPmhhbmRsZSk7CiAJZHJtX2NvbnRleHRfc3dpdGNoX2NvbXBsZXRl KGRldiwgZmlsZV9wcml2LCBjdHgtPmhhbmRsZSk7CiAKQEAgLTQ0OCw2ICs0ODEsOSBAQCBpbnQg ZHJtX2xlZ2FjeV9ybWN0eChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogewog CXN0cnVjdCBkcm1fY3R4ICpjdHggPSBkYXRhOwogCisJaWYgKCFkcm1fY29yZV9jaGVja19mZWF0 dXJlKGRldiwgRFJJVkVSX0tNU19MRUdBQ1lfQ09OVEVYVCkpCisJCXJldHVybiAtRUlOVkFMOwor CiAJRFJNX0RFQlVHKCIlZFxuIiwgY3R4LT5oYW5kbGUpOwogCWlmIChfRFJNX0xPQ0tJTkdfQ09O VEVYVChjdHgtPmhhbmRsZSkgIT0gRFJNX0tFUk5FTF9DT05URVhUKSB7CiAJCWlmIChkZXYtPmRy aXZlci0+Y29udGV4dF9kdG9yKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9kcnYu YyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZHJ2LmMKaW5kZXggNDhmNzM1OS4uZGM2NjJlOCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9kcnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v ZHJtX2Rydi5jCkBAIC01OTYsMTEgKzU5NiwxMyBAQCBzdHJ1Y3QgZHJtX2RldmljZSAqZHJtX2Rl dl9hbGxvYyhzdHJ1Y3QgZHJtX2RyaXZlciAqZHJpdmVyLAogCWlmIChkcm1faHRfY3JlYXRlKCZk ZXYtPm1hcF9oYXNoLCAxMikpCiAJCWdvdG8gZXJyX21pbm9yczsKIAotCXJldCA9IGRybV9sZWdh Y3lfY3R4Yml0bWFwX2luaXQoZGV2KTsKLQlpZiAocmV0KSB7Ci0JCURSTV9FUlJPUigiQ2Fubm90 IGFsbG9jYXRlIG1lbW9yeSBmb3IgY29udGV4dCBiaXRtYXAuXG4iKTsKLQkJZ290byBlcnJfaHQ7 Ci0JfQorCWlmIChkcm1fY29yZV9jaGVja19mZWF0dXJlKGRldiwgRFJJVkVSX0tNU19MRUdBQ1lf Q09OVEVYVCkpCisJCXJldCA9IGRybV9sZWdhY3lfY3R4Yml0bWFwX2luaXQoZGV2KTsKKwkJaWYg KHJldCkgeworCQkJRFJNX0VSUk9SKAorCQkJCSJDYW5ub3QgYWxsb2NhdGUgbWVtb3J5IGZvciBj b250ZXh0IGJpdG1hcC5cbiIpOworCQkJZ290byBlcnJfaHQ7CisJCX0KIAogCWlmIChkcm1fY29y ZV9jaGVja19mZWF0dXJlKGRldiwgRFJJVkVSX0dFTSkpIHsKIAkJcmV0ID0gZHJtX2dlbV9pbml0 KGRldik7Ci0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK