From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH v2 2/2] drm: Make Legacy Context access functions optional. Date: Wed, 13 May 2015 09:19:09 +0200 Message-ID: <20150513071909.GS15256@phenom.ffwll.local> References: <1429798078-18987-1-git-send-email-peter.antoine@intel.com> <1431500088-15278-1-git-send-email-peter.antoine@intel.com> <1431500088-15278-3-git-send-email-peter.antoine@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <1431500088-15278-3-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: Peter Antoine Cc: daniel.vetter@ffwll.ch, intel-gfx@lists.freedesktop.org, DRI Development List-Id: dri-devel@lists.freedesktop.org T24gV2VkLCBNYXkgMTMsIDIwMTUgYXQgMDc6NTQ6NDhBTSArMDEwMCwgUGV0ZXIgQW50b2luZSB3 cm90ZToKPiBBcyB0aGVzZSBmdW5jdGlvbnMgYXJlIG9ubHkgdXNlZCBieSBvbmUgZHJpdmVyIGFu ZCB0aGVyZSBhcmUgc2VjdXJpdHkgaG9sZXMKPiBpbiB0aGVzZSBmdW5jdGlvbnMuIE1ha2UgdGhl IGZ1bmN0aW9ucyBvcHRpb25hbC4KPiAKPiBUaGVzZSBjaGFuZ2VzIGFyZSBiYXNlZCBvbiB0aGUg dHdvIHBhdGNoZXM6Cj4gICBjb21taXQgYzIxZWIyMWNiNTBkNThlN2NiZGNiOGI5ZTdmZjY4Yjg1 Y2ZhNTA5NQo+ICAgQXV0aG9yOiBEYXZlIEFpcmxpZSA8YWlybGllZEByZWRoYXQuY29tPgo+IAo+ IEFuZCB0aGUgY29tbWl0IHRoYXQgdGhlIGFib3ZlIHBhdGNoIHJldmVydHM6Cj4gICBjb21taXQg N2M1MTAxMzNkOTNkZDZmMTVjYTA0MDczM2JhN2IyODkxZWQ2MWZkMQo+ICAgQXV0aG9yOiBEYW5p ZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgo+IAo+IFRoaXMgc2hvdWxkIG5vdyB0 dXJuIG9mZiB0aGUgY29udGV4dCBmZWF0dXJlLgo+IAo+IElzc3VlOiBWSVotNTQ4NQo+IFNpZ25l ZC1vZmYtYnk6IFBldGVyIEFudG9pbmUgPHBldGVyLmFudG9pbmVAaW50ZWwuY29tPgoKUGxlYXNl IGNjIGRybSBjb3JlIHBhdGNoZXMgdG8gZHJpLWRldmVsLiBSZXZpZXcgYmVsb3cuCi1EYW5pZWwK Cj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9kcm1fY29udGV4dC5jIHwgMzYgKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrCj4gIGRyaXZlcnMvZ3B1L2RybS9kcm1fZHJ2LmMgICAg IHwgMTIgKysrKysrKy0tLS0tCj4gIDIgZmlsZXMgY2hhbmdlZCwgNDMgaW5zZXJ0aW9ucygrKSwg NSBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9jb250 ZXh0LmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2NvbnRleHQuYwo+IGluZGV4IDliMjM1MjUuLjU3 NGJlMmEgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9jb250ZXh0LmMKPiArKysg Yi9kcml2ZXJzL2dwdS9kcm0vZHJtX2NvbnRleHQuYwo+IEBAIC01Myw2ICs1Myw5IEBAIHN0cnVj dCBkcm1fY3R4X2xpc3Qgewo+ICAgKi8KPiAgdm9pZCBkcm1fbGVnYWN5X2N0eGJpdG1hcF9mcmVl KHN0cnVjdCBkcm1fZGV2aWNlICogZGV2LCBpbnQgY3R4X2hhbmRsZSkKPiAgewo+ICsJaWYgKCFk cm1fY29yZV9jaGVja19mZWF0dXJlKGRldiwgRFJJVkVSX0tNU19MRUdBQ1lfQ09OVEVYVCkpCj4g KwkJcmV0dXJuIC1FSU5WQUw7CgpUaGlzIGRvZXNuJ3QgY29tcGlsZSB0b28gd2VsbC4gQWxzbyBs aWtlIHdpdGggdGhlIHByZXZpb3VzIHBhdGNoLCBkcml2ZXJzCndpdGhvdXQgRFJJVkVSX01PREVT RVQgc3RpbGwgbmVlZCB0aGVzZSBpb2N0bHMuCgo+ICsKPiAgCW11dGV4X2xvY2soJmRldi0+c3Ry dWN0X211dGV4KTsKPiAgCWlkcl9yZW1vdmUoJmRldi0+Y3R4X2lkciwgY3R4X2hhbmRsZSk7Cj4g IAltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKPiBAQCAtODcsNiArOTAsOSBAQCBz dGF0aWMgaW50IGRybV9sZWdhY3lfY3R4Yml0bWFwX25leHQoc3RydWN0IGRybV9kZXZpY2UgKiBk ZXYpCj4gICAqLwo+ICBpbnQgZHJtX2xlZ2FjeV9jdHhiaXRtYXBfaW5pdChzdHJ1Y3QgZHJtX2Rl dmljZSAqIGRldikKPiAgewo+ICsJaWYgKCFkcm1fY29yZV9jaGVja19mZWF0dXJlKGRldiwgRFJJ VkVSX0tNU19MRUdBQ1lfQ09OVEVYVCkpCj4gKwkJcmV0dXJuIC1FSU5WQUw7CgpUaGlzIGlzIHJl ZHVuZGFudCB3aXRoIHRoZSBjaGVjayB5b3UndmUgYWRkZWQgYXJvdW5kIHRoZSBjYWxsZXIuIExv b2tpbmcKYXQgb3RoZXIgcGxhY2VzIHdyYXBwaW5nIGNhbGxlcnMgb2YgX2xlZ2FjeV8gZnVuY3Rp b25zIHdpdGggdGhlc2UgY2hlY2tzCmlzIHRoZSBtb3JlIGNvbW1vbiBwYXR0ZXJuIGluIGRybS4K Cj4gKwo+ICAJaWRyX2luaXQoJmRldi0+Y3R4X2lkcik7Cj4gIAlyZXR1cm4gMDsKPiAgfQo+IEBA IC0xMDEsNiArMTA3LDkgQEAgaW50IGRybV9sZWdhY3lfY3R4Yml0bWFwX2luaXQoc3RydWN0IGRy bV9kZXZpY2UgKiBkZXYpCj4gICAqLwo+ICB2b2lkIGRybV9sZWdhY3lfY3R4Yml0bWFwX2NsZWFu dXAoc3RydWN0IGRybV9kZXZpY2UgKiBkZXYpCj4gIHsKPiArCWlmICghZHJtX2NvcmVfY2hlY2tf ZmVhdHVyZShkZXYsIERSSVZFUl9LTVNfTEVHQUNZX0NPTlRFWFQpKQo+ICsJCXJldHVybiAtRUlO VkFMOwoKU2FtZSBpc3N1ZSB3aXRoIGNvbXBpbGluZy4gQW5kIHByb2JhYmx5IGJldHRlciB0byBt b3ZlIHRoZSBjaGVjayBvdXQgaW50bwpjYWxsZXJzLgoKPiArCj4gIAltdXRleF9sb2NrKCZkZXYt PnN0cnVjdF9tdXRleCk7Cj4gIAlpZHJfZGVzdHJveSgmZGV2LT5jdHhfaWRyKTsKPiAgCW11dGV4 X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwo+IEBAIC0xMTksNiArMTI4LDkgQEAgdm9pZCBk cm1fbGVnYWN5X2N0eGJpdG1hcF9mbHVzaChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3Qg ZHJtX2ZpbGUgKmZpbGUpCj4gIHsKPiAgCXN0cnVjdCBkcm1fY3R4X2xpc3QgKnBvcywgKnRtcDsK PiAgCj4gKwlpZiAoIWRybV9jb3JlX2NoZWNrX2ZlYXR1cmUoZGV2LCBEUklWRVJfS01TX0xFR0FD WV9DT05URVhUKSkKPiArCQlyZXR1cm4gLUVJTlZBTDsKClNhbWUgYXMgYWJvdmUuCgo+ICsKPiAg CW11dGV4X2xvY2soJmRldi0+Y3R4bGlzdF9tdXRleCk7Cj4gIAo+ICAJbGlzdF9mb3JfZWFjaF9l bnRyeV9zYWZlKHBvcywgdG1wLCAmZGV2LT5jdHhsaXN0LCBoZWFkKSB7Cj4gQEAgLTE2MSw2ICsx NzMsOSBAQCBpbnQgZHJtX2xlZ2FjeV9nZXRzYXJlYWN0eChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LCB2b2lkICpkYXRhLAo+ICAJc3RydWN0IGRybV9sb2NhbF9tYXAgKm1hcDsKPiAgCXN0cnVjdCBk cm1fbWFwX2xpc3QgKl9lbnRyeTsKPiAgCj4gKwlpZiAoIWRybV9jb3JlX2NoZWNrX2ZlYXR1cmUo ZGV2LCBEUklWRVJfS01TX0xFR0FDWV9DT05URVhUKSkKPiArCQlyZXR1cm4gLUVJTlZBTDsKPiAr Cj4gIAltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Cj4gIAo+ICAJbWFwID0gaWRyX2Zp bmQoJmRldi0+Y3R4X2lkciwgcmVxdWVzdC0+Y3R4X2lkKTsKPiBAQCAtMjA1LDYgKzIyMCw5IEBA IGludCBkcm1fbGVnYWN5X3NldHNhcmVhY3R4KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQg KmRhdGEsCj4gIAlzdHJ1Y3QgZHJtX2xvY2FsX21hcCAqbWFwID0gTlVMTDsKPiAgCXN0cnVjdCBk cm1fbWFwX2xpc3QgKnJfbGlzdCA9IE5VTEw7Cj4gIAo+ICsJaWYgKCFkcm1fY29yZV9jaGVja19m ZWF0dXJlKGRldiwgRFJJVkVSX0tNU19MRUdBQ1lfQ09OVEVYVCkpCj4gKwkJcmV0dXJuIC1FSU5W QUw7Cj4gKwo+ICAJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwo+ICAJbGlzdF9mb3Jf ZWFjaF9lbnRyeShyX2xpc3QsICZkZXYtPm1hcGxpc3QsIGhlYWQpIHsKPiAgCQlpZiAocl9saXN0 LT5tYXAKPiBAQCAtMzA1LDYgKzMyMyw5IEBAIGludCBkcm1fbGVnYWN5X3Jlc2N0eChzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAo+ICAJc3RydWN0IGRybV9jdHggY3R4Owo+ICAJ aW50IGk7Cj4gIAo+ICsJaWYgKCFkcm1fY29yZV9jaGVja19mZWF0dXJlKGRldiwgRFJJVkVSX0tN U19MRUdBQ1lfQ09OVEVYVCkpCj4gKwkJcmV0dXJuIC1FSU5WQUw7Cj4gKwo+ICAJaWYgKHJlcy0+ Y291bnQgPj0gRFJNX1JFU0VSVkVEX0NPTlRFWFRTKSB7Cj4gIAkJbWVtc2V0KCZjdHgsIDAsIHNp emVvZihjdHgpKTsKPiAgCQlmb3IgKGkgPSAwOyBpIDwgRFJNX1JFU0VSVkVEX0NPTlRFWFRTOyBp KyspIHsKPiBAQCAtMzM1LDYgKzM1Niw5IEBAIGludCBkcm1fbGVnYWN5X2FkZGN0eChzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAo+ICAJc3RydWN0IGRybV9jdHhfbGlzdCAqY3R4 X2VudHJ5Owo+ICAJc3RydWN0IGRybV9jdHggKmN0eCA9IGRhdGE7Cj4gIAo+ICsJaWYgKCFkcm1f Y29yZV9jaGVja19mZWF0dXJlKGRldiwgRFJJVkVSX0tNU19MRUdBQ1lfQ09OVEVYVCkpCj4gKwkJ cmV0dXJuIC1FSU5WQUw7Cj4gKwo+ICAJY3R4LT5oYW5kbGUgPSBkcm1fbGVnYWN5X2N0eGJpdG1h cF9uZXh0KGRldik7Cj4gIAlpZiAoY3R4LT5oYW5kbGUgPT0gRFJNX0tFUk5FTF9DT05URVhUKSB7 Cj4gIAkJLyogU2tpcCBrZXJuZWwncyBjb250ZXh0IGFuZCBnZXQgYSBuZXcgb25lLiAqLwo+IEBA IC0zNzgsNiArNDAyLDkgQEAgaW50IGRybV9sZWdhY3lfZ2V0Y3R4KHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsIHZvaWQgKmRhdGEsCj4gIHsKPiAgCXN0cnVjdCBkcm1fY3R4ICpjdHggPSBkYXRhOwo+ ICAKPiArCWlmICghZHJtX2NvcmVfY2hlY2tfZmVhdHVyZShkZXYsIERSSVZFUl9LTVNfTEVHQUNZ X0NPTlRFWFQpKQo+ICsJCXJldHVybiAtRUlOVkFMOwo+ICsKPiAgCS8qIFRoaXMgaXMgMCwgYmVj YXVzZSB3ZSBkb24ndCBoYW5kbGUgYW55IGNvbnRleHQgZmxhZ3MgKi8KPiAgCWN0eC0+ZmxhZ3Mg PSAwOwo+ICAKPiBAQCAtNDAwLDYgKzQyNyw5IEBAIGludCBkcm1fbGVnYWN5X3N3aXRjaGN0eChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAo+ICB7Cj4gIAlzdHJ1Y3QgZHJtX2N0 eCAqY3R4ID0gZGF0YTsKPiAgCj4gKwlpZiAoIWRybV9jb3JlX2NoZWNrX2ZlYXR1cmUoZGV2LCBE UklWRVJfS01TX0xFR0FDWV9DT05URVhUKSkKPiArCQlyZXR1cm4gLUVJTlZBTDsKPiArCj4gIAlE Uk1fREVCVUcoIiVkXG4iLCBjdHgtPmhhbmRsZSk7Cj4gIAlyZXR1cm4gZHJtX2NvbnRleHRfc3dp dGNoKGRldiwgZGV2LT5sYXN0X2NvbnRleHQsIGN0eC0+aGFuZGxlKTsKPiAgfQo+IEBAIC00MjAs NiArNDUwLDkgQEAgaW50IGRybV9sZWdhY3lfbmV3Y3R4KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs IHZvaWQgKmRhdGEsCj4gIHsKPiAgCXN0cnVjdCBkcm1fY3R4ICpjdHggPSBkYXRhOwo+ICAKPiAr CWlmICghZHJtX2NvcmVfY2hlY2tfZmVhdHVyZShkZXYsIERSSVZFUl9LTVNfTEVHQUNZX0NPTlRF WFQpKQo+ICsJCXJldHVybiAtRUlOVkFMOwo+ICsKPiAgCURSTV9ERUJVRygiJWRcbiIsIGN0eC0+ aGFuZGxlKTsKPiAgCWRybV9jb250ZXh0X3N3aXRjaF9jb21wbGV0ZShkZXYsIGZpbGVfcHJpdiwg Y3R4LT5oYW5kbGUpOwo+ICAKPiBAQCAtNDQyLDYgKzQ3NSw5IEBAIGludCBkcm1fbGVnYWN5X3Jt Y3R4KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCj4gIHsKPiAgCXN0cnVjdCBk cm1fY3R4ICpjdHggPSBkYXRhOwo+ICAKPiArCWlmICghZHJtX2NvcmVfY2hlY2tfZmVhdHVyZShk ZXYsIERSSVZFUl9LTVNfTEVHQUNZX0NPTlRFWFQpKQo+ICsJCXJldHVybiAtRUlOVkFMOwo+ICsK PiAgCURSTV9ERUJVRygiJWRcbiIsIGN0eC0+aGFuZGxlKTsKPiAgCWlmIChjdHgtPmhhbmRsZSAh PSBEUk1fS0VSTkVMX0NPTlRFWFQpIHsKPiAgCQlpZiAoZGV2LT5kcml2ZXItPmNvbnRleHRfZHRv cikKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9kcnYuYyBiL2RyaXZlcnMvZ3B1 L2RybS9kcm1fZHJ2LmMKPiBpbmRleCAzYjNjNGY1Li4xZGUyZGY4IDEwMDY0NAo+IC0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9kcm1fZHJ2LmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2Rydi5j Cj4gQEAgLTU4NCwxMSArNTg0LDEzIEBAIHN0cnVjdCBkcm1fZGV2aWNlICpkcm1fZGV2X2FsbG9j KHN0cnVjdCBkcm1fZHJpdmVyICpkcml2ZXIsCj4gIAlpZiAoZHJtX2h0X2NyZWF0ZSgmZGV2LT5t YXBfaGFzaCwgMTIpKQo+ICAJCWdvdG8gZXJyX21pbm9yczsKPiAgCj4gLQlyZXQgPSBkcm1fbGVn YWN5X2N0eGJpdG1hcF9pbml0KGRldik7Cj4gLQlpZiAocmV0KSB7Cj4gLQkJRFJNX0VSUk9SKCJD YW5ub3QgYWxsb2NhdGUgbWVtb3J5IGZvciBjb250ZXh0IGJpdG1hcC5cbiIpOwo+IC0JCWdvdG8g ZXJyX2h0Owo+IC0JfQo+ICsJaWYgKGRybV9jb3JlX2NoZWNrX2ZlYXR1cmUoZGV2LCBEUklWRVJf S01TX0xFR0FDWV9DT05URVhUKSkKCkNvZGluZyBzdHlsZSByZXF1aXJlcyB7fSBzaW5jZSBpdCdz IG11bHRpLWxpbmUuIEFuZCBjb25mdXNpbmcgc2luY2UgdGhlIGlmCihyZXQpIGdldHMgYWx3YXlz IGV4ZWN1dGVkLgoKPiArCQlyZXQgPSBkcm1fbGVnYWN5X2N0eGJpdG1hcF9pbml0KGRldik7Cj4g KwkJaWYgKHJldCkgewo+ICsJCQlEUk1fRVJST1IoCj4gKwkJCQkiQ2Fubm90IGFsbG9jYXRlIG1l bW9yeSBmb3IgY29udGV4dCBiaXRtYXAuXG4iKTsKPiArCQkJZ290byBlcnJfaHQ7Cj4gKwkJfQo+ ICAKPiAgCWlmIChkcm1fY29yZV9jaGVja19mZWF0dXJlKGRldiwgRFJJVkVSX0dFTSkpIHsKPiAg CQlyZXQgPSBkcm1fZ2VtX2luaXQoZGV2KTsKPiAtLSAKPiAxLjkuMQo+IAoKLS0gCkRhbmllbCBW ZXR0ZXIKU29mdHdhcmUgRW5naW5lZXIsIEludGVsIENvcnBvcmF0aW9uCmh0dHA6Ly9ibG9nLmZm d2xsLmNoCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==