From mboxrd@z Thu Jan  1 00:00:00 1970
From: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Subject: [PATCH 08/11] drm/i915/uc: Simplify firmware path
	handling
Date: Mon, 13 Mar 2017 14:15:05 +0100
Message-ID: <20170313131508.24439-9-arkadiusz.hiler@intel.com>
References: <20170313131508.24439-1-arkadiusz.hiler@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga02.intel.com (mga02.intel.com [134.134.136.20])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 937086E508
 for <intel-gfx@lists.freedesktop.org>; Mon, 13 Mar 2017 13:15:34 +0000 (UTC)
In-Reply-To: <20170313131508.24439-1-arkadiusz.hiler@intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

Q3VycmVudGx5IGZ3LT5wYXRoIHZhbHVlcyBjYW4gcmVwcmVzZW50IG9uZSBvZiB0aHJlZSBwb3Nz
aWJsZSBzdGF0ZXM6CgogMSkgTlVMTCAtIGRldmljZSB3aXRob3V0IHRoZSB1QwogMikgJ1wwJyAt
IGRldmljZSB3aXRoIHRoZSB1QyBidXQgaGF2ZSBubyBmaXJtd2FyZQogMykgZWxzZSAtIGRldmlj
ZSB3aXRoIHRoZSB1QyBhbmQgd2UgaGF2ZSBmaXJtd2FyZQoKU2Vjb25kIGNhc2UgaXMgdXNlZCBv
bmx5IHRvIFdBUk4gYXQgYSBsYXRlciBzdGFnZS4KCldlIGNhbiBXQVJOIHJpZ2h0IGF3YXkgYW5k
IG1lcmdlIGNhc2VzIDEgYW5kIDIuCgpDb2RlIGNhbiBiZSBldmVuIGZ1cnRoZXIgc2ltcGxpZmll
ZCBhbmQgY29tbW9uIChIdUMvR3VDIGxvZ2ljKSBoYXBwZW5pbmcKcmlnaHQgYmVmb3JlIHRoZSBm
ZXRjaCBjYW4gYmUgb2ZmbG9hZGVkIHRvIHRoZSBjb21tb24gZnVuY3Rpb24uCgp2MjogZmV3ZXIg
dGVtcG9yYXJ5IHZhcmlhYmxlcywgbW9yZSBzdHJhaWdodGZvcndhcmQgZmxvdyAoTS4gV2FqZGVj
emtvKQp2MzogRFJNX0VSUk9SIGluc3RlYWQgb2YgV0FSTiAoTS4gV2FqZGVjemtvKQp2NDogY29k
aW5nIHN0YW5kYXJkIChKLiBMYWh0aW5lbikKdjU6IG5vbi10cml2aWFsIHJlYmFzZQp2NjogcmVt
b3ZlIHBhdGggY2hlY2ssIHdlIGFyZSBjaGVja2luZyBmZXRjaCBzdGF0dXMgKE0uIFdhamRlY3pr
bykKCkNjOiBBbnVzaGEgU3JpdmF0c2EgPGFudXNoYS5zcml2YXRzYUBpbnRlbC5jb20+CkNjOiBU
dnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpDYzogTWljaGFsIFdpbmlh
cnNraSA8bWljaGFsLndpbmlhcnNraUBpbnRlbC5jb20+CkNjOiBNaWNoYWwgV2FqZGVjemtvIDxt
aWNoYWwud2FqZGVjemtvQGludGVsLmNvbT4KQ2M6IEpvb25hcyBMYWh0aW5lbiA8am9vbmFzLmxh
aHRpbmVuQGxpbnV4LmludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogQXJrYWRpdXN6IEhpbGVyIDxh
cmthZGl1c3ouaGlsZXJAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs
X2d1Y19sb2FkZXIuYyB8IDM2ICsrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJp
dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVjLmMgICAgICAgIHwgMjEgKysrKysrLS0tLS0tLS0t
LS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuYyAgICAgICAgIHwgIDQgKysrLQog
MyBmaWxlcyBjaGFuZ2VkLCAyMCBpbnNlcnRpb25zKCspLCA0MSBkZWxldGlvbnMoLSkKCmRpZmYg
LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMgYi9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKaW5kZXggMGEyOWMxYi4uZDczMWY2OCAx
MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCisrKyBi
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYwpAQCAtMzY4LDEzICszNjgs
NiBAQCBpbnQgaW50ZWxfZ3VjX2luaXRfaHcoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogCQlpbnRl
bF91Y19md19zdGF0dXNfcmVwcihndWMtPmZ3LmZldGNoX3N0YXR1cyksCiAJCWludGVsX3VjX2Z3
X3N0YXR1c19yZXByKGd1Yy0+ZncubG9hZF9zdGF0dXMpKTsKIAotCWlmICghZndfcGF0aCkgewot
CQlyZXR1cm4gLUVOWElPOwotCX0gZWxzZSBpZiAoKmZ3X3BhdGggPT0gJ1wwJykgewotCQlXQVJO
KDEsICJObyBHdUMgZmlybXdhcmUga25vd24gZm9yIHRoaXMgcGxhdGZvcm0hXG4iKTsKLQkJcmV0
dXJuIC1FTk9ERVY7Ci0JfQotCiAJaWYgKGd1Yy0+ZncuZmV0Y2hfc3RhdHVzICE9IElOVEVMX1VD
X0ZJUk1XQVJFX1NVQ0NFU1MpCiAJCXJldHVybiAtRUlPOwogCkBAIC0zOTksNyArMzkyLDYgQEAg
aW50IGludGVsX2d1Y19pbml0X2h3KHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKIAlyZXR1cm4gMDsK
IH0KIAotCiAvKioKICAqIGludGVsX2d1Y19pbml0X2Z3KCkgLSBzZWxlY3QgYW5kIHByZXBhcmUg
ZmlybXdhcmUgZm9yIGxvYWRpbmcKICAqIEBndWM6CWludGVsX2d1YyBzdHJ1Y3QKQEAgLTQxMiwz
NyArNDA0LDMxIEBAIGludCBpbnRlbF9ndWNfaW5pdF9odyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMp
CiB2b2lkIGludGVsX2d1Y19pbml0X2Z3KHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKIHsKIAlzdHJ1
Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBndWNfdG9faTkxNShndWMpOwotCWNvbnN0
IGNoYXIgKmZ3X3BhdGg7CisKKwlndWMtPmZ3LnBhdGggPSBOVUxMOworCWd1Yy0+ZncuZmV0Y2hf
c3RhdHVzID0gSU5URUxfVUNfRklSTVdBUkVfTk9ORTsKKwlndWMtPmZ3LmxvYWRfc3RhdHVzID0g
SU5URUxfVUNfRklSTVdBUkVfTk9ORTsKKwlndWMtPmZ3LmZ3ID0gSU5URUxfVUNfRldfVFlQRV9H
VUM7CiAKIAlpZiAoSVNfU0tZTEFLRShkZXZfcHJpdikpIHsKLQkJZndfcGF0aCA9IEk5MTVfU0tM
X0dVQ19VQ09ERTsKKwkJZ3VjLT5mdy5wYXRoID0gSTkxNV9TS0xfR1VDX1VDT0RFOwogCQlndWMt
PmZ3Lm1ham9yX3Zlcl93YW50ZWQgPSBTS0xfRldfTUFKT1I7CiAJCWd1Yy0+ZncubWlub3JfdmVy
X3dhbnRlZCA9IFNLTF9GV19NSU5PUjsKIAl9IGVsc2UgaWYgKElTX0JST1hUT04oZGV2X3ByaXYp
KSB7Ci0JCWZ3X3BhdGggPSBJOTE1X0JYVF9HVUNfVUNPREU7CisJCWd1Yy0+ZncucGF0aCA9IEk5
MTVfQlhUX0dVQ19VQ09ERTsKIAkJZ3VjLT5mdy5tYWpvcl92ZXJfd2FudGVkID0gQlhUX0ZXX01B
Sk9SOwogCQlndWMtPmZ3Lm1pbm9yX3Zlcl93YW50ZWQgPSBCWFRfRldfTUlOT1I7CiAJfSBlbHNl
IGlmIChJU19LQUJZTEFLRShkZXZfcHJpdikpIHsKLQkJZndfcGF0aCA9IEk5MTVfS0JMX0dVQ19V
Q09ERTsKKwkJZ3VjLT5mdy5wYXRoID0gSTkxNV9LQkxfR1VDX1VDT0RFOwogCQlndWMtPmZ3Lm1h
am9yX3Zlcl93YW50ZWQgPSBLQkxfRldfTUFKT1I7CiAJCWd1Yy0+ZncubWlub3JfdmVyX3dhbnRl
ZCA9IEtCTF9GV19NSU5PUjsKIAl9IGVsc2UgewotCQlmd19wYXRoID0gIiI7CS8qIHVua25vd24g
ZGV2aWNlICovCisJCURSTV9FUlJPUigiTm8gR3VDIGZpcm13YXJlIGtub3duIGZvciBwbGF0Zm9y
bSB3aXRoIEd1QyFcbiIpOworCQlpOTE1LmVuYWJsZV9ndWNfbG9hZGluZyA9IDA7CisJCXJldHVy
bjsKIAl9CiAKLQlndWMtPmZ3LnBhdGggPSBmd19wYXRoOwotCWd1Yy0+ZncuZmV0Y2hfc3RhdHVz
ID0gSU5URUxfVUNfRklSTVdBUkVfTk9ORTsKLQlndWMtPmZ3LmxvYWRfc3RhdHVzID0gSU5URUxf
VUNfRklSTVdBUkVfTk9ORTsKLQotCWlmIChmd19wYXRoID09IE5VTEwpCi0JCXJldHVybjsKLQlp
ZiAoKmZ3X3BhdGggPT0gJ1wwJykKLQkJcmV0dXJuOwotCi0JZ3VjLT5mdy5mZXRjaF9zdGF0dXMg
PSBJTlRFTF9VQ19GSVJNV0FSRV9QRU5ESU5HOwotCURSTV9ERUJVR19EUklWRVIoIkd1QyBmaXJt
d2FyZSBwZW5kaW5nLCBwYXRoICVzXG4iLCBmd19wYXRoKTsKIAlpbnRlbF91Y19wcmVwYXJlX2Z3
KGRldl9wcml2LCAmZ3VjLT5mdyk7Ci0JLyogc3RhdHVzIG11c3Qgbm93IGJlIEZBSUwgb3IgU1VD
Q0VTUyAqLwogfQogCiAvKioKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs
X2h1Yy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVjLmMKaW5kZXggMTY4YWFiMS4u
NWZhZGQ1NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVjLmMKKysr
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVjLmMKQEAgLTE1NSw3ICsxNTUsNiBAQCBz
dGF0aWMgaW50IGh1Y191Y29kZV94ZmVyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp
dikKIHZvaWQgaW50ZWxfaHVjX2luaXRfZncoc3RydWN0IGludGVsX2h1YyAqaHVjKQogewogCXN0
cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGh1Y190b19pOTE1KGh1Yyk7Ci0JY29u
c3QgY2hhciAqZndfcGF0aCA9IE5VTEw7CiAKIAlodWMtPmZ3LnBhdGggPSBOVUxMOwogCWh1Yy0+
ZncuZmV0Y2hfc3RhdHVzID0gSU5URUxfVUNfRklSTVdBUkVfTk9ORTsKQEAgLTE2MywyOSArMTYy
LDIxIEBAIHZvaWQgaW50ZWxfaHVjX2luaXRfZncoc3RydWN0IGludGVsX2h1YyAqaHVjKQogCWh1
Yy0+ZncuZncgPSBJTlRFTF9VQ19GV19UWVBFX0hVQzsKIAogCWlmIChJU19TS1lMQUtFKGRldl9w
cml2KSkgewotCQlmd19wYXRoID0gSTkxNV9TS0xfSFVDX1VDT0RFOworCQlodWMtPmZ3LnBhdGgg
PSBJOTE1X1NLTF9IVUNfVUNPREU7CiAJCWh1Yy0+ZncubWFqb3JfdmVyX3dhbnRlZCA9IFNLTF9I
VUNfRldfTUFKT1I7CiAJCWh1Yy0+ZncubWlub3JfdmVyX3dhbnRlZCA9IFNLTF9IVUNfRldfTUlO
T1I7CiAJfSBlbHNlIGlmIChJU19CUk9YVE9OKGRldl9wcml2KSkgewotCQlmd19wYXRoID0gSTkx
NV9CWFRfSFVDX1VDT0RFOworCQlodWMtPmZ3LnBhdGggPSBJOTE1X0JYVF9IVUNfVUNPREU7CiAJ
CWh1Yy0+ZncubWFqb3JfdmVyX3dhbnRlZCA9IEJYVF9IVUNfRldfTUFKT1I7CiAJCWh1Yy0+Zncu
bWlub3JfdmVyX3dhbnRlZCA9IEJYVF9IVUNfRldfTUlOT1I7CiAJfSBlbHNlIGlmIChJU19LQUJZ
TEFLRShkZXZfcHJpdikpIHsKLQkJZndfcGF0aCA9IEk5MTVfS0JMX0hVQ19VQ09ERTsKKwkJaHVj
LT5mdy5wYXRoID0gSTkxNV9LQkxfSFVDX1VDT0RFOwogCQlodWMtPmZ3Lm1ham9yX3Zlcl93YW50
ZWQgPSBLQkxfSFVDX0ZXX01BSk9SOwogCQlodWMtPmZ3Lm1pbm9yX3Zlcl93YW50ZWQgPSBLQkxf
SFVDX0ZXX01JTk9SOwotCX0KLQotCWh1Yy0+ZncucGF0aCA9IGZ3X3BhdGg7Ci0KLQlpZiAoZndf
cGF0aCA9PSBOVUxMKQorCX0gZWxzZSB7CisJCURSTV9FUlJPUigiTm8gSHVDIGZpcm13YXJlIGtu
b3duIGZvciBwbGF0Zm9ybSB3aXRoIEh1QyFcbiIpOwogCQlyZXR1cm47Ci0KLQlodWMtPmZ3LmZl
dGNoX3N0YXR1cyA9IElOVEVMX1VDX0ZJUk1XQVJFX1BFTkRJTkc7Ci0KLQlEUk1fREVCVUdfRFJJ
VkVSKCJIdUMgZmlybXdhcmUgcGVuZGluZywgcGF0aCAlc1xuIiwgZndfcGF0aCk7Ci0KLQlXQVJO
KGh1Yy0+ZncucGF0aCA9PSBOVUxMLCAiSHVDIHByZXNlbnQgYnV0IG5vIGZ3IHBhdGhcbiIpOwor
CX0KIAogCWludGVsX3VjX3ByZXBhcmVfZncoZGV2X3ByaXYsICZodWMtPmZ3KTsKIH0KZGlmZiAt
LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmMgYi9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF91Yy5jCmluZGV4IDY5ZjIxY2MuLjRiODVhMGYgMTAwNjQ0Ci0tLSBhL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfdWMuYwpAQCAtMjY4LDggKzI2OCwxMCBAQCB2b2lkIGludGVsX3VjX3ByZXBhcmVfZncoc3Ry
dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCXNpemVfdCBzaXplOwogCWludCBlcnI7
CiAKKwl1Y19mdy0+ZmV0Y2hfc3RhdHVzID0gSU5URUxfVUNfRklSTVdBUkVfUEVORElORzsKKwog
CURSTV9ERUJVR19EUklWRVIoImJlZm9yZSByZXF1ZXN0aW5nIGZpcm13YXJlOiB1QyBmdyBmZXRj
aCBzdGF0dXMgJXNcbiIsCi0JCWludGVsX3VjX2Z3X3N0YXR1c19yZXByKHVjX2Z3LT5mZXRjaF9z
dGF0dXMpKTsKKwkJCSBpbnRlbF91Y19md19zdGF0dXNfcmVwcih1Y19mdy0+ZmV0Y2hfc3RhdHVz
KSk7CiAKIAllcnIgPSByZXF1ZXN0X2Zpcm13YXJlKCZmdywgdWNfZnctPnBhdGgsICZwZGV2LT5k
ZXYpOwogCWlmIChlcnIpCi0tIAoyLjkuMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu
ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz
dGluZm8vaW50ZWwtZ2Z4Cg==