From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jani Nikula <jani.nikula@intel.com>
Subject: [PATCH 2/3] drm/i915/csr: keep max firmware size
 together with firmare name and version
Date: Thu,  6 Sep 2018 11:21:25 +0300
Message-ID: <20180906082126.15539-2-jani.nikula@intel.com>
References: <20180906082126.15539-1-jani.nikula@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 mga18.intel.com (mga18.intel.com [134.134.136.126])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 413256E600
 for <intel-gfx@lists.freedesktop.org>; Thu,  6 Sep 2018 08:21:57 +0000 (UTC)
In-Reply-To: <20180906082126.15539-1-jani.nikula@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
Cc: jani.nikula@intel.com
List-Id: intel-gfx@lists.freedesktop.org

TW92ZSBtYXggZmlybXdhcmUgc2l6ZSB0byB0aGUgc2FtZSBpZiBsYWRkZXIgd2l0aCBmaXJtd2Fy
ZSBuYW1lIGFuZApyZXF1aXJlZCB2ZXJzaW9uLiBUaGlzIGFsbG93cyB1cyB0byBkZXRlY3QgdGhl
IG1pc3NpbmcgbWF4IHNpemUgZm9yIGEKcGxhdGZvcm0gd2l0aG91dCBhY3R1YWxseSBsb2FkaW5n
IHRoZSBmaXJtd2FyZSwgYW5kIG1ha2VzIHRoZSB3aG9sZQp0aGluZyBlYXNpZXIgdG8gbWFpbnRh
aW4uCgpXZSBuZWVkIHRvIG1vdmUgdGhlIHBvd2VyIGdldCBlYXJsaWVyIHRvIGFsbG93IGZvciBl
YXJseSByZXR1cm4gaW4gdGhlCm1pc3NpbmcgcGxhdGZvcm0gY2FzZS4gV2UgYWxzbyBuZWVkIHRv
IG1vdmUgdGhlIG1vZHVsZSBwYXJhbWV0ZXIKb3ZlcnJpZGUgbGF0ZXIgdG8gcmV1c2UgdGhlIG1h
eCBmaXJtd2FyZSBzaXplLCB3aGljaCBpcyBpbmRlcGVuZGVudCBvZgp0aGUgb3ZlcnJpZGUuIE5v
dGUgaG93IHRoaXMgd29ya3Mgd2l0aCBnZW4gMTErIHdoaWNoIGRvbid0IGhhdmUgYQpzcGVjaWZp
ZWQgZmlybXdhcmUgYmxvYiB5ZXQsIGJ1dCBkbyBoYXZlIGEgbWF4aW11bSBzaXplLgoKU2lnbmVk
LW9mZi1ieTogSmFuaSBOaWt1bGEgPGphbmkubmlrdWxhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJz
L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICB8ICAzICsrLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv
aW50ZWxfY3NyLmMgfCA0MSArKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0t
CiAyIGZpbGVzIGNoYW5nZWQsIDI0IGluc2VydGlvbnMoKyksIDIwIGRlbGV0aW9ucygtKQoKZGlm
ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDM2ODA2NjAxMGY5NC4uNjI0NDRmNGMzYzhlIDEwMDY0
NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTQ2NSw4ICs0NjUsOSBAQCBzdHJ1Y3QgaW50ZWxfY3Ny
IHsKIAlzdHJ1Y3Qgd29ya19zdHJ1Y3Qgd29yazsKIAljb25zdCBjaGFyICpmd19wYXRoOwogCXVp
bnQzMl90IHJlcXVpcmVkX3ZlcnNpb247CisJdWludDMyX3QgbWF4X2Z3X3NpemU7IC8qIGJ5dGVz
ICovCiAJdWludDMyX3QgKmRtY19wYXlsb2FkOwotCXVpbnQzMl90IGRtY19md19zaXplOworCXVp
bnQzMl90IGRtY19md19zaXplOyAvKiBkd29yZHMgKi8KIAl1aW50MzJfdCB2ZXJzaW9uOwogCXVp
bnQzMl90IG1taW9fY291bnQ7CiAJaTkxNV9yZWdfdCBtbWlvYWRkcls4XTsKZGlmZiAtLWdpdCBh
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Nzci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aW50ZWxfY3NyLmMKaW5kZXggOWE2MGJiOWNjNDQzLi45NTZhYzhiYmY1ZTQgMTAwNjQ0Ci0tLSBh
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Nzci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2ludGVsX2Nzci5jCkBAIC0yODEsNyArMjgxLDYgQEAgc3RhdGljIHVpbnQzMl90ICpwYXJz
ZV9jc3JfZncoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCXN0cnVjdCBpbnRl
bF9jc3IgKmNzciA9ICZkZXZfcHJpdi0+Y3NyOwogCWNvbnN0IHN0cnVjdCBzdGVwcGluZ19pbmZv
ICpzaSA9IGludGVsX2dldF9zdGVwcGluZ19pbmZvKGRldl9wcml2KTsKIAl1aW50MzJfdCBkbWNf
b2Zmc2V0ID0gQ1NSX0RFRkFVTFRfRldfT0ZGU0VULCByZWFkY291bnQgPSAwLCBuYnl0ZXM7Ci0J
dWludDMyX3QgbWF4X2Z3X3NpemUgPSAwOwogCXVpbnQzMl90IGk7CiAJdWludDMyX3QgKmRtY19w
YXlsb2FkOwogCkBAIC0zNzgsMTUgKzM3Nyw3IEBAIHN0YXRpYyB1aW50MzJfdCAqcGFyc2VfY3Ny
X2Z3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAogCS8qIGZ3X3NpemUgaXMg
aW4gZHdvcmRzLCBzbyBtdWx0aXBsaWVkIGJ5IDQgdG8gY29udmVydCBpbnRvIGJ5dGVzLiAqLwog
CW5ieXRlcyA9IGRtY19oZWFkZXItPmZ3X3NpemUgKiA0OwotCWlmIChJTlRFTF9HRU4oZGV2X3By
aXYpID49IDExKQotCQltYXhfZndfc2l6ZSA9IElDTF9DU1JfTUFYX0ZXX1NJWkU7Ci0JZWxzZSBp
ZiAoSVNfQ0FOTk9OTEFLRShkZXZfcHJpdikgfHwgSVNfR0VNSU5JTEFLRShkZXZfcHJpdikpCi0J
CW1heF9md19zaXplID0gR0xLX0NTUl9NQVhfRldfU0laRTsKLQllbHNlIGlmIChJU19HRU45KGRl
dl9wcml2KSkKLQkJbWF4X2Z3X3NpemUgPSBCWFRfQ1NSX01BWF9GV19TSVpFOwotCWVsc2UKLQkJ
TUlTU0lOR19DQVNFKElOVEVMX1JFVklEKGRldl9wcml2KSk7Ci0JaWYgKG5ieXRlcyA+IG1heF9m
d19zaXplKSB7CisJaWYgKG5ieXRlcyA+IGNzci0+bWF4X2Z3X3NpemUpIHsKIAkJRFJNX0VSUk9S
KCJETUMgRlcgdG9vIGJpZyAoJXUgYnl0ZXMpXG4iLCBuYnl0ZXMpOwogCQlyZXR1cm4gTlVMTDsK
IAl9CkBAIC00NTEsMzIgKzQ0Miw0NCBAQCB2b2lkIGludGVsX2Nzcl91Y29kZV9pbml0KHN0cnVj
dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlpZiAoIUhBU19DU1IoZGV2X3ByaXYpKQog
CQlyZXR1cm47CiAKLQlpZiAoaTkxNV9tb2RwYXJhbXMuZG1jX2Zpcm13YXJlX3BhdGgpIHsKLQkJ
Y3NyLT5md19wYXRoID0gaTkxNV9tb2RwYXJhbXMuZG1jX2Zpcm13YXJlX3BhdGg7Ci0JCS8qIEJ5
cGFzcyB2ZXJzaW9uIGNoZWNrIGZvciBmaXJtd2FyZSBvdmVycmlkZS4gKi8KLQkJY3NyLT5yZXF1
aXJlZF92ZXJzaW9uID0gMDsKKwkvKgorCSAqIE9idGFpbiBhIHJ1bnRpbWUgcG0gcmVmZXJlbmNl
LCB1bnRpbCBDU1IgaXMgbG9hZGVkLAorCSAqIHRvIGF2b2lkIGVudGVyaW5nIHJ1bnRpbWUtc3Vz
cGVuZC4KKwkgKi8KKwlpbnRlbF9kaXNwbGF5X3Bvd2VyX2dldChkZXZfcHJpdiwgUE9XRVJfRE9N
QUlOX0lOSVQpOworCisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gMTEpIHsKKwkJY3NyLT5t
YXhfZndfc2l6ZSA9IElDTF9DU1JfTUFYX0ZXX1NJWkU7CiAJfSBlbHNlIGlmIChJU19DQU5OT05M
QUtFKGRldl9wcml2KSkgewogCQljc3ItPmZ3X3BhdGggPSBJOTE1X0NTUl9DTkw7CiAJCWNzci0+
cmVxdWlyZWRfdmVyc2lvbiA9IENOTF9DU1JfVkVSU0lPTl9SRVFVSVJFRDsKKwkJY3NyLT5tYXhf
Zndfc2l6ZSA9IEdMS19DU1JfTUFYX0ZXX1NJWkU7CiAJfSBlbHNlIGlmIChJU19HRU1JTklMQUtF
KGRldl9wcml2KSkgewogCQljc3ItPmZ3X3BhdGggPSBJOTE1X0NTUl9HTEs7CiAJCWNzci0+cmVx
dWlyZWRfdmVyc2lvbiA9IEdMS19DU1JfVkVSU0lPTl9SRVFVSVJFRDsKKwkJY3NyLT5tYXhfZndf
c2l6ZSA9IEdMS19DU1JfTUFYX0ZXX1NJWkU7CiAJfSBlbHNlIGlmIChJU19LQUJZTEFLRShkZXZf
cHJpdikgfHwgSVNfQ09GRkVFTEFLRShkZXZfcHJpdikpIHsKIAkJY3NyLT5md19wYXRoID0gSTkx
NV9DU1JfS0JMOwogCQljc3ItPnJlcXVpcmVkX3ZlcnNpb24gPSBLQkxfQ1NSX1ZFUlNJT05fUkVR
VUlSRUQ7CisJCWNzci0+bWF4X2Z3X3NpemUgPSBCWFRfQ1NSX01BWF9GV19TSVpFOwogCX0gZWxz
ZSBpZiAoSVNfU0tZTEFLRShkZXZfcHJpdikpIHsKIAkJY3NyLT5md19wYXRoID0gSTkxNV9DU1Jf
U0tMOwogCQljc3ItPnJlcXVpcmVkX3ZlcnNpb24gPSBTS0xfQ1NSX1ZFUlNJT05fUkVRVUlSRUQ7
CisJCWNzci0+bWF4X2Z3X3NpemUgPSBCWFRfQ1NSX01BWF9GV19TSVpFOwogCX0gZWxzZSBpZiAo
SVNfQlJPWFRPTihkZXZfcHJpdikpIHsKIAkJY3NyLT5md19wYXRoID0gSTkxNV9DU1JfQlhUOwog
CQljc3ItPnJlcXVpcmVkX3ZlcnNpb24gPSBCWFRfQ1NSX1ZFUlNJT05fUkVRVUlSRUQ7CisJCWNz
ci0+bWF4X2Z3X3NpemUgPSBCWFRfQ1NSX01BWF9GV19TSVpFOworCX0gZWxzZSB7CisJCU1JU1NJ
TkdfQ0FTRShJTlRFTF9SRVZJRChkZXZfcHJpdikpOworCQlyZXR1cm47CiAJfQogCi0JLyoKLQkg
KiBPYnRhaW4gYSBydW50aW1lIHBtIHJlZmVyZW5jZSwgdW50aWwgQ1NSIGlzIGxvYWRlZCwKLQkg
KiB0byBhdm9pZCBlbnRlcmluZyBydW50aW1lLXN1c3BlbmQuCi0JICovCi0JaW50ZWxfZGlzcGxh
eV9wb3dlcl9nZXQoZGV2X3ByaXYsIFBPV0VSX0RPTUFJTl9JTklUKTsKKwlpZiAoaTkxNV9tb2Rw
YXJhbXMuZG1jX2Zpcm13YXJlX3BhdGgpIHsKKwkJY3NyLT5md19wYXRoID0gaTkxNV9tb2RwYXJh
bXMuZG1jX2Zpcm13YXJlX3BhdGg7CisJCS8qIEJ5cGFzcyB2ZXJzaW9uIGNoZWNrIGZvciBmaXJt
d2FyZSBvdmVycmlkZS4gKi8KKwkJY3NyLT5yZXF1aXJlZF92ZXJzaW9uID0gMDsKKwl9CiAKIAlp
ZiAoY3NyLT5md19wYXRoID09IE5VTEwpIHsKIAkJRFJNX0RFQlVHX0tNUygiTm8ga25vd24gQ1NS
IGZpcm13YXJlIGZvciBwbGF0Zm9ybSwgZGlzYWJsaW5nIHJ1bnRpbWUgUE1cbiIpOwotLSAKMi4x
MS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl
bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6
Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK