From: Ben Skeggs Subject: [mesa 7/9] nv50: fix g98+ vdec class allocation Date: Thu, 26 Nov 2015 17:15:01 +1000 Message-ID: <1448522103-4925-7-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 RnJvbTogQmVuIFNrZWdncyA8YnNrZWdnc0ByZWRoYXQuY29tPgoKVGhlIGtlcm5lbCBwcmV2aW91 c2x5IGV4cG9zZWQgaW5jb3JyZWN0IGNsYXNzZXMgZm9yIHNvbWUgb2YgdGhlIGNoaXBzZXRzCnRo YXQgdGhpcyBjb2RlIHN1cHBvcnRzLiAgSXQgbm8gbG9uZ2VyIGRvZXMsIGJ1dCB0aGUgb2xkZXIg b2JqZWN0IGlvY3RscwpoYXZlIGNvbXBhdGliaWxpdHkgdG8gYXZvaWQgYnJlYWtpbmcgdXNlcnNw YWNlLgoKVGhpcyBuZWVkcyB0byBiZSBmaXhlZCBiZWZvcmUgc3dpdGNoaW5nIG92ZXIgdG8gdGhl IG5ld2VyIGludGVyZmFjZXMuCgpSYXRoZXIgdGhhbiBoYXJkY29kaW5nIGNoaXBzZXQtPmNsYXNz IGxpa2UgdGhlIHJlc3Qgb2YgdGhlIGRyaXZlciBkb2VzLAp0aGlzIG1ha2VzIHVzZSBvZiAobmV3 KSBzY2xhc3MgcXVlcmllcyB0byBkZXRlcm1pbmUgd2hhdCdzIGF2YWlsYWJsZS4KClNpZ25lZC1v ZmYtYnk6IEJlbiBTa2VnZ3MgPGJza2VnZ3NAcmVkaGF0LmNvbT4KLS0tCiBzcmMvZ2FsbGl1bS9k cml2ZXJzL25vdXZlYXUvbnY1MC9udjk4X3ZpZGVvLmMgfCA1NSArKysrKysrKysrKysrKysrKysr KysrKystLS0KIDEgZmlsZSBjaGFuZ2VkLCA0OSBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL3NyYy9nYWxsaXVtL2RyaXZlcnMvbm91dmVhdS9udjUwL252OThfdmlk ZW8uYyBiL3NyYy9nYWxsaXVtL2RyaXZlcnMvbm91dmVhdS9udjUwL252OThfdmlkZW8uYwppbmRl eCAyMGVhNTQ3Li5lZjFkNmYzIDEwMDY0NAotLS0gYS9zcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZl YXUvbnY1MC9udjk4X3ZpZGVvLmMKKysrIGIvc3JjL2dhbGxpdW0vZHJpdmVycy9ub3V2ZWF1L252 NTAvbnY5OF92aWRlby5jCkBAIC01Niw2ICs1NiwyOCBAQCBudjk4X2RlY29kZXJfZGVjb2RlX2Jp dHN0cmVhbShzdHJ1Y3QgcGlwZV92aWRlb19jb2RlYyAqZGVjb2RlciwKICAgIG52OThfZGVjb2Rl cl9wcHAoZGVjLCBkZXNjLCB0YXJnZXQsIGNvbW1fc2VxKTsKIH0KIAorc3RhdGljIGNvbnN0IHN0 cnVjdCBub3V2ZWF1X21jbGFzcworbnY5OF9kZWNvZGVyX21zdmxkW10gPSB7CisgICB7IDB4ODhi MSwgLTEgfSwKKyAgIHsgMHg4NmIxLCAtMSB9LAorICAgeyAweDg1YjEsIC0xIH0sCisgICB7fQor fTsKKworc3RhdGljIGNvbnN0IHN0cnVjdCBub3V2ZWF1X21jbGFzcworbnY5OF9kZWNvZGVyX21z cGRlY1tdID0geworICAgeyAweDg4YjIsIC0xIH0sCisgICB7IDB4ODViMiwgLTEgfSwKKyAgIHt9 Cit9OworCitzdGF0aWMgY29uc3Qgc3RydWN0IG5vdXZlYXVfbWNsYXNzCitudjk4X2RlY29kZXJf bXNwcHBbXSA9IHsKKyAgIHsgMHg4OGIzLCAtMSB9LAorICAgeyAweDg1YjMsIC0xIH0sCisgICB7 fQorfTsKKwogc3RydWN0IHBpcGVfdmlkZW9fY29kZWMgKgogbnY5OF9jcmVhdGVfZGVjb2Rlcihz dHJ1Y3QgcGlwZV9jb250ZXh0ICpjb250ZXh0LAogICAgICAgICAgICAgICAgICAgICBjb25zdCBz dHJ1Y3QgcGlwZV92aWRlb19jb2RlYyAqdGVtcGwpCkBAIC0xMDMsMTIgKzEyNSwzMyBAQCBudjk4 X2NyZWF0ZV9kZWNvZGVyKHN0cnVjdCBwaXBlX2NvbnRleHQgKmNvbnRleHQsCiAgICB9CiAgICBw dXNoID0gZGVjLT5wdXNoYnVmOwogCi0gICBpZiAoIXJldCkKLSAgICAgIHJldCA9IG5vdXZlYXVf b2JqZWN0X25ldyhkZWMtPmNoYW5uZWxbMF0sIDB4MzkwYjEsIDB4ODViMSwgTlVMTCwgMCwgJmRl Yy0+YnNwKTsKLSAgIGlmICghcmV0KQotICAgICAgcmV0ID0gbm91dmVhdV9vYmplY3RfbmV3KGRl Yy0+Y2hhbm5lbFsxXSwgMHgxOTBiMiwgMHg4NWIyLCBOVUxMLCAwLCAmZGVjLT52cCk7Ci0gICBp ZiAoIXJldCkKLSAgICAgIHJldCA9IG5vdXZlYXVfb2JqZWN0X25ldyhkZWMtPmNoYW5uZWxbMl0s IDB4MjkwYjMsIDB4ODViMywgTlVMTCwgMCwgJmRlYy0+cHBwKTsKKyAgIGlmICghcmV0KSB7Cisg ICAgICByZXQgPSBub3V2ZWF1X29iamVjdF9tY2xhc3MoZGVjLT5jaGFubmVsWzBdLCBudjk4X2Rl Y29kZXJfbXN2bGQpOworICAgICAgaWYgKHJldCA+PSAwKSB7CisgICAgICAgICByZXQgPSBub3V2 ZWF1X29iamVjdF9uZXcoZGVjLT5jaGFubmVsWzBdLCAweGJlZWY4NWIxLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIG52OThfZGVjb2Rlcl9tc3ZsZFtyZXRdLm9jbGFzcywgTlVM TCwgMCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmZGVjLT5ic3ApOworICAg ICAgfQorICAgfQorCisgICBpZiAoIXJldCkgeworICAgICAgcmV0ID0gbm91dmVhdV9vYmplY3Rf bWNsYXNzKGRlYy0+Y2hhbm5lbFsxXSwgbnY5OF9kZWNvZGVyX21zcGRlYyk7CisgICAgICBpZiAo cmV0ID49IDApIHsKKyAgICAgICAgIHJldCA9IG5vdXZlYXVfb2JqZWN0X25ldyhkZWMtPmNoYW5u ZWxbMV0sIDB4YmVlZjg1YjIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbnY5 OF9kZWNvZGVyX21zcGRlY1tyZXRdLm9jbGFzcywgTlVMTCwgMCwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAmZGVjLT52cCk7CisgICAgICB9CisgICB9CisKKyAgIGlmICghcmV0 KSB7CisgICAgICByZXQgPSBub3V2ZWF1X29iamVjdF9tY2xhc3MoZGVjLT5jaGFubmVsWzJdLCBu djk4X2RlY29kZXJfbXNwcHApOworICAgICAgaWYgKHJldCA+PSAwKSB7CisgICAgICAgICByZXQg PSBub3V2ZWF1X29iamVjdF9uZXcoZGVjLT5jaGFubmVsWzJdLCAweGJlZWY4NWIzLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIG52OThfZGVjb2Rlcl9tc3BwcFtyZXRdLm9jbGFz cywgTlVMTCwgMCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmZGVjLT5wcHAp OworICAgICAgfQorICAgfQorCiAgICBpZiAocmV0KQogICAgICAgZ290byBmYWlsOwogCi0tIAoy LjYuMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KTm91 dmVhdSBtYWlsaW5nIGxpc3QKTm91dmVhdUBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL25vdXZlYXUK