From: John.C.Harrison@Intel.com Subject: [PATCH 39/39] drm/i915: Allow scheduler to manage inter-ring object synchronisation Date: Mon, 23 Nov 2015 11:39:34 +0000 Message-ID: <1448278774-31376-40-git-send-email-John.C.Harrison@Intel.com> References: <1448278774-31376-1-git-send-email-John.C.Harrison@Intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id CEBDC6E51A for ; Mon, 23 Nov 2015 03:40:19 -0800 (PST) In-Reply-To: <1448278774-31376-1-git-send-email-John.C.Harrison@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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClRoZSBzY2hl ZHVsZXIgaGFzIGFsd2F5cyB0cmFja2VkIGJhdGNoIGJ1ZmZlciBkZXBlbmRlbmNpZXMgYmFzZWQg b24KRFJNIG9iamVjdCB1c2FnZS4gVGhpcyBtZWFucyB0aGF0IGl0IHdpbGwgbm90IHN1Ym1pdCBh IGJhdGNoIG9uIG9uZQpyaW5nIHRoYXQgaGFzIG91dHN0YW5kaW5nIGRlcGVuZGVuY2llcyBzdGls bCBleGVjdXRpbmcgb24gb3RoZXIgcmluZ3MuClRoaXMgaXMgZXhhY3RseSB0aGUgc2FtZSBzeW5j aHJvbmlzYXRpb24gcGVyZm9ybWVkIGJ5Cmk5MTVfZ2VtX29iamVjdF9zeW5jKCkgdXNpbmcgaGFy ZHdhcmUgc2VtYXBob3JlcyB3aGVyZSBhdmFpbGFibGUgYW5kCkNQVSBzdGFsbHMgd2hlcmUgbm90 IChlLmcuIGluIGV4ZWNsaXN0IG1vZGUgYW5kL29yIG9uIEdlbjggaGFyZHdhcmUpLgoKVW5mb3J0 dW5hdGVseSwgd2hlbiBhIGJhdGNoIGJ1ZmZlciBpcyBzdWJtaXR0ZWQgdG8gdGhlIGRyaXZlciB0 aGUKX29iamVjdF9zeW5jKCkgY2FsbCBoYXBwZW5zIGZpcnN0LiBUaHVzIGluIGNhc2Ugd2hlcmUg aGFyZHdhcmUKc2VtYXBob3JlcyBhcmUgZGlzYWJsZWQsIHRoZSBkcml2ZXIgaGFzIGFscmVhZHkg c3RhbGxlZCB1bnRpbCB0aGUKZGVwZW5kZW5jeSBoYXMgYmVlbiByZXNvbHZlZC4KClRoaXMgcGF0 Y2ggYWRkcyBhbiBvcHRpbWlzYXRpb24gdG8gX29iamVjdF9zeW5jKCkgdG8gaWdub3JlIHRoZQpz eW5jaHJvbmlzYXRpb24gaW4gdGhlIGNhc2Ugd2hlcmUgaXQgd2lsbCBzdWJzZXF1ZW50bHkgYmUg aGFuZGxlZCBieQp0aGUgc2NoZWR1bGVyLiBUaGlzIHJlbW92ZXMgdGhlIGRyaXZlciBzdGFsbCBh bmQgKGluIHRoZSBzaW5nbGUKYXBwbGljYXRpb24gY2FzZSkgcHJvdmlkZXMgbmVhciBoYXJkd2Fy ZSBzZW1hcGhvcmUgcGVyZm9ybWFuY2UgZXZlbgp3aGVuIGhhcmR3YXJlIHNlbWFwaG9yZXMgYXJl IGRpc2FibGVkLiBJbiBhIGJ1c3kgc3lzdGVtIHdoZXJlIHRoZXJlIGlzCm90aGVyIHdvcmsgdGhh dCBjYW4gYmUgZXhlY3V0ZWQgb24gdGhlIHN0YWxsaW5nIHJpbmcsIGl0IHByb3ZpZGVzCmJldHRl ciB0aGFuIGhhcmR3YXJlIHNlbWFwaG9yZSBwZXJmb3JtYW5jZSBhcyBpdCByZW1vdmVzIHRoZSBz dGFsbApmcm9tIGJvdGggdGhlIGRyaXZlciBhbmQgZnJvbSB0aGUgaGFyZHdhcmUuIFRoZXJlIGlz IGFsc28gYSB0aGVvcnkKdGhhdCB0aGlzIG1ldGhvZCBzaG91bGQgaW1wcm92ZSBwb3dlciB1c2Fn ZSBhcyBoYXJkd2FyZSBzZW1hcGhvcmVzIGFyZQphcHBhcmVudGx5IG5vdCB2ZXJ5IHBvd2VyIGVm ZmljaWVudCAtIHRoZSBzdGFsbGVkIHJpbmcgZG9lcyBub3QgZ28KaW50byBhcyBsb3cgYSBwb3dl ciBhIHN0YXRlIGFzIHdoZW4gaXQgaXMgZ2VudWluZWx5IGlkbGUuCgpUaGUgb3B0aW1pc2F0aW9u IGlzIHRvIGNoZWNrIHdoZXRoZXIgYm90aCBlbmRzIG9mIHRoZSBzeW5jaHJvbmlzYXRpb24KYXJl IGJhdGNoIGJ1ZmZlciByZXF1ZXN0cy4gSWYgdGhleSBhcmUsIHRoZW4gdGhlIHNjaGVkdWxlciB3 aWxsIGhhdmUKdGhlIGludGVyLWRlcGVuZGVuY3kgdHJhY2tlZCBhbmQgbWFuYWdlZC4gSWYgb25l IG9yIG90aGVyIGVuZCBpcyBub3QgYQpiYXRjaCBidWZmZXIgcmVxdWVzdCAoZS5nLiBhIHBhZ2Ug ZmxpcCkgdGhlbiB0aGUgY29kZSBmYWxscyBiYWNrIHRvCnRoZSBDUFUgc3RhbGwgb3IgaGFyZHdh cmUgc2VtYXBob3JlIGFzIGFwcHJvcHJpYXRlLgoKVG8gY2hlY2sgd2hldGhlciB0aGUgZXhpc3Rp bmcgdXNhZ2UgaXMgYSBiYXRjaCBidWZmZXIsIHRoZSBjb2RlIHNpbXBseQpjYWxscyB0aGUgJ2Fy ZSB5b3UgdHJhY2tpbmcgdGhpcyByZXF1ZXN0JyBmdW5jdGlvbiBvZiB0aGUgc2NoZWR1bGVyIG9u CnRoZSBvYmplY3QncyBsYXN0X3JlYWRfcmVxIG1lbWJlci4gVG8gY2hlY2sgd2hldGhlciB0aGUg bmV3IHVzYWdlIGlzIGEKYmF0Y2ggYnVmZmVyLCBhIGZsYWcgaXMgcGFzc2VkIGluIGZyb20gdGhl IGNhbGxlci4KCkNoYW5nZS1JZDogSWRjMTZlMTliNWE0ZGM4YjM3ODJjZTlkYjQ0ZGQzZGY0NDVm Mzk2YzEKSXNzdWU6IFZJWi01NTY2ClNpZ25lZC1vZmYtYnk6IEpvaG4gSGFycmlzb24gPEpvaG4u Qy5IYXJyaXNvbkBJbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aCAgICAgICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAg ICAgICAgICB8IDE3ICsrKysrKysrKysrKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9leGVjYnVmZmVyLmMgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAg ICAgICAgICB8ICAyICstCiA1IGZpbGVzIGNoYW5nZWQsIDE4IGluc2VydGlvbnMoKyksIDcgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggOWRlODMxYi4uODA5ODE2YSAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0yOTcxLDcgKzI5NzEsNyBAQCBpbnQgX19tdXN0 X2NoZWNrIGk5MTVfbXV0ZXhfbG9ja19pbnRlcnJ1cHRpYmxlKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpOwogI2VuZGlmCiBpbnQgaTkxNV9nZW1fb2JqZWN0X3N5bmMoc3RydWN0IGRybV9pOTE1X2dl bV9vYmplY3QgKm9iaiwKIAkJCSBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICp0bywKLQkJCSBzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKip0b19yZXEpOworCQkJIHN0cnVjdCBkcm1faTkxNV9n ZW1fcmVxdWVzdCAqKnRvX3JlcSwgYm9vbCB0b19iYXRjaCk7CiB2b2lkIGk5MTVfdm1hX21vdmVf dG9fYWN0aXZlKHN0cnVjdCBpOTE1X3ZtYSAqdm1hLAogCQkJICAgICBzdHJ1Y3QgZHJtX2k5MTVf Z2VtX3JlcXVlc3QgKnJlcSk7CiBpbnQgaTkxNV9nZW1fZHVtYl9jcmVhdGUoc3RydWN0IGRybV9m aWxlICpmaWxlX3ByaXYsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCA5YzA4MDM1Li5hYjYw NjRlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTM1NTUsNyArMzU1NSw3IEBAIHN0YXRp YyBpbnQKIF9faTkxNV9nZW1fb2JqZWN0X3N5bmMoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3Qg Km9iaiwKIAkJICAgICAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnRvLAogCQkgICAgICAgc3Ry dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpmcm9tX3JlcSwKLQkJICAgICAgIHN0cnVjdCBkcm1f aTkxNV9nZW1fcmVxdWVzdCAqKnRvX3JlcSkKKwkJICAgICAgIHN0cnVjdCBkcm1faTkxNV9nZW1f cmVxdWVzdCAqKnRvX3JlcSwgYm9vbCB0b19iYXRjaCkKIHsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICpmcm9tOwogCWludCByZXQ7CkBAIC0zNTY3LDYgKzM1NjcsMTUgQEAgX19pOTE1X2dlbV9v YmplY3Rfc3luYyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCWlmIChpOTE1X2dl bV9yZXF1ZXN0X2NvbXBsZXRlZChmcm9tX3JlcSkpCiAJCXJldHVybiAwOwogCisJLyoKKwkgKiBU aGUgc2NoZWR1bGVyIHdpbGwgbWFuYWdlIGludGVyLXJpbmcgb2JqZWN0IGRlcGVuZGVuY2llcwor CSAqIGFzIGxvbmcgYXMgYm90aCB0byBhbmQgZnJvbSByZXF1ZXN0cyBhcmUgc2NoZWR1bGVyIG1h bmFnZWQKKwkgKiAoaS5lLiBiYXRjaCBidWZmZXJzKS4KKwkgKi8KKwlpZiAodG9fYmF0Y2ggJiYK KwkgICAgaTkxNV9zY2hlZHVsZXJfaXNfcmVxdWVzdF90cmFja2VkKGZyb21fcmVxLCBOVUxMLCBO VUxMKSkKKwkJcmV0dXJuIDA7CisKIAlpZiAoIWk5MTVfc2VtYXBob3JlX2lzX2VuYWJsZWQob2Jq LT5iYXNlLmRldikpIHsKIAkJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUgPSB0b19pOTE1 KG9iai0+YmFzZS5kZXYpOwogCQlyZXQgPSBfX2k5MTVfd2FpdF9yZXF1ZXN0KGZyb21fcmVxLApA QCAtMzYxNyw2ICszNjI2LDggQEAgX19pOTE1X2dlbV9vYmplY3Rfc3luYyhzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX29iamVjdCAqb2JqLAogICogQHRvX3JlcTogcmVxdWVzdCB3ZSB3aXNoIHRvIHVzZSB0 aGUgb2JqZWN0IGZvci4gU2VlIGJlbG93LgogICogICAgICAgICAgVGhpcyB3aWxsIGJlIGFsbG9j YXRlZCBhbmQgcmV0dXJuZWQgaWYgYSByZXF1ZXN0IGlzCiAgKiAgICAgICAgICByZXF1aXJlZCBi dXQgbm90IHBhc3NlZCBpbi4KKyAqIEB0b19iYXRjaDogaXMgdGhlIHN5bmMgcmVxdWVzdCBvbiBi ZWhhbGYgb2YgYmF0Y2ggYnVmZmVyIHN1Ym1pc3Npb24/CisgKiBJZiBzbyB0aGVuIHRoZSBzY2hl ZHVsZXIgY2FuIChwb3RlbnRpYWxseSkgbWFuYWdlIHRoZSBzeW5jaHJvbmlzYXRpb24uCiAgKgog ICogVGhpcyBjb2RlIGlzIG1lYW50IHRvIGFic3RyYWN0IG9iamVjdCBzeW5jaHJvbml6YXRpb24g d2l0aCB0aGUgR1BVLgogICogQ2FsbGluZyB3aXRoIE5VTEwgaW1wbGllcyBzeW5jaHJvbml6aW5n IHRoZSBvYmplY3Qgd2l0aCB0aGUgQ1BVCkBAIC0zNjQ3LDcgKzM2NTgsNyBAQCBfX2k5MTVfZ2Vt X29iamVjdF9zeW5jKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCiBpbnQKIGk5MTVf Z2VtX29iamVjdF9zeW5jKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJCSAgICAg c3RydWN0IGludGVsX2VuZ2luZV9jcyAqdG8sCi0JCSAgICAgc3RydWN0IGRybV9pOTE1X2dlbV9y ZXF1ZXN0ICoqdG9fcmVxKQorCQkgICAgIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqKnRv X3JlcSwgYm9vbCB0b19iYXRjaCkKIHsKIAljb25zdCBib29sIHJlYWRvbmx5ID0gb2JqLT5iYXNl LnBlbmRpbmdfd3JpdGVfZG9tYWluID09IDA7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0 ICpyZXFbSTkxNV9OVU1fUklOR1NdOwpAQCAtMzY2OSw3ICszNjgwLDcgQEAgaTkxNV9nZW1fb2Jq ZWN0X3N5bmMoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAkJCQlyZXFbbisrXSA9 IG9iai0+bGFzdF9yZWFkX3JlcVtpXTsKIAl9CiAJZm9yIChpID0gMDsgaSA8IG47IGkrKykgewot CQlyZXQgPSBfX2k5MTVfZ2VtX29iamVjdF9zeW5jKG9iaiwgdG8sIHJlcVtpXSwgdG9fcmVxKTsK KwkJcmV0ID0gX19pOTE1X2dlbV9vYmplY3Rfc3luYyhvYmosIHRvLCByZXFbaV0sIHRvX3JlcSwg dG9fYmF0Y2gpOwogCQlpZiAocmV0KQogCQkJcmV0dXJuIHJldDsKIAl9CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKaW5kZXggODU1MzI5Ny4uMjA2OTNjMyAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwpAQCAtOTE5LDcgKzkx OSw3IEBAIGk5MTVfZ2VtX2V4ZWNidWZmZXJfbW92ZV90b19ncHUoc3RydWN0IGRybV9pOTE1X2dl bV9yZXF1ZXN0ICpyZXEsCiAJCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmogPSB2bWEt Pm9iajsKIAogCQlpZiAob2JqLT5hY3RpdmUgJiBvdGhlcl9yaW5ncykgewotCQkJcmV0ID0gaTkx NV9nZW1fb2JqZWN0X3N5bmMob2JqLCByZXEtPnJpbmcsICZyZXEpOworCQkJcmV0ID0gaTkxNV9n ZW1fb2JqZWN0X3N5bmMob2JqLCByZXEtPnJpbmcsICZyZXEsIHRydWUpOwogCQkJaWYgKHJldCkK IAkJCQlyZXR1cm4gcmV0OwogCQl9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5k ZXggNThjNDY0Zi4uMzYxMjU2MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpA QCAtMTE0ODcsNyArMTE0ODcsNyBAQCBzdGF0aWMgaW50IGludGVsX2NydGNfcGFnZV9mbGlwKHN0 cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkgKiBpbnRvIHRoZSBkaXNwbGF5IHBsYW5lIGFuZCBza2lw IGFueSB3YWl0cy4KIAkgKi8KIAlpZiAoIW1taW9fZmxpcCkgewotCQlyZXQgPSBpOTE1X2dlbV9v YmplY3Rfc3luYyhvYmosIHJpbmcsICZyZXF1ZXN0KTsKKwkJcmV0ID0gaTkxNV9nZW1fb2JqZWN0 X3N5bmMob2JqLCByaW5nLCAmcmVxdWVzdCwgZmFsc2UpOwogCQlpZiAocmV0KQogCQkJZ290byBj bGVhbnVwX3BlbmRpbmc7CiAJfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCBiNWFiZWE0 Li43YTNmYjIxOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTY1OCw3ICs2NTgsNyBA QCBzdGF0aWMgaW50IGV4ZWNsaXN0c19tb3ZlX3RvX2dwdShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl cXVlc3QgKnJlcSwKIAkJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9IHZtYS0+b2Jq OwogCiAJCWlmIChvYmotPmFjdGl2ZSAmIG90aGVyX3JpbmdzKSB7Ci0JCQlyZXQgPSBpOTE1X2dl bV9vYmplY3Rfc3luYyhvYmosIHJlcS0+cmluZywgJnJlcSk7CisJCQlyZXQgPSBpOTE1X2dlbV9v YmplY3Rfc3luYyhvYmosIHJlcS0+cmluZywgJnJlcSwgdHJ1ZSk7CiAJCQlpZiAocmV0KQogCQkJ CXJldHVybiByZXQ7CiAJCX0KLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeAo=