From: John.C.Harrison@Intel.com Subject: [PATCH v6 21/34] drm/i915: Support for 'unflushed' ring idle Date: Wed, 20 Apr 2016 18:13:39 +0100 Message-ID: <1461172435-4256-22-git-send-email-John.C.Harrison@Intel.com> References: <1461172435-4256-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 0B6D26EA94 for ; Wed, 20 Apr 2016 17:14:21 +0000 (UTC) In-Reply-To: <1461172435-4256-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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KCldoZW4gdGhl IHNlcW5vIHdyYXBzIGFyb3VuZCB6ZXJvLCB0aGUgZW50aXJlIEdQVSBpcyBmb3JjZWQgdG8gYmUg aWRsZQpmb3Igc29tZSByZWFzb24gKHBvc3NpYmx5IG9ubHkgdG8gd29yayBhcm91bmQgaXNzdWVz IHdpdGggaGFyZHdhcmUKc2VtYXBob3JlcyBidXQgbm8tb25lIHNlZW1zIHRvbyBzdXJlISkuIFRo aXMgY2F1c2VzIGEgcHJvYmxlbSBpZiB0aGUKZm9yY2UgaWRsZSBvY2N1cnMgYXQgYW4gaW5vcHBv cnR1bmUgbW9tZW50IHN1Y2ggYXMgaW4gdGhlIG1pZGRsZSBvZgpzdWJtaXR0aW5nIGEgYmF0Y2gg YnVmZmVyLiBTcGVjaWZpY2FsbHksIGl0IHdvdWxkIGxlYWQgdG8gcmVjdXJzaXZlCnN1Ym1pdHMg LSBzdWJtaXR0aW5nIHdvcmsgcmVxdWlyZXMgYSBuZXcgc2Vxbm8sIHRoZSBuZXcgc2Vxbm8gcmVx dWlyZXMKaWRsaW5nIHRoZSByaW5nLCBpZGxpbmcgdGhlIHJpbmcgcmVxdWlyZXMgc3VibWl0dGlu ZyB3b3JrLCBzdWJtaXR0aW5nCndvcmsgcmVxdWlyZXMgYSBuZXcgc2Vxbm8uLi4KClRoaXMgY2hh bmdlIGFkZHMgYSAnZmx1c2gnIHBhcmFtZXRlciB0byB0aGUgaWRsZSBmdW5jdGlvbiBjYWxsIHdo aWNoCnNwZWNpZmllcyB3aGV0aGVyIHRoZSBzY2hlZHVsZXIgcXVldWVzIHNob3VsZCBiZSBmbHVz aGVkIG91dC4gSS5lLiBpcwp0aGUgY2FsbCBpbnRlbmRlZCB0byBqdXN0IGlkbGUgdGhlIHJpbmcg YXMgaXQgaXMgcmlnaHQgbm93IChubyBmbHVzaCkKb3IgaXMgaXQgaW50ZW5kZWQgdG8gZm9yY2Ug YWxsIG91dHN0YW5kaW5nIHdvcmsgb3V0IG9mIHRoZSBzeXN0ZW0KKHdpdGggZmx1c2gpLgoKSW4g dGhlIHNlcW5vIHdyYXAgY2FzZSwgcGVuZGluZyB3b3JrIGlzIG5vdCBhbiBpc3N1ZSBiZWNhdXNl IHRoZSBuZXh0Cm9wZXJhdGlvbiB3aWxsIGJlIHRvIHN1Ym1pdCBpdC4gSG93ZXZlciwgaW4gb3Ro ZXIgY2FzZXMsIHRoZSBpbnRlbnRpb24KaXMgdG8gbWFrZSBzdXJlIGV2ZXJ5dGhpbmcgdGhhdCBj b3VsZCBiZSBkb25lIGhhcyBiZWVuIGRvbmUuCgp2NjogVXBkYXRlZCB0byBuZXdlciBuaWdodGx5 IChsb3RzIG9mIHJpbmcgLT4gZW5naW5lIHJlbmFtaW5nKS4KCkFkZGVkIGtlcm5lbGRvYyBmb3Ig aW50ZWxfZW5naW5lX2lkbGUoKS4KCldyYXBwZWQgYm9vbGVhbiAnZmx1c2gnIHBhcmFtZXRlciB3 aXRoIGFuIF9mbHVzaCgpIG1hY3JvLgpbcmV2aWV3IGZlZWRiYWNrIGZyb20gSm9vbmFzIExhaHRp bmVuXQoKRm9yOiBWSVotMTU4NwpTaWduZWQtb2ZmLWJ5OiBKb2huIEhhcnJpc29uIDxKb2huLkMu SGFycmlzb25ASW50ZWwuY29tPgpSZXZpZXdlZC1ieTogSmVzc2UgQmFybmVzIDxqYmFybmVzQHZp cnR1b3VzZ2Vlay5vcmc+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAg ICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAgICAgICB8ICAy ICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgfCAzMSArKysrKysr KysrKysrKysrKysrKysrKysrKysrKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5n YnVmZmVyLmggfCAgNCArKystCiA0IGZpbGVzIGNoYW5nZWQsIDM0IGluc2VydGlvbnMoKyksIDUg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggZWJjN2YwYS4uMTczN2Yx MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0zODk2LDcgKzM4OTYsNyBAQCBpbnQgaTkx NV9ncHVfaWRsZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJaTkxNV9hZGRfcmVxdWVzdF9u b19mbHVzaChyZXEpOwogCQl9CiAKLQkJcmV0ID0gaW50ZWxfZW5naW5lX2lkbGUoZW5naW5lKTsK KwkJcmV0ID0gaW50ZWxfZW5naW5lX2lkbGVfZmx1c2goZW5naW5lKTsKIAkJaWYgKHJldCkKIAkJ CXJldHVybiByZXQ7CiAJfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf bHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCAwYTRlZjYxLi5k NjdiMDhiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtMTA5MSw3ICsxMDkxLDcgQEAg dm9pZCBpbnRlbF9sb2dpY2FsX3Jpbmdfc3RvcChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdp bmUpCiAJaWYgKCFpbnRlbF9lbmdpbmVfaW5pdGlhbGl6ZWQoZW5naW5lKSkKIAkJcmV0dXJuOwog Ci0JcmV0ID0gaW50ZWxfZW5naW5lX2lkbGUoZW5naW5lKTsKKwlyZXQgPSBpbnRlbF9lbmdpbmVf aWRsZV9mbHVzaChlbmdpbmUpOwogCWlmIChyZXQgJiYgIWk5MTVfcmVzZXRfaW5fcHJvZ3Jlc3Mo JnRvX2k5MTUoZW5naW5lLT5kZXYpLT5ncHVfZXJyb3IpKQogCQlEUk1fRVJST1IoImZhaWxlZCB0 byBxdWllc2NlICVzIHdoaWxzdCBjbGVhbmluZyB1cDogJWRcbiIsCiAJCQkgIGVuZ2luZS0+bmFt ZSwgcmV0KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZm ZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwppbmRleCA2MDIx NjU1Li5mNWJjZDI0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5n YnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCkBA IC0yMzU5LDEwICsyMzU5LDM3IEBAIHN0YXRpYyB2b2lkIF9fd3JhcF9yaW5nX2J1ZmZlcihzdHJ1 Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZikKIAlpbnRlbF9yaW5nX3VwZGF0ZV9zcGFjZShy aW5nYnVmKTsKIH0KIAotaW50IGludGVsX2VuZ2luZV9pZGxlKHN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKmVuZ2luZSkKKy8qKgorICogX19pbnRlbF9lbmdpbmVfaWRsZSAtIEZvcmNlIHRoZSBlbmdp bmUgdG8gYmUgaWRsZS4KKyAqIEBlbmdpbmU6IEVuZ2luZSB0byBiZSBpZGxlZAorICogQGZsdXNo OiBTaG91bGQgcXVldWVkIHNjaGVkdWxlciB3b3JrIGFsc28gYmUgZmx1c2hlZAorICogV2FpdHMg Zm9yIGFsbCBvdXRzdGFuZGluZyByZXF1ZXN0cyB0aGF0IGhhdmUgYmVlbiBzZW50IHRvIHRoZSBn aXZlbiBlbmdpbmUKKyAqIHRvIGNvbXBsZXRlLiBDYW4gb3B0aW9uYWxseSBhbHNvIGZvcmNlIGFs bCB1bnNlbnQgcmVxdWVzdHMgdGhhdCBhcmUgcXVldWVkCisgKiBpbiB0aGUgc2NoZWR1bGVyIHRv IGJlIHNlbnQgZmlyc3QuCisgKiBSZXR1cm5zIHplcm8gb24gc3VjY2VzcyBvdGhlcndpc2UgYSBu ZWdhdGl2ZSBlcnJvciBjb2RlLgorICoKKyAqIE5COiBGbHVzaGluZyBjYW4gbGVhZCB0byByZWN1 cnNpb24gaWYgY2FsbGVkIGF0IHRoZSB3cm9uZyB0aW1lLiBFLmcuIGZsdXNoCisgKiBjYXVzZXMg dGhlIHNjaGVkdWxlciB0byBzdWJtaXQgcmVxdWVzdHMgdG8gdGhlIGhhcmR3YXJlLCBzdWJtaXR0 aW5nCisgKiByZXF1ZXN0cyByZXF1aXJlcyBhbGxvY2F0aW5nIGEgbmV3IHNlcW5vLCB3aGVuIHRo ZSBzZXFubyB3cmFwcyBhcm91bmQgaXQKKyAqIGlkbGVzIHRoZSBlbmdpbmUsIGlkbGluZyB3aXRo IGZsdXNoIGNhdXNlcyB0aGUgc2NoZWR1bGVyIHRvIHN1Ym1pdCByZXF1ZXN0cy4uLgorICovCitp bnQgX19pbnRlbF9lbmdpbmVfaWRsZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsIGJv b2wgZmx1c2gpCiB7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXE7CiAJdWludDMy X3QgZmxhZ3M7CisJaW50IHJldDsKKworCS8qCisJICogTkI6IE11c3Qgbm90IGZsdXNoIHRoZSBz Y2hlZHVsZXIgaWYgdGhpcyBpZGxlIHJlcXVlc3QgaXMgZnJvbQorCSAqIHdpdGhpbiBhbiBleGVj YnVmZiBzdWJtaXNzaW9uIChpLmUuIGR1ZSB0byAnZ2V0X3NlcW5vJyBjYWxsaW5nCisJICogJ3dy YXBfc2Vxbm8nIGNhbGxpbmcgJ2lkbGUnKS4gQXMgdGhhdCB3b3VsZCBsZWFkIHRvIHJlY3Vyc2l2 ZQorCSAqIGZsdXNoZXMhCisJICovCisJaWYgKGZsdXNoKSB7CisJCXJldCA9IGk5MTVfc2NoZWR1 bGVyX2ZsdXNoKGVuZ2luZSwgdHJ1ZSk7CisJCWlmIChyZXQpCisJCQlyZXR1cm4gcmV0OworCX0K IAogCS8qIFdhaXQgdXBvbiB0aGUgbGFzdCByZXF1ZXN0IHRvIGJlIGNvbXBsZXRlZCAqLwogCWlm IChsaXN0X2VtcHR5KCZlbmdpbmUtPnJlcXVlc3RfbGlzdCkpCkBAIC0zMjAyLDcgKzMyMjksNyBA QCBpbnRlbF9zdG9wX2VuZ2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJaWYg KCFpbnRlbF9lbmdpbmVfaW5pdGlhbGl6ZWQoZW5naW5lKSkKIAkJcmV0dXJuOwogCi0JcmV0ID0g aW50ZWxfZW5naW5lX2lkbGUoZW5naW5lKTsKKwlyZXQgPSBpbnRlbF9lbmdpbmVfaWRsZV9mbHVz aChlbmdpbmUpOwogCWlmIChyZXQgJiYgIWk5MTVfcmVzZXRfaW5fcHJvZ3Jlc3MoJnRvX2k5MTUo ZW5naW5lLT5kZXYpLT5ncHVfZXJyb3IpKQogCQlEUk1fRVJST1IoImZhaWxlZCB0byBxdWllc2Nl ICVzIHdoaWxzdCBjbGVhbmluZyB1cDogJWRcbiIsCiAJCQkgIGVuZ2luZS0+bmFtZSwgcmV0KTsK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAppbmRleCBjNzVjNWUxLi4yZTdk YWVmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCkBAIC00NzQsNyAr NDc0LDkgQEAgdm9pZCBpbnRlbF9yaW5nX3VwZGF0ZV9zcGFjZShzdHJ1Y3QgaW50ZWxfcmluZ2J1 ZmZlciAqcmluZ2J1Zik7CiBpbnQgaW50ZWxfcmluZ19zcGFjZShzdHJ1Y3QgaW50ZWxfcmluZ2J1 ZmZlciAqcmluZ2J1Zik7CiBib29sIGludGVsX2VuZ2luZV9zdG9wcGVkKHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKmVuZ2luZSk7CiAKLWludCBfX211c3RfY2hlY2sgaW50ZWxfZW5naW5lX2lkbGUo c3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKKyNkZWZpbmUgaW50ZWxfZW5naW5lX2lk bGUoZW5naW5lKSAgICAgICAgICAgX19pbnRlbF9lbmdpbmVfaWRsZSgoZW5naW5lKSwgZmFsc2Up CisjZGVmaW5lIGludGVsX2VuZ2luZV9pZGxlX2ZsdXNoKGVuZ2luZSkgICAgIF9faW50ZWxfZW5n aW5lX2lkbGUoKGVuZ2luZSksIHRydWUpCitpbnQgX19tdXN0X2NoZWNrIF9faW50ZWxfZW5naW5l X2lkbGUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLCBib29sIGZsdXNoKTsKIHZvaWQg aW50ZWxfcmluZ19pbml0X3NlcW5vKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwgdTMy IHNlcW5vKTsKIGludCBpbnRlbF9yaW5nX2ZsdXNoX2FsbF9jYWNoZXMoc3RydWN0IGRybV9pOTE1 X2dlbV9yZXF1ZXN0ICpyZXEpOwogaW50IGludGVsX3JpbmdfaW52YWxpZGF0ZV9hbGxfY2FjaGVz KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKTsKLS0gCjEuOS4xCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK