From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 2/5] drm/i915: Prepare for engine init unification Date: Wed, 6 Jul 2016 11:52:08 +0100 Message-ID: <1467802331-5402-2-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1467802331-5402-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 3A69D6E630 for ; Wed, 6 Jul 2016 10:52:28 +0000 (UTC) In-Reply-To: <1467802331-5402-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 dGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyB8IDEwMyArKysr KysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA1NCBp bnNlcnRpb25zKCspLCA0OSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmlu ZGV4IDM5MDc1YTkzZWY5MS4uZmNmZjMwOTk4MjI3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMu YwpAQCAtMTk3OCw2ICsxOTc4LDQ2IEBAIGxyY19zZXR1cF9od3Moc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqZW5naW5lLAogCXJldHVybiAwOwogfQogCitzdGF0aWMgdm9pZAorbG9naWNhbF9yaW5n X3NldHVwKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK3sKKwlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBlbmdpbmUtPmk5MTU7CisJZW51bSBmb3JjZXdha2VfZG9t YWlucyBmd19kb21haW5zOworCisJLyogSW50ZW50aW9uYWxseSBsZWZ0IGJsYW5rLiAqLworCWVu Z2luZS0+YnVmZmVyID0gTlVMTDsKKworCWZ3X2RvbWFpbnMgPSBpbnRlbF91bmNvcmVfZm9yY2V3 YWtlX2Zvcl9yZWcoZGV2X3ByaXYsCisJCQkJCQkgICAgUklOR19FTFNQKGVuZ2luZSksCisJCQkJ CQkgICAgRldfUkVHX1dSSVRFKTsKKworCWZ3X2RvbWFpbnMgfD0gaW50ZWxfdW5jb3JlX2ZvcmNl d2FrZV9mb3JfcmVnKGRldl9wcml2LAorCQkJCQkJICAgICBSSU5HX0NPTlRFWFRfU1RBVFVTX1BU UihlbmdpbmUpLAorCQkJCQkJICAgICBGV19SRUdfUkVBRCB8IEZXX1JFR19XUklURSk7CisKKwlm d19kb21haW5zIHw9IGludGVsX3VuY29yZV9mb3JjZXdha2VfZm9yX3JlZyhkZXZfcHJpdiwKKwkJ CQkJCSAgICAgUklOR19DT05URVhUX1NUQVRVU19CVUZfQkFTRShlbmdpbmUpLAorCQkJCQkJICAg ICBGV19SRUdfUkVBRCk7CisKKwllbmdpbmUtPmZ3X2RvbWFpbnMgPSBmd19kb21haW5zOworCisJ SU5JVF9MSVNUX0hFQUQoJmVuZ2luZS0+YWN0aXZlX2xpc3QpOworCUlOSVRfTElTVF9IRUFEKCZl bmdpbmUtPnJlcXVlc3RfbGlzdCk7CisJSU5JVF9MSVNUX0hFQUQoJmVuZ2luZS0+YnVmZmVycyk7 CisJSU5JVF9MSVNUX0hFQUQoJmVuZ2luZS0+ZXhlY2xpc3RfcXVldWUpOworCXNwaW5fbG9ja19p bml0KCZlbmdpbmUtPmV4ZWNsaXN0X2xvY2spOworCisJdGFza2xldF9pbml0KCZlbmdpbmUtPmly cV90YXNrbGV0LAorCQkgICAgIGludGVsX2xyY19pcnFfaGFuZGxlciwgKHVuc2lnbmVkIGxvbmcp ZW5naW5lKTsKKworCWxvZ2ljYWxfcmluZ19pbml0X3BsYXRmb3JtX2ludmFyaWFudHMoZW5naW5l KTsKKwlsb2dpY2FsX3JpbmdfZGVmYXVsdF92ZnVuY3MoZW5naW5lKTsKKwlsb2dpY2FsX3Jpbmdf ZGVmYXVsdF9pcnFzKGVuZ2luZSk7CisKKwlpbnRlbF9lbmdpbmVfaW5pdF9oYW5nY2hlY2soZW5n aW5lKTsKKwlpOTE1X2dlbV9iYXRjaF9wb29sX2luaXQoJmRldl9wcml2LT5kcm0sICZlbmdpbmUt PmJhdGNoX3Bvb2wpOworfQorCiBzdGF0aWMgaW50CiBsb2dpY2FsX3JpbmdfaW5pdChzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7CkBAIC0yMDIzLDYgKzIwNjMsOCBAQCBzdGF0aWMg aW50IGxvZ2ljYWxfcmVuZGVyX3JpbmdfaW5pdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdp bmUpCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZW5naW5lLT5pOTE1Owog CWludCByZXQ7CiAKKwlsb2dpY2FsX3Jpbmdfc2V0dXAoZW5naW5lKTsKKwogCWlmIChIQVNfTDNf RFBGKGRldl9wcml2KSkKIAkJZW5naW5lLT5pcnFfa2VlcF9tYXNrIHw9IEdUX1JFTkRFUl9MM19Q QVJJVFlfRVJST1JfSU5URVJSVVBUOwogCkBAIC0yMDU5LDYgKzIxMDEsMTMgQEAgc3RhdGljIGlu dCBsb2dpY2FsX3JlbmRlcl9yaW5nX2luaXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l KQogCXJldHVybiByZXQ7CiB9CiAKK3N0YXRpYyBpbnQgbG9naWNhbF94Y3NfcmluZ19pbml0KHN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK3sKKwlsb2dpY2FsX3Jpbmdfc2V0dXAoZW5n aW5lKTsKKworCXJldHVybiBsb2dpY2FsX3JpbmdfaW5pdChlbmdpbmUpOworfQorCiBzdGF0aWMg Y29uc3Qgc3RydWN0IGVuZ2luZV9pbmZvIHsKIAljb25zdCBjaGFyICpuYW1lOwogCXVuc2lnbmVk IGV4ZWNfaWQ7CkBAIC0yMDgxLDcgKzIxMzAsNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGVuZ2lu ZV9pbmZvIHsKIAkJLmd1Y19pZCA9IEdVQ19CTElUVEVSX0VOR0lORSwKIAkJLm1taW9fYmFzZSA9 IEJMVF9SSU5HX0JBU0UsCiAJCS5pcnFfc2hpZnQgPSBHRU44X0JDU19JUlFfU0hJRlQsCi0JCS5p bml0ID0gbG9naWNhbF9yaW5nX2luaXQsCisJCS5pbml0ID0gbG9naWNhbF94Y3NfcmluZ19pbml0 LAogCX0sCiAJW1ZDU10gPSB7CiAJCS5uYW1lID0gImJzZCByaW5nIiwKQEAgLTIwODksNyArMjEz OCw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZW5naW5lX2luZm8gewogCQkuZ3VjX2lkID0gR1VD X1ZJREVPX0VOR0lORSwKIAkJLm1taW9fYmFzZSA9IEdFTjZfQlNEX1JJTkdfQkFTRSwKIAkJLmly cV9zaGlmdCA9IEdFTjhfVkNTMV9JUlFfU0hJRlQsCi0JCS5pbml0ID0gbG9naWNhbF9yaW5nX2lu aXQsCisJCS5pbml0ID0gbG9naWNhbF94Y3NfcmluZ19pbml0LAogCX0sCiAJW1ZDUzJdID0gewog CQkubmFtZSA9ICJic2QyIHJpbmciLApAQCAtMjA5Nyw3ICsyMTQ2LDcgQEAgc3RhdGljIGNvbnN0 IHN0cnVjdCBlbmdpbmVfaW5mbyB7CiAJCS5ndWNfaWQgPSBHVUNfVklERU9fRU5HSU5FMiwKIAkJ Lm1taW9fYmFzZSA9IEdFTjhfQlNEMl9SSU5HX0JBU0UsCiAJCS5pcnFfc2hpZnQgPSBHRU44X1ZD UzJfSVJRX1NISUZULAotCQkuaW5pdCA9IGxvZ2ljYWxfcmluZ19pbml0LAorCQkuaW5pdCA9IGxv Z2ljYWxfeGNzX3JpbmdfaW5pdCwKIAl9LAogCVtWRUNTXSA9IHsKIAkJLm5hbWUgPSAidmlkZW8g ZW5oYW5jZW1lbnQgcmluZyIsCkBAIC0yMTA1LDcgKzIxNTQsNyBAQCBzdGF0aWMgY29uc3Qgc3Ry dWN0IGVuZ2luZV9pbmZvIHsKIAkJLmd1Y19pZCA9IEdVQ19WSURFT0VOSEFOQ0VfRU5HSU5FLAog CQkubW1pb19iYXNlID0gVkVCT1hfUklOR19CQVNFLAogCQkuaXJxX3NoaWZ0ID0gR0VOOF9WRUNT X0lSUV9TSElGVCwKLQkJLmluaXQgPSBsb2dpY2FsX3JpbmdfaW5pdCwKKwkJLmluaXQgPSBsb2dp Y2FsX3hjc19yaW5nX2luaXQsCiAJfSwKIH07CiAKQEAgLTIxMjcsNTAgKzIxNzYsNiBAQCBpbnRl bF9lbmdpbmVfc2V0dXAoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCXJldHVy biBlbmdpbmU7CiB9CiAKLXN0YXRpYyBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICoKLWxvZ2ljYWxf cmluZ19zZXR1cChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGVudW0gaW50ZWxf ZW5naW5lX2lkIGlkKQotewotCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsKLQllbnVt IGZvcmNld2FrZV9kb21haW5zIGZ3X2RvbWFpbnM7Ci0KLQllbmdpbmUgPSBpbnRlbF9lbmdpbmVf c2V0dXAoZGV2X3ByaXYsIGlkKTsKLQotCS8qIEludGVudGlvbmFsbHkgbGVmdCBibGFuay4gKi8K LQllbmdpbmUtPmJ1ZmZlciA9IE5VTEw7Ci0KLQlmd19kb21haW5zID0gaW50ZWxfdW5jb3JlX2Zv cmNld2FrZV9mb3JfcmVnKGRldl9wcml2LAotCQkJCQkJICAgIFJJTkdfRUxTUChlbmdpbmUpLAot CQkJCQkJICAgIEZXX1JFR19XUklURSk7Ci0KLQlmd19kb21haW5zIHw9IGludGVsX3VuY29yZV9m b3JjZXdha2VfZm9yX3JlZyhkZXZfcHJpdiwKLQkJCQkJCSAgICAgUklOR19DT05URVhUX1NUQVRV U19QVFIoZW5naW5lKSwKLQkJCQkJCSAgICAgRldfUkVHX1JFQUQgfCBGV19SRUdfV1JJVEUpOwot Ci0JZndfZG9tYWlucyB8PSBpbnRlbF91bmNvcmVfZm9yY2V3YWtlX2Zvcl9yZWcoZGV2X3ByaXYs Ci0JCQkJCQkgICAgIFJJTkdfQ09OVEVYVF9TVEFUVVNfQlVGX0JBU0UoZW5naW5lKSwKLQkJCQkJ CSAgICAgRldfUkVHX1JFQUQpOwotCi0JZW5naW5lLT5md19kb21haW5zID0gZndfZG9tYWluczsK LQotCUlOSVRfTElTVF9IRUFEKCZlbmdpbmUtPmFjdGl2ZV9saXN0KTsKLQlJTklUX0xJU1RfSEVB RCgmZW5naW5lLT5yZXF1ZXN0X2xpc3QpOwotCUlOSVRfTElTVF9IRUFEKCZlbmdpbmUtPmJ1ZmZl cnMpOwotCUlOSVRfTElTVF9IRUFEKCZlbmdpbmUtPmV4ZWNsaXN0X3F1ZXVlKTsKLQlzcGluX2xv Y2tfaW5pdCgmZW5naW5lLT5leGVjbGlzdF9sb2NrKTsKLQotCXRhc2tsZXRfaW5pdCgmZW5naW5l LT5pcnFfdGFza2xldCwKLQkJICAgICBpbnRlbF9scmNfaXJxX2hhbmRsZXIsICh1bnNpZ25lZCBs b25nKWVuZ2luZSk7Ci0KLQlsb2dpY2FsX3JpbmdfaW5pdF9wbGF0Zm9ybV9pbnZhcmlhbnRzKGVu Z2luZSk7Ci0JbG9naWNhbF9yaW5nX2RlZmF1bHRfdmZ1bmNzKGVuZ2luZSk7Ci0JbG9naWNhbF9y aW5nX2RlZmF1bHRfaXJxcyhlbmdpbmUpOwotCi0JaW50ZWxfZW5naW5lX2luaXRfaGFuZ2NoZWNr KGVuZ2luZSk7Ci0JaTkxNV9nZW1fYmF0Y2hfcG9vbF9pbml0KCZkZXZfcHJpdi0+ZHJtLCAmZW5n aW5lLT5iYXRjaF9wb29sKTsKLQotCXJldHVybiBlbmdpbmU7Ci19Ci0KIC8qKgogICogaW50ZWxf bG9naWNhbF9yaW5nc19pbml0KCkgLSBhbGxvY2F0ZSwgcG9wdWxhdGUgYW5kIGluaXQgdGhlIEVu Z2luZSBDb21tYW5kIFN0cmVhbWVycwogICogQGRldjogRFJNIGRldmljZS4KQEAgLTIxOTksNyAr MjIwNCw3IEBAIGludCBpbnRlbF9sb2dpY2FsX3JpbmdzX2luaXQoc3RydWN0IGRybV9kZXZpY2Ug KmRldikKIAkJaWYgKCFpbnRlbF9lbmdpbmVzW2ldLmluaXQpCiAJCQljb250aW51ZTsKIAotCQly ZXQgPSBpbnRlbF9lbmdpbmVzW2ldLmluaXQobG9naWNhbF9yaW5nX3NldHVwKGRldl9wcml2LCBp KSk7CisJCXJldCA9IGludGVsX2VuZ2luZXNbaV0uaW5pdChpbnRlbF9lbmdpbmVfc2V0dXAoZGV2 X3ByaXYsIGkpKTsKIAkJaWYgKHJldCkKIAkJCWdvdG8gY2xlYW51cDsKIAotLSAKMS45LjEKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=