From: Alexandre Courbot Subject: [PATCH] gr: fallback to legacy paths during firmware lookup Date: Wed, 2 Nov 2016 13:54:17 +0900 Message-ID: <20161102045417.5886-1-acourbot@nvidia.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" To: Ben Skeggs Cc: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: nouveau.vger.kernel.org TG9vayBmb3IgZmlybXdhcmUgZmlsZXMgdXNpbmcgdGhlIGxlZ2FjeSAoIm5vdXZlYXUvbnZ4eF9m dWN4eHh4IikgcGF0aAppZiB0aGV5IGNhbm5vdCBiZSBmb3VuZCBpbiB0aGUgbmV3LCAib2ZmaWNp YWwiIHBhdGguIFVzZXIgc2V0dXBzIHdlcmUKYnJva2VuIGJ5IHRoZSBzd2l0Y2gsIHdoaWNoIGlz IGJhZC4KClRoZXJlIGFyZSBvbmx5IDQgZmlybXdhcmUgZmlsZXMgd2UgbWF5IHdhbnQgdG8gbG9v ayB1cCB0aGF0IHdheSwgc28KaGFyZGNvZGUgdGhlbSBpbnRvIHRoZSBsb29rdXAgZnVuY3Rpb24u IEFsbCBuZXcgZmlybXdhcmUgZmlsZXMgc2hvdWxkCnVzZSB0aGUgc3RhbmRhcmQgIm52aWRpYS88 Y2hpcD4vZ3IvIiBwYXRoLgoKRml4ZXM6IDg1MzliMzdhY2VmNyAoImRybS9ub3V2ZWF1L2dyOiB1 c2UgTlZJRElBLXByb3ZpZGVkIGV4dGVybmFsIGZpcm13YXJlcyIpClNpZ25lZC1vZmYtYnk6IEFs ZXhhbmRyZSBDb3VyYm90IDxhY291cmJvdEBudmlkaWEuY29tPgotLS0KIGRybS9ub3V2ZWF1L252 a20vZW5naW5lL2dyL2dmMTAwLmMgfCA1NiArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrLS0tLQogMSBmaWxlIGNoYW5nZWQsIDUxIGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvZHJtL25vdXZlYXUvbnZrbS9lbmdpbmUvZ3IvZ2YxMDAuYyBiL2RybS9u b3V2ZWF1L252a20vZW5naW5lL2dyL2dmMTAwLmMKaW5kZXggMTU3OTE5Yzc4OGU2Li45ZTY1YWRi YWIyMWMgMTAwNjQ0Ci0tLSBhL2RybS9ub3V2ZWF1L252a20vZW5naW5lL2dyL2dmMTAwLmMKKysr IGIvZHJtL25vdXZlYXUvbnZrbS9lbmdpbmUvZ3IvZ2YxMDAuYwpAQCAtMTc1NiwyNCArMTc1Niw3 MCBAQCBnZjEwMF9ncl8gPSB7CiB9OwogCiBpbnQKK2dmMTAwX2dyX2N0b3JfZndfbGVnYWN5KHN0 cnVjdCBnZjEwMF9nciAqZ3IsIGNvbnN0IGNoYXIgKmZ3bmFtZSwKKwkJCXN0cnVjdCBnZjEwMF9n cl9mdWMgKmZ1YykKK3sKKwlzdHJ1Y3QgbnZrbV9zdWJkZXYgKnN1YmRldiA9ICZnci0+YmFzZS5l bmdpbmUuc3ViZGV2OworCXN0cnVjdCBudmttX2RldmljZSAqZGV2aWNlID0gc3ViZGV2LT5kZXZp Y2U7CisJY29uc3Qgc3RydWN0IGZpcm13YXJlICpmdzsKKwljaGFyIGZbMzJdOworCWludCByZXQ7 CisKKwlzbnByaW50ZihmLCBzaXplb2YoZiksICJub3V2ZWF1L252JTAyeF8lcyIsIGRldmljZS0+ Y2hpcHNldCwgZnduYW1lKTsKKwlyZXQgPSByZXF1ZXN0X2Zpcm13YXJlKCZmdywgZiwgZGV2aWNl LT5kZXYpOworCWlmIChyZXQpIHsKKwkJc25wcmludGYoZiwgc2l6ZW9mKGYpLCAibm91dmVhdS8l cyIsIGZ3bmFtZSk7CisJCXJldCA9IHJlcXVlc3RfZmlybXdhcmUoJmZ3LCBmLCBkZXZpY2UtPmRl dik7CisJCWlmIChyZXQpIHsKKwkJCW52a21fZXJyb3Ioc3ViZGV2LCAiZmFpbGVkIHRvIGxvYWQg JXNcbiIsIGZ3bmFtZSk7CisJCQlyZXR1cm4gcmV0OworCQl9CisJfQorCisJZnVjLT5zaXplID0g ZnctPnNpemU7CisJZnVjLT5kYXRhID0ga21lbWR1cChmdy0+ZGF0YSwgZnVjLT5zaXplLCBHRlBf S0VSTkVMKTsKKwlyZWxlYXNlX2Zpcm13YXJlKGZ3KTsKKwlyZXR1cm4gKGZ1Yy0+ZGF0YSAhPSBO VUxMKSA/IDAgOiAtRU5PTUVNOworfQorCitpbnQKIGdmMTAwX2dyX2N0b3JfZncoc3RydWN0IGdm MTAwX2dyICpnciwgY29uc3QgY2hhciAqZnduYW1lLAogCQkgc3RydWN0IGdmMTAwX2dyX2Z1YyAq ZnVjKQogewogCXN0cnVjdCBudmttX3N1YmRldiAqc3ViZGV2ID0gJmdyLT5iYXNlLmVuZ2luZS5z dWJkZXY7CiAJc3RydWN0IG52a21fZGV2aWNlICpkZXZpY2UgPSBzdWJkZXYtPmRldmljZTsKKwlj b25zdCBjaGFyICpsZWdhY3lfZnduYW1lID0gTlVMTDsKIAljb25zdCBzdHJ1Y3QgZmlybXdhcmUg KmZ3OwogCWludCByZXQ7CiAKIAlyZXQgPSBudmttX2Zpcm13YXJlX2dldChkZXZpY2UsIGZ3bmFt ZSwgJmZ3KTsKLQlpZiAocmV0KSB7CisJLyogZmlybXdhcmUgZm91bmQsIHN1Y2Nlc3MhICovCisJ aWYgKCFyZXQpIHsKKwkJZnVjLT5zaXplID0gZnctPnNpemU7CisJCWZ1Yy0+ZGF0YSA9IGttZW1k dXAoZnctPmRhdGEsIGZ1Yy0+c2l6ZSwgR0ZQX0tFUk5FTCk7CisJCW52a21fZmlybXdhcmVfcHV0 KGZ3KTsKKwkJcmV0dXJuIChmdWMtPmRhdGEgIT0gTlVMTCkgPyAwIDogLUVOT01FTTsKKwl9CisK KwkvKiBzZWUgaWYgdGhpcyBmaXJtd2FyZSBoYXMgYSBsZWdhY3kgcGF0aCAqLworCWlmICghc3Ry Y21wKGZ3bmFtZSwgImZlY3NfaW5zdCIpKQorCQlsZWdhY3lfZnduYW1lID0gImZ1YzQwOWMiOwor CWVsc2UgaWYgKCFzdHJjbXAoZnduYW1lLCAiZmVjc19kYXRhIikpCisJCWxlZ2FjeV9md25hbWUg PSAiZnVjNDA5ZCI7CisJZWxzZSBpZiAoIXN0cmNtcChmd25hbWUsICJncGNjc19pbnN0IikpCisJ CWxlZ2FjeV9md25hbWUgPSAiZnVjNDFhYyI7CisJZWxzZSBpZiAoIXN0cmNtcChmd25hbWUsICJn cGNjc19kYXRhIikpCisJCWxlZ2FjeV9md25hbWUgPSAiZnVjNDFhZCI7CisKKwkvKiBub3BlLCBs ZXQncyBqdXN0IHJldHVybiB0aGUgZXJyb3Igd2UgZ290ICovCisJaWYgKCFsZWdhY3lfZnduYW1l KSB7CiAJCW52a21fZXJyb3Ioc3ViZGV2LCAiZmFpbGVkIHRvIGxvYWQgJXNcbiIsIGZ3bmFtZSk7 CiAJCXJldHVybiByZXQ7CiAJfQogCi0JZnVjLT5zaXplID0gZnctPnNpemU7Ci0JZnVjLT5kYXRh ID0ga21lbWR1cChmdy0+ZGF0YSwgZnVjLT5zaXplLCBHRlBfS0VSTkVMKTsKLQludmttX2Zpcm13 YXJlX3B1dChmdyk7Ci0JcmV0dXJuIChmdWMtPmRhdGEgIT0gTlVMTCkgPyAwIDogLUVOT01FTTsK KwkvKiB5ZXMsIHRyeSB0byBsb2FkIGZyb20gdGhlIGxlZ2FjeSBwYXRoICovCisJbnZrbV9kZWJ1 ZyhzdWJkZXYsICIlczogZmFsbGluZyBiYWNrIHRvIGxlZ2FjeSBwYXRoXG4iLCBmd25hbWUpOwor CXJldHVybiBnZjEwMF9ncl9jdG9yX2Z3X2xlZ2FjeShnciwgbGVnYWN5X2Z3bmFtZSwgZnVjKTsK IH0KIAogaW50Ci0tIAoyLjEwLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCk5vdXZlYXUgbWFpbGluZyBsaXN0Ck5vdXZlYXVAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vbm91 dmVhdQo=