From: Tvrtko Ursulin Subject: [PATCH 7/7] drm/i915: Pull out some more common engine init code Date: Wed, 13 Jul 2016 16:03:41 +0100 Message-ID: <1468422221-12132-7-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1468422221-12132-1-git-send-email-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id C3C2C6E766 for ; Wed, 13 Jul 2016 15:06:00 +0000 (UTC) In-Reply-To: <1468422221-12132-1-git-send-email-tvrtko.ursulin@linux.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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkNyZWF0ZWQg dHdvIGNvbW1vbiBoZWxwZXJzIGZvciBlbmdpbmUgc2V0dXAgYW5kIGVuZ2luZSBpbml0IHBoYXNl cwpyZXNwZWN0aXZlbHkgdG8gaGVscCB3aXRoIGNvZGUgc2hhcmluZy4KClNpZ25lZC1vZmYtYnk6 IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMgIHwgNDcgKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAgfCAx NyArKystLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyB8 IDE4ICsrKy0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIu aCB8ICAzICsrKwogNCBmaWxlcyBjaGFuZ2VkLCA1NiBpbnNlcnRpb25zKCspLCAyOSBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVfY3Mu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2luZV9jcy5jCmluZGV4IDgwMTE3YjQ5 OTAyNC4uZTNjOWYwNGVhNTFlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9lbmdpbmVfY3MuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVfY3Mu YwpAQCAtMTYwLDMgKzE2MCw1MCBAQCBjbGVhbnVwOgogCXJldHVybiByZXQ7CiB9CiAKK3ZvaWQg aW50ZWxfZW5naW5lX2luaXRfaGFuZ2NoZWNrKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2lu ZSkKK3sKKwltZW1zZXQoJmVuZ2luZS0+aGFuZ2NoZWNrLCAwLCBzaXplb2YoZW5naW5lLT5oYW5n Y2hlY2spKTsKK30KKworLyoqCisgKiBpbnRlbF9lbmdpbmVzX3NldHVwX2NvbW1vbiAtIHNldHVw IGVuZ2luZSBzdGF0ZSBub3QgcmVxdWlyaW5nIGh3IGFjY2VzcworICogQGVuZ2luZTogRW5naW5l IHRvIHNldHVwLgorICoKKyAqIEluaXRpYWxpemVzIEBlbmdpbmVAIHN0cnVjdHVyZSBtZW1iZXJz IHNoYXJlZCBiZXR3ZWVuIGxlZ2FjeSBhbmQgZXhlY2xpc3RzCisgKiBzdWJtaXNzaW9uIG1vZGVz IHdoaWNoIGRvIG5vdCByZXF1aXJlIGhhcmR3YXJlIGFjY2Vzcy4KKyAqCisgKiBUeXBpY2FsbHkg ZG9uZSBlYXJseSBpbiB0aGUgc3VibWlzc2lvbiBtb2RlIHNwZWNpZmljIGVuZ2luZSBzZXR1cCBz dGFnZS4KKyAqLwordm9pZCBpbnRlbF9lbmdpbmVfc2V0dXBfY29tbW9uKHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKmVuZ2luZSkKK3sKKwlJTklUX0xJU1RfSEVBRCgmZW5naW5lLT5hY3RpdmVfbGlz dCk7CisJSU5JVF9MSVNUX0hFQUQoJmVuZ2luZS0+cmVxdWVzdF9saXN0KTsKKwlJTklUX0xJU1Rf SEVBRCgmZW5naW5lLT5idWZmZXJzKTsKKwlJTklUX0xJU1RfSEVBRCgmZW5naW5lLT5leGVjbGlz dF9xdWV1ZSk7CisJc3Bpbl9sb2NrX2luaXQoJmVuZ2luZS0+ZXhlY2xpc3RfbG9jayk7CisKKwlp bnRlbF9lbmdpbmVfaW5pdF9oYW5nY2hlY2soZW5naW5lKTsKKwlpOTE1X2dlbV9iYXRjaF9wb29s X2luaXQoJmVuZ2luZS0+aTkxNS0+ZHJtLCAmZW5naW5lLT5iYXRjaF9wb29sKTsKK30KKworLyoq CisgKiBpbnRlbF9lbmdpbmVzX2luaXRfY29tbW9uIC0gaW5pdGlhbGl6ZSBjZW5naW5lIHN0YXRl IHdoaWNoIG1pZ2h0IHJlcXVpcmUgaHcgYWNjZXNzCisgKiBAZW5naW5lOiBFbmdpbmUgdG8gaW5p dGlhbGl6ZS4KKyAqCisgKiBJbml0aWFsaXplcyBAZW5naW5lQCBzdHJ1Y3R1cmUgbWVtYmVycyBz aGFyZWQgYmV0d2VlbiBsZWdhY3kgYW5kIGV4ZWNsaXN0cworICogc3VibWlzc2lvbiBtb2RlcyB3 aGljaCBkbyByZXF1aXJlIGhhcmR3YXJlIGFjY2Vzcy4KKyAqCisgKiBUeXBjYWxseSBkb25lIGF0 IGxhdGVyIHN0YWdlcyBvZiBzdWJtaXNzaW9uIG1vZGUgc3BlY2lmaWMgZW5naW5lIHNldHVwLgor ICoKKyAqIFJldHVybnMgemVybyBvbiBzdWNjZXNzIG9yIGFuIGVycm9yIGNvZGUgb24gZmFpbHVy ZS4KKyAqLworaW50IGludGVsX2VuZ2luZV9pbml0X2NvbW1vbihzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICplbmdpbmUpCit7CisJaW50IHJldDsKKworCXJldCA9IGludGVsX2VuZ2luZV9pbml0X2Jy ZWFkY3J1bWJzKGVuZ2luZSk7CisJaWYgKHJldCkKKwkJcmV0dXJuIHJldDsKKworCXJldHVybiBp OTE1X2NtZF9wYXJzZXJfaW5pdF9yaW5nKGVuZ2luZSk7Cit9CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xy Yy5jCmluZGV4IDZlODhkOWFmOTMyOC4uYjZhZjYzNWUzYTBmIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9scmMuYwpAQCAtMjAwOSw2ICsyMDA5LDggQEAgbG9naWNhbF9yaW5nX3NldHVwKHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSBlbmdpbmUtPmk5MTU7CiAJZW51bSBmb3JjZXdha2VfZG9tYWlucyBmd19kb21haW5zOwog CisJaW50ZWxfZW5naW5lX3NldHVwX2NvbW1vbihlbmdpbmUpOworCiAJLyogSW50ZW50aW9uYWxs eSBsZWZ0IGJsYW5rLiAqLwogCWVuZ2luZS0+YnVmZmVyID0gTlVMTDsKIApAQCAtMjAyNiwyMSAr MjAyOCwxMiBAQCBsb2dpY2FsX3Jpbmdfc2V0dXAoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5n aW5lKQogCiAJZW5naW5lLT5md19kb21haW5zID0gZndfZG9tYWluczsKIAotCUlOSVRfTElTVF9I RUFEKCZlbmdpbmUtPmFjdGl2ZV9saXN0KTsKLQlJTklUX0xJU1RfSEVBRCgmZW5naW5lLT5yZXF1 ZXN0X2xpc3QpOwotCUlOSVRfTElTVF9IRUFEKCZlbmdpbmUtPmJ1ZmZlcnMpOwotCUlOSVRfTElT VF9IRUFEKCZlbmdpbmUtPmV4ZWNsaXN0X3F1ZXVlKTsKLQlzcGluX2xvY2tfaW5pdCgmZW5naW5l LT5leGVjbGlzdF9sb2NrKTsKLQogCXRhc2tsZXRfaW5pdCgmZW5naW5lLT5pcnFfdGFza2xldCwK IAkJICAgICBpbnRlbF9scmNfaXJxX2hhbmRsZXIsICh1bnNpZ25lZCBsb25nKWVuZ2luZSk7CiAK IAlsb2dpY2FsX3JpbmdfaW5pdF9wbGF0Zm9ybV9pbnZhcmlhbnRzKGVuZ2luZSk7CiAJbG9naWNh bF9yaW5nX2RlZmF1bHRfdmZ1bmNzKGVuZ2luZSk7CiAJbG9naWNhbF9yaW5nX2RlZmF1bHRfaXJx cyhlbmdpbmUpOwotCi0JaW50ZWxfZW5naW5lX2luaXRfaGFuZ2NoZWNrKGVuZ2luZSk7Ci0JaTkx NV9nZW1fYmF0Y2hfcG9vbF9pbml0KCZkZXZfcHJpdi0+ZHJtLCAmZW5naW5lLT5iYXRjaF9wb29s KTsKIH0KIAogc3RhdGljIGludApAQCAtMjA0OSwxMSArMjA0Miw3IEBAIGxvZ2ljYWxfcmluZ19p bml0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAlzdHJ1Y3QgaTkxNV9nZW1fY29u dGV4dCAqZGN0eCA9IGVuZ2luZS0+aTkxNS0+a2VybmVsX2NvbnRleHQ7CiAJaW50IHJldDsKIAot CXJldCA9IGludGVsX2VuZ2luZV9pbml0X2JyZWFkY3J1bWJzKGVuZ2luZSk7Ci0JaWYgKHJldCkK LQkJZ290byBlcnJvcjsKLQotCXJldCA9IGk5MTVfY21kX3BhcnNlcl9pbml0X3JpbmcoZW5naW5l KTsKKwlyZXQgPSBpbnRlbF9lbmdpbmVfaW5pdF9jb21tb24oZW5naW5lKTsKIAlpZiAocmV0KQog CQlnb3RvIGVycm9yOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9y aW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKaW5k ZXggM2E4ZGY3NTJjZWFlLi45NGM4ZWY0NjE3MjEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9yaW5nYnVmZmVyLmMKQEAgLTU0OSwxMSArNTQ5LDYgQEAgc3RhdGljIGJvb2wgc3RvcF9yaW5n KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAlyZXR1cm4gKEk5MTVfUkVBRF9IRUFE KGVuZ2luZSkgJiBIRUFEX0FERFIpID09IDA7CiB9CiAKLXZvaWQgaW50ZWxfZW5naW5lX2luaXRf aGFuZ2NoZWNrKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKLXsKLQltZW1zZXQoJmVu Z2luZS0+aGFuZ2NoZWNrLCAwLCBzaXplb2YoZW5naW5lLT5oYW5nY2hlY2spKTsKLX0KLQogc3Rh dGljIGludCBpbml0X3JpbmdfY29tbW9uKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkK IHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBlbmdpbmUtPmk5MTU7CkBA IC0yMTc2LDE1ICsyMTcxLDEyIEBAIHN0YXRpYyBpbnQgaW50ZWxfaW5pdF9yaW5nX2J1ZmZlcihz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAKIAlXQVJOX09OKGVuZ2luZS0+YnVmZmVy KTsKIAotCUlOSVRfTElTVF9IRUFEKCZlbmdpbmUtPmFjdGl2ZV9saXN0KTsKLQlJTklUX0xJU1Rf SEVBRCgmZW5naW5lLT5yZXF1ZXN0X2xpc3QpOwotCUlOSVRfTElTVF9IRUFEKCZlbmdpbmUtPmV4 ZWNsaXN0X3F1ZXVlKTsKLQlJTklUX0xJU1RfSEVBRCgmZW5naW5lLT5idWZmZXJzKTsKLQlpOTE1 X2dlbV9iYXRjaF9wb29sX2luaXQoJmRldl9wcml2LT5kcm0sICZlbmdpbmUtPmJhdGNoX3Bvb2wp OworCWludGVsX2VuZ2luZV9zZXR1cF9jb21tb24oZW5naW5lKTsKKwogCW1lbXNldChlbmdpbmUt PnNlbWFwaG9yZS5zeW5jX3NlcW5vLCAwLAogCSAgICAgICBzaXplb2YoZW5naW5lLT5zZW1hcGhv cmUuc3luY19zZXFubykpOwogCi0JcmV0ID0gaW50ZWxfZW5naW5lX2luaXRfYnJlYWRjcnVtYnMo ZW5naW5lKTsKKwlyZXQgPSBpbnRlbF9lbmdpbmVfaW5pdF9jb21tb24oZW5naW5lKTsKIAlpZiAo cmV0KQogCQlnb3RvIGVycm9yOwogCkBAIC0yMjI1LDEwICsyMjE3LDYgQEAgc3RhdGljIGludCBp bnRlbF9pbml0X3JpbmdfYnVmZmVyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAkJ Z290byBlcnJvcjsKIAl9CiAKLQlyZXQgPSBpOTE1X2NtZF9wYXJzZXJfaW5pdF9yaW5nKGVuZ2lu ZSk7Ci0JaWYgKHJldCkKLQkJZ290byBlcnJvcjsKLQogCXJldHVybiAwOwogCiBlcnJvcjoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAppbmRleCBkYjc2MTNlOGQ1ODUuLmRm NzU4N2FiMWJhNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1 ZmZlci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaApAQCAt NDgwLDYgKzQ4MCw5IEBAIGludCBpbnRlbF9yaW5nX2ludmFsaWRhdGVfYWxsX2NhY2hlcyhzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSk7CiBpbnQgaW50ZWxfaW5pdF9waXBlX2NvbnRy b2woc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLCBpbnQgc2l6ZSk7CiB2b2lkIGludGVs X2ZpbmlfcGlwZV9jb250cm9sKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7CiAKK3Zv aWQgaW50ZWxfZW5naW5lX3NldHVwX2NvbW1vbihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdp bmUpOworaW50IGludGVsX2VuZ2luZV9pbml0X2NvbW1vbihzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICplbmdpbmUpOworCiBpbnQgaW50ZWxfaW5pdF9yZW5kZXJfcmluZ19idWZmZXIoc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKIGludCBpbnRlbF9pbml0X2JzZF9yaW5nX2J1ZmZlcihz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwogaW50IGludGVsX2luaXRfYnNkMl9yaW5n X2J1ZmZlcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwotLSAKMS45LjEKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=