From: Ben Skeggs Subject: [mesa 3/9] nouveau: remove use of deprecated nouveau_device::drm_version Date: Thu, 26 Nov 2015 17:14:57 +1000 Message-ID: <1448522103-4925-3-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 RnJvbTogQmVuIFNrZWdncyA8YnNrZWdnc0ByZWRoYXQuY29tPgoKU2lnbmVkLW9mZi1ieTogQmVu IFNrZWdncyA8YnNrZWdnc0ByZWRoYXQuY29tPgotLS0KIHNyYy9nYWxsaXVtL2RyaXZlcnMvbm91 dmVhdS9udjUwL252NTBfbWlwdHJlZS5jICAgICAgICAgfCAzICsrLQogc3JjL2dhbGxpdW0vZHJp dmVycy9ub3V2ZWF1L252NTAvbnY1MF9zY3JlZW4uYyAgICAgICAgICB8IDQgKystLQogc3JjL2dh bGxpdW0vZHJpdmVycy9ub3V2ZWF1L252YzAvbnZjMF9taXB0cmVlLmMgICAgICAgICB8IDMgKyst CiBzcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZlYXUvbnZjMC9udmMwX3F1ZXJ5LmMgICAgICAgICAg IHwgMiArLQogc3JjL2dhbGxpdW0vZHJpdmVycy9ub3V2ZWF1L252YzAvbnZjMF9xdWVyeV9od19t ZXRyaWMuYyB8IDIgKy0KIHNyYy9nYWxsaXVtL2RyaXZlcnMvbm91dmVhdS9udmMwL252YzBfcXVl cnlfaHdfc20uYyAgICAgfCA0ICsrLS0KIHNyYy9nYWxsaXVtL2RyaXZlcnMvbm91dmVhdS9udmMw L252YzBfc2NyZWVuLmMgICAgICAgICAgfCA5ICsrKysrLS0tLQogNyBmaWxlcyBjaGFuZ2VkLCAx NSBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9zcmMvZ2FsbGl1 bS9kcml2ZXJzL25vdXZlYXUvbnY1MC9udjUwX21pcHRyZWUuYyBiL3NyYy9nYWxsaXVtL2RyaXZl cnMvbm91dmVhdS9udjUwL252NTBfbWlwdHJlZS5jCmluZGV4IDgxMmQxMGMuLjZlOWUwZmQgMTAw NjQ0Ci0tLSBhL3NyYy9nYWxsaXVtL2RyaXZlcnMvbm91dmVhdS9udjUwL252NTBfbWlwdHJlZS5j CisrKyBiL3NyYy9nYWxsaXVtL2RyaXZlcnMvbm91dmVhdS9udjUwL252NTBfbWlwdHJlZS5jCkBA IC0zMzYsOSArMzM2LDEwIEBAIG52NTBfbWlwdHJlZV9jcmVhdGUoc3RydWN0IHBpcGVfc2NyZWVu ICpwc2NyZWVuLAogICAgICAgICAgICAgICAgICAgICBjb25zdCBzdHJ1Y3QgcGlwZV9yZXNvdXJj ZSAqdGVtcGwpCiB7CiAgICBzdHJ1Y3Qgbm91dmVhdV9kZXZpY2UgKmRldiA9IG5vdXZlYXVfc2Ny ZWVuKHBzY3JlZW4pLT5kZXZpY2U7CisgICBzdHJ1Y3Qgbm91dmVhdV9kcm0gKmRybSA9IG5vdXZl YXVfc2NyZWVuKHBzY3JlZW4pLT5kcm07CiAgICBzdHJ1Y3QgbnY1MF9taXB0cmVlICptdCA9IENB TExPQ19TVFJVQ1QobnY1MF9taXB0cmVlKTsKICAgIHN0cnVjdCBwaXBlX3Jlc291cmNlICpwdCA9 ICZtdC0+YmFzZS5iYXNlOwotICAgYm9vbCBjb21wcmVzc2VkID0gZGV2LT5kcm1fdmVyc2lvbiA+ PSAweDAxMDAwMTAxOworICAgYm9vbCBjb21wcmVzc2VkID0gZHJtLT5kcm1fdmVyc2lvbiA+PSAw eDAxMDAwMTAxOwogICAgaW50IHJldDsKICAgIHVuaW9uIG5vdXZlYXVfYm9fY29uZmlnIGJvX2Nv bmZpZzsKICAgIHVpbnQzMl90IGJvX2ZsYWdzOwpkaWZmIC0tZ2l0IGEvc3JjL2dhbGxpdW0vZHJp dmVycy9ub3V2ZWF1L252NTAvbnY1MF9zY3JlZW4uYyBiL3NyYy9nYWxsaXVtL2RyaXZlcnMvbm91 dmVhdS9udjUwL252NTBfc2NyZWVuLmMKaW5kZXggMWU0Yjc1Zi4uYzE1MjFkYiAxMDA2NDQKLS0t IGEvc3JjL2dhbGxpdW0vZHJpdmVycy9ub3V2ZWF1L252NTAvbnY1MF9zY3JlZW4uYworKysgYi9z cmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZlYXUvbnY1MC9udjUwX3NjcmVlbi5jCkBAIC01MTgsMTEg KzUxOCwxMSBAQCBudjUwX3NjcmVlbl9pbml0X2h3Y3R4KHN0cnVjdCBudjUwX3NjcmVlbiAqc2Ny ZWVuKQogICAgfQogCiAgICBCRUdJTl9OVjA0KHB1c2gsIE5WNTBfM0QoWkVUQV9DT01QX0VOQUJM RSksIDEpOwotICAgUFVTSF9EQVRBKHB1c2gsIHNjcmVlbi0+YmFzZS5kZXZpY2UtPmRybV92ZXJz aW9uID49IDB4MDEwMDAxMDEpOworICAgUFVTSF9EQVRBKHB1c2gsIHNjcmVlbi0+YmFzZS5kcm0t PmRybV92ZXJzaW9uID49IDB4MDEwMDAxMDEpOwogCiAgICBCRUdJTl9OVjA0KHB1c2gsIE5WNTBf M0QoUlRfQ09NUF9FTkFCTEUoMCkpLCA4KTsKICAgIGZvciAoaSA9IDA7IGkgPCA4OyArK2kpCi0g ICAgICBQVVNIX0RBVEEocHVzaCwgc2NyZWVuLT5iYXNlLmRldmljZS0+ZHJtX3ZlcnNpb24gPj0g MHgwMTAwMDEwMSk7CisgICAgICBQVVNIX0RBVEEocHVzaCwgc2NyZWVuLT5iYXNlLmRybS0+ZHJt X3ZlcnNpb24gPj0gMHgwMTAwMDEwMSk7CiAKICAgIEJFR0lOX05WMDQocHVzaCwgTlY1MF8zRChS VF9DT05UUk9MKSwgMSk7CiAgICBQVVNIX0RBVEEgKHB1c2gsIDEpOwpkaWZmIC0tZ2l0IGEvc3Jj L2dhbGxpdW0vZHJpdmVycy9ub3V2ZWF1L252YzAvbnZjMF9taXB0cmVlLmMgYi9zcmMvZ2FsbGl1 bS9kcml2ZXJzL25vdXZlYXUvbnZjMC9udmMwX21pcHRyZWUuYwppbmRleCAxNTk5MWMzLi5iMWQx YjY3IDEwMDY0NAotLS0gYS9zcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZlYXUvbnZjMC9udmMwX21p cHRyZWUuYworKysgYi9zcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZlYXUvbnZjMC9udmMwX21pcHRy ZWUuYwpAQCAtMjQ4LDkgKzI0OCwxMCBAQCBudmMwX21pcHRyZWVfY3JlYXRlKHN0cnVjdCBwaXBl X3NjcmVlbiAqcHNjcmVlbiwKICAgICAgICAgICAgICAgICAgICAgY29uc3Qgc3RydWN0IHBpcGVf cmVzb3VyY2UgKnRlbXBsKQogewogICAgc3RydWN0IG5vdXZlYXVfZGV2aWNlICpkZXYgPSBub3V2 ZWF1X3NjcmVlbihwc2NyZWVuKS0+ZGV2aWNlOworICAgc3RydWN0IG5vdXZlYXVfZHJtICpkcm0g PSBub3V2ZWF1X3NjcmVlbihwc2NyZWVuKS0+ZHJtOwogICAgc3RydWN0IG52NTBfbWlwdHJlZSAq bXQgPSBDQUxMT0NfU1RSVUNUKG52NTBfbWlwdHJlZSk7CiAgICBzdHJ1Y3QgcGlwZV9yZXNvdXJj ZSAqcHQgPSAmbXQtPmJhc2UuYmFzZTsKLSAgIGJvb2wgY29tcHJlc3NlZCA9IGRldi0+ZHJtX3Zl cnNpb24gPj0gMHgwMTAwMDEwMTsKKyAgIGJvb2wgY29tcHJlc3NlZCA9IGRybS0+ZHJtX3ZlcnNp b24gPj0gMHgwMTAwMDEwMTsKICAgIGludCByZXQ7CiAgICB1bmlvbiBub3V2ZWF1X2JvX2NvbmZp ZyBib19jb25maWc7CiAgICB1aW50MzJfdCBib19mbGFnczsKZGlmZiAtLWdpdCBhL3NyYy9nYWxs aXVtL2RyaXZlcnMvbm91dmVhdS9udmMwL252YzBfcXVlcnkuYyBiL3NyYy9nYWxsaXVtL2RyaXZl cnMvbm91dmVhdS9udmMwL252YzBfcXVlcnkuYwppbmRleCBkOTkyYjEwLi4yOTQ2NDQ1IDEwMDY0 NAotLS0gYS9zcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZlYXUvbnZjMC9udmMwX3F1ZXJ5LmMKKysr IGIvc3JjL2dhbGxpdW0vZHJpdmVycy9ub3V2ZWF1L252YzAvbnZjMF9xdWVyeS5jCkBAIC0xODQs NyArMTg0LDcgQEAgbnZjMF9zY3JlZW5fZ2V0X2RyaXZlcl9xdWVyeV9ncm91cF9pbmZvKHN0cnVj dCBwaXBlX3NjcmVlbiAqcHNjcmVlbiwKICAgIGNvdW50Kys7CiAjZW5kaWYKIAotICAgaWYgKHNj cmVlbi0+YmFzZS5kZXZpY2UtPmRybV92ZXJzaW9uID49IDB4MDEwMDAxMDEpIHsKKyAgIGlmIChz Y3JlZW4tPmJhc2UuZHJtLT5kcm1fdmVyc2lvbiA+PSAweDAxMDAwMTAxKSB7CiAgICAgICBpZiAo c2NyZWVuLT5jb21wdXRlKSB7CiAgICAgICAgICBpZiAoc2NyZWVuLT5iYXNlLmNsYXNzXzNkID09 IE5WRTRfM0RfQ0xBU1MpIHsKICAgICAgICAgICAgIGNvdW50Kys7CmRpZmYgLS1naXQgYS9zcmMv Z2FsbGl1bS9kcml2ZXJzL25vdXZlYXUvbnZjMC9udmMwX3F1ZXJ5X2h3X21ldHJpYy5jIGIvc3Jj L2dhbGxpdW0vZHJpdmVycy9ub3V2ZWF1L252YzAvbnZjMF9xdWVyeV9od19tZXRyaWMuYwppbmRl eCBmYjI4MDZhLi45OTM3NDFkIDEwMDY0NAotLS0gYS9zcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZl YXUvbnZjMC9udmMwX3F1ZXJ5X2h3X21ldHJpYy5jCisrKyBiL3NyYy9nYWxsaXVtL2RyaXZlcnMv bm91dmVhdS9udmMwL252YzBfcXVlcnlfaHdfbWV0cmljLmMKQEAgLTQwNCw3ICs0MDQsNyBAQCBu dmMwX2h3X21ldHJpY19nZXRfZHJpdmVyX3F1ZXJ5X2luZm8oc3RydWN0IG52YzBfc2NyZWVuICpz Y3JlZW4sIHVuc2lnbmVkIGlkLAogICAgdWludDE2X3QgY2xhc3NfM2QgPSBzY3JlZW4tPmJhc2Uu Y2xhc3NfM2Q7CiAgICBpbnQgY291bnQgPSAwOwogCi0gICBpZiAoc2NyZWVuLT5iYXNlLmRldmlj ZS0+ZHJtX3ZlcnNpb24gPj0gMHgwMTAwMDEwMSkgeworICAgaWYgKHNjcmVlbi0+YmFzZS5kcm0t PmRybV92ZXJzaW9uID49IDB4MDEwMDAxMDEpIHsKICAgICAgIGlmIChzY3JlZW4tPmNvbXB1dGUp IHsKICAgICAgICAgIGlmIChjbGFzc18zZCA8IE5WRTRfM0RfQ0xBU1MpIHsKICAgICAgICAgICAg IGNvbnN0IHN0cnVjdCBudmMwX2h3X21ldHJpY19xdWVyeV9jZmcgKipxdWVyaWVzID0KZGlmZiAt LWdpdCBhL3NyYy9nYWxsaXVtL2RyaXZlcnMvbm91dmVhdS9udmMwL252YzBfcXVlcnlfaHdfc20u YyBiL3NyYy9nYWxsaXVtL2RyaXZlcnMvbm91dmVhdS9udmMwL252YzBfcXVlcnlfaHdfc20uYwpp bmRleCA3OTYyMTQzLi40NjNhOTliIDEwMDY0NAotLS0gYS9zcmMvZ2FsbGl1bS9kcml2ZXJzL25v dXZlYXUvbnZjMC9udmMwX3F1ZXJ5X2h3X3NtLmMKKysrIGIvc3JjL2dhbGxpdW0vZHJpdmVycy9u b3V2ZWF1L252YzAvbnZjMF9xdWVyeV9od19zbS5jCkBAIC0xMjUxLDcgKzEyNTEsNyBAQCBudmMw X2h3X3NtX2NyZWF0ZV9xdWVyeShzdHJ1Y3QgbnZjMF9jb250ZXh0ICpudmMwLCB1bnNpZ25lZCB0 eXBlKQogICAgc3RydWN0IG52YzBfaHdfcXVlcnkgKmhxOwogICAgdW5zaWduZWQgc3BhY2U7CiAK LSAgIGlmIChudmMwLT5zY3JlZW4tPmJhc2UuZGV2aWNlLT5kcm1fdmVyc2lvbiA8IDB4MDEwMDAx MDEpCisgICBpZiAobnZjMC0+c2NyZWVuLT5iYXNlLmRybS0+ZHJtX3ZlcnNpb24gPCAweDAxMDAw MTAxKQogICAgICAgcmV0dXJuIE5VTEw7CiAKICAgIGlmICgodHlwZSA8IE5WRTRfSFdfU01fUVVF UlkoMCkgfHwgdHlwZSA+IE5WRTRfSFdfU01fUVVFUllfTEFTVCkgJiYKQEAgLTEzNDEsNyArMTM0 MSw3IEBAIG52YzBfaHdfc21fZ2V0X2RyaXZlcl9xdWVyeV9pbmZvKHN0cnVjdCBudmMwX3NjcmVl biAqc2NyZWVuLCB1bnNpZ25lZCBpZCwKIHsKICAgIGludCBjb3VudCA9IDA7CiAKLSAgIGlmIChz Y3JlZW4tPmJhc2UuZGV2aWNlLT5kcm1fdmVyc2lvbiA+PSAweDAxMDAwMTAxKSB7CisgICBpZiAo c2NyZWVuLT5iYXNlLmRybS0+ZHJtX3ZlcnNpb24gPj0gMHgwMTAwMDEwMSkgewogICAgICAgaWYg KHNjcmVlbi0+Y29tcHV0ZSkgewogICAgICAgICAgaWYgKHNjcmVlbi0+YmFzZS5jbGFzc18zZCA9 PSBOVkU0XzNEX0NMQVNTKSB7CiAgICAgICAgICAgICBjb3VudCArPSBOVkU0X0hXX1NNX1FVRVJZ X0NPVU5UOwpkaWZmIC0tZ2l0IGEvc3JjL2dhbGxpdW0vZHJpdmVycy9ub3V2ZWF1L252YzAvbnZj MF9zY3JlZW4uYyBiL3NyYy9nYWxsaXVtL2RyaXZlcnMvbm91dmVhdS9udmMwL252YzBfc2NyZWVu LmMKaW5kZXggNDYxZmNhYS4uYjdlNDRlNyAxMDA2NDQKLS0tIGEvc3JjL2dhbGxpdW0vZHJpdmVy cy9ub3V2ZWF1L252YzAvbnZjMF9zY3JlZW4uYworKysgYi9zcmMvZ2FsbGl1bS9kcml2ZXJzL25v dXZlYXUvbnZjMC9udmMwX3NjcmVlbi5jCkBAIC02ODcsNyArNjg3LDcgQEAgbnZjMF9zY3JlZW5f Y3JlYXRlKHN0cnVjdCBub3V2ZWF1X2RldmljZSAqZGV2KQogICAgc2NyZWVuLT5iYXNlLmJhc2Uu aXNfdmlkZW9fZm9ybWF0X3N1cHBvcnRlZCA9IG5vdXZlYXVfdnAzX3NjcmVlbl92aWRlb19zdXBw b3J0ZWQ7CiAKICAgIGZsYWdzID0gTk9VVkVBVV9CT19HQVJUIHwgTk9VVkVBVV9CT19NQVA7Ci0g ICBpZiAoZGV2LT5kcm1fdmVyc2lvbiA+PSAweDAxMDAwMjAyKQorICAgaWYgKHNjcmVlbi0+YmFz ZS5kcm0tPmRybV92ZXJzaW9uID49IDB4MDEwMDAyMDIpCiAgICAgICBmbGFncyB8PSBOT1VWRUFV X0JPX0NPSEVSRU5UOwogCiAgICByZXQgPSBub3V2ZWF1X2JvX25ldyhkZXYsIGZsYWdzLCAwLCA0 MDk2LCBOVUxMLCAmc2NyZWVuLT5mZW5jZS5ibyk7CkBAIC04MTEsMTAgKzgxMSwxMSBAQCBudmMw X3NjcmVlbl9jcmVhdGUoc3RydWN0IG5vdXZlYXVfZGV2aWNlICpkZXYpCiAgICAgICBQVVNIX0RB VEEgKHB1c2gsIDB4MTcpOwogICAgfQogCi0gICBJTU1FRF9OVkMwKHB1c2gsIE5WQzBfM0QoWkVU QV9DT01QX0VOQUJMRSksIGRldi0+ZHJtX3ZlcnNpb24gPj0gMHgwMTAwMDEwMSk7CisgICBJTU1F RF9OVkMwKHB1c2gsIE5WQzBfM0QoWkVUQV9DT01QX0VOQUJMRSksCisgICAgICAgICAgICAgICAg ICAgIHNjcmVlbi0+YmFzZS5kcm0tPmRybV92ZXJzaW9uID49IDB4MDEwMDAxMDEpOwogICAgQkVH SU5fTlZDMChwdXNoLCBOVkMwXzNEKFJUX0NPTVBfRU5BQkxFKDApKSwgOCk7CiAgICBmb3IgKGkg PSAwOyBpIDwgODsgKytpKQotICAgICAgICAgICBQVVNIX0RBVEEocHVzaCwgZGV2LT5kcm1fdmVy c2lvbiA+PSAweDAxMDAwMTAxKTsKKyAgICAgICAgICAgUFVTSF9EQVRBKHB1c2gsIHNjcmVlbi0+ YmFzZS5kcm0tPmRybV92ZXJzaW9uID49IDB4MDEwMDAxMDEpOwogCiAgICBCRUdJTl9OVkMwKHB1 c2gsIE5WQzBfM0QoUlRfQ09OVFJPTCksIDEpOwogICAgUFVTSF9EQVRBIChwdXNoLCAxKTsKQEAg LTkxMCw3ICs5MTEsNyBAQCBudmMwX3NjcmVlbl9jcmVhdGUoc3RydWN0IG5vdXZlYXVfZGV2aWNl ICpkZXYpCiAgICBQVVNIX0RBVEFoKHB1c2gsIHNjcmVlbi0+dW5pZm9ybV9iby0+b2Zmc2V0ICsg KDUgPDwgMTYpICsgKDYgPDwgOSkpOwogICAgUFVTSF9EQVRBIChwdXNoLCBzY3JlZW4tPnVuaWZv cm1fYm8tPm9mZnNldCArICg1IDw8IDE2KSArICg2IDw8IDkpKTsKIAotICAgaWYgKGRldi0+ZHJt X3ZlcnNpb24gPj0gMHgwMTAwMDEwMSkgeworICAgaWYgKHNjcmVlbi0+YmFzZS5kcm0tPmRybV92 ZXJzaW9uID49IDB4MDEwMDAxMDEpIHsKICAgICAgIHJldCA9IG5vdXZlYXVfZ2V0cGFyYW0oZGV2 LCBOT1VWRUFVX0dFVFBBUkFNX0dSQVBIX1VOSVRTLCAmdmFsdWUpOwogICAgICAgaWYgKHJldCkg ewogICAgICAgICAgTk9VVkVBVV9FUlIoIk5PVVZFQVVfR0VUUEFSQU1fR1JBUEhfVU5JVFMgZmFp bGVkLlxuIik7Ci0tIAoyLjYuMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KTm91dmVhdSBtYWlsaW5nIGxpc3QKTm91dmVhdUBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL25vdXZl YXUK