From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arkadiusz Hiler Subject: [PATCH 09/10] drm/i915/uc: Separate firmware selection and preparation Date: Tue, 7 Mar 2017 16:24:59 +0100 Message-ID: <20170307152500.6760-10-arkadiusz.hiler@intel.com> References: <20170307152500.6760-1-arkadiusz.hiler@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4B6426E70C for ; Tue, 7 Mar 2017 15:25:39 +0000 (UTC) In-Reply-To: <20170307152500.6760-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 aW50ZWxfe2gsZ311Y19pbml0X2Z3IHNlbGVjdHMgY29ycmVjdCBmaXJtd2FyZSBhbmQgdGhlbiB0 cmlnZ2VycyBpdCdzCnByZXBhcmF0aW9uIChmZXRjaCArIGluaXRpYWwgcGFyc2luZykuCgpUaGlz IGNoYW5nZSBzZXBhcmF0ZXMgb3V0IHNlbGVjdCBzdGVwcywgc28gdGhvc2UgY2FuIGJlIGNhbGxl ZCBieQp0aGUgc2FuaXRpemVfb3B0aW9ucygpLgoKVGhlbiwgZHVyaW5nIHRoZSBpbml0X2Z3KCks IHdlIHByZXBhcmUgdGhlIGZpcm13YXJlIGlmIHRoZSBmaXJtd2FyZSB3YXMKc2VsZWN0ZWQuCgpD YzogTWljaGFsIFdpbmlhcnNraSA8bWljaGFsLndpbmlhcnNraUBpbnRlbC5jb20+CkNjOiBKb29u YXMgTGFodGluZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+ClNpZ25lZC1vZmYt Ynk6IEFya2FkaXVzeiBIaWxlciA8YXJrYWRpdXN6LmhpbGVyQGludGVsLmNvbT4KUmV2aWV3ZWQt Ynk6IEpvb25hcyBMYWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMgfCAxNCArKysrKy0tLS0t LS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVjLmMgICAgICAgIHwgMTQgKystLS0t LS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmMgICAgICAgICB8IDE4ICsr KysrKysrKysrKy0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuaCAgICAgICAg IHwgIDQgKystLQogNCBmaWxlcyBjaGFuZ2VkLCAyMSBpbnNlcnRpb25zKCspLCAyOSBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVy LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKaW5kZXggYTM2YWFi YS4uMDQ3ODQ4MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xv YWRlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYwpAQCAt NDYwLDE1ICs0NjAsMTIgQEAgaW50IGludGVsX2d1Y19pbml0X2h3KHN0cnVjdCBpbnRlbF9ndWMg Kmd1YykKIH0KIAogLyoqCi0gKiBpbnRlbF9ndWNfaW5pdF9mdygpIC0gc2VsZWN0IGFuZCBwcmVw YXJlIGZpcm13YXJlIGZvciBsb2FkaW5nCisgKiBpbnRlbF9ndWNfc2VsZWN0X2Z3KCkgLSBzZWxl Y3RzIEd1QyBmaXJtd2FyZSBmb3IgbG9hZGluZwogICogQGd1YzoJaW50ZWxfZ3VjIHN0cnVjdAog ICoKLSAqIENhbGxlZCBlYXJseSBkdXJpbmcgZHJpdmVyIGxvYWQsIGJ1dCBhZnRlciBHRU0gaXMg aW5pdGlhbGlzZWQuCi0gKgotICogVGhlIGZpcm13YXJlIHdpbGwgYmUgdHJhbnNmZXJyZWQgdG8g dGhlIEd1QydzIG1lbW9yeSBsYXRlciwKLSAqIHdoZW4gaW50ZWxfZ3VjX2luaXRfaHcoKSBpcyBj YWxsZWQuCisgKiBSZXR1cm46IHplcm8gd2hlbiB3ZSBrbm93IGZpcm13YXJlLCBub24temVybyBp biBvdGhlciBjYXNlCiAgKi8KLXZvaWQgaW50ZWxfZ3VjX2luaXRfZncoc3RydWN0IGludGVsX2d1 YyAqZ3VjKQoraW50IGludGVsX2d1Y19zZWxlY3RfZncoc3RydWN0IGludGVsX2d1YyAqZ3VjKQog ewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGd1Y190b19pOTE1KGd1Yyk7 CiAKQEAgLTQ5MSwxMSArNDg4LDEwIEBAIHZvaWQgaW50ZWxfZ3VjX2luaXRfZncoc3RydWN0IGlu dGVsX2d1YyAqZ3VjKQogCQlndWMtPmZ3Lm1pbm9yX3Zlcl93YW50ZWQgPSBLQkxfRldfTUlOT1I7 CiAJfSBlbHNlIHsKIAkJRFJNX0VSUk9SKCJObyBHdUMgZmlybXdhcmUga25vd24gZm9yIHBsYXRm b3JtIHdpdGggR3VDIVxuIik7Ci0JCWk5MTUuZW5hYmxlX2d1Y19sb2FkaW5nID0gMDsKLQkJcmV0 dXJuOworCQlyZXR1cm4gLUVOT0VOVDsKIAl9CiAKLQlpbnRlbF91Y19wcmVwYXJlX2Z3KGRldl9w cml2LCAmZ3VjLT5mdyk7CisJcmV0dXJuIDA7CiB9CiAKIC8qKgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9o dWMuYwppbmRleCA1ZmFkZDU1Li5lYTY3YWJjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9odWMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9odWMuYwpA QCAtMTQxLDE4ICsxNDEsMTAgQEAgc3RhdGljIGludCBodWNfdWNvZGVfeGZlcihzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB9CiAKIC8qKgotICogaW50ZWxfaHVjX2luaXRfZnco KSAtIHNlbGVjdCBhbmQgcHJlcGFyZSBmaXJtd2FyZSBmb3IgbG9hZGluZworICogaW50ZWxfaHVj X3NlbGVjdF9mdygpIC0gc2VsZWN0cyBIdUMgZmlybXdhcmUgZm9yIGxvYWRpbmcKICAqIEBodWM6 CWludGVsX2h1YyBzdHJ1Y3QKLSAqCi0gKiBDYWxsZWQgZWFybHkgZHVyaW5nIGRyaXZlciBsb2Fk LCBidXQgYWZ0ZXIgR0VNIGlzIGluaXRpYWxpc2VkLiBUaGUgbG9hZGluZwotICogd2lsbCBjb250 aW51ZSBvbmx5IHdoZW4gZHJpdmVyIGV4cGxpY2l0bHkgc3BlY2lmeSBmaXJtd2FyZSBuYW1lIGFu ZCB2ZXJzaW9uLgotICogQWxsIG90aGVyIGNhc2VzIGFyZSBjb25zaWRlcmVkIGFzIElOVEVMX1VD X0ZJUk1XQVJFX05PTkUgZWl0aGVyIGJlY2F1c2UgSFcKLSAqIGlzIG5vdCBjYXBhYmxlIG9yIGRy aXZlciB5ZXQgc3VwcG9ydCBpdC4gQW5kIHRoZXJlIHdpbGwgYmUgbm8gZXJyb3IgbWVzc2FnZQot ICogZm9yIElOVEVMX1VDX0ZJUk1XQVJFX05PTkUgY2FzZXMuCi0gKgotICogVGhlIERNQS1jb3B5 aW5nIHRvIEhXIGlzIGRvbmUgbGF0ZXIgd2hlbiBpbnRlbF9odWNfaW5pdF9odygpIGlzIGNhbGxl ZC4KICAqLwotdm9pZCBpbnRlbF9odWNfaW5pdF9mdyhzdHJ1Y3QgaW50ZWxfaHVjICpodWMpCit2 b2lkIGludGVsX2h1Y19zZWxlY3RfZncoc3RydWN0IGludGVsX2h1YyAqaHVjKQogewogCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGh1Y190b19pOTE1KGh1Yyk7CiAKQEAgLTE3 Nyw4ICsxNjksNiBAQCB2b2lkIGludGVsX2h1Y19pbml0X2Z3KHN0cnVjdCBpbnRlbF9odWMgKmh1 YykKIAkJRFJNX0VSUk9SKCJObyBIdUMgZmlybXdhcmUga25vd24gZm9yIHBsYXRmb3JtIHdpdGgg SHVDIVxuIik7CiAJCXJldHVybjsKIAl9Ci0KLQlpbnRlbF91Y19wcmVwYXJlX2Z3KGRldl9wcml2 LCAmaHVjLT5mdyk7CiB9CiAKIC8qKgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfdWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmMKaW5kZXggN2Y5YWFk Ny4uODg3NTY0NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5jCkBAIC02Niw2ICs2NiwxNCBAQCB2 b2lkIGludGVsX3VjX3Nhbml0aXplX29wdGlvbnMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KQogCQlpZiAoIWk5MTUuZW5hYmxlX2d1Y19sb2FkaW5nKQogCQkJaTkxNS5lbmFibGVf Z3VjX3N1Ym1pc3Npb24gPSAwOwogCX0KKworCWlmIChpOTE1LmVuYWJsZV9ndWNfbG9hZGluZykg eworCQlpZiAoSEFTX0hVQ19VQ09ERShkZXZfcHJpdikpCisJCQlpbnRlbF9odWNfc2VsZWN0X2Z3 KCZkZXZfcHJpdi0+aHVjKTsKKworCQlpZiAoaW50ZWxfZ3VjX3NlbGVjdF9mdygmZGV2X3ByaXYt Pmd1YykpCisJCQlpOTE1LmVuYWJsZV9ndWNfbG9hZGluZyA9IDA7CisJfQogfQogCiB2b2lkIGlu dGVsX3VjX2luaXRfZWFybHkoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQpAQCAt NzUsMTMgKzgzLDExIEBAIHZvaWQgaW50ZWxfdWNfaW5pdF9lYXJseShzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpCiAKIHZvaWQgaW50ZWxfdWNfaW5pdF9mdyhzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0JaWYgKCFpOTE1LmVuYWJsZV9ndWNfbG9hZGluZykK LQkJcmV0dXJuOworCWlmIChkZXZfcHJpdi0+aHVjLmZ3LnBhdGgpCisJCWludGVsX3VjX3ByZXBh cmVfZncoZGV2X3ByaXYsICZkZXZfcHJpdi0+aHVjLmZ3KTsKIAotCWlmIChIQVNfSFVDX1VDT0RF KGRldl9wcml2KSkKLQkJaW50ZWxfaHVjX2luaXRfZncoJmRldl9wcml2LT5odWMpOwotCi0JaW50 ZWxfZ3VjX2luaXRfZncoJmRldl9wcml2LT5ndWMpOworCWlmIChkZXZfcHJpdi0+Z3VjLmZ3LnBh dGgpCisJCWludGVsX3VjX3ByZXBhcmVfZncoZGV2X3ByaXYsICZkZXZfcHJpdi0+Z3VjLmZ3KTsK IH0KIAogaW50IGludGVsX3VjX2luaXRfaHcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuaCBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmgKaW5kZXggYTlhNDE4OC4uNTBlZDU2MSAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuaAorKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF91Yy5oCkBAIC0xOTQsNyArMTk0LDcgQEAgaW50IGludGVsX2d1Y19zZW5k KHN0cnVjdCBpbnRlbF9ndWMgKmd1YywgY29uc3QgdTMyICphY3Rpb24sIHUzMiBsZW4pOwogaW50 IGludGVsX2d1Y19zYW1wbGVfZm9yY2V3YWtlKHN0cnVjdCBpbnRlbF9ndWMgKmd1Yyk7CiAKIC8q IGludGVsX2d1Y19sb2FkZXIuYyAqLwotdm9pZCBpbnRlbF9ndWNfaW5pdF9mdyhzdHJ1Y3QgaW50 ZWxfZ3VjICpndWMpOworaW50IGludGVsX2d1Y19zZWxlY3RfZncoc3RydWN0IGludGVsX2d1YyAq Z3VjKTsKIGludCBpbnRlbF9ndWNfaW5pdF9odyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpOwogdm9p ZCBpbnRlbF9ndWNfZmluaShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogY29u c3QgY2hhciAqaW50ZWxfdWNfZndfc3RhdHVzX3JlcHIoZW51bSBpbnRlbF91Y19md19zdGF0dXMg c3RhdHVzKTsKQEAgLTIyOCw3ICsyMjgsNyBAQCBzdGF0aWMgaW5saW5lIHUzMiBndWNfZ2d0dF9v ZmZzZXQoc3RydWN0IGk5MTVfdm1hICp2bWEpCiB9CiAKIC8qIGludGVsX2h1Yy5jICovCi12b2lk IGludGVsX2h1Y19pbml0X2Z3KHN0cnVjdCBpbnRlbF9odWMgKmh1Yyk7Cit2b2lkIGludGVsX2h1 Y19zZWxlY3RfZncoc3RydWN0IGludGVsX2h1YyAqaHVjKTsKIHZvaWQgaW50ZWxfaHVjX2Zpbmko c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgICpkZXZfcHJpdik7CiBpbnQgaW50ZWxfaHVjX2luaXRf aHcoc3RydWN0IGludGVsX2h1YyAqaHVjKTsKIHZvaWQgaW50ZWxfZ3VjX2F1dGhfaHVjKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7Ci0tIAoyLjkuMwoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJ bnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==