From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: [PATCH v2 1/3] drm/i915/csr: keep firmware name and required version together Date: Thu, 6 Sep 2018 13:40:31 +0300 Message-ID: <20180906104033.20872-1-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 539896E683 for ; Thu, 6 Sep 2018 10:41:07 +0000 (UTC) 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 Cc: jani.nikula@intel.com List-Id: intel-gfx@lists.freedesktop.org SGF2aW5nIHR3byBzZXBhcmF0ZSBpZiBsYWRkZXJzIGdldHMgaW5jcmVhc2luZ2x5IGhhcmQgdG8g bWFpbnRhaW4uIFB1dAp0aGVtIHRvZ2V0aGVyLgoKUmV2aWV3ZWQtYnk6IENocmlzIFdpbHNvbiA8 Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpTaWduZWQtb2ZmLWJ5OiBKYW5pIE5pa3VsYSA8amFu aS5uaWt1bGFAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2Lmgg IHwgIDEgKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY3NyLmMgfCA1NCArKysrKysrKysr KysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDIzIGluc2Vy dGlvbnMoKyksIDMyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDc2 NzYxNWVjZGVhNS4uMzY4MDY2MDEwZjk0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTQ2 NCw2ICs0NjQsNyBAQCBzdHJ1Y3QgZHJtX2k5MTVfZGlzcGxheV9mdW5jcyB7CiBzdHJ1Y3QgaW50 ZWxfY3NyIHsKIAlzdHJ1Y3Qgd29ya19zdHJ1Y3Qgd29yazsKIAljb25zdCBjaGFyICpmd19wYXRo OworCXVpbnQzMl90IHJlcXVpcmVkX3ZlcnNpb247CiAJdWludDMyX3QgKmRtY19wYXlsb2FkOwog CXVpbnQzMl90IGRtY19md19zaXplOwogCXVpbnQzMl90IHZlcnNpb247CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jc3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Nzci5jCmluZGV4IDE0Y2Y0YzM2N2UzNi4uOWE2MGJiOWNjNDQzIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jc3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9jc3IuYwpAQCAtMjg0LDcgKzI4NCw2IEBAIHN0YXRpYyB1aW50MzJfdCAqcGFyc2Vf Y3NyX2Z3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAl1aW50MzJfdCBtYXhf Zndfc2l6ZSA9IDA7CiAJdWludDMyX3QgaTsKIAl1aW50MzJfdCAqZG1jX3BheWxvYWQ7Ci0JdWlu dDMyX3QgcmVxdWlyZWRfdmVyc2lvbjsKIAogCWlmICghZncpCiAJCXJldHVybiBOVUxMOwpAQCAt Mjk5LDM2ICsyOTgsMTkgQEAgc3RhdGljIHVpbnQzMl90ICpwYXJzZV9jc3JfZncoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQlyZXR1cm4gTlVMTDsKIAl9CiAKLQljc3ItPnZl cnNpb24gPSBjc3NfaGVhZGVyLT52ZXJzaW9uOwotCi0JaWYgKGNzci0+ZndfcGF0aCA9PSBpOTE1 X21vZHBhcmFtcy5kbWNfZmlybXdhcmVfcGF0aCkgewotCQkvKiBCeXBhc3MgdmVyc2lvbiBjaGVj ayBmb3IgZmlybXdhcmUgb3ZlcnJpZGUuICovCi0JCXJlcXVpcmVkX3ZlcnNpb24gPSBjc3ItPnZl cnNpb247Ci0JfSBlbHNlIGlmIChJU19DQU5OT05MQUtFKGRldl9wcml2KSkgewotCQlyZXF1aXJl ZF92ZXJzaW9uID0gQ05MX0NTUl9WRVJTSU9OX1JFUVVJUkVEOwotCX0gZWxzZSBpZiAoSVNfR0VN SU5JTEFLRShkZXZfcHJpdikpIHsKLQkJcmVxdWlyZWRfdmVyc2lvbiA9IEdMS19DU1JfVkVSU0lP Tl9SRVFVSVJFRDsKLQl9IGVsc2UgaWYgKElTX0tBQllMQUtFKGRldl9wcml2KSB8fCBJU19DT0ZG RUVMQUtFKGRldl9wcml2KSkgewotCQlyZXF1aXJlZF92ZXJzaW9uID0gS0JMX0NTUl9WRVJTSU9O X1JFUVVJUkVEOwotCX0gZWxzZSBpZiAoSVNfU0tZTEFLRShkZXZfcHJpdikpIHsKLQkJcmVxdWly ZWRfdmVyc2lvbiA9IFNLTF9DU1JfVkVSU0lPTl9SRVFVSVJFRDsKLQl9IGVsc2UgaWYgKElTX0JS T1hUT04oZGV2X3ByaXYpKSB7Ci0JCXJlcXVpcmVkX3ZlcnNpb24gPSBCWFRfQ1NSX1ZFUlNJT05f UkVRVUlSRUQ7Ci0JfSBlbHNlIHsKLQkJTUlTU0lOR19DQVNFKElOVEVMX1JFVklEKGRldl9wcml2 KSk7Ci0JCXJlcXVpcmVkX3ZlcnNpb24gPSAwOwotCX0KLQotCWlmIChjc3ItPnZlcnNpb24gIT0g cmVxdWlyZWRfdmVyc2lvbikgeworCWlmIChjc3ItPnJlcXVpcmVkX3ZlcnNpb24gJiYKKwkgICAg Y3NzX2hlYWRlci0+dmVyc2lvbiAhPSBjc3ItPnJlcXVpcmVkX3ZlcnNpb24pIHsKIAkJRFJNX0lO Rk8oIlJlZnVzaW5nIHRvIGxvYWQgRE1DIGZpcm13YXJlIHYldS4ldSwiCiAJCQkgIiBwbGVhc2Ug dXNlIHYldS4ldVxuIiwKLQkJCSBDU1JfVkVSU0lPTl9NQUpPUihjc3ItPnZlcnNpb24pLAotCQkJ IENTUl9WRVJTSU9OX01JTk9SKGNzci0+dmVyc2lvbiksCi0JCQkgQ1NSX1ZFUlNJT05fTUFKT1Io cmVxdWlyZWRfdmVyc2lvbiksCi0JCQkgQ1NSX1ZFUlNJT05fTUlOT1IocmVxdWlyZWRfdmVyc2lv bikpOworCQkJIENTUl9WRVJTSU9OX01BSk9SKGNzc19oZWFkZXItPnZlcnNpb24pLAorCQkJIENT Ul9WRVJTSU9OX01JTk9SKGNzc19oZWFkZXItPnZlcnNpb24pLAorCQkJIENTUl9WRVJTSU9OX01B Sk9SKGNzci0+cmVxdWlyZWRfdmVyc2lvbiksCisJCQkgQ1NSX1ZFUlNJT05fTUlOT1IoY3NyLT5y ZXF1aXJlZF92ZXJzaW9uKSk7CiAJCXJldHVybiBOVUxMOwogCX0KIAorCWNzci0+dmVyc2lvbiA9 IGNzc19oZWFkZXItPnZlcnNpb247CisKIAlyZWFkY291bnQgKz0gc2l6ZW9mKHN0cnVjdCBpbnRl bF9jc3NfaGVhZGVyKTsKIAogCS8qIEV4dHJhY3QgUGFja2FnZSBIZWFkZXIgaW5mb3JtYXRpb24q LwpAQCAtNDY5LDE4ICs0NTEsMjYgQEAgdm9pZCBpbnRlbF9jc3JfdWNvZGVfaW5pdChzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJaWYgKCFIQVNfQ1NSKGRldl9wcml2KSkKIAkJ cmV0dXJuOwogCi0JaWYgKGk5MTVfbW9kcGFyYW1zLmRtY19maXJtd2FyZV9wYXRoKQorCWlmIChp OTE1X21vZHBhcmFtcy5kbWNfZmlybXdhcmVfcGF0aCkgewogCQljc3ItPmZ3X3BhdGggPSBpOTE1 X21vZHBhcmFtcy5kbWNfZmlybXdhcmVfcGF0aDsKLQllbHNlIGlmIChJU19DQU5OT05MQUtFKGRl dl9wcml2KSkKKwkJLyogQnlwYXNzIHZlcnNpb24gY2hlY2sgZm9yIGZpcm13YXJlIG92ZXJyaWRl LiAqLworCQljc3ItPnJlcXVpcmVkX3ZlcnNpb24gPSAwOworCX0gZWxzZSBpZiAoSVNfQ0FOTk9O TEFLRShkZXZfcHJpdikpIHsKIAkJY3NyLT5md19wYXRoID0gSTkxNV9DU1JfQ05MOwotCWVsc2Ug aWYgKElTX0dFTUlOSUxBS0UoZGV2X3ByaXYpKQorCQljc3ItPnJlcXVpcmVkX3ZlcnNpb24gPSBD TkxfQ1NSX1ZFUlNJT05fUkVRVUlSRUQ7CisJfSBlbHNlIGlmIChJU19HRU1JTklMQUtFKGRldl9w cml2KSkgewogCQljc3ItPmZ3X3BhdGggPSBJOTE1X0NTUl9HTEs7Ci0JZWxzZSBpZiAoSVNfS0FC WUxBS0UoZGV2X3ByaXYpIHx8IElTX0NPRkZFRUxBS0UoZGV2X3ByaXYpKQorCQljc3ItPnJlcXVp cmVkX3ZlcnNpb24gPSBHTEtfQ1NSX1ZFUlNJT05fUkVRVUlSRUQ7CisJfSBlbHNlIGlmIChJU19L QUJZTEFLRShkZXZfcHJpdikgfHwgSVNfQ09GRkVFTEFLRShkZXZfcHJpdikpIHsKIAkJY3NyLT5m d19wYXRoID0gSTkxNV9DU1JfS0JMOwotCWVsc2UgaWYgKElTX1NLWUxBS0UoZGV2X3ByaXYpKQor CQljc3ItPnJlcXVpcmVkX3ZlcnNpb24gPSBLQkxfQ1NSX1ZFUlNJT05fUkVRVUlSRUQ7CisJfSBl bHNlIGlmIChJU19TS1lMQUtFKGRldl9wcml2KSkgewogCQljc3ItPmZ3X3BhdGggPSBJOTE1X0NT Ul9TS0w7Ci0JZWxzZSBpZiAoSVNfQlJPWFRPTihkZXZfcHJpdikpCisJCWNzci0+cmVxdWlyZWRf dmVyc2lvbiA9IFNLTF9DU1JfVkVSU0lPTl9SRVFVSVJFRDsKKwl9IGVsc2UgaWYgKElTX0JST1hU T04oZGV2X3ByaXYpKSB7CiAJCWNzci0+ZndfcGF0aCA9IEk5MTVfQ1NSX0JYVDsKKwkJY3NyLT5y ZXF1aXJlZF92ZXJzaW9uID0gQlhUX0NTUl9WRVJTSU9OX1JFUVVJUkVEOworCX0KIAogCS8qCiAJ ICogT2J0YWluIGEgcnVudGltZSBwbSByZWZlcmVuY2UsIHVudGlsIENTUiBpcyBsb2FkZWQsCi0t IAoyLjExLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=