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: Fri, 1 Jul 2016 17:47:12 +0100 Message-ID: <1467391635-9902-2-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1467391635-9902-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 C0DE66EB04 for ; Fri, 1 Jul 2016 16:47:26 +0000 (UTC) In-Reply-To: <1467391635-9902-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 ZGV4IGVkMDE3ZjFhMDdhMi4uYWJiMTY1MDE5YWY3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMu YwpAQCAtMjAyMCw2ICsyMDIwLDQ2IEBAIGxyY19zZXR1cF9od3Moc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqZW5naW5lLAogCXJldHVybiAwOwogfQogCitzdGF0aWMgdm9pZAorbG9naWNhbF9yaW5n X3NldHVwKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK3sKKwlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBlbmdpbmUtPmk5MTU7CisJZW51bSBmb3JjZXdha2VfZG9t YWlucyBmd19kb21haW5zOworCisJLyogSW50ZW50aW9uYWxseSBsZWZ0IGJsYW5rLiAqLworCWVu Z2luZS0+YnVmZmVyID0gTlVMTDsKKworCWZ3X2RvbWFpbnMgPSBpbnRlbF91bmNvcmVfZm9yY2V3 YWtlX2Zvcl9yZWcoZGV2X3ByaXYsCisJCQkJCQkgICAgUklOR19FTFNQKGVuZ2luZSksCisJCQkJ CQkgICAgRldfUkVHX1dSSVRFKTsKKworCWZ3X2RvbWFpbnMgfD0gaW50ZWxfdW5jb3JlX2ZvcmNl d2FrZV9mb3JfcmVnKGRldl9wcml2LAorCQkJCQkJICAgICBSSU5HX0NPTlRFWFRfU1RBVFVTX1BU UihlbmdpbmUpLAorCQkJCQkJICAgICBGV19SRUdfUkVBRCB8IEZXX1JFR19XUklURSk7CisKKwlm d19kb21haW5zIHw9IGludGVsX3VuY29yZV9mb3JjZXdha2VfZm9yX3JlZyhkZXZfcHJpdiwKKwkJ CQkJCSAgICAgUklOR19DT05URVhUX1NUQVRVU19CVUZfQkFTRShlbmdpbmUpLAorCQkJCQkJICAg ICBGV19SRUdfUkVBRCk7CisKKwllbmdpbmUtPmZ3X2RvbWFpbnMgPSBmd19kb21haW5zOworCisJ SU5JVF9MSVNUX0hFQUQoJmVuZ2luZS0+YWN0aXZlX2xpc3QpOworCUlOSVRfTElTVF9IRUFEKCZl bmdpbmUtPnJlcXVlc3RfbGlzdCk7CisJSU5JVF9MSVNUX0hFQUQoJmVuZ2luZS0+YnVmZmVycyk7 CisJSU5JVF9MSVNUX0hFQUQoJmVuZ2luZS0+ZXhlY2xpc3RfcXVldWUpOworCXNwaW5fbG9ja19p bml0KCZlbmdpbmUtPmV4ZWNsaXN0X2xvY2spOworCisJdGFza2xldF9pbml0KCZlbmdpbmUtPmly cV90YXNrbGV0LAorCQkgICAgIGludGVsX2xyY19pcnFfaGFuZGxlciwgKHVuc2lnbmVkIGxvbmcp ZW5naW5lKTsKKworCWxvZ2ljYWxfcmluZ19pbml0X3BsYXRmb3JtX2ludmFyaWFudHMoZW5naW5l KTsKKwlsb2dpY2FsX3JpbmdfZGVmYXVsdF92ZnVuY3MoZW5naW5lKTsKKwlsb2dpY2FsX3Jpbmdf ZGVmYXVsdF9pcnFzKGVuZ2luZSk7CisKKwlpbnRlbF9lbmdpbmVfaW5pdF9oYW5nY2hlY2soZW5n aW5lKTsKKwlpOTE1X2dlbV9iYXRjaF9wb29sX2luaXQoZGV2X3ByaXYtPmRldiwgJmVuZ2luZS0+ YmF0Y2hfcG9vbCk7Cit9CisKIHN0YXRpYyBpbnQKIGxvZ2ljYWxfcmluZ19pbml0KHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsKQEAgLTIwNjEsNiArMjEwMSw4IEBAIHN0YXRpYyBp bnQgbG9naWNhbF9yZW5kZXJfcmluZ19pbml0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2lu ZSkKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBlbmdpbmUtPmk5MTU7CiAJ aW50IHJldDsKIAorCWxvZ2ljYWxfcmluZ19zZXR1cChlbmdpbmUpOworCiAJaWYgKEhBU19MM19E UEYoZGV2X3ByaXYpKQogCQllbmdpbmUtPmlycV9rZWVwX21hc2sgfD0gR1RfUkVOREVSX0wzX1BB UklUWV9FUlJPUl9JTlRFUlJVUFQ7CiAKQEAgLTIwOTcsNiArMjEzOSwxMyBAQCBzdGF0aWMgaW50 IGxvZ2ljYWxfcmVuZGVyX3JpbmdfaW5pdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUp CiAJcmV0dXJuIHJldDsKIH0KIAorc3RhdGljIGludCBsb2dpY2FsX3hjc19yaW5nX2luaXQoc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQoreworCWxvZ2ljYWxfcmluZ19zZXR1cChlbmdp bmUpOworCisJcmV0dXJuIGxvZ2ljYWxfcmluZ19pbml0KGVuZ2luZSk7Cit9CisKIHN0YXRpYyBj b25zdCBzdHJ1Y3QgZW5naW5lX2luZm8gewogCWNvbnN0IGNoYXIgKm5hbWU7CiAJdW5zaWduZWQg ZXhlY19pZDsKQEAgLTIxMTksNyArMjE2OCw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZW5naW5l X2luZm8gewogCQkuZ3VjX2lkID0gR1VDX0JMSVRURVJfRU5HSU5FLAogCQkubW1pb19iYXNlID0g QkxUX1JJTkdfQkFTRSwKIAkJLmlycV9zaGlmdCA9IEdFTjhfQkNTX0lSUV9TSElGVCwKLQkJLmlu aXQgPSBsb2dpY2FsX3JpbmdfaW5pdCwKKwkJLmluaXQgPSBsb2dpY2FsX3hjc19yaW5nX2luaXQs CiAJfSwKIAlbVkNTXSA9IHsKIAkJLm5hbWUgPSAiYnNkIHJpbmciLApAQCAtMjEyNyw3ICsyMTc2 LDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBlbmdpbmVfaW5mbyB7CiAJCS5ndWNfaWQgPSBHVUNf VklERU9fRU5HSU5FLAogCQkubW1pb19iYXNlID0gR0VONl9CU0RfUklOR19CQVNFLAogCQkuaXJx X3NoaWZ0ID0gR0VOOF9WQ1MxX0lSUV9TSElGVCwKLQkJLmluaXQgPSBsb2dpY2FsX3JpbmdfaW5p dCwKKwkJLmluaXQgPSBsb2dpY2FsX3hjc19yaW5nX2luaXQsCiAJfSwKIAlbVkNTMl0gPSB7CiAJ CS5uYW1lID0gImJzZDIgcmluZyIsCkBAIC0yMTM1LDcgKzIxODQsNyBAQCBzdGF0aWMgY29uc3Qg c3RydWN0IGVuZ2luZV9pbmZvIHsKIAkJLmd1Y19pZCA9IEdVQ19WSURFT19FTkdJTkUyLAogCQku bW1pb19iYXNlID0gR0VOOF9CU0QyX1JJTkdfQkFTRSwKIAkJLmlycV9zaGlmdCA9IEdFTjhfVkNT Ml9JUlFfU0hJRlQsCi0JCS5pbml0ID0gbG9naWNhbF9yaW5nX2luaXQsCisJCS5pbml0ID0gbG9n aWNhbF94Y3NfcmluZ19pbml0LAogCX0sCiAJW1ZFQ1NdID0gewogCQkubmFtZSA9ICJ2aWRlbyBl bmhhbmNlbWVudCByaW5nIiwKQEAgLTIxNDMsNyArMjE5Miw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1 Y3QgZW5naW5lX2luZm8gewogCQkuZ3VjX2lkID0gR1VDX1ZJREVPRU5IQU5DRV9FTkdJTkUsCiAJ CS5tbWlvX2Jhc2UgPSBWRUJPWF9SSU5HX0JBU0UsCiAJCS5pcnFfc2hpZnQgPSBHRU44X1ZFQ1Nf SVJRX1NISUZULAotCQkuaW5pdCA9IGxvZ2ljYWxfcmluZ19pbml0LAorCQkuaW5pdCA9IGxvZ2lj YWxfeGNzX3JpbmdfaW5pdCwKIAl9LAogfTsKIApAQCAtMjE2NSw1MCArMjIxNCw2IEBAIGludGVs X2VuZ2luZV9zZXR1cChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJcmV0dXJu IGVuZ2luZTsKIH0KIAotc3RhdGljIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKgotbG9naWNhbF9y aW5nX3NldHVwKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgZW51bSBpbnRlbF9l bmdpbmVfaWQgaWQpCi17Ci0Jc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOwotCWVudW0g Zm9yY2V3YWtlX2RvbWFpbnMgZndfZG9tYWluczsKLQotCWVuZ2luZSA9IGludGVsX2VuZ2luZV9z ZXR1cChkZXZfcHJpdiwgaWQpOwotCi0JLyogSW50ZW50aW9uYWxseSBsZWZ0IGJsYW5rLiAqLwot CWVuZ2luZS0+YnVmZmVyID0gTlVMTDsKLQotCWZ3X2RvbWFpbnMgPSBpbnRlbF91bmNvcmVfZm9y Y2V3YWtlX2Zvcl9yZWcoZGV2X3ByaXYsCi0JCQkJCQkgICAgUklOR19FTFNQKGVuZ2luZSksCi0J CQkJCQkgICAgRldfUkVHX1dSSVRFKTsKLQotCWZ3X2RvbWFpbnMgfD0gaW50ZWxfdW5jb3JlX2Zv cmNld2FrZV9mb3JfcmVnKGRldl9wcml2LAotCQkJCQkJICAgICBSSU5HX0NPTlRFWFRfU1RBVFVT X1BUUihlbmdpbmUpLAotCQkJCQkJICAgICBGV19SRUdfUkVBRCB8IEZXX1JFR19XUklURSk7Ci0K LQlmd19kb21haW5zIHw9IGludGVsX3VuY29yZV9mb3JjZXdha2VfZm9yX3JlZyhkZXZfcHJpdiwK LQkJCQkJCSAgICAgUklOR19DT05URVhUX1NUQVRVU19CVUZfQkFTRShlbmdpbmUpLAotCQkJCQkJ ICAgICBGV19SRUdfUkVBRCk7Ci0KLQllbmdpbmUtPmZ3X2RvbWFpbnMgPSBmd19kb21haW5zOwot Ci0JSU5JVF9MSVNUX0hFQUQoJmVuZ2luZS0+YWN0aXZlX2xpc3QpOwotCUlOSVRfTElTVF9IRUFE KCZlbmdpbmUtPnJlcXVlc3RfbGlzdCk7Ci0JSU5JVF9MSVNUX0hFQUQoJmVuZ2luZS0+YnVmZmVy cyk7Ci0JSU5JVF9MSVNUX0hFQUQoJmVuZ2luZS0+ZXhlY2xpc3RfcXVldWUpOwotCXNwaW5fbG9j a19pbml0KCZlbmdpbmUtPmV4ZWNsaXN0X2xvY2spOwotCi0JdGFza2xldF9pbml0KCZlbmdpbmUt PmlycV90YXNrbGV0LAotCQkgICAgIGludGVsX2xyY19pcnFfaGFuZGxlciwgKHVuc2lnbmVkIGxv bmcpZW5naW5lKTsKLQotCWxvZ2ljYWxfcmluZ19pbml0X3BsYXRmb3JtX2ludmFyaWFudHMoZW5n aW5lKTsKLQlsb2dpY2FsX3JpbmdfZGVmYXVsdF92ZnVuY3MoZW5naW5lKTsKLQlsb2dpY2FsX3Jp bmdfZGVmYXVsdF9pcnFzKGVuZ2luZSk7Ci0KLQlpbnRlbF9lbmdpbmVfaW5pdF9oYW5nY2hlY2so ZW5naW5lKTsKLQlpOTE1X2dlbV9iYXRjaF9wb29sX2luaXQoZGV2X3ByaXYtPmRldiwgJmVuZ2lu ZS0+YmF0Y2hfcG9vbCk7Ci0KLQlyZXR1cm4gZW5naW5lOwotfQotCiAvKioKICAqIGludGVsX2xv Z2ljYWxfcmluZ3NfaW5pdCgpIC0gYWxsb2NhdGUsIHBvcHVsYXRlIGFuZCBpbml0IHRoZSBFbmdp bmUgQ29tbWFuZCBTdHJlYW1lcnMKICAqIEBkZXY6IERSTSBkZXZpY2UuCkBAIC0yMjM3LDcgKzIy NDIsNyBAQCBpbnQgaW50ZWxfbG9naWNhbF9yaW5nc19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiAJCWlmICghaW50ZWxfZW5naW5lc1tpXS5pbml0KQogCQkJY29udGludWU7CiAKLQkJcmV0 ID0gaW50ZWxfZW5naW5lc1tpXS5pbml0KGxvZ2ljYWxfcmluZ19zZXR1cChkZXZfcHJpdiwgaSkp OworCQlyZXQgPSBpbnRlbF9lbmdpbmVzW2ldLmluaXQoaW50ZWxfZW5naW5lX3NldHVwKGRldl9w cml2LCBpKSk7CiAJCWlmIChyZXQpCiAJCQlnb3RvIGNsZWFudXA7CiAKLS0gCjEuOS4xCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK