From: Ben Skeggs Subject: [mesa 6/9] nouveau: remove use of deprecated nouveau_device_wrap() Date: Thu, 26 Nov 2015 17:15:00 +1000 Message-ID: <1448522103-4925-6-git-send-email-skeggsb@gmail.com> References: <1448522103-4925-1-git-send-email-skeggsb@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1448522103-4925-1-git-send-email-skeggsb-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" To: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Ben Skeggs List-Id: nouveau.vger.kernel.org RnJvbTogQmVuIFNrZWdncyA8YnNrZWdnc0ByZWRoYXQuY29tPgoKU3dpdGNoaW5nIHRvIHRoZSBu ZXdlciBsaWJkcm0gZW50cnktcG9pbnRzIHRlbGxzIGxpYmRybSB0aGF0IGl0J3MgT0sgdG8KbWFr ZSB1c2Ugb2YgbmV3ZXIga2VybmVsIGludGVyZmFjZXMuCgpXZSB3YW50IHRvIGJlIGFibGUgdG8g aXNvbGF0ZSBhbnkgYnVncyB0byBlaXRoZXIgdGhlIGludGVyZmFjZXMgY2hhbmdlcywKb3IgdGhl IHVzZSBvZiBOVklGIGl0c2VsZi4gIEFzIHN1Y2gsIHRoaXMgY29tbWl0IGhhcyBhIHNsaWdodCBo YWNrIHdoaWNoCmZvcmNlcyBsaWJkcm0gdG8gY29udGludWUgdXNpbmcgdGhlIG9sZGVyIGtlcm5l bCBpbnRlcmZhY2VzLgoKU2lnbmVkLW9mZi1ieTogQmVuIFNrZWdncyA8YnNrZWdnc0ByZWRoYXQu Y29tPgotLS0KIHNyYy9nYWxsaXVtL2RyaXZlcnMvbm91dmVhdS9ub3V2ZWF1X3NjcmVlbi5jICAg ICAgIHwgIDQgKysrCiAuLi4vd2luc3lzL25vdXZlYXUvZHJtL25vdXZlYXVfZHJtX3dpbnN5cy5j ICAgICAgICB8IDMxICsrKysrKysrKysrKysrKystLS0tLS0KIHNyYy9tZXNhL2RyaXZlcnMvZHJp L25vdXZlYXUvbm91dmVhdV9zY3JlZW4uYyAgICAgIHwgMTggKysrKysrKysrKysrLQogc3JjL21l c2EvZHJpdmVycy9kcmkvbm91dmVhdS9ub3V2ZWF1X3NjcmVlbi5oICAgICAgfCAgMSArCiA0IGZp bGVzIGNoYW5nZWQsIDQ1IGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvc3JjL2dhbGxpdW0vZHJpdmVycy9ub3V2ZWF1L25vdXZlYXVfc2NyZWVuLmMgYi9zcmMvZ2Fs bGl1bS9kcml2ZXJzL25vdXZlYXUvbm91dmVhdV9zY3JlZW4uYwppbmRleCAzY2RjYzIwLi40Y2E5 ZTVjIDEwMDY0NAotLS0gYS9zcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZlYXUvbm91dmVhdV9zY3Jl ZW4uYworKysgYi9zcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZlYXUvbm91dmVhdV9zY3JlZW4uYwpA QCAtMjM0LDYgKzIzNCw4IEBAIG5vdXZlYXVfc2NyZWVuX2luaXQoc3RydWN0IG5vdXZlYXVfc2Ny ZWVuICpzY3JlZW4sIHN0cnVjdCBub3V2ZWF1X2RldmljZSAqZGV2KQogdm9pZAogbm91dmVhdV9z Y3JlZW5fZmluaShzdHJ1Y3Qgbm91dmVhdV9zY3JlZW4gKnNjcmVlbikKIHsKKyAgIGludCBmZCA9 IHNjcmVlbi0+ZHJtLT5mZDsKKwogICAgbm91dmVhdV9tbV9kZXN0cm95KHNjcmVlbi0+bW1fR0FS VCk7CiAgICBub3V2ZWF1X21tX2Rlc3Ryb3koc2NyZWVuLT5tbV9WUkFNKTsKIApAQCAtMjQzLDYg KzI0NSw4IEBAIG5vdXZlYXVfc2NyZWVuX2Zpbmkoc3RydWN0IG5vdXZlYXVfc2NyZWVuICpzY3Jl ZW4pCiAgICBub3V2ZWF1X29iamVjdF9kZWwoJnNjcmVlbi0+Y2hhbm5lbCk7CiAKICAgIG5vdXZl YXVfZGV2aWNlX2RlbCgmc2NyZWVuLT5kZXZpY2UpOworICAgbm91dmVhdV9kcm1fZGVsKCZzY3Jl ZW4tPmRybSk7CisgICBjbG9zZShmZCk7CiB9CiAKIHN0YXRpYyB2b2lkCmRpZmYgLS1naXQgYS9z cmMvZ2FsbGl1bS93aW5zeXMvbm91dmVhdS9kcm0vbm91dmVhdV9kcm1fd2luc3lzLmMgYi9zcmMv Z2FsbGl1bS93aW5zeXMvbm91dmVhdS9kcm0vbm91dmVhdV9kcm1fd2luc3lzLmMKaW5kZXggNDU2 NTMwZC4uZmYwMTdlNCAxMDA2NDQKLS0tIGEvc3JjL2dhbGxpdW0vd2luc3lzL25vdXZlYXUvZHJt L25vdXZlYXVfZHJtX3dpbnN5cy5jCisrKyBiL3NyYy9nYWxsaXVtL3dpbnN5cy9ub3V2ZWF1L2Ry bS9ub3V2ZWF1X2RybV93aW5zeXMuYwpAQCAtMTMsNiArMTMsOSBAQAogI2luY2x1ZGUgIm5vdXZl YXUvbm91dmVhdV93aW5zeXMuaCIKICNpbmNsdWRlICJub3V2ZWF1L25vdXZlYXVfc2NyZWVuLmgi CiAKKyNpbmNsdWRlIDxudmlmL2NsYXNzLmg+CisjaW5jbHVkZSA8bnZpZi9jbDAwODAuaD4KKwog c3RhdGljIHN0cnVjdCB1dGlsX2hhc2hfdGFibGUgKmZkX3RhYiA9IE5VTEw7CiAKIHBpcGVfc3Rh dGljX211dGV4KG5vdXZlYXVfc2NyZWVuX211dGV4KTsKQEAgLTU3LDE2ICs2MCwxOSBAQCBzdGF0 aWMgaW50IGNvbXBhcmVfZmQodm9pZCAqa2V5MSwgdm9pZCAqa2V5MikKIFBVQkxJQyBzdHJ1Y3Qg cGlwZV9zY3JlZW4gKgogbm91dmVhdV9kcm1fc2NyZWVuX2NyZWF0ZShpbnQgZmQpCiB7CisJc3Ry dWN0IG5vdXZlYXVfZHJtICpkcm0gPSBOVUxMOwogCXN0cnVjdCBub3V2ZWF1X2RldmljZSAqZGV2 ID0gTlVMTDsKIAlzdHJ1Y3Qgbm91dmVhdV9zY3JlZW4gKigqaW5pdCkoc3RydWN0IG5vdXZlYXVf ZGV2aWNlICopOwogCXN0cnVjdCBub3V2ZWF1X3NjcmVlbiAqc2NyZWVuID0gTlVMTDsKLQlpbnQg cmV0LCBkdXBmZCA9IC0xOworCWludCByZXQsIGR1cGZkOwogCiAJcGlwZV9tdXRleF9sb2NrKG5v dXZlYXVfc2NyZWVuX211dGV4KTsKIAlpZiAoIWZkX3RhYikgewogCQlmZF90YWIgPSB1dGlsX2hh c2hfdGFibGVfY3JlYXRlKGhhc2hfZmQsIGNvbXBhcmVfZmQpOwotCQlpZiAoIWZkX3RhYikKLQkJ CWdvdG8gZXJyOworCQlpZiAoIWZkX3RhYikgeworCQkJcGlwZV9tdXRleF91bmxvY2sobm91dmVh dV9zY3JlZW5fbXV0ZXgpOworCQkJcmV0dXJuIE5VTEw7CisJCX0KIAl9CiAKIAlzY3JlZW4gPSB1 dGlsX2hhc2hfdGFibGVfZ2V0KGZkX3RhYiwgaW50cHRyX3RvX3BvaW50ZXIoZmQpKTsKQEAgLTg2 LDcgKzkyLDE3IEBAIG5vdXZlYXVfZHJtX3NjcmVlbl9jcmVhdGUoaW50IGZkKQogCSAqIGNyZWF0 aW9uIGVycm9yLgogCSAqLwogCWR1cGZkID0gZHVwKGZkKTsKLQlyZXQgPSBub3V2ZWF1X2Rldmlj ZV93cmFwKGR1cGZkLCAxLCAmZGV2KTsKKworCXJldCA9IG5vdXZlYXVfZHJtX25ldyhkdXBmZCwg JmRybSk7CisJaWYgKHJldCkKKwkJZ290byBlcnI7CisKKwlkcm0tPm52aWYgPSBmYWxzZTsKKwor CXJldCA9IG5vdXZlYXVfZGV2aWNlX25ldygmZHJtLT5jbGllbnQsIE5WX0RFVklDRSwKKwkJCQkg JihzdHJ1Y3QgbnZfZGV2aWNlX3YwKSB7CisJCQkJCS5kZXZpY2UgPSB+MFVMTCwKKwkJCQkgfSwg c2l6ZW9mKHN0cnVjdCBudl9kZXZpY2VfdjApLCAmZGV2KTsKIAlpZiAocmV0KQogCQlnb3RvIGVy cjsKIApAQCAtMTMzLDEwICsxNDksOSBAQCBlcnI6CiAJaWYgKHNjcmVlbikgewogCQlzY3JlZW4t PmJhc2UuZGVzdHJveSgmc2NyZWVuLT5iYXNlKTsKIAl9IGVsc2UgewotCQlpZiAoZGV2KQotCQkJ bm91dmVhdV9kZXZpY2VfZGVsKCZkZXYpOwotCQllbHNlIGlmIChkdXBmZCA+PSAwKQotCQkJY2xv c2UoZHVwZmQpOworCQlub3V2ZWF1X2RldmljZV9kZWwoJmRldik7CisJCW5vdXZlYXVfZHJtX2Rl bCgmZHJtKTsKKwkJY2xvc2UoZHVwZmQpOwogCX0KIAlwaXBlX211dGV4X3VubG9jayhub3V2ZWF1 X3NjcmVlbl9tdXRleCk7CiAJcmV0dXJuIE5VTEw7CmRpZmYgLS1naXQgYS9zcmMvbWVzYS9kcml2 ZXJzL2RyaS9ub3V2ZWF1L25vdXZlYXVfc2NyZWVuLmMgYi9zcmMvbWVzYS9kcml2ZXJzL2RyaS9u b3V2ZWF1L25vdXZlYXVfc2NyZWVuLmMKaW5kZXggMTUzZjE4ZS4uMWE3NGFlMiAxMDA2NDQKLS0t IGEvc3JjL21lc2EvZHJpdmVycy9kcmkvbm91dmVhdS9ub3V2ZWF1X3NjcmVlbi5jCisrKyBiL3Ny Yy9tZXNhL2RyaXZlcnMvZHJpL25vdXZlYXUvbm91dmVhdV9zY3JlZW4uYwpAQCAtNDAsNiArNDAs OSBAQAogI2luY2x1ZGUgIm1haW4vcmVuZGVyYnVmZmVyLmgiCiAjaW5jbHVkZSAic3dyYXN0L3Nf cmVuZGVyYnVmZmVyLmgiCiAKKyNpbmNsdWRlIDxudmlmL2NsYXNzLmg+CisjaW5jbHVkZSA8bnZp Zi9jbDAwODAuaD4KKwogc3RhdGljIGNvbnN0IF9fRFJJZXh0ZW5zaW9uICpub3V2ZWF1X3NjcmVl bl9leHRlbnNpb25zW107CiAKIHN0YXRpYyB2b2lkCkBAIC05OSwxMiArMTAyLDI0IEBAIG5vdXZl YXVfaW5pdF9zY3JlZW4yKF9fRFJJc2NyZWVuICpkcmlfc2NyZWVuKQogCWRyaV9zY3JlZW4tPmRy aXZlclByaXZhdGUgPSBzY3JlZW47CiAKIAkvKiBPcGVuIHRoZSBEUk0gZGV2aWNlLiAqLwotCXJl dCA9IG5vdXZlYXVfZGV2aWNlX3dyYXAoZHJpX3NjcmVlbi0+ZmQsIDAsICZzY3JlZW4tPmRldmlj ZSk7CisJcmV0ID0gbm91dmVhdV9kcm1fbmV3KGRyaV9zY3JlZW4tPmZkLCAmc2NyZWVuLT5kcm0p OwogCWlmIChyZXQpIHsKIAkJbm91dmVhdV9lcnJvcigiRXJyb3Igb3BlbmluZyB0aGUgRFJNIGRl dmljZS5cbiIpOwogCQlnb3RvIGZhaWw7CiAJfQogCisJc2NyZWVuLT5kcm0tPm52aWYgPSBmYWxz ZTsKKworCXJldCA9IG5vdXZlYXVfZGV2aWNlX25ldygmc2NyZWVuLT5kcm0tPmNsaWVudCwgTlZf REVWSUNFLAorCQkJCSAmKHN0cnVjdCBudl9kZXZpY2VfdjApIHsKKwkJCQkJLmRldmljZSA9IH4w VUxMLAorCQkJCSB9LCBzaXplb2Yoc3RydWN0IG52X2RldmljZV92MCksCisJCQkJICZzY3JlZW4t PmRldmljZSk7CisJaWYgKHJldCkgeworCQlub3V2ZWF1X2Vycm9yKCJFcnJvciBjcmVhdGluZyBk ZXZpY2Ugb2JqZWN0LlxuIik7CisJCWdvdG8gZmFpbDsKKwl9CisKIAkvKiBDaG9vc2UgdGhlIGNh cmQgc3BlY2lmaWMgZnVuY3Rpb24gcG9pbnRlcnMuICovCiAJc3dpdGNoIChzY3JlZW4tPmRldmlj ZS0+Y2hpcHNldCAmIDB4ZjApIHsKIAljYXNlIDB4MDA6CkBAIC0yMTMsNiArMjI4LDcgQEAgbm91 dmVhdV9kZXN0cm95X3NjcmVlbihfX0RSSXNjcmVlbiAqZHJpX3NjcmVlbikKIAkJcmV0dXJuOwog CiAJbm91dmVhdV9kZXZpY2VfZGVsKCZzY3JlZW4tPmRldmljZSk7CisJbm91dmVhdV9kcm1fZGVs KCZzY3JlZW4tPmRybSk7CiAKIAlmcmVlKHNjcmVlbik7CiAJZHJpX3NjcmVlbi0+ZHJpdmVyUHJp dmF0ZSA9IE5VTEw7CmRpZmYgLS1naXQgYS9zcmMvbWVzYS9kcml2ZXJzL2RyaS9ub3V2ZWF1L25v dXZlYXVfc2NyZWVuLmggYi9zcmMvbWVzYS9kcml2ZXJzL2RyaS9ub3V2ZWF1L25vdXZlYXVfc2Ny ZWVuLmgKaW5kZXggNDViMWVlOS4uZTNjMTkyOCAxMDA2NDQKLS0tIGEvc3JjL21lc2EvZHJpdmVy cy9kcmkvbm91dmVhdS9ub3V2ZWF1X3NjcmVlbi5oCisrKyBiL3NyYy9tZXNhL2RyaXZlcnMvZHJp L25vdXZlYXUvbm91dmVhdV9zY3JlZW4uaApAQCAtMzMsNiArMzMsNyBAQCBzdHJ1Y3Qgbm91dmVh dV9jb250ZXh0OwogCiBzdHJ1Y3Qgbm91dmVhdV9zY3JlZW4gewogCV9fRFJJc2NyZWVuICpkcmlf c2NyZWVuOworCXN0cnVjdCBub3V2ZWF1X2RybSAqZHJtOwogCXN0cnVjdCBub3V2ZWF1X2Rldmlj ZSAqZGV2aWNlOwogCWNvbnN0IHN0cnVjdCBub3V2ZWF1X2RyaXZlciAqZHJpdmVyOwogfTsKLS0g CjIuNi4zCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpO b3V2ZWF1IG1haWxpbmcgbGlzdApOb3V2ZWF1QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vbm91dmVhdQo=