From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 1/2] drm/i915: Simplify intel_engines_init Date: Fri, 16 Jun 2017 14:03:38 +0100 Message-ID: <20170616130339.23015-1-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wr0-x242.google.com (mail-wr0-x242.google.com [IPv6:2a00:1450:400c:c0c::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id E54726E8CB for ; Fri, 16 Jun 2017 13:03:48 +0000 (UTC) Received: by mail-wr0-x242.google.com with SMTP id x23so6543020wrb.0 for ; Fri, 16 Jun 2017 06:03:48 -0700 (PDT) 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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCldlIGRvIG5v dCB3YW50IHRvIGNhcnJ5IG9uIG92ZXIgbWlzc2luZyBjb25zdHJ1Y3RvcnMgYW5kIGRvbid0Cm5l ZWQgYSBkdXBsaWNhdGVkIGVuZ2luZSBtYXNrIGNoZWNraW5nIHdoaWNoIGlzIGFscmVhZHkgZG9u ZQppbiB0aGUgc2V0dXAgcGhhc2UuCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZy dGtvLnVyc3VsaW5AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Vu Z2luZV9jcy5jIHwgMzYgKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxl IGNoYW5nZWQsIDEyIGluc2VydGlvbnMoKyksIDI0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2luZV9jcy5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZW5naW5lX2NzLmMKaW5kZXggYmMzOGJkMTI4Yjc2Li5jMGYxZWRlMTk4MjYg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2luZV9jcy5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2luZV9jcy5jCkBAIC0yOTEsMTEgKzI5MSw5 IEBAIGludCBpbnRlbF9lbmdpbmVzX2luaXRfbW1pbyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCiAgKi8KIGludCBpbnRlbF9lbmdpbmVzX2luaXQoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQogewotCXN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyAqZGV2aWNlX2lu Zm8gPSBta3dyaXRlX2RldmljZV9pbmZvKGRldl9wcml2KTsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICplbmdpbmU7CiAJZW51bSBpbnRlbF9lbmdpbmVfaWQgaWQsIGVycl9pZDsKLQl1bnNpZ25l ZCBpbnQgbWFzayA9IDA7Ci0JaW50IGVyciA9IDA7CisJaW50IGVycjsKIAogCWZvcl9lYWNoX2Vu Z2luZShlbmdpbmUsIGRldl9wcml2LCBpZCkgewogCQljb25zdCBzdHJ1Y3QgZW5naW5lX2NsYXNz X2luZm8gKmNsYXNzX2luZm8gPQpAQCAtMzA2LDQwICszMDQsMzAgQEAgaW50IGludGVsX2VuZ2lu ZXNfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCQlpbml0ID0gY2xh c3NfaW5mby0+aW5pdF9leGVjbGlzdHM7CiAJCWVsc2UKIAkJCWluaXQgPSBjbGFzc19pbmZvLT5p bml0X2xlZ2FjeTsKLQkJaWYgKCFpbml0KSB7Ci0JCQlrZnJlZShlbmdpbmUpOwotCQkJZGV2X3By aXYtPmVuZ2luZVtpZF0gPSBOVUxMOwotCQkJY29udGludWU7Ci0JCX0KKworCQllcnIgPSAtRUlO VkFMOworCQllcnJfaWQgPSBpZDsKKworCQlpZiAoR0VNX1dBUk5fT04oIWluaXQpKQorCQkJZ290 byBjbGVhbnVwOwogCiAJCWVyciA9IGluaXQoZW5naW5lKTsKLQkJaWYgKGVycikgewotCQkJZXJy X2lkID0gaWQ7CisJCWlmIChlcnIpCiAJCQlnb3RvIGNsZWFudXA7Ci0JCX0KIAogCQlHRU1fQlVH X09OKCFlbmdpbmUtPnN1Ym1pdF9yZXF1ZXN0KTsKLQkJbWFzayB8PSBFTkdJTkVfTUFTSyhpZCk7 CiAJfQogCi0JLyoKLQkgKiBDYXRjaCBmYWlsdXJlcyB0byB1cGRhdGUgaW50ZWxfZW5naW5lcyB0 YWJsZSB3aGVuIHRoZSBuZXcgZW5naW5lcwotCSAqIGFyZSBhZGRlZCB0byB0aGUgZHJpdmVyIGJ5 IGEgd2FybmluZyBhbmQgZGlzYWJsaW5nIHRoZSBmb3Jnb3R0ZW4KLQkgKiBlbmdpbmVzLgotCSAq LwotCWlmIChXQVJOX09OKG1hc2sgIT0gSU5URUxfSU5GTyhkZXZfcHJpdiktPnJpbmdfbWFzaykp Ci0JCWRldmljZV9pbmZvLT5yaW5nX21hc2sgPSBtYXNrOwotCi0JZGV2aWNlX2luZm8tPm51bV9y aW5ncyA9IGh3ZWlnaHQzMihtYXNrKTsKLQogCXJldHVybiAwOwogCiBjbGVhbnVwOgogCWZvcl9l YWNoX2VuZ2luZShlbmdpbmUsIGRldl9wcml2LCBpZCkgewotCQlpZiAoaWQgPj0gZXJyX2lkKQor CQlpZiAoaWQgPj0gZXJyX2lkKSB7CiAJCQlrZnJlZShlbmdpbmUpOwotCQllbHNlCisJCQlkZXZf cHJpdi0+ZW5naW5lW2lkXSA9IE5VTEw7CisJCX0gZWxzZSB7CiAJCQlkZXZfcHJpdi0+Z3QuY2xl YW51cF9lbmdpbmUoZW5naW5lKTsKKwkJfQogCX0KIAlyZXR1cm4gZXJyOwogfQotLSAKMi45LjQK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=