From mboxrd@z Thu Jan 1 00:00:00 1970 From: Samuel Pitoiset Subject: Re: [PATCH mesa 6/6] nouveau: codegen: Disable more old resource handling code Date: Wed, 16 Mar 2016 11:45:14 +0100 Message-ID: <56E9393A.2080300@gmail.com> References: <1458120239-27659-1-git-send-email-hdegoede@redhat.com> <1458120239-27659-6-git-send-email-hdegoede@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1458120239-27659-6-git-send-email-hdegoede@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: mesa-dev-bounces@lists.freedesktop.org Sender: "mesa-dev" To: Hans de Goede , Ilia Mirkin Cc: mesa-dev@lists.freedesktop.org, nouveau@lists.freedesktop.org List-Id: nouveau.vger.kernel.org CgpPbiAwMy8xNi8yMDE2IDEwOjIzIEFNLCBIYW5zIGRlIEdvZWRlIHdyb3RlOgo+IENvbW1pdCBj MzA4M2M3MDgyICgibnY1MC9pcjogYWRkIHN1cHBvcnQgZm9yIEJVRkZFUiBhY2Nlc3NlcyIpIGRp c2FibGVkIC8KPiBjb21tZW50ZWQgb3V0IHNvbWUgb2YgdGhlIG9sZCByZXNvdXJjZSBoYW5kbGlu ZyBjb2RlLCBidXQgbm90IGFsbCBvZiBpdC4KPgo+IEVmZmVjdGl2ZWx5IGFsbCBvZiBpdCBpcyBk ZWFkIGFscmVhZHksIGlmIHdlIGV2ZXIgZW50ZXIgdGhlIG9sZCBjb2RlCj4gcGF0aHMgaW4gaGFu ZGVMT0FEIC8gaGFuZGxlU1RPUkUgLyBoYW5kbGVBVE9NIHdlIHdpbGwgZ2V0IGFuIGV4Y2VwdGlv bgo+IGR1ZSB0byB0cnlpbmcgdG8gYWNjZXNzIHRoZSBub3cgYWx3YXlzIHplcm8tc2l6ZWQgcmVz b3VyY2VzIHZlY3Rvci4KPgo+IE1ha2Ugbm9uIGJ1ZmZlciAvIG1lbW9yeSBmaWxlIGFjY2Vzc2Vz IG5vdCBiZWluZyBzdXBwb3J0ZWQgaW4gdGhlc2UKPiBmdW5jdGlvbnMgbW9yZSBleHBsaWNpdCBh bmQgY29tbWVudCBvdXQgYSB3aG9sZSBidW5jaCBvZiBkZWFkIGNvZGUuCj4KPiBBbHNvIHJlbW92 ZSB0aGUgbWFnaWMgZmlsZS1pbmRleGUgZGVmaW5lcyBmcm9tIHRoZSBvbGQgcmVzb3VyY2UgY29k ZQo+IGZyb20gaW5jbHVkZS9waXBlL3Bfc2hhZGVyX3Rva2Vucy5oIGFzIHRob3NlIGFyZSBubyBs b25nZXIgdXNlZCBub3cKPiAod2hpY2ggaXMgYSBnb29kIHRoaW5nKS4KPgo+IFNpZ25lZC1vZmYt Ynk6IEhhbnMgZGUgR29lZGUgPGhkZWdvZWRlQHJlZGhhdC5jb20+Cj4gLS0tCj4gICAuLi4vZHJp dmVycy9ub3V2ZWF1L2NvZGVnZW4vbnY1MF9pcl9mcm9tX3Rnc2kuY3BwICB8IDQyICsrKysrKysr KysrKysrKy0tLS0tLS0KPiAgIHNyYy9nYWxsaXVtL2luY2x1ZGUvcGlwZS9wX3NoYWRlcl90b2tl bnMuaCAgICAgICAgIHwgIDkgLS0tLS0KPiAgIDIgZmlsZXMgY2hhbmdlZCwgMzAgaW5zZXJ0aW9u cygrKSwgMjEgZGVsZXRpb25zKC0pCj4KPiBkaWZmIC0tZ2l0IGEvc3JjL2dhbGxpdW0vZHJpdmVy cy9ub3V2ZWF1L2NvZGVnZW4vbnY1MF9pcl9mcm9tX3Rnc2kuY3BwIGIvc3JjL2dhbGxpdW0vZHJp dmVycy9ub3V2ZWF1L2NvZGVnZW4vbnY1MF9pcl9mcm9tX3Rnc2kuY3BwCj4gaW5kZXggYzE2N2M0 YS4uMTE1ZDBiYiAxMDA2NDQKPiAtLS0gYS9zcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZlYXUvY29k ZWdlbi9udjUwX2lyX2Zyb21fdGdzaS5jcHAKPiArKysgYi9zcmMvZ2FsbGl1bS9kcml2ZXJzL25v dXZlYXUvY29kZWdlbi9udjUwX2lyX2Zyb21fdGdzaS5jcHAKPiBAQCAtODU2LDEyICs4NTYsMTQg QEAgcHVibGljOgo+ICAgICAgfTsKPiAgICAgIHN0ZDo6dmVjdG9yPFRleHR1cmVWaWV3PiB0ZXh0 dXJlVmlld3M7Cj4KPiArICAgLyoKPiAgICAgIHN0cnVjdCBSZXNvdXJjZSB7Cj4gICAgICAgICB1 aW50OF90IHRhcmdldDsgLy8gVEdTSV9URVhUVVJFXyoKPiAgICAgICAgIGJvb2wgcmF3Owo+ICAg ICAgICAgdWludDhfdCBzbG90OyAvLyAkc3VyZmFjZSBpbmRleAo+ICAgICAgfTsKPiAgICAgIHN0 ZDo6dmVjdG9yPFJlc291cmNlPiByZXNvdXJjZXM7Cj4gKyAgICovCj4KPiAgICAgIHN0cnVjdCBN ZW1vcnlGaWxlIHsKPiAgICAgICAgIHVpbnQ4X3QgbWVtX3R5cGU7IC8vIFRHU0lfTUVNT1JZX1RZ UEVfKgo+IEBAIC0xNDIzLDggKzE0MjUsOCBAQCBwcml2YXRlOgo+ICAgICAgdm9pZCBoYW5kbGVM SVQoVmFsdWUgKmRzdDBbNF0pOwo+ICAgICAgdm9pZCBoYW5kbGVVc2VyQ2xpcFBsYW5lcygpOwo+ Cj4gLSAgIFN5bWJvbCAqZ2V0UmVzb3VyY2VCYXNlKGludCByKTsKPiAtICAgdm9pZCBnZXRSZXNv dXJjZUNvb3JkcyhzdGQ6OnZlY3RvcjxWYWx1ZSAqPiYsIGludCByLCBpbnQgcyk7Cj4gKyAgIC8v IFN5bWJvbCAqZ2V0UmVzb3VyY2VCYXNlKGludCByKTsKPiArICAgLy8gdm9pZCBnZXRSZXNvdXJj ZUNvb3JkcyhzdGQ6OnZlY3RvcjxWYWx1ZSAqPiYsIGludCByLCBpbnQgcyk7Cj4KPiAgICAgIHZv aWQgaGFuZGxlTE9BRChWYWx1ZSAqZHN0MFs0XSk7Cj4gICAgICB2b2lkIGhhbmRsZVNUT1JFKCk7 Cj4gQEAgLTIxNjksNiArMjE3MSw3IEBAIENvbnZlcnRlcjo6aGFuZGxlTElUKFZhbHVlICpkc3Qw WzRdKQo+ICAgICAgfQo+ICAgfQo+Cj4gKy8qIEtlZXAgdGhpcyBhcm91bmQgZm9yIG5vdyBhcyBy ZWZlcmVuY2Ugd2hlbiBhZGRpbmcgaW1nIHN1cHBvcnQKPiAgIHN0YXRpYyBpbmxpbmUgYm9vbAo+ ICAgaXNSZXNvdXJjZVNwZWNpYWwoY29uc3QgaW50IHIpCj4gICB7Cj4gQEAgLTIyNjQsNiArMjI2 Nyw3IEBAIHBhcnRpdGlvbkxvYWRTdG9yZSh1aW50OF90IGNvbXBbMl0sIHVpbnQ4X3Qgc2l6ZVsy XSwgdWludDhfdCBtYXNrKQo+ICAgICAgfQo+ICAgICAgcmV0dXJuIG4gKyAxOwo+ICAgfQo+ICsq Lwo+Cj4gICAvLyBGb3IgcmF3IGxvYWRzLCBncmFudWxhcml0eSBpcyA0IGJ5dGUuCj4gICAvLyBV c2FnZSBvZiB0aGUgdGV4dHVyZSByZWFkIG1hc2sgb24gT1BfU1VMRFAgaXMgbm90IGFsbG93ZWQu Cj4gQEAgLTIyNzQsOCArMjI3OCw5IEBAIENvbnZlcnRlcjo6aGFuZGxlTE9BRChWYWx1ZSAqZHN0 MFs0XSkKPiAgICAgIGludCBjOwo+ICAgICAgc3RkOjp2ZWN0b3I8VmFsdWUgKj4gb2ZmLCBzcmMs IGxkdiwgZGVmOwo+Cj4gLSAgIGlmICh0Z3NpLmdldFNyYygwKS5nZXRGaWxlKCkgPT0gVEdTSV9G SUxFX0JVRkZFUiB8fAo+IC0gICAgICAgdGdzaS5nZXRTcmMoMCkuZ2V0RmlsZSgpID09IFRHU0lf RklMRV9NRU1PUlkpIHsKPiArICAgc3dpdGNoICh0Z3NpLmdldFNyYygwKS5nZXRGaWxlKCkpIHsK PiArICAgY2FzZSBUR1NJX0ZJTEVfQlVGRkVSOgo+ICsgICBjYXNlIFRHU0lfRklMRV9NRU1PUlk6 Cj4gICAgICAgICBmb3IgKGMgPSAwOyBjIDwgNDsgKytjKSB7Cj4gICAgICAgICAgICBpZiAoIWRz dDBbY10pCj4gICAgICAgICAgICAgICBjb250aW51ZTsKPiBAQCAtMjI5NSw5ICsyMzAwLDEyIEBA IENvbnZlcnRlcjo6aGFuZGxlTE9BRChWYWx1ZSAqZHN0MFs0XSkKPiAgICAgICAgICAgIGlmICh0 Z3NpLmdldFNyYygwKS5pc0luZGlyZWN0KDApKQo+ICAgICAgICAgICAgICAgbGQtPnNldEluZGly ZWN0KDAsIDEsIGZldGNoU3JjKHRnc2kuZ2V0U3JjKDApLmdldEluZGlyZWN0KDApLCAwLCAwKSk7 Cj4gICAgICAgICB9Cj4gLSAgICAgIHJldHVybjsKPiArICAgICAgYnJlYWs7Cj4gKyAgIGRlZmF1 bHQ6Cj4gKyAgICAgIGFzc2VydCghIlVuc3VwcG9ydGVkIHNyY0ZpbGUgZm9yIExPQUQiKTsKPiAg ICAgIH0KPgo+ICsvKiBLZWVwIHRoaXMgYXJvdW5kIGZvciBub3cgYXMgcmVmZXJlbmNlIHdoZW4g YWRkaW5nIGltZyBzdXBwb3J0Cj4gICAgICBnZXRSZXNvdXJjZUNvb3JkcyhvZmYsIHIsIDEpOwo+ Cj4gICAgICBpZiAoaXNSZXNvdXJjZVJhdyhjb2RlLCByKSkgewo+IEBAIC0yMzYzLDYgKzIzNzEs NyBAQCBDb252ZXJ0ZXI6OmhhbmRsZUxPQUQoVmFsdWUgKmRzdDBbNF0pCj4gICAgICBGT1JfRUFD SF9EU1RfRU5BQkxFRF9DSEFOTkVMKDAsIGMsIHRnc2kpCj4gICAgICAgICBpZiAoZHN0MFtjXSAh PSBkZWZbY10pCj4gICAgICAgICAgICBta01vdihkc3QwW2NdLCBkZWZbdGdzaS5nZXRTcmMoMCku Z2V0U3dpenpsZShjKV0pOwo+ICsqLwo+ICAgfQo+Cj4gICAvLyBGb3IgZm9ybWF0dGVkIHN0b3Jl cywgdGhlIHdyaXRlIG1hc2sgb24gT1BfU1VTVFAgY2FuIGJlIHVzZWQuCj4gQEAgLTIzNzQsOCAr MjM4Myw5IEBAIENvbnZlcnRlcjo6aGFuZGxlU1RPUkUoKQo+ICAgICAgaW50IGM7Cj4gICAgICBz dGQ6OnZlY3RvcjxWYWx1ZSAqPiBvZmYsIHNyYywgZHVtbXk7Cj4KPiAtICAgaWYgKHRnc2kuZ2V0 RHN0KDApLmdldEZpbGUoKSA9PSBUR1NJX0ZJTEVfQlVGRkVSIHx8Cj4gLSAgICAgICB0Z3NpLmdl dERzdCgwKS5nZXRGaWxlKCkgPT0gVEdTSV9GSUxFX01FTU9SWSkgewo+ICsgICBzd2l0Y2ggKHRn c2kuZ2V0RHN0KDApLmdldEZpbGUoKSkgewo+ICsgICBjYXNlIFRHU0lfRklMRV9CVUZGRVI6Cj4g KyAgIGNhc2UgVEdTSV9GSUxFX01FTU9SWToKPiAgICAgICAgIGZvciAoYyA9IDA7IGMgPCA0OyAr K2MpIHsKPiAgICAgICAgICAgIGlmICghKHRnc2kuZ2V0RHN0KDApLmdldE1hc2soKSAmICgxIDw8 IGMpKSkKPiAgICAgICAgICAgICAgIGNvbnRpbnVlOwo+IEBAIC0yMzk2LDkgKzI0MDYsMTIgQEAg Q29udmVydGVyOjpoYW5kbGVTVE9SRSgpCj4gICAgICAgICAgICBpZiAodGdzaS5nZXREc3QoMCku aXNJbmRpcmVjdCgwKSkKPiAgICAgICAgICAgICAgIHN0LT5zZXRJbmRpcmVjdCgwLCAxLCBmZXRj aFNyYyh0Z3NpLmdldERzdCgwKS5nZXRJbmRpcmVjdCgwKSwgMCwgMCkpOwo+ICAgICAgICAgfQo+ IC0gICAgICByZXR1cm47Cj4gKyAgICAgIGJyZWFrOwo+ICsgICBkZWZhdWx0Ogo+ICsgICAgICBh c3NlcnQoISJVbnN1cHBvcnRlZCBkc3RGaWxlIGZvciBTVE9SRSIpOwo+ICAgICAgfQo+Cj4gKy8q IEtlZXAgdGhpcyBhcm91bmQgZm9yIG5vdyBhcyByZWZlcmVuY2Ugd2hlbiBhZGRpbmcgaW1nIHN1 cHBvcnQKPiAgICAgIGdldFJlc291cmNlQ29vcmRzKG9mZiwgciwgMCk7Cj4gICAgICBzcmMgPSBv ZmY7Cj4gICAgICBjb25zdCBpbnQgcyA9IHNyYy5zaXplKCk7Cj4gQEAgLTI0NDYsNiArMjQ1OSw3 IEBAIENvbnZlcnRlcjo6aGFuZGxlU1RPUkUoKQo+ICAgICAgICAgbWtUZXgoT1BfU1VTVFAsIGdl dFJlc291cmNlVGFyZ2V0KGNvZGUsIHIpLCBjb2RlLT5yZXNvdXJjZXNbcl0uc2xvdCwgMCwKPiAg ICAgICAgICAgICAgIGR1bW15LCBzcmMpLT50ZXgubWFzayA9IHRnc2kuZ2V0RHN0KDApLmdldE1h c2soKTsKPiAgICAgIH0KPiArKi8KPiAgIH0KPgo+ICAgLy8gWFhYOiBUaGVzZSBvbmx5IHdvcmsg b24gcmVzb3VyY2VzIHdpdGggdGhlIHNpbmdsZS1jb21wb25lbnQgdTMyL3MzMiBmb3JtYXRzLgo+ IEBAIC0yNDYwLDggKzI0NzQsOSBAQCBDb252ZXJ0ZXI6OmhhbmRsZUFUT00oVmFsdWUgKmRzdDBb NF0sIERhdGFUeXBlIHR5LCB1aW50MTZfdCBzdWJPcCkKPiAgICAgIHN0ZDo6dmVjdG9yPFZhbHVl ICo+IGRlZnY7Cj4gICAgICBMVmFsdWUgKmRzdCA9IGdldFNjcmF0Y2goKTsKPgo+IC0gICBpZiAo dGdzaS5nZXRTcmMoMCkuZ2V0RmlsZSgpID09IFRHU0lfRklMRV9CVUZGRVIgfHwKPiAtICAgICAg IHRnc2kuZ2V0U3JjKDApLmdldEZpbGUoKSA9PSBUR1NJX0ZJTEVfTUVNT1JZKSB7Cj4gKyAgIHN3 aXRjaCAodGdzaS5nZXRTcmMoMCkuZ2V0RmlsZSgpKSB7Cj4gKyAgIGNhc2UgVEdTSV9GSUxFX0JV RkZFUjoKPiArICAgY2FzZSBUR1NJX0ZJTEVfTUVNT1JZOgo+ICAgICAgICAgZm9yIChpbnQgYyA9 IDA7IGMgPCA0OyArK2MpIHsKPiAgICAgICAgICAgIGlmICghZHN0MFtjXSkKPiAgICAgICAgICAg ICAgIGNvbnRpbnVlOwo+IEBAIC0yNDg5LDEwICsyNTA0LDEyIEBAIENvbnZlcnRlcjo6aGFuZGxl QVRPTShWYWx1ZSAqZHN0MFs0XSwgRGF0YVR5cGUgdHksIHVpbnQxNl90IHN1Yk9wKQo+ICAgICAg ICAgZm9yIChpbnQgYyA9IDA7IGMgPCA0OyArK2MpCj4gICAgICAgICAgICBpZiAoZHN0MFtjXSkK PiAgICAgICAgICAgICAgIGRzdDBbY10gPSBkc3Q7IC8vIG5vdCBlcXVhbCB0byByRHN0IHNvIGhh bmRsZUluc3RydWN0aW9uIHdpbGwgZG8gbWtNb3YKPiAtICAgICAgcmV0dXJuOwo+ICsgICAgICBi cmVhazsKPiArICAgZGVmYXVsdDoKPiArICAgICAgYXNzZXJ0KCEiVW5zdXBwb3J0ZWQgc3JjRmls ZSBmb3IgQVRPTSIpOwo+ICAgICAgfQo+Cj4gLQo+ICsvKiBLZWVwIHRoaXMgYXJvdW5kIGZvciBu b3cgYXMgcmVmZXJlbmNlIHdoZW4gYWRkaW5nIGltZyBzdXBwb3J0Cj4gICAgICBnZXRSZXNvdXJj ZUNvb3JkcyhzcmN2LCByLCAxKTsKPgo+ICAgICAgaWYgKGlzUmVzb3VyY2VTcGVjaWFsKHIpKSB7 Cj4gQEAgLTI1MjAsNiArMjUzNyw3IEBAIENvbnZlcnRlcjo6aGFuZGxlQVRPTShWYWx1ZSAqZHN0 MFs0XSwgRGF0YVR5cGUgdHksIHVpbnQxNl90IHN1Yk9wKQo+ICAgICAgZm9yIChpbnQgYyA9IDA7 IGMgPCA0OyArK2MpCj4gICAgICAgICBpZiAoZHN0MFtjXSkKPiAgICAgICAgICAgIGRzdDBbY10g PSBkc3Q7IC8vIG5vdCBlcXVhbCB0byByRHN0IHNvIGhhbmRsZUluc3RydWN0aW9uIHdpbGwgZG8g bWtNb3YKPiArKi8KPiAgIH0KPgo+ICAgdm9pZAo+IGRpZmYgLS1naXQgYS9zcmMvZ2FsbGl1bS9p bmNsdWRlL3BpcGUvcF9zaGFkZXJfdG9rZW5zLmggYi9zcmMvZ2FsbGl1bS9pbmNsdWRlL3BpcGUv cF9zaGFkZXJfdG9rZW5zLmgKPiBpbmRleCA2NWQ4YWQ5Li41ZWY2YzMwIDEwMDY0NAo+IC0tLSBh L3NyYy9nYWxsaXVtL2luY2x1ZGUvcGlwZS9wX3NoYWRlcl90b2tlbnMuaAo+ICsrKyBiL3NyYy9n YWxsaXVtL2luY2x1ZGUvcGlwZS9wX3NoYWRlcl90b2tlbnMuaAo+IEBAIC0yMzcsMTUgKzIzNyw2 IEBAIHN0cnVjdCB0Z3NpX2RlY2xhcmF0aW9uX2FycmF5IHsKPiAgICAgIHVuc2lnbmVkIFBhZGRp bmcgOiAyMjsKPiAgIH07Cj4KPiAtLyoKPiAtICogU3BlY2lhbCByZXNvdXJjZXMgdGhhdCBkb24n dCBuZWVkIHRvIGJlIGRlY2xhcmVkLiAgVGhleSBtYXAgdG8gdGhlCj4gLSAqIEdMT0JBTC9MT0NB TC9QUklWQVRFL0lOUFVUIGNvbXB1dGUgbWVtb3J5IHNwYWNlcy4KPiAtICovCj4gLSNkZWZpbmUg VEdTSV9SRVNPVVJDRV9HTE9CQUwJMHg3ZmZmCj4gLSNkZWZpbmUgVEdTSV9SRVNPVVJDRV9MT0NB TAkweDdmZmUKPiAtI2RlZmluZSBUR1NJX1JFU09VUkNFX1BSSVZBVEUJMHg3ZmZkCj4gLSNkZWZp bmUgVEdTSV9SRVNPVVJDRV9JTlBVVAkweDdmZmMKPiAtCgpUaGlzIHNob3VsZCBiZSBpbiBhIHNl cGFyYXRlIHBhdGNoIHdpdGggImdhbGxpdW06IiBhcyBwcmVmaXggZXZlbiBpZiAKbm91dmVhdSBp cyB0aGUgb25seSBkcml2ZXIgd2hpY2ggc29tZWhvdyB1c2VzIHRoZXNlIGNvbnN0YW50cy4KCk90 aGVyIHRoYW4gdGhhdCwgdGhlIHBhdGNoIGxvb2tzIGZpbmUuCkFuZCB0aGFua3MgdG8gbm90IHJl bW92ZSB0aGlzIHJlc291cmNlIHRoaW5nIGJlY2F1c2UgdGhpcyBjb3VsZCBoZWxwIGZvciAKYXJi X3NoYWRlcl9pbWFnZV9sb2FkX3N0b3JlLiA6LSkKCkkgaGF2ZSB0aGUgc2FtZSBjb21tZW50IGFz IHRoZSBwcmV2aW91cyBwYXRjaCwgSSB0aGluayB0aGUgY29zbWV0aWMgCmNoYW5nZXMgc2hvdWxk IG5vdCBiZSBoZXJlLgoKPiAgICNkZWZpbmUgVEdTSV9JTU1fRkxPQVQzMiAgIDAKPiAgICNkZWZp bmUgVEdTSV9JTU1fVUlOVDMyICAgIDEKPiAgICNkZWZpbmUgVEdTSV9JTU1fSU5UMzIgICAgIDIK PgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwptZXNhLWRl diBtYWlsaW5nIGxpc3QKbWVzYS1kZXZAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vbWVzYS1kZXYK