From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michal Wajdeczko Subject: [CI v4 2/8] drm/i915/guc: Move firmware selection to init_early Date: Wed, 6 Dec 2017 14:51:29 +0000 Message-ID: <20171206145135.52016-2-michal.wajdeczko@intel.com> References: <20171206145135.52016-1-michal.wajdeczko@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id A49CB6E1C9 for ; Wed, 6 Dec 2017 14:51:42 +0000 (UTC) In-Reply-To: <20171206145135.52016-1-michal.wajdeczko@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 RG9pbmcgR3VDIGZpcm13YXJlIHBhdGggc2VsZWN0aW9uIGZyb20gc2FuaXRpemVfb3B0aW9ucyBm dW5jdGlvbgppcyBub3QgcGVyZmVjdCwgd2hpbGUgdGhlcmUgaXMgbm8gcHJvYmxlbSB3aXRoIGRv aW5nIHNvIGR1cmluZwplYXJseSBpbml0IHN0YWdlIGFzIHdlIGFscmVhZHkgaGF2ZSBhbGwgbmVl ZGVkIGRhdGEuCgpTaWduZWQtb2ZmLWJ5OiBNaWNoYWwgV2FqZGVjemtvIDxtaWNoYWwud2FqZGVj emtvQGludGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVr PgpDYzogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgpD YzogU2FnYXIgQXJ1biBLYW1ibGUgPHNhZ2FyLmEua2FtYmxlQGludGVsLmNvbT4KUmV2aWV3ZWQt Ynk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2d1Yy5jICAgIHwgIDEgKwogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZ3VjX2Z3LmMgfCA2MyArKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfZncuaCB8ICAyICstCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF91Yy5jICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF91Y19mdy5oICB8ICA1ICsrKwogNSBmaWxlcyBjaGFuZ2VkLCA0NCBpbnNlcnRpb25zKCsp LCAyOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9ndWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5jCmluZGV4IGQwOGU3NjAu LmRmODY5MDcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5jCkBAIC02MSw2ICs2MSw3IEBAIHZv aWQgaW50ZWxfZ3VjX2luaXRfc2VuZF9yZWdzKHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKIAogdm9p ZCBpbnRlbF9ndWNfaW5pdF9lYXJseShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiB7CisJaW50ZWxf Z3VjX2Z3X2luaXRfZWFybHkoZ3VjKTsKIAlpbnRlbF9ndWNfY3RfaW5pdF9lYXJseSgmZ3VjLT5j dCk7CiAKIAltdXRleF9pbml0KCZndWMtPnNlbmRfbXV0ZXgpOwpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9ndWNfZncuYwppbmRleCA4OTg2MmZhLi5jYmM1MWM5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9ndWNfZncuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9ndWNfZncuYwpAQCAtNTYsNDUgKzU2LDU0IEBAIE1PRFVMRV9GSVJNV0FSRShJOTE1X0tCTF9H VUNfVUNPREUpOwogCiAjZGVmaW5lIEk5MTVfR0xLX0dVQ19VQ09ERSBHVUNfRldfUEFUSChnbGss IEdMS19GV19NQUpPUiwgR0xLX0ZXX01JTk9SKQogCi0vKioKLSAqIGludGVsX2d1Y19md19zZWxl Y3QoKSAtIHNlbGVjdHMgR3VDIGZpcm13YXJlIGZvciB1cGxvYWRpbmcKLSAqCi0gKiBAZ3VjOglp bnRlbF9ndWMgc3RydWN0Ci0gKgotICogUmV0dXJuOiB6ZXJvIHdoZW4gd2Uga25vdyBmaXJtd2Fy ZSwgbm9uLXplcm8gaW4gb3RoZXIgY2FzZQotICovCi1pbnQgaW50ZWxfZ3VjX2Z3X3NlbGVjdChz dHJ1Y3QgaW50ZWxfZ3VjICpndWMpCitzdGF0aWMgdm9pZCBndWNfZndfc2VsZWN0KHN0cnVjdCBp bnRlbF91Y19mdyAqZ3VjX2Z3KQogeworCXN0cnVjdCBpbnRlbF9ndWMgKmd1YyA9IGNvbnRhaW5l cl9vZihndWNfZncsIHN0cnVjdCBpbnRlbF9ndWMsIGZ3KTsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYgPSBndWNfdG9faTkxNShndWMpOwogCi0JaW50ZWxfdWNfZndfaW5pdCgm Z3VjLT5mdywgSU5URUxfVUNfRldfVFlQRV9HVUMpOworCUdFTV9CVUdfT04oZ3VjX2Z3LT50eXBl ICE9IElOVEVMX1VDX0ZXX1RZUEVfR1VDKTsKKworCWlmICghSEFTX0dVQyhkZXZfcHJpdikpCisJ CXJldHVybjsKIAogCWlmIChpOTE1X21vZHBhcmFtcy5ndWNfZmlybXdhcmVfcGF0aCkgewotCQln dWMtPmZ3LnBhdGggPSBpOTE1X21vZHBhcmFtcy5ndWNfZmlybXdhcmVfcGF0aDsKLQkJZ3VjLT5m dy5tYWpvcl92ZXJfd2FudGVkID0gMDsKLQkJZ3VjLT5mdy5taW5vcl92ZXJfd2FudGVkID0gMDsK KwkJZ3VjX2Z3LT5wYXRoID0gaTkxNV9tb2RwYXJhbXMuZ3VjX2Zpcm13YXJlX3BhdGg7CisJCWd1 Y19mdy0+bWFqb3JfdmVyX3dhbnRlZCA9IDA7CisJCWd1Y19mdy0+bWlub3JfdmVyX3dhbnRlZCA9 IDA7CiAJfSBlbHNlIGlmIChJU19TS1lMQUtFKGRldl9wcml2KSkgewotCQlndWMtPmZ3LnBhdGgg PSBJOTE1X1NLTF9HVUNfVUNPREU7Ci0JCWd1Yy0+ZncubWFqb3JfdmVyX3dhbnRlZCA9IFNLTF9G V19NQUpPUjsKLQkJZ3VjLT5mdy5taW5vcl92ZXJfd2FudGVkID0gU0tMX0ZXX01JTk9SOworCQln dWNfZnctPnBhdGggPSBJOTE1X1NLTF9HVUNfVUNPREU7CisJCWd1Y19mdy0+bWFqb3JfdmVyX3dh bnRlZCA9IFNLTF9GV19NQUpPUjsKKwkJZ3VjX2Z3LT5taW5vcl92ZXJfd2FudGVkID0gU0tMX0ZX X01JTk9SOwogCX0gZWxzZSBpZiAoSVNfQlJPWFRPTihkZXZfcHJpdikpIHsKLQkJZ3VjLT5mdy5w YXRoID0gSTkxNV9CWFRfR1VDX1VDT0RFOwotCQlndWMtPmZ3Lm1ham9yX3Zlcl93YW50ZWQgPSBC WFRfRldfTUFKT1I7Ci0JCWd1Yy0+ZncubWlub3JfdmVyX3dhbnRlZCA9IEJYVF9GV19NSU5PUjsK KwkJZ3VjX2Z3LT5wYXRoID0gSTkxNV9CWFRfR1VDX1VDT0RFOworCQlndWNfZnctPm1ham9yX3Zl cl93YW50ZWQgPSBCWFRfRldfTUFKT1I7CisJCWd1Y19mdy0+bWlub3JfdmVyX3dhbnRlZCA9IEJY VF9GV19NSU5PUjsKIAl9IGVsc2UgaWYgKElTX0tBQllMQUtFKGRldl9wcml2KSB8fCBJU19DT0ZG RUVMQUtFKGRldl9wcml2KSkgewotCQlndWMtPmZ3LnBhdGggPSBJOTE1X0tCTF9HVUNfVUNPREU7 Ci0JCWd1Yy0+ZncubWFqb3JfdmVyX3dhbnRlZCA9IEtCTF9GV19NQUpPUjsKLQkJZ3VjLT5mdy5t aW5vcl92ZXJfd2FudGVkID0gS0JMX0ZXX01JTk9SOworCQlndWNfZnctPnBhdGggPSBJOTE1X0tC TF9HVUNfVUNPREU7CisJCWd1Y19mdy0+bWFqb3JfdmVyX3dhbnRlZCA9IEtCTF9GV19NQUpPUjsK KwkJZ3VjX2Z3LT5taW5vcl92ZXJfd2FudGVkID0gS0JMX0ZXX01JTk9SOwogCX0gZWxzZSBpZiAo SVNfR0VNSU5JTEFLRShkZXZfcHJpdikpIHsKLQkJZ3VjLT5mdy5wYXRoID0gSTkxNV9HTEtfR1VD X1VDT0RFOwotCQlndWMtPmZ3Lm1ham9yX3Zlcl93YW50ZWQgPSBHTEtfRldfTUFKT1I7Ci0JCWd1 Yy0+ZncubWlub3JfdmVyX3dhbnRlZCA9IEdMS19GV19NSU5PUjsKKwkJZ3VjX2Z3LT5wYXRoID0g STkxNV9HTEtfR1VDX1VDT0RFOworCQlndWNfZnctPm1ham9yX3Zlcl93YW50ZWQgPSBHTEtfRldf TUFKT1I7CisJCWd1Y19mdy0+bWlub3JfdmVyX3dhbnRlZCA9IEdMS19GV19NSU5PUjsKIAl9IGVs c2UgewotCQlEUk1fRVJST1IoIk5vIEd1QyBmaXJtd2FyZSBrbm93biBmb3IgcGxhdGZvcm0gd2l0 aCBHdUMhXG4iKTsKLQkJcmV0dXJuIC1FTk9FTlQ7CisJCURSTV9XQVJOKCIlczogTm8gZmlybXdh cmUga25vd24gZm9yIHRoaXMgcGxhdGZvcm0hXG4iLAorCQkJIGludGVsX3VjX2Z3X3R5cGVfcmVw cihndWNfZnctPnR5cGUpKTsKIAl9Cit9CiAKLQlyZXR1cm4gMDsKKy8qKgorICogaW50ZWxfZ3Vj X2Z3X2luaXRfZWFybHkoKSAtIGluaXRpYWxpemVzIEd1QyBmaXJtd2FyZSBzdHJ1Y3QKKyAqIEBn dWM6IGludGVsX2d1YyBzdHJ1Y3QKKyAqCisgKiBPbiBwbGF0Zm9ybXMgd2l0aCBHdUMgc2VsZWN0 cyBmaXJtd2FyZSBmb3IgdXBsb2FkaW5nCisgKi8KK3ZvaWQgaW50ZWxfZ3VjX2Z3X2luaXRfZWFy bHkoc3RydWN0IGludGVsX2d1YyAqZ3VjKQoreworCXN0cnVjdCBpbnRlbF91Y19mdyAqZ3VjX2Z3 ID0gJmd1Yy0+Znc7CisKKwlpbnRlbF91Y19md19pbml0KGd1Y19mdywgSU5URUxfVUNfRldfVFlQ RV9HVUMpOworCWd1Y19md19zZWxlY3QoZ3VjX2Z3KTsKIH0KIAogc3RhdGljIHZvaWQgZ3VjX3By ZXBhcmVfeGZlcihzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9ndWNfZncuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1 Y19mdy5oCmluZGV4IDAyM2Y1YmEuLjRlYzVkM2QgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2d1Y19mdy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1 Y19mdy5oCkBAIC0yNyw3ICsyNyw3IEBACiAKIHN0cnVjdCBpbnRlbF9ndWM7CiAKLWludCBpbnRl bF9ndWNfZndfc2VsZWN0KHN0cnVjdCBpbnRlbF9ndWMgKmd1Yyk7Cit2b2lkIGludGVsX2d1Y19m d19pbml0X2Vhcmx5KHN0cnVjdCBpbnRlbF9ndWMgKmd1Yyk7CiBpbnQgaW50ZWxfZ3VjX2Z3X3Vw bG9hZChzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpOwogCiAjZW5kaWYKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91 Yy5jCmluZGV4IDk1YjUyNGMuLjRiN2YyYTcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3VjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuYwpAQCAt NjUsNyArNjUsNyBAQCB2b2lkIGludGVsX3VjX3Nhbml0aXplX29wdGlvbnMoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQogCiAJLyogVmVyaWZ5IGZpcm13YXJlIHZlcnNpb24gKi8K IAlpZiAoaTkxNV9tb2RwYXJhbXMuZW5hYmxlX2d1Y19sb2FkaW5nKSB7Ci0JCWlmIChpbnRlbF9n dWNfZndfc2VsZWN0KCZkZXZfcHJpdi0+Z3VjKSkKKwkJaWYgKCFpbnRlbF91Y19md19pc19zZWxl Y3RlZCgmZGV2X3ByaXYtPmd1Yy5mdykpCiAJCQlpOTE1X21vZHBhcmFtcy5lbmFibGVfZ3VjX2xv YWRpbmcgPSAwOwogCX0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf dWNfZncuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjX2Z3LmgKaW5kZXggNTM5NGQ5 ZC4uZDVmZDQ2MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWNfZncu aAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Y19mdy5oCkBAIC0xMTAsNiArMTEw LDExIEBAIHZvaWQgaW50ZWxfdWNfZndfaW5pdChzdHJ1Y3QgaW50ZWxfdWNfZncgKnVjX2Z3LCBl bnVtIGludGVsX3VjX2Z3X3R5cGUgdHlwZSkKIAl1Y19mdy0+dHlwZSA9IHR5cGU7CiB9CiAKK3N0 YXRpYyBpbmxpbmUgYm9vbCBpbnRlbF91Y19md19pc19zZWxlY3RlZChzdHJ1Y3QgaW50ZWxfdWNf ZncgKnVjX2Z3KQoreworCXJldHVybiB1Y19mdy0+cGF0aCAhPSBOVUxMOworfQorCiB2b2lkIGlu dGVsX3VjX2Z3X2ZldGNoKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJICAg ICAgIHN0cnVjdCBpbnRlbF91Y19mdyAqdWNfZncpOwogaW50IGludGVsX3VjX2Z3X3VwbG9hZChz dHJ1Y3QgaW50ZWxfdWNfZncgKnVjX2Z3LAotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=