From: Dave Gordon Subject: [PATCH v4 1/7] drm/i915/guc: rename loader entry points Date: Fri, 13 May 2016 15:36:29 +0100 Message-ID: <1463150195-28805-2-git-send-email-david.s.gordon@intel.com> References: <1463150195-28805-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: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id CFE876E41C for ; Fri, 13 May 2016 14:37:08 +0000 (UTC) In-Reply-To: <1463150195-28805-1-git-send-email-david.s.gordon@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 VGhlIEd1QyBpbml0aWFsaXNhdGlvbiBjb2RlIGNvdWxkIGRvIG90aGVyIHRoaW5ncyBhcGFydCBm cm9tIGxvYWRpbmcKZmlybXdhcmUsIHNvIGhlcmUgd2UgcmVuYW1lIHRoZSB0aHJlZSBwcmltYXJ5 IGVudHJ5IHBvaW50cyB0byByZW1vdmUgYW55CnNwZWNpZmljIHJlZmVyZW5jZSB0byAidWNvZGUi IChubyBmdW5jdGlvbmFsIGNoYW5nZXMsIGp1c3QgcmVuYW1pbmcpLgoKU2lnbmVkLW9mZi1ieTog RGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2RtYS5jICAgICAgICAgfCAgNiArKystLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtLmMgICAgICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9ndWMuaCAgICAgICAgfCAgNiArKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1 Y19sb2FkZXIuYyB8IDE5ICsrKysrKysrKystLS0tLS0tLS0KIDQgZmlsZXMgY2hhbmdlZCwgMTcg aW5zZXJ0aW9ucygrKSwgMTYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kbWEuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMKaW5k ZXggNTQ3MTAwZi4uN2Q5M2Y4ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kbWEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jCkBAIC01MDcsNyAr NTA3LDcgQEAgc3RhdGljIGludCBpOTE1X2xvYWRfbW9kZXNldF9pbml0KHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCiAJICogd29ya2luZyBpcnFzIGZvciBlLmcuIGdtYnVzIGFuZCBkcCBhdXggdHJh bnNmZXJzLiAqLwogCWludGVsX21vZGVzZXRfaW5pdChkZXYpOwogCi0JaW50ZWxfZ3VjX3Vjb2Rl X2luaXQoZGV2KTsKKwlpbnRlbF9ndWNfaW5pdChkZXYpOwogCiAJcmV0ID0gaTkxNV9nZW1faW5p dChkZXYpOwogCWlmIChyZXQpCkBAIC01NDcsNyArNTQ3LDcgQEAgc3RhdGljIGludCBpOTE1X2xv YWRfbW9kZXNldF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiBjbGVhbnVwX2dlbToKIAlp OTE1X2dlbV9maW5pKGRldik7CiBjbGVhbnVwX2lycToKLQlpbnRlbF9ndWNfdWNvZGVfZmluaShk ZXYpOworCWludGVsX2d1Y19maW5pKGRldik7CiAJZHJtX2lycV91bmluc3RhbGwoZGV2KTsKIAlp bnRlbF90ZWFyZG93bl9nbWJ1cyhkZXYpOwogY2xlYW51cF9jc3I6CkBAIC0xNTI4LDcgKzE1Mjgs NyBAQCBpbnQgaTkxNV9kcml2ZXJfdW5sb2FkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJLyog Rmx1c2ggYW55IG91dHN0YW5kaW5nIHVucGluX3dvcmsuICovCiAJZmx1c2hfd29ya3F1ZXVlKGRl dl9wcml2LT53cSk7CiAKLQlpbnRlbF9ndWNfdWNvZGVfZmluaShkZXYpOworCWludGVsX2d1Y19m aW5pKGRldik7CiAJaTkxNV9nZW1fZmluaShkZXYpOwogCWludGVsX2ZiY19jbGVhbnVwX2NmYihk ZXZfcHJpdik7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IGEzZDgyNmIuLjQzZTQ1Yjcg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtNDg2Nyw3ICs0ODY3LDcgQEAgaW50IGk5MTVf Z2VtX2luaXRfZW5naW5lcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJLyogV2UgY2FuJ3Qg ZW5hYmxlIGNvbnRleHRzIHVudGlsIGFsbCBmaXJtd2FyZSBpcyBsb2FkZWQgKi8KIAlpZiAoSEFT X0dVQ19VQ09ERShkZXYpKSB7Ci0JCXJldCA9IGludGVsX2d1Y191Y29kZV9sb2FkKGRldik7CisJ CXJldCA9IGludGVsX2d1Y19zZXR1cChkZXYpOwogCQlpZiAocmV0KSB7CiAJCQlEUk1fRVJST1Io IkZhaWxlZCB0byBpbml0aWFsaXplIEd1QywgZXJyb3IgJWRcbiIsIHJldCk7CiAJCQlyZXQgPSAt RUlPOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmggYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaAppbmRleCA5ZDc5YzRjLi4zOTg0MTM2IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaAorKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9ndWMuaApAQCAtMTM4LDkgKzEzOCw5IEBAIHN0cnVjdCBpbnRlbF9n dWMgewogfTsKIAogLyogaW50ZWxfZ3VjX2xvYWRlci5jICovCi1leHRlcm4gdm9pZCBpbnRlbF9n dWNfdWNvZGVfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKLWV4dGVybiBpbnQgaW50ZWxf Z3VjX3Vjb2RlX2xvYWQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7Ci1leHRlcm4gdm9pZCBpbnRl bF9ndWNfdWNvZGVfZmluaShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKK2V4dGVybiB2b2lkIGlu dGVsX2d1Y19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOworZXh0ZXJuIGludCBpbnRlbF9n dWNfc2V0dXAoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CitleHRlcm4gdm9pZCBpbnRlbF9ndWNf ZmluaShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIGV4dGVybiBjb25zdCBjaGFyICppbnRlbF9n dWNfZndfc3RhdHVzX3JlcHIoZW51bSBpbnRlbF9ndWNfZndfc3RhdHVzIHN0YXR1cyk7CiBleHRl cm4gaW50IGludGVsX2d1Y19zdXNwZW5kKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogZXh0ZXJu IGludCBpbnRlbF9ndWNfcmVzdW1lKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCmluZGV4IDIzMzQ1ZTEuLmIxNGEzYTMgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKQEAgLTM3NSwxOCArMzc1LDE5IEBA IHN0YXRpYyBpbnQgaTkxNV9yZXNldF9ndWMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KQogfQogCiAvKioKLSAqIGludGVsX2d1Y191Y29kZV9sb2FkKCkgLSBsb2FkIEd1QyB1Q29k ZSBpbnRvIHRoZSBkZXZpY2UKKyAqIGludGVsX2d1Y19zZXR1cCgpIC0gZmluaXNoIHByZXBhcmlu ZyB0aGUgR3VDIGZvciBhY3Rpdml0eQogICogQGRldjoJZHJtIGRldmljZQogICoKICAqIENhbGxl ZCBmcm9tIGdlbV9pbml0X2h3KCkgZHVyaW5nIGRyaXZlciBsb2FkaW5nIGFuZCBhbHNvIGFmdGVy IGEgR1BVIHJlc2V0LgogICoKKyAqIFRoZSBtYWluIGFjdGlvbiByZXF1aXJlZCBoZXJlIGl0IHRv IGxvYWQgdGhlIEd1QyB1Q29kZSBpbnRvIHRoZSBkZXZpY2UuCiAgKiBUaGUgZmlybXdhcmUgaW1h Z2Ugc2hvdWxkIGhhdmUgYWxyZWFkeSBiZWVuIGZldGNoZWQgaW50byBtZW1vcnkgYnkgdGhlCi0g KiBlYXJsaWVyIGNhbGwgdG8gaW50ZWxfZ3VjX3Vjb2RlX2luaXQoKSwgc28gaGVyZSB3ZSBuZWVk IG9ubHkgY2hlY2sgdGhhdAotICogaXMgc3VjY2VlZGVkLCBhbmQgdGhlbiB0cmFuc2ZlciB0aGUg aW1hZ2UgdG8gdGhlIGgvdy4KKyAqIGVhcmxpZXIgY2FsbCB0byBpbnRlbF9ndWNfaW5pdCgpLCBz byBoZXJlIHdlIG5lZWQgb25seSBjaGVjayB0aGF0IHdvcmtlZCwKKyAqIGFuZCB0aGVuIHRyYW5z ZmVyIHRoZSBpbWFnZSB0byB0aGUgaC93LgogICoKICAqIFJldHVybjoJbm9uLXplcm8gY29kZSBv biBlcnJvcgogICovCi1pbnQgaW50ZWxfZ3VjX3Vjb2RlX2xvYWQoc3RydWN0IGRybV9kZXZpY2Ug KmRldikKK2ludCBpbnRlbF9ndWNfc2V0dXAoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0 cnVjdCBpbnRlbF9ndWNfZncgKmd1Y19mdyA9ICZkZXZfcHJpdi0+Z3VjLmd1Y19mdzsKQEAgLTYy MCwxNSArNjIxLDE1IEBAIHN0YXRpYyB2b2lkIGd1Y19md19mZXRjaChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LCBzdHJ1Y3QgaW50ZWxfZ3VjX2Z3ICpndWNfZncpCiB9CiAKIC8qKgotICogaW50ZWxf Z3VjX3Vjb2RlX2luaXQoKSAtIGRlZmluZSBwYXJhbWV0ZXJzIGFuZCBmZXRjaCBmaXJtd2FyZQor ICogaW50ZWxfZ3VjX2luaXQoKSAtIGRlZmluZSBwYXJhbWV0ZXJzIGFuZCBmZXRjaCBmaXJtd2Fy ZQogICogQGRldjoJZHJtIGRldmljZQogICoKICAqIENhbGxlZCBlYXJseSBkdXJpbmcgZHJpdmVy IGxvYWQsIGJ1dCBhZnRlciBHRU0gaXMgaW5pdGlhbGlzZWQuCiAgKgogICogVGhlIGZpcm13YXJl IHdpbGwgYmUgdHJhbnNmZXJyZWQgdG8gdGhlIEd1QydzIG1lbW9yeSBsYXRlciwKLSAqIHdoZW4g aW50ZWxfZ3VjX3Vjb2RlX2xvYWQoKSBpcyBjYWxsZWQuCisgKiB3aGVuIGludGVsX2d1Y19zZXR1 cCgpIGlzIGNhbGxlZC4KICAqLwotdm9pZCBpbnRlbF9ndWNfdWNvZGVfaW5pdChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQordm9pZCBpbnRlbF9ndWNfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZh dGU7CiAJc3RydWN0IGludGVsX2d1Y19mdyAqZ3VjX2Z3ID0gJmRldl9wcml2LT5ndWMuZ3VjX2Z3 OwpAQCAtNjc2LDEwICs2NzcsMTAgQEAgdm9pZCBpbnRlbF9ndWNfdWNvZGVfaW5pdChzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KQogfQogCiAvKioKLSAqIGludGVsX2d1Y191Y29kZV9maW5pKCkgLSBj bGVhbiB1cCBhbGwgYWxsb2NhdGVkIHJlc291cmNlcworICogaW50ZWxfZ3VjX2ZpbmkoKSAtIGNs ZWFuIHVwIGFsbCBhbGxvY2F0ZWQgcmVzb3VyY2VzCiAgKiBAZGV2Oglkcm0gZGV2aWNlCiAgKi8K LXZvaWQgaW50ZWxfZ3VjX3Vjb2RlX2Zpbmkoc3RydWN0IGRybV9kZXZpY2UgKmRldikKK3ZvaWQg aW50ZWxfZ3VjX2Zpbmkoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9n dWNfZncgKmd1Y19mdyA9ICZkZXZfcHJpdi0+Z3VjLmd1Y19mdzsKLS0gCjEuOS4xCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK