From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arkadiusz Hiler Subject: [PATCH 8/8] drm/i915/uc: Simplify firmware path handling Date: Wed, 22 Feb 2017 13:41:25 +0100 Message-ID: <20170222124125.4437-9-arkadiusz.hiler@intel.com> References: <20170222124125.4437-1-arkadiusz.hiler@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6DDF189872 for ; Wed, 22 Feb 2017 12:41:50 +0000 (UTC) In-Reply-To: <20170222124125.4437-1-arkadiusz.hiler@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org Q3VycmVudGx5IGZ3LT5wYXRoIHZhbHVlcyBjYW4gcmVwcmVzZW50IG9uZSBvZiB0aHJlZSBwb3Nz aWJsZSBzdGF0ZXM6CgogMSkgTlVMTCAtIGRldmljZSB3aXRob3V0IHRoZSB1QwogMikgJ1wwJyAt IGRldmljZSB3aXRoIHRoZSB1QyBidXQgaGF2ZSBubyBmaXJtd2FyZQogMykgZWxzZSAtIGRldmlj ZSB3aXRoIHRoZSB1QyBhbmQgd2UgaGF2ZSBmaXJtd2FyZQoKU2Vjb25kIGNhc2UgaXMgdXNlZCBv bmx5IHRvIFdBUk4gYXQgYSBsYXRlciBzdGFnZS4KCldlIGNhbiBXQVJOIHJpZ2h0IGF3YXkgYW5k IG1lcmdlIGNhc2VzIDEgYW5kIDIuCgpDb2RlIGNhbiBiZSBldmVuIGZ1cnRoZXIgc2ltcGxpZmll ZCBhbmQgY29tbW9uIChIdUMvR3VDIGxvZ2ljKSBoYXBwZW5pbmcKcmlnaHQgYmVmb3JlIHRoZSBm ZXRjaCBjYW4gYmUgb2ZmbG9hZGVkIHRvIHRoZSBjb21tb24gZnVuY3Rpb24uCgp2MjogZmV3ZXIg dGVtcG9yYXJ5IHZhcmlhYmxlcywgbW9yZSBzdHJhaWdodGZvcndhcmQgZmxvdyAoTS4gV2FqZGVj emtvKQp2MzogRFJNX0VSUk9SIGluc3RlYWQgb2YgV0FSTiAoTS4gV2FqZGVjemtvKQoKQ2M6IEFu dXNoYSBTcml2YXRzYSA8YW51c2hhLnNyaXZhdHNhQGludGVsLmNvbT4KQ2M6IFR2cnRrbyBVcnN1 bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+CkNjOiBNaWNoYWwgV2luaWFyc2tpIDxtaWNo YWwud2luaWFyc2tpQGludGVsLmNvbT4KQ2M6IE1pY2hhbCBXYWpkZWN6a28gPG1pY2hhbC53YWpk ZWN6a29AaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBBcmthZGl1c3ogSGlsZXIgPGFya2FkaXVz ei5oaWxlckBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xv YWRlci5jIHwgMzkgKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9odWMuYyAgICAgICAgfCAyMCArKysrKy0tLS0tLS0tLS0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuYyAgICAgICAgIHwgIDUgKysrLS0KIDMgZmlsZXMg Y2hhbmdlZCwgMjIgaW5zZXJ0aW9ucygrKSwgNDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCmluZGV4IDU0OWEyNTQuLjMzNmU5N2QgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKQEAgLTQzMywxMiArNDMzLDggQEAgaW50 IGludGVsX2d1Y19pbml0X2h3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJ aW50ZWxfdWNfZndfc3RhdHVzX3JlcHIoZ3VjX2Z3LT5sb2FkX3N0YXR1cykpOwogCiAJaWYgKGZ3 X3BhdGggPT0gTlVMTCkgewotCQkvKiBEZXZpY2UgaXMga25vd24gdG8gaGF2ZSBubyB1Q29kZSAo ZS5nLiBubyBHdUMpICovCisJCS8qIFdlIGRvIG5vdCBoYXZlIHVDb2RlIGZvciB0aGUgZGV2aWNl ICovCiAJCXJldHVybiAtRU5YSU87Ci0JfSBlbHNlIGlmICgqZndfcGF0aCA9PSAnXDAnKSB7Ci0J CS8qIERldmljZSBoYXMgYSBHdUMgYnV0IHdlIGRvbid0IGtub3cgd2hhdCBmL3cgdG8gbG9hZD8g Ki8KLQkJV0FSTigxLCAiTm8gR3VDIGZpcm13YXJlIGtub3duIGZvciB0aGlzIHBsYXRmb3JtIVxu Iik7Ci0JCXJldHVybiAtRU5PREVWOwogCX0KIAogCS8qIEZldGNoIGZhaWxlZCwgb3IgYWxyZWFk eSBmZXRjaGVkIGJ1dCBmYWlsZWQgdG8gbG9hZD8gKi8KQEAgLTQ3NCw3ICs0NzAsNiBAQCBpbnQg aW50ZWxfZ3VjX2luaXRfaHcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCXJl dHVybiAwOwogfQogCi0KIC8qKgogICogaW50ZWxfZ3VjX2ZldGNoX2Z3KCkgLSBkZXRlcm1pbmUg YW5kIGZldGNoIGZpcm13YXJlCiAgKiBAZ3VjOglpbnRlbF9ndWMgc3RydWN0CkBAIC00ODcsMzkg KzQ4MiwzMSBAQCBpbnQgaW50ZWxfZ3VjX2luaXRfaHcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KQogdm9pZCBpbnRlbF9ndWNfZmV0Y2hfZncoc3RydWN0IGludGVsX2d1YyAqZ3Vj KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGd1Y190b19pOTE1KGd1 Yyk7Ci0JY29uc3QgY2hhciAqZndfcGF0aDsKIAotCWlmICghSEFTX0dVQ19VQ09ERShkZXZfcHJp dikpIHsKLQkJZndfcGF0aCA9IE5VTEw7Ci0JfSBlbHNlIGlmIChJU19TS1lMQUtFKGRldl9wcml2 KSkgewotCQlmd19wYXRoID0gSTkxNV9TS0xfR1VDX1VDT0RFOworCWd1Yy0+ZncucGF0aCA9IE5V TEw7CisJZ3VjLT5mdy5mZXRjaF9zdGF0dXMgPSBJTlRFTF9VQ19GSVJNV0FSRV9OT05FOworCWd1 Yy0+ZncubG9hZF9zdGF0dXMgPSBJTlRFTF9VQ19GSVJNV0FSRV9OT05FOworCWd1Yy0+ZncuZncg PSBJTlRFTF9VQ19GV19UWVBFX0dVQzsKKworCWlmIChJU19TS1lMQUtFKGRldl9wcml2KSkgewor CQlndWMtPmZ3LnBhdGggPSBJOTE1X1NLTF9HVUNfVUNPREU7CiAJCWd1Yy0+ZncubWFqb3JfdmVy X3dhbnRlZCA9IFNLTF9GV19NQUpPUjsKIAkJZ3VjLT5mdy5taW5vcl92ZXJfd2FudGVkID0gU0tM X0ZXX01JTk9SOwogCX0gZWxzZSBpZiAoSVNfQlJPWFRPTihkZXZfcHJpdikpIHsKLQkJZndfcGF0 aCA9IEk5MTVfQlhUX0dVQ19VQ09ERTsKKwkJZ3VjLT5mdy5wYXRoID0gSTkxNV9CWFRfR1VDX1VD T0RFOwogCQlndWMtPmZ3Lm1ham9yX3Zlcl93YW50ZWQgPSBCWFRfRldfTUFKT1I7CiAJCWd1Yy0+ ZncubWlub3JfdmVyX3dhbnRlZCA9IEJYVF9GV19NSU5PUjsKIAl9IGVsc2UgaWYgKElTX0tBQllM QUtFKGRldl9wcml2KSkgewotCQlmd19wYXRoID0gSTkxNV9LQkxfR1VDX1VDT0RFOworCQlndWMt PmZ3LnBhdGggPSBJOTE1X0tCTF9HVUNfVUNPREU7CiAJCWd1Yy0+ZncubWFqb3JfdmVyX3dhbnRl ZCA9IEtCTF9GV19NQUpPUjsKIAkJZ3VjLT5mdy5taW5vcl92ZXJfd2FudGVkID0gS0JMX0ZXX01J Tk9SOwogCX0gZWxzZSB7Ci0JCWZ3X3BhdGggPSAiIjsJLyogdW5rbm93biBkZXZpY2UgKi8KKwkJ RFJNX0VSUk9SKCJObyBHdUMgZmlybXdhcmUga25vd24gZm9yIHBsYXRmb3JtIHdpdGggR3VDIVxu Iik7CisJCWk5MTUuZW5hYmxlX2d1Y19sb2FkaW5nID0gMDsKKwkJcmV0dXJuOwogCX0KIAotCWd1 Yy0+ZncucGF0aCA9IGZ3X3BhdGg7Ci0JZ3VjLT5mdy5mZXRjaF9zdGF0dXMgPSBJTlRFTF9VQ19G SVJNV0FSRV9OT05FOwotCWd1Yy0+ZncubG9hZF9zdGF0dXMgPSBJTlRFTF9VQ19GSVJNV0FSRV9O T05FOwotCi0JaWYgKGZ3X3BhdGggPT0gTlVMTCkKLQkJcmV0dXJuOwotCWlmICgqZndfcGF0aCA9 PSAnXDAnKQotCQlyZXR1cm47Ci0KLQlndWMtPmZ3LmZldGNoX3N0YXR1cyA9IElOVEVMX1VDX0ZJ Uk1XQVJFX1BFTkRJTkc7Ci0JRFJNX0RFQlVHX0RSSVZFUigiR3VDIGZpcm13YXJlIHBlbmRpbmcs IHBhdGggJXNcbiIsIGZ3X3BhdGgpOwogCWd1Yy0+ZncuZmV0Y2goZGV2X3ByaXYsICZndWMtPmZ3 KTsKLQkvKiBzdGF0dXMgbXVzdCBub3cgYmUgRkFJTCBvciBTVUNDRVNTICovCiB9CiAKIC8qKgpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVjLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9odWMuYwppbmRleCA3NTI3OTg4Li40MTE1OTVkIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9odWMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9odWMuYwpAQCAtMTU1LDM3ICsxNTUsMjkgQEAgc3RhdGljIGludCBodWNfdWNv ZGVfeGZlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB2b2lkIGludGVsX2h1 Y19mZXRjaF9mdyhzdHJ1Y3QgaW50ZWxfaHVjICpodWMpCiB7CiAJc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gaHVjX3RvX2k5MTUoaHVjKTsKLQljb25zdCBjaGFyICpmd19wYXRo ID0gTlVMTDsKIAogCWh1Yy0+ZncucGF0aCA9IE5VTEw7CiAJaHVjLT5mdy5mZXRjaF9zdGF0dXMg PSBJTlRFTF9VQ19GSVJNV0FSRV9OT05FOwogCWh1Yy0+ZncubG9hZF9zdGF0dXMgPSBJTlRFTF9V Q19GSVJNV0FSRV9OT05FOwogCWh1Yy0+ZncuZncgPSBJTlRFTF9VQ19GV19UWVBFX0hVQzsKIAot CWlmICghSEFTX0hVQ19VQ09ERShkZXZfcHJpdikpCi0JCXJldHVybjsKLQogCWlmIChJU19TS1lM QUtFKGRldl9wcml2KSkgewotCQlmd19wYXRoID0gSTkxNV9TS0xfSFVDX1VDT0RFOworCQlodWMt PmZ3LnBhdGggPSBJOTE1X1NLTF9IVUNfVUNPREU7CiAJCWh1Yy0+ZncubWFqb3JfdmVyX3dhbnRl ZCA9IFNLTF9IVUNfRldfTUFKT1I7CiAJCWh1Yy0+ZncubWlub3JfdmVyX3dhbnRlZCA9IFNLTF9I VUNfRldfTUlOT1I7CiAJfSBlbHNlIGlmIChJU19CUk9YVE9OKGRldl9wcml2KSkgewotCQlmd19w YXRoID0gSTkxNV9CWFRfSFVDX1VDT0RFOworCQlodWMtPmZ3LnBhdGggPSBJOTE1X0JYVF9IVUNf VUNPREU7CiAJCWh1Yy0+ZncubWFqb3JfdmVyX3dhbnRlZCA9IEJYVF9IVUNfRldfTUFKT1I7CiAJ CWh1Yy0+ZncubWlub3JfdmVyX3dhbnRlZCA9IEJYVF9IVUNfRldfTUlOT1I7CiAJfSBlbHNlIGlm IChJU19LQUJZTEFLRShkZXZfcHJpdikpIHsKLQkJZndfcGF0aCA9IEk5MTVfS0JMX0hVQ19VQ09E RTsKKwkJaHVjLT5mdy5wYXRoID0gSTkxNV9LQkxfSFVDX1VDT0RFOwogCQlodWMtPmZ3Lm1ham9y X3Zlcl93YW50ZWQgPSBLQkxfSFVDX0ZXX01BSk9SOwogCQlodWMtPmZ3Lm1pbm9yX3Zlcl93YW50 ZWQgPSBLQkxfSFVDX0ZXX01JTk9SOworCX0gZWxzZSB7CisJCURSTV9FUlJPUigiTm8gSHVDIGZp cm13YXJlIGtub3duIGZvciBwbGF0Zm9ybSB3aXRoIEh1QyFcbiIpOworCQlyZXR1cm47CiAJfQog Ci0JaHVjLT5mdy5wYXRoID0gZndfcGF0aDsKLQlodWMtPmZ3LmZldGNoX3N0YXR1cyA9IElOVEVM X1VDX0ZJUk1XQVJFX1BFTkRJTkc7Ci0KLQlEUk1fREVCVUdfRFJJVkVSKCJIdUMgZmlybXdhcmUg cGVuZGluZywgcGF0aCAlc1xuIiwgZndfcGF0aCk7Ci0KLQlXQVJOKGh1Yy0+ZncucGF0aCA9PSBO VUxMLCAiSHVDIHByZXNlbnQgYnV0IG5vIGZ3IHBhdGhcbiIpOwotCiAJaHVjLT5mdy5mZXRjaChk ZXZfcHJpdiwgJmh1Yy0+ZncpOwogfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF91Yy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuYwppbmRleCAzZGU1 ZmJhLi40MDczNTQ5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmMKQEAgLTI2OSw4ICsyNjksOSBA QCBzdGF0aWMgdm9pZCB1Y19mZXRjaF9mdyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYsCiAJc2l6ZV90IHNpemU7CiAJaW50IGVycjsKIAotCURSTV9ERUJVR19EUklWRVIoImJlZm9y ZSByZXF1ZXN0aW5nIGZpcm13YXJlOiB1QyBmdyBmZXRjaCBzdGF0dXMgJXNcbiIsCi0JCWludGVs X3VjX2Z3X3N0YXR1c19yZXByKHVjX2Z3LT5mZXRjaF9zdGF0dXMpKTsKKwl1Y19mdy0+ZmV0Y2hf c3RhdHVzID0gSU5URUxfVUNfRklSTVdBUkVfUEVORElORzsKKworCURSTV9ERUJVR19EUklWRVIo InVDIGZpcm13YXJlIHBlbmRpbmcsIHBhdGggJXNcbiIsIHVjX2Z3LT5wYXRoKTsKIAogCWVyciA9 IHJlcXVlc3RfZmlybXdhcmUoJmZ3LCB1Y19mdy0+cGF0aCwgJnBkZXYtPmRldik7CiAJaWYgKGVy cikKLS0gCjIuOS4zCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n ZngK