From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arkadiusz Hiler Subject: [PATCH 1/8] drm/i915/uc: Rename intel_?uc_{setup, load}() to _init_hw() Date: Wed, 22 Feb 2017 13:41:18 +0100 Message-ID: <20170222124125.4437-2-arkadiusz.hiler@intel.com> References: <20170222124125.4437-1-arkadiusz.hiler@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id E6A586E7F2 for ; Wed, 22 Feb 2017 12:41:30 +0000 (UTC) In-Reply-To: <20170222124125.4437-1-arkadiusz.hiler@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 R3VDIGhpc3RvcmljYWxseSBoYXMgdHdvICJzdGFydHVwIiBmdW5jdGlvbnMgY2FsbGVkIF9pbml0 KCkgYW5kIF9zZXR1cCgpCgpUaGVuIEh1QyBjYW1lIHdpdGggaXQncyBfaW5pdCgpIGFuZCBfbG9h ZCgpLgoKVGhpcyBjb21taXQgcmVuYW1lcyBpbnRlbF9ndWNfc2V0dXAoKSBhbmQgaW50ZWxfaHVj X2xvYWQoKSB0bwoqdWNfaW5pdF9odygpIGFzIHRoZXkgY2FsbGVkIGZyb20gdGhlIGk5MTVfZ2Vt X2luaXRfaHcoKS4KClRoZSBhaW0gaXMgdG8gYmUgY29uc2lzdGVudCBpbiB0aGF0IGVudHJ5IHBv aW50cyBjYWxsZWQgZHVyaW5nCnBhcnRpY3VsYXIgZHJpdmVyIGluaXQgcGhhc2VzIChlLmcuIGlu aXRfaHcpIGFyZSBhbGwgc3VmZml4ZWQgYnkgdGhhdApwaGFzZS4gV2hlbiByZWFkaW5nIHRoZSBs ZWFmIGZ1bmN0aW9ucywgaXQgc2hvdWxkIGJlIGNsZWFyIGF0IHdoYXQgc3RhZ2UKZHVyaW5nIHRo ZSBkcml2ZXIgbG9hZCBpdCBpcyBjYWxsZWQgYW5kIHRoZXJlZm9yZSB3aGF0IG9wZXJhdGlvbnMg YXJlCmxlZ2FsIGF0IHRoYXQgcG9pbnQuCgp2MjogY29tbWl0IG1lc3NhZ2UgdXBkYXRlIChDaHJp cyBXaWxzb24pCgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNj OiBNaWNoYWwgV2luaWFyc2tpIDxtaWNoYWwud2luaWFyc2tpQGludGVsLmNvbT4KQ2M6IE1pY2hh bCBXYWpkZWN6a28gPG1pY2hhbC53YWpkZWN6a29AaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBB cmthZGl1c3ogSGlsZXIgPGFya2FkaXVzei5oaWxlckBpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBK b29uYXMgTGFodGluZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+ClJldmlld2Vk LWJ5OiBNaWNoYWwgV2FqZGVjemtvIDxtaWNoYWwud2FqZGVjemtvQGludGVsLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICAgICAgfCAgMiArLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jIHwgMTQgKysrKysrKy0tLS0tLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2h1Yy5jICAgICAgICB8ICA2ICsrKy0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfdWMuaCAgICAgICAgIHwgIDQgKystLQogNCBmaWxlcyBjaGFuZ2Vk LCAxMyBpbnNlcnRpb25zKCspLCAxMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u YwppbmRleCBkOTMwMzI4Li5iYmUyZGY5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTQ1 MTIsNyArNDUxMiw3IEBAIGludCBpOTE1X2dlbV9pbml0X2h3KHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKIAlpbnRlbF9tb2NzX2luaXRfbDNjY190YWJsZShkZXZfcHJpdik7CiAK IAkvKiBXZSBjYW4ndCBlbmFibGUgY29udGV4dHMgdW50aWwgYWxsIGZpcm13YXJlIGlzIGxvYWRl ZCAqLwotCXJldCA9IGludGVsX2d1Y19zZXR1cChkZXZfcHJpdik7CisJcmV0ID0gaW50ZWxfZ3Vj X2luaXRfaHcoZGV2X3ByaXYpOwogCWlmIChyZXQpCiAJCWdvdG8gb3V0OwogCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKaW5kZXggOTg4NWY3Ni4uOWYwOWUyNiAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYwpAQCAtNDI4LDE5ICs0MjgsMTkgQEAg c3RhdGljIGludCBndWNfaHdfcmVzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQogfQogCiAvKioKLSAqIGludGVsX2d1Y19zZXR1cCgpIC0gZmluaXNoIHByZXBhcmluZyB0aGUg R3VDIGZvciBhY3Rpdml0eQorICogaW50ZWxfZ3VjX2luaXRfaHcoKSAtIGZpbmlzaCBwcmVwYXJp bmcgdGhlIEd1QyBmb3IgYWN0aXZpdHkKICAqIEBkZXZfcHJpdjoJaTkxNSBkZXZpY2UgcHJpdmF0 ZQogICoKLSAqIENhbGxlZCBmcm9tIGdlbV9pbml0X2h3KCkgZHVyaW5nIGRyaXZlciBsb2FkaW5n IGFuZCBhbHNvIGFmdGVyIGEgR1BVIHJlc2V0LgorICogQ2FsbGVkIGR1cmluZyBkcml2ZXIgbG9h ZGluZyBhbmQgYWxzbyBhZnRlciBhIEdQVSByZXNldC4KICAqCiAgKiBUaGUgbWFpbiBhY3Rpb24g cmVxdWlyZWQgaGVyZSBpdCB0byBsb2FkIHRoZSBHdUMgdUNvZGUgaW50byB0aGUgZGV2aWNlLgog ICogVGhlIGZpcm13YXJlIGltYWdlIHNob3VsZCBoYXZlIGFscmVhZHkgYmVlbiBmZXRjaGVkIGlu dG8gbWVtb3J5IGJ5IHRoZQotICogZWFybGllciBjYWxsIHRvIGludGVsX2d1Y19pbml0KCksIHNv IGhlcmUgd2UgbmVlZCBvbmx5IGNoZWNrIHRoYXQgd29ya2VkLAotICogYW5kIHRoZW4gdHJhbnNm ZXIgdGhlIGltYWdlIHRvIHRoZSBoL3cuCisgKiBlYXJsaWVyIGNhbGwgdG8gaW50ZWxfZ3VjX2lu aXQoKSwgc28gaGVyZSB3ZSBuZWVkIG9ubHkgY2hlY2sgdGhhdAorICogd29ya2VkLCBhbmQgdGhl biB0cmFuc2ZlciB0aGUgaW1hZ2UgdG8gdGhlIGgvdy4KICAqCiAgKiBSZXR1cm46CW5vbi16ZXJv IGNvZGUgb24gZXJyb3IKICAqLwotaW50IGludGVsX2d1Y19zZXR1cChzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpCitpbnQgaW50ZWxfZ3VjX2luaXRfaHcoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KQogewogCXN0cnVjdCBpbnRlbF91Y19mdyAqZ3VjX2Z3ID0gJmRl dl9wcml2LT5ndWMuZnc7CiAJY29uc3QgY2hhciAqZndfcGF0aCA9IGd1Y19mdy0+cGF0aDsKQEAg LTUwNiw3ICs1MDYsNyBAQCBpbnQgaW50ZWxfZ3VjX3NldHVwKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKIAkJaWYgKGVycikKIAkJCWdvdG8gZmFpbDsKIAotCQlpbnRlbF9odWNf bG9hZChkZXZfcHJpdik7CisJCWludGVsX2h1Y19pbml0X2h3KGRldl9wcml2KTsKIAkJZXJyID0g Z3VjX3Vjb2RlX3hmZXIoZGV2X3ByaXYpOwogCQlpZiAoIWVycikKIAkJCWJyZWFrOwpAQCAtNzI5 LDcgKzcyOSw3IEBAIHZvaWQgaW50ZWxfdWNfZndfZmV0Y2goc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2LAogICogQ2FsbGVkIGVhcmx5IGR1cmluZyBkcml2ZXIgbG9hZCwgYnV0IGFm dGVyIEdFTSBpcyBpbml0aWFsaXNlZC4KICAqCiAgKiBUaGUgZmlybXdhcmUgd2lsbCBiZSB0cmFu c2ZlcnJlZCB0byB0aGUgR3VDJ3MgbWVtb3J5IGxhdGVyLAotICogd2hlbiBpbnRlbF9ndWNfc2V0 dXAoKSBpcyBjYWxsZWQuCisgKiB3aGVuIGludGVsX2d1Y19pbml0X2h3KCkgaXMgY2FsbGVkLgog ICovCiB2b2lkIGludGVsX2d1Y19pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp dikKIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2h1Yy5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVjLmMKaW5kZXggYzI4NTQzZC4uYmFiZTBlYiAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVjLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfaHVjLmMKQEAgLTE1MCw3ICsxNTAsNyBAQCBzdGF0aWMgaW50IGh1 Y191Y29kZV94ZmVyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKICAqIGlzIG5v dCBjYXBhYmxlIG9yIGRyaXZlciB5ZXQgc3VwcG9ydCBpdC4gQW5kIHRoZXJlIHdpbGwgYmUgbm8g ZXJyb3IgbWVzc2FnZQogICogZm9yIElOVEVMX1VDX0ZJUk1XQVJFX05PTkUgY2FzZXMuCiAgKgot ICogVGhlIERNQS1jb3B5aW5nIHRvIEhXIGlzIGRvbmUgbGF0ZXIgd2hlbiBpbnRlbF9odWNfbG9h ZCgpIGlzIGNhbGxlZC4KKyAqIFRoZSBETUEtY29weWluZyB0byBIVyBpcyBkb25lIGxhdGVyIHdo ZW4gaW50ZWxfaHVjX2luaXRfaHcoKSBpcyBjYWxsZWQuCiAgKi8KIHZvaWQgaW50ZWxfaHVjX2lu aXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewpAQCAtMTkxLDcgKzE5MSw3 IEBAIHZvaWQgaW50ZWxfaHVjX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQogfQogCiAvKioKLSAqIGludGVsX2h1Y19sb2FkKCkgLSBsb2FkIEh1QyB1Q29kZSB0byBkZXZp Y2UKKyAqIGludGVsX2h1Y19pbml0X2h3KCkgLSBsb2FkIEh1QyB1Q29kZSB0byBkZXZpY2UKICAq IEBkZXZfcHJpdjogdGhlIGRybV9pOTE1X3ByaXZhdGUgZGV2aWNlCiAgKgogICogQ2FsbGVkIGZy b20gZ3VjX3NldHVwKCkgZHVyaW5nIGRyaXZlciBsb2FkaW5nIGFuZCBhbHNvIGFmdGVyIGEgR1BV IHJlc2V0LgpAQCAtMjAzLDcgKzIwMyw3IEBAIHZvaWQgaW50ZWxfaHVjX2luaXQoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogICoKICAqIFJldHVybjoJbm9uLXplcm8gY29kZSBv biBlcnJvcgogICovCi1pbnQgaW50ZWxfaHVjX2xvYWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KQoraW50IGludGVsX2h1Y19pbml0X2h3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKIHsKIAlzdHJ1Y3QgaW50ZWxfdWNfZncgKmh1Y19mdyA9ICZkZXZfcHJpdi0+ aHVjLmZ3OwogCWludCBlcnI7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF91Yy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuaAppbmRleCBkNzRmNGQzLi5k ZDM0YTFiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmgKQEAgLTE5MCw3ICsxOTAsNyBAQCBpbnQg aW50ZWxfZ3VjX3NhbXBsZV9mb3JjZXdha2Uoc3RydWN0IGludGVsX2d1YyAqZ3VjKTsKIAogLyog aW50ZWxfZ3VjX2xvYWRlci5jICovCiBleHRlcm4gdm9pZCBpbnRlbF9ndWNfaW5pdChzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwotZXh0ZXJuIGludCBpbnRlbF9ndWNfc2V0dXAo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKK2V4dGVybiBpbnQgaW50ZWxfZ3Vj X2luaXRfaHcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIGV4dGVybiB2b2lk IGludGVsX2d1Y19maW5pKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiBleHRl cm4gY29uc3QgY2hhciAqaW50ZWxfdWNfZndfc3RhdHVzX3JlcHIoZW51bSBpbnRlbF91Y19md19z dGF0dXMgc3RhdHVzKTsKIGV4dGVybiBpbnQgaW50ZWxfZ3VjX3N1c3BlbmQoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KTsKQEAgLTIyNSw3ICsyMjUsNyBAQCBzdGF0aWMgaW5saW5l IHUzMiBndWNfZ2d0dF9vZmZzZXQoc3RydWN0IGk5MTVfdm1hICp2bWEpCiAvKiBpbnRlbF9odWMu YyAqLwogdm9pZCBpbnRlbF9odWNfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYpOwogdm9pZCBpbnRlbF9odWNfZmluaShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAgKmRldl9w cml2KTsKLWludCBpbnRlbF9odWNfbG9hZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYpOworaW50IGludGVsX2h1Y19pbml0X2h3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdik7CiB2b2lkIGludGVsX2d1Y19hdXRoX2h1YyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpOwogCiAjZW5kaWYKLS0gCjIuOS4zCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK