From mboxrd@z Thu Jan  1 00:00:00 1970
From: Dave Gordon <david.s.gordon@intel.com>
Subject: [PATCH 2/3] drm/i915/guc: general tidying up (loader)
Date: Mon, 12 Sep 2016 21:19:36 +0100
Message-ID: <1473711577-11454-3-git-send-email-david.s.gordon@intel.com>
References: <1473711577-11454-1-git-send-email-david.s.gordon@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 mga06.intel.com (mga06.intel.com [134.134.136.31])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 99E266E589
 for <intel-gfx@lists.freedesktop.org>; Mon, 12 Sep 2016 20:19:48 +0000 (UTC)
In-Reply-To: <1473711577-11454-1-git-send-email-david.s.gordon@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
List-Id: intel-gfx@lists.freedesktop.org

UmVuYW1pbmcgdG8gbW9yZSBjb25zaXN0ZW50IHNjaGVtZSwgZGVsZXRlIHVudXNlZCBkZWZpbml0
aW9ucwoKU2lnbmVkLW9mZi1ieTogRGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNv
bT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19yZWcuaCAgICAgfCAgMyAtLS0K
IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYyB8IDI3ICsrKysrKysrKysr
KysrKystLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAxNiBpbnNlcnRpb25zKCspLCAxNCBk
ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19y
ZWcuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3JlZy5oCmluZGV4IGNmNWE2NWIu
LmE0N2UxZTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3JlZy5o
CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3JlZy5oCkBAIC0xMDMsOSArMTAz
LDYgQEAKICNkZWZpbmUgSE9TVDJHVUNfSU5URVJSVVBUCQlfTU1JTygweGM0YzgpCiAjZGVmaW5l
ICAgSE9TVDJHVUNfVFJJR0dFUgkJICAoMTw8MCkKIAotI2RlZmluZSBEUkJNSVNDMQkJCTB4MTk4
NAotI2RlZmluZSAgIERPT1JCRUxMX0VOQUJMRQkJICAoMTw8MCkKLQogI2RlZmluZSBHRU44X0RS
QlJFR0woeCkJCQlfTU1JTygweDEwMDAgKyAoeCkgKiA4KQogI2RlZmluZSAgIEdFTjhfRFJCX1ZB
TElECQkgICgxPDwwKQogI2RlZmluZSBHRU44X0RSQlJFR1UoeCkJCQlfTU1JTygweDEwMDAgKyAo
eCkgKiA4ICsgNCkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19s
b2FkZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYwppbmRleCAw
MDIxNzQ4Li42ZmQzOWVmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9n
dWNfbG9hZGVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5j
CkBAIC05Nyw3ICs5Nyw3IEBAIGNvbnN0IGNoYXIgKmludGVsX2d1Y19md19zdGF0dXNfcmVwcihl
bnVtIGludGVsX2d1Y19md19zdGF0dXMgc3RhdHVzKQogCX0KIH07CiAKLXN0YXRpYyB2b2lkIGRp
cmVjdF9pbnRlcnJ1cHRzX3RvX2hvc3Qoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2
KQorc3RhdGljIHZvaWQgZ3VjX2ludGVycnVwdHNfcmVsZWFzZShzdHJ1Y3QgZHJtX2k5MTVfcHJp
dmF0ZSAqZGV2X3ByaXYpCiB7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOwogCWlu
dCBpcnFzOwpAQCAtMTE0LDcgKzExNCw3IEBAIHN0YXRpYyB2b2lkIGRpcmVjdF9pbnRlcnJ1cHRz
X3RvX2hvc3Qoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCUk5MTVfV1JJVEUo
R1VDX1dEX1ZFQ1NfSUVSLCAwKTsKIH0KIAotc3RhdGljIHZvaWQgZGlyZWN0X2ludGVycnVwdHNf
dG9fZ3VjKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK3N0YXRpYyB2b2lkIGd1
Y19pbnRlcnJ1cHRzX2NhcHR1cmUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQog
ewogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsKIAlpbnQgaXJxczsKQEAgLTE3OSw3
ICsxNzksMTIgQEAgc3RhdGljIHUzMiBnZXRfY29yZV9mYW1pbHkoc3RydWN0IGRybV9pOTE1X3By
aXZhdGUgKmRldl9wcml2KQogCX0KIH0KIAotc3RhdGljIHZvaWQgc2V0X2d1Y19pbml0X3BhcmFt
cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCisvKgorICogSW5pdGlhbGlzZSB0
aGUgR3VDIHBhcmFtZXRlciBibG9jayBiZWZvcmUgc3RhcnRpbmcgdGhlIGZpcm13YXJlCisgKiB0
cmFuc2Zlci4gVGhlc2UgcGFyYW1ldGVycyBhcmUgcmVhZCBieSB0aGUgZmlybXdhcmUgb24gc3Rh
cnR1cAorICogYW5kIGNhbm5vdCBiZSBjaGFuZ2VkIHRoZXJlYWZ0ZXIuCisgKi8KK3N0YXRpYyB2
b2lkIGd1Y19wYXJhbXNfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7
CiAJc3RydWN0IGludGVsX2d1YyAqZ3VjID0gJmRldl9wcml2LT5ndWM7CiAJdTMyIHBhcmFtc1tH
VUNfQ1RMX01BWF9EV09SRFNdOwpAQCAtMzkyLDExICszOTcsMTEgQEAgc3RhdGljIGludCBndWNf
dWNvZGVfeGZlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCUk5MTVfV1JJ
VEUoR0VON19NSVNDQ1BDVEwsIChHRU44X0RPUF9DTE9DS19HQVRFX0dVQ19FTkFCTEUgfAogCQkJ
CQkgICAgSTkxNV9SRUFEKEdFTjdfTUlTQ0NQQ1RMKSkpOwogCi0JCS8qIGFsbG93cyBmb3IgNXVz
IGJlZm9yZSBHVCBjYW4gZ28gdG8gUkM2ICovCisJCS8qIGFsbG93cyBmb3IgNXVzIChpbiAxMG5z
IHVuaXRzKSBiZWZvcmUgR1QgY2FuIGdvIHRvIFJDNiAqLwogCQlJOTE1X1dSSVRFKEdVQ19BUkFU
X0M2RElTLCAweDFGRik7CiAJfQogCi0Jc2V0X2d1Y19pbml0X3BhcmFtcyhkZXZfcHJpdik7CisJ
Z3VjX3BhcmFtc19pbml0KGRldl9wcml2KTsKIAogCXJldCA9IGd1Y191Y29kZV94ZmVyX2RtYShk
ZXZfcHJpdiwgdm1hKTsKIApAQCAtNDExLDcgKzQxNiw3IEBAIHN0YXRpYyBpbnQgZ3VjX3Vjb2Rl
X3hmZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCXJldHVybiByZXQ7CiB9
CiAKLXN0YXRpYyBpbnQgaTkxNV9yZXNldF9ndWMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl
dl9wcml2KQorc3RhdGljIGludCBndWNfaHdfcmVzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg
KmRldl9wcml2KQogewogCWludCByZXQ7CiAJdTMyIGd1Y19zdGF0dXM7CkBAIC00NzgsNyArNDgz
LDcgQEAgaW50IGludGVsX2d1Y19zZXR1cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlnb3Rv
IGZhaWw7CiAJfQogCi0JZGlyZWN0X2ludGVycnVwdHNfdG9faG9zdChkZXZfcHJpdik7CisJZ3Vj
X2ludGVycnVwdHNfcmVsZWFzZShkZXZfcHJpdik7CiAKIAlndWNfZnctPmd1Y19md19sb2FkX3N0
YXR1cyA9IEdVQ19GSVJNV0FSRV9QRU5ESU5HOwogCkBAIC01MDEsNyArNTA2LDcgQEAgaW50IGlu
dGVsX2d1Y19zZXR1cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkgKiBBbHdheXMgcmVzZXQg
dGhlIEd1QyBqdXN0IGJlZm9yZSAocmUpbG9hZGluZywgc28KIAkJICogdGhhdCB0aGUgc3RhdGUg
YW5kIHRpbWluZyBhcmUgZmFpcmx5IHByZWRpY3RhYmxlCiAJCSAqLwotCQllcnIgPSBpOTE1X3Jl
c2V0X2d1YyhkZXZfcHJpdik7CisJCWVyciA9IGd1Y19od19yZXNldChkZXZfcHJpdik7CiAJCWlm
IChlcnIpCiAJCQlnb3RvIGZhaWw7CiAKQEAgLTUyNiw3ICs1MzEsNyBAQCBpbnQgaW50ZWxfZ3Vj
X3NldHVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCWVyciA9IGk5MTVfZ3VjX3N1Ym1pc3Np
b25fZW5hYmxlKGRldl9wcml2KTsKIAkJaWYgKGVycikKIAkJCWdvdG8gZmFpbDsKLQkJZGlyZWN0
X2ludGVycnVwdHNfdG9fZ3VjKGRldl9wcml2KTsKKwkJZ3VjX2ludGVycnVwdHNfY2FwdHVyZShk
ZXZfcHJpdik7CiAJfQogCiAJcmV0dXJuIDA7CkBAIC01MzUsNyArNTQwLDcgQEAgaW50IGludGVs
X2d1Y19zZXR1cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWlmIChndWNfZnctPmd1Y19md19s
b2FkX3N0YXR1cyA9PSBHVUNfRklSTVdBUkVfUEVORElORykKIAkJZ3VjX2Z3LT5ndWNfZndfbG9h
ZF9zdGF0dXMgPSBHVUNfRklSTVdBUkVfRkFJTDsKIAotCWRpcmVjdF9pbnRlcnJ1cHRzX3RvX2hv
c3QoZGV2X3ByaXYpOworCWd1Y19pbnRlcnJ1cHRzX3JlbGVhc2UoZGV2X3ByaXYpOwogCWk5MTVf
Z3VjX3N1Ym1pc3Npb25fZGlzYWJsZShkZXZfcHJpdik7CiAJaTkxNV9ndWNfc3VibWlzc2lvbl9m
aW5pKGRldl9wcml2KTsKIApAQCAtNzY4LDcgKzc3Myw3IEBAIHZvaWQgaW50ZWxfZ3VjX2Zpbmko
c3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlzdHJ1Y3QgaW50ZWxfZ3VjX2Z3ICpndWNfZncgPSAm
ZGV2X3ByaXYtPmd1Yy5ndWNfZnc7CiAKIAltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7
Ci0JZGlyZWN0X2ludGVycnVwdHNfdG9faG9zdChkZXZfcHJpdik7CisJZ3VjX2ludGVycnVwdHNf
cmVsZWFzZShkZXZfcHJpdik7CiAJaTkxNV9ndWNfc3VibWlzc2lvbl9kaXNhYmxlKGRldl9wcml2
KTsKIAlpOTE1X2d1Y19zdWJtaXNzaW9uX2ZpbmkoZGV2X3ByaXYpOwogCi0tIAoxLjkuMQoKX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h
aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu
ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==