From: Jani Nikula Subject: [PATCH v3 1/3] drm/i915/csr: keep firmware name and required version together Date: Wed, 26 Sep 2018 16:34:12 +0300 Message-ID: <20180926133414.22073-1-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 84E8B6E454 for ; Wed, 26 Sep 2018 13:35:12 +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 bWFpbnRhaW4uIFB1dAp0aGVtIHRvZ2V0aGVyLgoKdjI6IFJlYmFzZQoKUmV2aWV3ZWQtYnk6IENo cmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPiAjIHYxClNpZ25lZC1vZmYtYnk6 IEphbmkgTmlrdWxhIDxqYW5pLm5pa3VsYUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaCAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jc3Iu YyB8IDU5ICsrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDIgZmlsZXMg Y2hhbmdlZCwgMjUgaW5zZXJ0aW9ucygrKSwgMzUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKaW5kZXggODYyNGI0YmRjMjQyLi4zN2Y1ZmNmMTY0NGQgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaApAQCAtNDY1LDYgKzQ2NSw3IEBAIHN0cnVjdCBkcm1faTkxNV9kaXNwbGF5X2Z1 bmNzIHsKIHN0cnVjdCBpbnRlbF9jc3IgewogCXN0cnVjdCB3b3JrX3N0cnVjdCB3b3JrOwogCWNv bnN0IGNoYXIgKmZ3X3BhdGg7CisJdWludDMyX3QgcmVxdWlyZWRfdmVyc2lvbjsKIAl1aW50MzJf dCAqZG1jX3BheWxvYWQ7CiAJdWludDMyX3QgZG1jX2Z3X3NpemU7CiAJdWludDMyX3QgdmVyc2lv bjsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Nzci5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfY3NyLmMKaW5kZXggNGFhOGYzZDZiNjRjLi5lZTI3N2VjMzM5 OTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Nzci5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Nzci5jCkBAIC0yODcsNyArMjg3LDYgQEAgc3RhdGlj IHVpbnQzMl90ICpwYXJzZV9jc3JfZncoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 LAogCXVpbnQzMl90IG1heF9md19zaXplID0gMDsKIAl1aW50MzJfdCBpOwogCXVpbnQzMl90ICpk bWNfcGF5bG9hZDsKLQl1aW50MzJfdCByZXF1aXJlZF92ZXJzaW9uOwogCiAJaWYgKCFmdykKIAkJ cmV0dXJuIE5VTEw7CkBAIC0zMDIsMzggKzMwMSwxOSBAQCBzdGF0aWMgdWludDMyX3QgKnBhcnNl X2Nzcl9mdyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCXJldHVybiBOVUxM OwogCX0KIAotCWNzci0+dmVyc2lvbiA9IGNzc19oZWFkZXItPnZlcnNpb247Ci0KLQlpZiAoY3Ny LT5md19wYXRoID09IGk5MTVfbW9kcGFyYW1zLmRtY19maXJtd2FyZV9wYXRoKSB7Ci0JCS8qIEJ5 cGFzcyB2ZXJzaW9uIGNoZWNrIGZvciBmaXJtd2FyZSBvdmVycmlkZS4gKi8KLQkJcmVxdWlyZWRf dmVyc2lvbiA9IGNzci0+dmVyc2lvbjsKLQl9IGVsc2UgaWYgKElTX0lDRUxBS0UoZGV2X3ByaXYp KSB7Ci0JCXJlcXVpcmVkX3ZlcnNpb24gPSBJQ0xfQ1NSX1ZFUlNJT05fUkVRVUlSRUQ7Ci0JfSBl bHNlIGlmIChJU19DQU5OT05MQUtFKGRldl9wcml2KSkgewotCQlyZXF1aXJlZF92ZXJzaW9uID0g Q05MX0NTUl9WRVJTSU9OX1JFUVVJUkVEOwotCX0gZWxzZSBpZiAoSVNfR0VNSU5JTEFLRShkZXZf cHJpdikpIHsKLQkJcmVxdWlyZWRfdmVyc2lvbiA9IEdMS19DU1JfVkVSU0lPTl9SRVFVSVJFRDsK LQl9IGVsc2UgaWYgKElTX0tBQllMQUtFKGRldl9wcml2KSB8fCBJU19DT0ZGRUVMQUtFKGRldl9w cml2KSkgewotCQlyZXF1aXJlZF92ZXJzaW9uID0gS0JMX0NTUl9WRVJTSU9OX1JFUVVJUkVEOwot CX0gZWxzZSBpZiAoSVNfU0tZTEFLRShkZXZfcHJpdikpIHsKLQkJcmVxdWlyZWRfdmVyc2lvbiA9 IFNLTF9DU1JfVkVSU0lPTl9SRVFVSVJFRDsKLQl9IGVsc2UgaWYgKElTX0JST1hUT04oZGV2X3By aXYpKSB7Ci0JCXJlcXVpcmVkX3ZlcnNpb24gPSBCWFRfQ1NSX1ZFUlNJT05fUkVRVUlSRUQ7Ci0J fSBlbHNlIHsKLQkJTUlTU0lOR19DQVNFKElOVEVMX1JFVklEKGRldl9wcml2KSk7Ci0JCXJlcXVp cmVkX3ZlcnNpb24gPSAwOwotCX0KLQotCWlmIChjc3ItPnZlcnNpb24gIT0gcmVxdWlyZWRfdmVy c2lvbikgeworCWlmIChjc3ItPnJlcXVpcmVkX3ZlcnNpb24gJiYKKwkgICAgY3NzX2hlYWRlci0+ dmVyc2lvbiAhPSBjc3ItPnJlcXVpcmVkX3ZlcnNpb24pIHsKIAkJRFJNX0lORk8oIlJlZnVzaW5n IHRvIGxvYWQgRE1DIGZpcm13YXJlIHYldS4ldSwiCiAJCQkgIiBwbGVhc2UgdXNlIHYldS4ldVxu IiwKLQkJCSBDU1JfVkVSU0lPTl9NQUpPUihjc3ItPnZlcnNpb24pLAotCQkJIENTUl9WRVJTSU9O X01JTk9SKGNzci0+dmVyc2lvbiksCi0JCQkgQ1NSX1ZFUlNJT05fTUFKT1IocmVxdWlyZWRfdmVy c2lvbiksCi0JCQkgQ1NSX1ZFUlNJT05fTUlOT1IocmVxdWlyZWRfdmVyc2lvbikpOworCQkJIENT Ul9WRVJTSU9OX01BSk9SKGNzc19oZWFkZXItPnZlcnNpb24pLAorCQkJIENTUl9WRVJTSU9OX01J Tk9SKGNzc19oZWFkZXItPnZlcnNpb24pLAorCQkJIENTUl9WRVJTSU9OX01BSk9SKGNzci0+cmVx dWlyZWRfdmVyc2lvbiksCisJCQkgQ1NSX1ZFUlNJT05fTUlOT1IoY3NyLT5yZXF1aXJlZF92ZXJz aW9uKSk7CiAJCXJldHVybiBOVUxMOwogCX0KIAorCWNzci0+dmVyc2lvbiA9IGNzc19oZWFkZXIt PnZlcnNpb247CisKIAlyZWFkY291bnQgKz0gc2l6ZW9mKHN0cnVjdCBpbnRlbF9jc3NfaGVhZGVy KTsKIAogCS8qIEV4dHJhY3QgUGFja2FnZSBIZWFkZXIgaW5mb3JtYXRpb24qLwpAQCAtNDc0LDIw ICs0NTQsMjkgQEAgdm9pZCBpbnRlbF9jc3JfdWNvZGVfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCiAJaWYgKCFIQVNfQ1NSKGRldl9wcml2KSkKIAkJcmV0dXJuOwogCi0J aWYgKGk5MTVfbW9kcGFyYW1zLmRtY19maXJtd2FyZV9wYXRoKQorCWlmIChpOTE1X21vZHBhcmFt cy5kbWNfZmlybXdhcmVfcGF0aCkgewogCQljc3ItPmZ3X3BhdGggPSBpOTE1X21vZHBhcmFtcy5k bWNfZmlybXdhcmVfcGF0aDsKLQllbHNlIGlmIChJU19JQ0VMQUtFKGRldl9wcml2KSkKKwkJLyog QnlwYXNzIHZlcnNpb24gY2hlY2sgZm9yIGZpcm13YXJlIG92ZXJyaWRlLiAqLworCQljc3ItPnJl cXVpcmVkX3ZlcnNpb24gPSAwOworCX0gZWxzZSBpZiAoSVNfSUNFTEFLRShkZXZfcHJpdikpIHsK IAkJY3NyLT5md19wYXRoID0gSTkxNV9DU1JfSUNMOwotCWVsc2UgaWYgKElTX0NBTk5PTkxBS0Uo ZGV2X3ByaXYpKQorCQljc3ItPnJlcXVpcmVkX3ZlcnNpb24gPSBJQ0xfQ1NSX1ZFUlNJT05fUkVR VUlSRUQ7CisJfSBlbHNlIGlmIChJU19DQU5OT05MQUtFKGRldl9wcml2KSkgewogCQljc3ItPmZ3 X3BhdGggPSBJOTE1X0NTUl9DTkw7Ci0JZWxzZSBpZiAoSVNfR0VNSU5JTEFLRShkZXZfcHJpdikp CisJCWNzci0+cmVxdWlyZWRfdmVyc2lvbiA9IENOTF9DU1JfVkVSU0lPTl9SRVFVSVJFRDsKKwl9 IGVsc2UgaWYgKElTX0dFTUlOSUxBS0UoZGV2X3ByaXYpKSB7CiAJCWNzci0+ZndfcGF0aCA9IEk5 MTVfQ1NSX0dMSzsKLQllbHNlIGlmIChJU19LQUJZTEFLRShkZXZfcHJpdikgfHwgSVNfQ09GRkVF TEFLRShkZXZfcHJpdikpCisJCWNzci0+cmVxdWlyZWRfdmVyc2lvbiA9IEdMS19DU1JfVkVSU0lP Tl9SRVFVSVJFRDsKKwl9IGVsc2UgaWYgKElTX0tBQllMQUtFKGRldl9wcml2KSB8fCBJU19DT0ZG RUVMQUtFKGRldl9wcml2KSkgewogCQljc3ItPmZ3X3BhdGggPSBJOTE1X0NTUl9LQkw7Ci0JZWxz ZSBpZiAoSVNfU0tZTEFLRShkZXZfcHJpdikpCisJCWNzci0+cmVxdWlyZWRfdmVyc2lvbiA9IEtC TF9DU1JfVkVSU0lPTl9SRVFVSVJFRDsKKwl9IGVsc2UgaWYgKElTX1NLWUxBS0UoZGV2X3ByaXYp KSB7CiAJCWNzci0+ZndfcGF0aCA9IEk5MTVfQ1NSX1NLTDsKLQllbHNlIGlmIChJU19CUk9YVE9O KGRldl9wcml2KSkKKwkJY3NyLT5yZXF1aXJlZF92ZXJzaW9uID0gU0tMX0NTUl9WRVJTSU9OX1JF UVVJUkVEOworCX0gZWxzZSBpZiAoSVNfQlJPWFRPTihkZXZfcHJpdikpIHsKIAkJY3NyLT5md19w YXRoID0gSTkxNV9DU1JfQlhUOworCQljc3ItPnJlcXVpcmVkX3ZlcnNpb24gPSBCWFRfQ1NSX1ZF UlNJT05fUkVRVUlSRUQ7CisJfQogCiAJLyoKIAkgKiBPYnRhaW4gYSBydW50aW1lIHBtIHJlZmVy ZW5jZSwgdW50aWwgQ1NSIGlzIGxvYWRlZCwKLS0gCjIuMTEuMAoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRl bC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==