From: Tvrtko Ursulin Subject: [PATCH 2/7] drm/i915: Prepare for engine init unification Date: Wed, 13 Jul 2016 16:03:36 +0100 Message-ID: <1468422221-12132-2-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id A634F6E770 for ; Wed, 13 Jul 2016 15:08:14 +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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCk1vdmUgdGhl IGV4ZWNsaXN0IGVuZ2luZSBzZXR1cCB0byB2ZnVuY3Mgc28gdGhhdCB0aGUgZW5naW5lCmluaXQg bG9vcCBpcyBjbGVhcmx5IHNwbGl0IGludG8gdGhlIG1vZGUgYWdub3N0aWMgYW5kCnNwZWNpZmlj IHN0ZXBzLgoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGlu dGVsLmNvbT4KUmV2aWV3ZWQtYnk6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwu Y2g+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgfCAxMDMgKysrKysrKysr KysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNTQgaW5zZXJ0 aW9ucygrKSwgNDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCAx ZWI2ZDQ2MDhlZmYuLjYwNGNmYmI4YWVjOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAg LTIwMDMsNiArMjAwMyw0NiBAQCBscmNfc2V0dXBfaHdzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KmVuZ2luZSwKIAlyZXR1cm4gMDsKIH0KIAorc3RhdGljIHZvaWQKK2xvZ2ljYWxfcmluZ19zZXR1 cChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCit7CisJc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gZW5naW5lLT5pOTE1OworCWVudW0gZm9yY2V3YWtlX2RvbWFpbnMg ZndfZG9tYWluczsKKworCS8qIEludGVudGlvbmFsbHkgbGVmdCBibGFuay4gKi8KKwllbmdpbmUt PmJ1ZmZlciA9IE5VTEw7CisKKwlmd19kb21haW5zID0gaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9m b3JfcmVnKGRldl9wcml2LAorCQkJCQkJICAgIFJJTkdfRUxTUChlbmdpbmUpLAorCQkJCQkJICAg IEZXX1JFR19XUklURSk7CisKKwlmd19kb21haW5zIHw9IGludGVsX3VuY29yZV9mb3JjZXdha2Vf Zm9yX3JlZyhkZXZfcHJpdiwKKwkJCQkJCSAgICAgUklOR19DT05URVhUX1NUQVRVU19QVFIoZW5n aW5lKSwKKwkJCQkJCSAgICAgRldfUkVHX1JFQUQgfCBGV19SRUdfV1JJVEUpOworCisJZndfZG9t YWlucyB8PSBpbnRlbF91bmNvcmVfZm9yY2V3YWtlX2Zvcl9yZWcoZGV2X3ByaXYsCisJCQkJCQkg ICAgIFJJTkdfQ09OVEVYVF9TVEFUVVNfQlVGX0JBU0UoZW5naW5lKSwKKwkJCQkJCSAgICAgRldf UkVHX1JFQUQpOworCisJZW5naW5lLT5md19kb21haW5zID0gZndfZG9tYWluczsKKworCUlOSVRf TElTVF9IRUFEKCZlbmdpbmUtPmFjdGl2ZV9saXN0KTsKKwlJTklUX0xJU1RfSEVBRCgmZW5naW5l LT5yZXF1ZXN0X2xpc3QpOworCUlOSVRfTElTVF9IRUFEKCZlbmdpbmUtPmJ1ZmZlcnMpOworCUlO SVRfTElTVF9IRUFEKCZlbmdpbmUtPmV4ZWNsaXN0X3F1ZXVlKTsKKwlzcGluX2xvY2tfaW5pdCgm ZW5naW5lLT5leGVjbGlzdF9sb2NrKTsKKworCXRhc2tsZXRfaW5pdCgmZW5naW5lLT5pcnFfdGFz a2xldCwKKwkJICAgICBpbnRlbF9scmNfaXJxX2hhbmRsZXIsICh1bnNpZ25lZCBsb25nKWVuZ2lu ZSk7CisKKwlsb2dpY2FsX3JpbmdfaW5pdF9wbGF0Zm9ybV9pbnZhcmlhbnRzKGVuZ2luZSk7CisJ bG9naWNhbF9yaW5nX2RlZmF1bHRfdmZ1bmNzKGVuZ2luZSk7CisJbG9naWNhbF9yaW5nX2RlZmF1 bHRfaXJxcyhlbmdpbmUpOworCisJaW50ZWxfZW5naW5lX2luaXRfaGFuZ2NoZWNrKGVuZ2luZSk7 CisJaTkxNV9nZW1fYmF0Y2hfcG9vbF9pbml0KCZkZXZfcHJpdi0+ZHJtLCAmZW5naW5lLT5iYXRj aF9wb29sKTsKK30KKwogc3RhdGljIGludAogbG9naWNhbF9yaW5nX2luaXQoc3RydWN0IGludGVs X2VuZ2luZV9jcyAqZW5naW5lKQogewpAQCAtMjA0OCw2ICsyMDg4LDggQEAgc3RhdGljIGludCBs b2dpY2FsX3JlbmRlcl9yaW5nX2luaXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQog CXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGVuZ2luZS0+aTkxNTsKIAlpbnQg cmV0OwogCisJbG9naWNhbF9yaW5nX3NldHVwKGVuZ2luZSk7CisKIAlpZiAoSEFTX0wzX0RQRihk ZXZfcHJpdikpCiAJCWVuZ2luZS0+aXJxX2tlZXBfbWFzayB8PSBHVF9SRU5ERVJfTDNfUEFSSVRZ X0VSUk9SX0lOVEVSUlVQVDsKIApAQCAtMjA4NCw2ICsyMTI2LDEzIEBAIHN0YXRpYyBpbnQgbG9n aWNhbF9yZW5kZXJfcmluZ19pbml0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAly ZXR1cm4gcmV0OwogfQogCitzdGF0aWMgaW50IGxvZ2ljYWxfeGNzX3JpbmdfaW5pdChzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICplbmdpbmUpCit7CisJbG9naWNhbF9yaW5nX3NldHVwKGVuZ2luZSk7 CisKKwlyZXR1cm4gbG9naWNhbF9yaW5nX2luaXQoZW5naW5lKTsKK30KKwogc3RhdGljIGNvbnN0 IHN0cnVjdCBlbmdpbmVfaW5mbyB7CiAJY29uc3QgY2hhciAqbmFtZTsKIAl1bnNpZ25lZCBleGVj X2lkOwpAQCAtMjEwNiw3ICsyMTU1LDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBlbmdpbmVfaW5m byB7CiAJCS5ndWNfaWQgPSBHVUNfQkxJVFRFUl9FTkdJTkUsCiAJCS5tbWlvX2Jhc2UgPSBCTFRf UklOR19CQVNFLAogCQkuaXJxX3NoaWZ0ID0gR0VOOF9CQ1NfSVJRX1NISUZULAotCQkuaW5pdCA9 IGxvZ2ljYWxfcmluZ19pbml0LAorCQkuaW5pdCA9IGxvZ2ljYWxfeGNzX3JpbmdfaW5pdCwKIAl9 LAogCVtWQ1NdID0gewogCQkubmFtZSA9ICJic2QgcmluZyIsCkBAIC0yMTE0LDcgKzIxNjMsNyBA QCBzdGF0aWMgY29uc3Qgc3RydWN0IGVuZ2luZV9pbmZvIHsKIAkJLmd1Y19pZCA9IEdVQ19WSURF T19FTkdJTkUsCiAJCS5tbWlvX2Jhc2UgPSBHRU42X0JTRF9SSU5HX0JBU0UsCiAJCS5pcnFfc2hp ZnQgPSBHRU44X1ZDUzFfSVJRX1NISUZULAotCQkuaW5pdCA9IGxvZ2ljYWxfcmluZ19pbml0LAor CQkuaW5pdCA9IGxvZ2ljYWxfeGNzX3JpbmdfaW5pdCwKIAl9LAogCVtWQ1MyXSA9IHsKIAkJLm5h bWUgPSAiYnNkMiByaW5nIiwKQEAgLTIxMjIsNyArMjE3MSw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1 Y3QgZW5naW5lX2luZm8gewogCQkuZ3VjX2lkID0gR1VDX1ZJREVPX0VOR0lORTIsCiAJCS5tbWlv X2Jhc2UgPSBHRU44X0JTRDJfUklOR19CQVNFLAogCQkuaXJxX3NoaWZ0ID0gR0VOOF9WQ1MyX0lS UV9TSElGVCwKLQkJLmluaXQgPSBsb2dpY2FsX3JpbmdfaW5pdCwKKwkJLmluaXQgPSBsb2dpY2Fs X3hjc19yaW5nX2luaXQsCiAJfSwKIAlbVkVDU10gPSB7CiAJCS5uYW1lID0gInZpZGVvIGVuaGFu Y2VtZW50IHJpbmciLApAQCAtMjEzMCw3ICsyMTc5LDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBl bmdpbmVfaW5mbyB7CiAJCS5ndWNfaWQgPSBHVUNfVklERU9FTkhBTkNFX0VOR0lORSwKIAkJLm1t aW9fYmFzZSA9IFZFQk9YX1JJTkdfQkFTRSwKIAkJLmlycV9zaGlmdCA9IEdFTjhfVkVDU19JUlFf U0hJRlQsCi0JCS5pbml0ID0gbG9naWNhbF9yaW5nX2luaXQsCisJCS5pbml0ID0gbG9naWNhbF94 Y3NfcmluZ19pbml0LAogCX0sCiB9OwogCkBAIC0yMTUyLDUwICsyMjAxLDYgQEAgaW50ZWxfZW5n aW5lX3NldHVwKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAlyZXR1cm4gZW5n aW5lOwogfQogCi1zdGF0aWMgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqCi1sb2dpY2FsX3Jpbmdf c2V0dXAoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBlbnVtIGludGVsX2VuZ2lu ZV9pZCBpZCkKLXsKLQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmU7Ci0JZW51bSBmb3Jj ZXdha2VfZG9tYWlucyBmd19kb21haW5zOwotCi0JZW5naW5lID0gaW50ZWxfZW5naW5lX3NldHVw KGRldl9wcml2LCBpZCk7Ci0KLQkvKiBJbnRlbnRpb25hbGx5IGxlZnQgYmxhbmsuICovCi0JZW5n aW5lLT5idWZmZXIgPSBOVUxMOwotCi0JZndfZG9tYWlucyA9IGludGVsX3VuY29yZV9mb3JjZXdh a2VfZm9yX3JlZyhkZXZfcHJpdiwKLQkJCQkJCSAgICBSSU5HX0VMU1AoZW5naW5lKSwKLQkJCQkJ CSAgICBGV19SRUdfV1JJVEUpOwotCi0JZndfZG9tYWlucyB8PSBpbnRlbF91bmNvcmVfZm9yY2V3 YWtlX2Zvcl9yZWcoZGV2X3ByaXYsCi0JCQkJCQkgICAgIFJJTkdfQ09OVEVYVF9TVEFUVVNfUFRS KGVuZ2luZSksCi0JCQkJCQkgICAgIEZXX1JFR19SRUFEIHwgRldfUkVHX1dSSVRFKTsKLQotCWZ3 X2RvbWFpbnMgfD0gaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9mb3JfcmVnKGRldl9wcml2LAotCQkJ CQkJICAgICBSSU5HX0NPTlRFWFRfU1RBVFVTX0JVRl9CQVNFKGVuZ2luZSksCi0JCQkJCQkgICAg IEZXX1JFR19SRUFEKTsKLQotCWVuZ2luZS0+ZndfZG9tYWlucyA9IGZ3X2RvbWFpbnM7Ci0KLQlJ TklUX0xJU1RfSEVBRCgmZW5naW5lLT5hY3RpdmVfbGlzdCk7Ci0JSU5JVF9MSVNUX0hFQUQoJmVu Z2luZS0+cmVxdWVzdF9saXN0KTsKLQlJTklUX0xJU1RfSEVBRCgmZW5naW5lLT5idWZmZXJzKTsK LQlJTklUX0xJU1RfSEVBRCgmZW5naW5lLT5leGVjbGlzdF9xdWV1ZSk7Ci0Jc3Bpbl9sb2NrX2lu aXQoJmVuZ2luZS0+ZXhlY2xpc3RfbG9jayk7Ci0KLQl0YXNrbGV0X2luaXQoJmVuZ2luZS0+aXJx X3Rhc2tsZXQsCi0JCSAgICAgaW50ZWxfbHJjX2lycV9oYW5kbGVyLCAodW5zaWduZWQgbG9uZyll bmdpbmUpOwotCi0JbG9naWNhbF9yaW5nX2luaXRfcGxhdGZvcm1faW52YXJpYW50cyhlbmdpbmUp OwotCWxvZ2ljYWxfcmluZ19kZWZhdWx0X3ZmdW5jcyhlbmdpbmUpOwotCWxvZ2ljYWxfcmluZ19k ZWZhdWx0X2lycXMoZW5naW5lKTsKLQotCWludGVsX2VuZ2luZV9pbml0X2hhbmdjaGVjayhlbmdp bmUpOwotCWk5MTVfZ2VtX2JhdGNoX3Bvb2xfaW5pdCgmZGV2X3ByaXYtPmRybSwgJmVuZ2luZS0+ YmF0Y2hfcG9vbCk7Ci0KLQlyZXR1cm4gZW5naW5lOwotfQotCiAvKioKICAqIGludGVsX2xvZ2lj YWxfcmluZ3NfaW5pdCgpIC0gYWxsb2NhdGUsIHBvcHVsYXRlIGFuZCBpbml0IHRoZSBFbmdpbmUg Q29tbWFuZCBTdHJlYW1lcnMKICAqIEBkZXY6IERSTSBkZXZpY2UuCkBAIC0yMjI0LDcgKzIyMjks NyBAQCBpbnQgaW50ZWxfbG9naWNhbF9yaW5nc19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp CiAJCWlmICghaW50ZWxfZW5naW5lc1tpXS5pbml0KQogCQkJY29udGludWU7CiAKLQkJcmV0ID0g aW50ZWxfZW5naW5lc1tpXS5pbml0KGxvZ2ljYWxfcmluZ19zZXR1cChkZXZfcHJpdiwgaSkpOwor CQlyZXQgPSBpbnRlbF9lbmdpbmVzW2ldLmluaXQoaW50ZWxfZW5naW5lX3NldHVwKGRldl9wcml2 LCBpKSk7CiAJCWlmIChyZXQpCiAJCQlnb3RvIGNsZWFudXA7CiAKLS0gCjEuOS4xCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK