From: John.C.Harrison@Intel.com Subject: [PATCH v5 25/35] drm/i915: Added scheduler queue throttling by DRM file handle Date: Thu, 18 Feb 2016 14:27:13 +0000 Message-ID: <1455805644-6450-26-git-send-email-John.C.Harrison@Intel.com> References: <1455805644-6450-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id DD4A56EBF5 for ; Thu, 18 Feb 2016 14:27:59 +0000 (UTC) In-Reply-To: <1455805644-6450-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 ZHVsZXIgZGVjb3VwbGVzIHRoZSBzdWJtaXNzaW9uIG9mIGJhdGNoIGJ1ZmZlcnMgdG8gdGhlIGRy aXZlcgpmcm9tIHRoZWlyIHN1YnNlcXVlbnQgc3VibWlzc2lvbiB0byB0aGUgaGFyZHdhcmUuIFRo aXMgbWVhbnMgdGhhdCBhbgphcHBsaWNhdGlvbiB3aGljaCBpcyBjb250aW51b3VzbHkgc3VibWl0 dGluZyBidWZmZXJzIGFzIGZhc3QgYXMgaXQgY2FuCmNvdWxkIHBvdGVudGlhbHkgZmxvb2QgdGhl IGRyaXZlci4gVG8gcHJldmVudCB0aGlzLCB0aGUgZHJpdmVyIG5vdwp0cmFja3MgaG93IG1hbnkg YnVmZmVycyBhcmUgaW4gcHJvZ3Jlc3MgKHF1ZXVlZCBpbiBzb2Z0d2FyZSBvcgpleGVjdXRpbmcg aW4gaGFyZHdhcmUpIGFuZCBsaW1pdHMgdGhpcyB0byBhIGdpdmVuICh0dW5hYmxlKSBudW1iZXIu IElmCnRoaXMgbnVtYmVyIGlzIGV4Y2VlZGVkIHRoZW4gdGhlIHF1ZXVlIHRvIHRoZSBkcml2ZXIg d2lsbCByZXR1cm4KRUFHQUlOIGFuZCB0aHVzIHByZXZlbnQgdGhlIHNjaGVkdWxlcidzIHF1ZXVl IGJlY29taW5nIGFyYml0cmFyaWx5CmxhcmdlLgoKdjM6IEFkZGVkIGEgbWlzc2luZyBkZWNyZW1l bnQgb2YgdGhlIGZpbGUgcXVldWUgY291bnRlci4KCnY0OiBVcGRhdGVkIGEgY29tbWVudC4KCnY1 OiBVcGRhdGVkIGR1ZSB0byBjaGFuZ2VzIHRvIGVhcmxpZXIgcGF0Y2hlcyBpbiBzZXJpZXMgLSBy ZW1vdmluZwpmb3J3YXJkIGRlY2xhcmF0aW9ucyBhbmQgd2hpdGUgc3BhY2UuIEFsc28gYWRkZWQg c29tZSBkb2N1bWVudGF0aW9uLgpbSm9vbmFzIExhaHRpbmVuXQoKRm9yOiBWSVotMTU4NwpTaWdu ZWQtb2ZmLWJ5OiBKb2huIEhhcnJpc29uIDxKb2huLkMuSGFycmlzb25ASW50ZWwuY29tPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgICAgICB8ICAyICsrCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMgfCAgOCArKysrKwogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIuYyAgICAgIHwgNDggKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxlci5oICAg ICAgfCAgMiArKwogNCBmaWxlcyBjaGFuZ2VkLCA2MCBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmgKaW5kZXggMDcxYTI3Yi4uM2Y0YzRmMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oCkBAIC0zMzYsNiArMzM2LDggQEAgc3RydWN0IGRybV9pOTE1X2ZpbGVfcHJpdmF0ZSB7CiAJ fSBycHM7CiAKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpic2RfcmluZzsKKworCXUzMiBzY2hl ZHVsZXJfcXVldWVfbGVuZ3RoOwogfTsKIAogZW51bSBpbnRlbF9kcGxsX2lkIHsKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwppbmRleCBkNGRlOGM3Li5kZmYxMjBj IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCkBAIC0xODAz LDYgKzE4MDMsMTAgQEAgaTkxNV9nZW1fZXhlY2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LCB2b2lkICpkYXRhLAogCQlyZXR1cm4gLUVJTlZBTDsKIAl9CiAKKwkvKiBUaHJvdHRsZSBiYXRj aCByZXF1ZXN0cyBwZXIgZGV2aWNlIGZpbGUgKi8KKwlpZiAoaTkxNV9zY2hlZHVsZXJfZmlsZV9x dWV1ZV9pc19mdWxsKGZpbGUpKQorCQlyZXR1cm4gLUVBR0FJTjsKKwogCS8qIENvcHkgaW4gdGhl IGV4ZWMgbGlzdCBmcm9tIHVzZXJsYW5kICovCiAJZXhlY19saXN0ID0gZHJtX21hbGxvY19hYihz aXplb2YoKmV4ZWNfbGlzdCksIGFyZ3MtPmJ1ZmZlcl9jb3VudCk7CiAJZXhlYzJfbGlzdCA9IGRy bV9tYWxsb2NfYWIoc2l6ZW9mKCpleGVjMl9saXN0KSwgYXJncy0+YnVmZmVyX2NvdW50KTsKQEAg LTE4OTMsNiArMTg5NywxMCBAQCBpOTE1X2dlbV9leGVjYnVmZmVyMihzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LCB2b2lkICpkYXRhLAogCQlyZXR1cm4gLUVJTlZBTDsKIAl9CiAKKwkvKiBUaHJvdHRs ZSBiYXRjaCByZXF1ZXN0cyBwZXIgZGV2aWNlIGZpbGUgKi8KKwlpZiAoaTkxNV9zY2hlZHVsZXJf ZmlsZV9xdWV1ZV9pc19mdWxsKGZpbGUpKQorCQlyZXR1cm4gLUVBR0FJTjsKKwogCWV4ZWMyX2xp c3QgPSBrbWFsbG9jKHNpemVvZigqZXhlYzJfbGlzdCkqYXJncy0+YnVmZmVyX2NvdW50LAogCQkJ ICAgICBHRlBfVEVNUE9SQVJZIHwgX19HRlBfTk9XQVJOIHwgX19HRlBfTk9SRVRSWSk7CiAJaWYg KGV4ZWMyX2xpc3QgPT0gTlVMTCkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfc2NoZWR1bGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxlci5jCmlu ZGV4IGU1NmNlMDguLmY3ZjI5ZDUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfc2NoZWR1bGVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIu YwpAQCAtNjksNiArNjksNyBAQCBpbnQgaTkxNV9zY2hlZHVsZXJfaW5pdChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQogCXNjaGVkdWxlci0+cHJpb3JpdHlfbGV2ZWxfYnVtcCAgICA9IDUwOwogCXNj aGVkdWxlci0+cHJpb3JpdHlfbGV2ZWxfcHJlZW1wdCA9IDkwMDsKIAlzY2hlZHVsZXItPm1pbl9m bHlpbmcgICAgICAgICAgICAgPSAyOworCXNjaGVkdWxlci0+ZmlsZV9xdWV1ZV9tYXggICAgICAg ICA9IDY0OwogCiAJZGV2X3ByaXYtPnNjaGVkdWxlciA9IHNjaGVkdWxlcjsKIApAQCAtNDY0LDYg KzQ2NSw0NCBAQCBzdGF0aWMgaW50IGk5MTVfc2NoZWR1bGVyX3N1Ym1pdF91bmxvY2tlZChzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogCXJldHVybiByZXQ7CiB9CiAKKy8qKgorICogaTkx NV9zY2hlZHVsZXJfZmlsZV9xdWV1ZV9pc19mdWxsIC0gUmV0dXJucyB0cnVlIGlmIHRoZSBxdWV1 ZSBpcyBmdWxsLgorICogQGZpbGU6IEZpbGUgb2JqZWN0IHRvIHF1ZXJ5LgorICogVGhpcyBhbGxv d3MgdGhyb3R0bGluZyBvZiBhcHBsaWNhdGlvbnMgYnkgbGltaXRpbmcgdGhlIHRvdGFsIG51bWJl ciBvZgorICogb3V0c3RhbmRpbmcgcmVxdWVzdHMgdG8gYSBzcGVjaWZpZWQgbGV2ZWwuIE9uY2Ug dGhhdCBsaW1pdCBpcyByZWFjaGVkLAorICogdGhpcyBjYWxsIHdpbGwgcmV0dXJuIHRydWUgYW5k IG5vIG1vcmUgcmVxdWVzdHMgc2hvdWxkIGJlIGFjY2VwdGVkLgorICovCitib29sIGk5MTVfc2No ZWR1bGVyX2ZpbGVfcXVldWVfaXNfZnVsbChzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpCit7CisJc3Ry dWN0IGRybV9pOTE1X2ZpbGVfcHJpdmF0ZSAqZmlsZV9wcml2ID0gZmlsZS0+ZHJpdmVyX3ByaXY7 CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ICA9IGZpbGVfcHJpdi0+ZGV2X3By aXY7CisJc3RydWN0IGk5MTVfc2NoZWR1bGVyICpzY2hlZHVsZXIgPSBkZXZfcHJpdi0+c2NoZWR1 bGVyOworCisJcmV0dXJuIGZpbGVfcHJpdi0+c2NoZWR1bGVyX3F1ZXVlX2xlbmd0aCA+PSBzY2hl ZHVsZXItPmZpbGVfcXVldWVfbWF4OworfQorCisvKioKKyAqIGk5MTVfc2NoZWR1bGVyX2ZpbGVf cXVldWVfaW5jIC0gSW5jcmVtZW50IHRoZSBmaWxlJ3MgcmVxdWVzdCBxdWV1ZSBjb3VudC4KKyAq IEBmaWxlOiBGaWxlIG9iamVjdCB0byBwcm9jZXNzLgorICovCitzdGF0aWMgdm9pZCBpOTE1X3Nj aGVkdWxlcl9maWxlX3F1ZXVlX2luYyhzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpCit7CisJc3RydWN0 IGRybV9pOTE1X2ZpbGVfcHJpdmF0ZSAqZmlsZV9wcml2ID0gZmlsZS0+ZHJpdmVyX3ByaXY7CisK KwlmaWxlX3ByaXYtPnNjaGVkdWxlcl9xdWV1ZV9sZW5ndGgrKzsKK30KKworLyoqCisgKiBpOTE1 X3NjaGVkdWxlcl9maWxlX3F1ZXVlX2RlYyAtIERlY3JlbWVudCB0aGUgZmlsZSdzIHJlcXVlc3Qg cXVldWUgY291bnQuCisgKiBAZmlsZTogRmlsZSBvYmplY3QgdG8gcHJvY2Vzcy4KKyAqLworc3Rh dGljIHZvaWQgaTkxNV9zY2hlZHVsZXJfZmlsZV9xdWV1ZV9kZWMoc3RydWN0IGRybV9maWxlICpm aWxlKQoreworCXN0cnVjdCBkcm1faTkxNV9maWxlX3ByaXZhdGUgKmZpbGVfcHJpdiA9IGZpbGUt PmRyaXZlcl9wcml2OworCisJZmlsZV9wcml2LT5zY2hlZHVsZXJfcXVldWVfbGVuZ3RoLS07Cit9 CisKIHN0YXRpYyB2b2lkIGk5MTVfZ2VuZXJhdGVfZGVwZW5kZW5jaWVzKHN0cnVjdCBpOTE1X3Nj aGVkdWxlciAqc2NoZWR1bGVyLAogCQkJCSAgICAgICBzdHJ1Y3QgaTkxNV9zY2hlZHVsZXJfcXVl dWVfZW50cnkgKm5vZGUsCiAJCQkJICAgICAgIHVpbnQzMl90IHJpbmcpCkBAIC02NDAsNiArNjc5 LDggQEAgaW50IGk5MTVfc2NoZWR1bGVyX3F1ZXVlX2V4ZWNidWZmZXIoc3RydWN0IGk5MTVfc2No ZWR1bGVyX3F1ZXVlX2VudHJ5ICpxZSkKIAogCWxpc3RfYWRkX3RhaWwoJm5vZGUtPmxpbmssICZz Y2hlZHVsZXItPm5vZGVfcXVldWVbcmluZy0+aWRdKTsKIAorCWk5MTVfc2NoZWR1bGVyX2ZpbGVf cXVldWVfaW5jKG5vZGUtPnBhcmFtcy5maWxlKTsKKwogCW5vdF9mbHlpbmcgPSBpOTE1X3NjaGVk dWxlcl9jb3VudF9mbHlpbmcoc2NoZWR1bGVyLCByaW5nKSA8CiAJCQkJCQkgc2NoZWR1bGVyLT5t aW5fZmx5aW5nOwogCkBAIC04ODMsNiArOTI0LDEyIEBAIHN0YXRpYyBib29sIGk5MTVfc2NoZWR1 bGVyX3JlbW92ZShzdHJ1Y3QgaTkxNV9zY2hlZHVsZXIgKnNjaGVkdWxlciwKIAkJLyogU3RyaXAg dGhlIGRlcGVuZGVuY3kgaW5mbyB3aGlsZSB0aGUgbXV0ZXggaXMgc3RpbGwgbG9ja2VkICovCiAJ CWk5MTVfc2NoZWR1bGVyX3JlbW92ZV9kZXBlbmRlbnQoc2NoZWR1bGVyLCBub2RlKTsKIAorCQkv KiBMaWtld2lzZSBjbGVhbiB1cCB0aGUgZmlsZSBwb2ludGVyLiAqLworCQlpZiAobm9kZS0+cGFy YW1zLmZpbGUpIHsKKwkJCWk5MTVfc2NoZWR1bGVyX2ZpbGVfcXVldWVfZGVjKG5vZGUtPnBhcmFt cy5maWxlKTsKKwkJCW5vZGUtPnBhcmFtcy5maWxlID0gTlVMTDsKKwkJfQorCiAJCWNvbnRpbnVl OwogCX0KIApAQCAtMTIwNSw2ICsxMjUyLDcgQEAgaW50IGk5MTVfc2NoZWR1bGVyX2Nsb3NlZmls ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpCiAJCQkJCQkg bm9kZS0+c3RhdHVzLAogCQkJCQkJIHJpbmctPm5hbWUpOwogCisJCQlpOTE1X3NjaGVkdWxlcl9m aWxlX3F1ZXVlX2RlYyhub2RlLT5wYXJhbXMuZmlsZSk7CiAJCQlub2RlLT5wYXJhbXMuZmlsZSA9 IE5VTEw7CiAJCX0KIAl9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3Nj aGVkdWxlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIuaAppbmRleCAw NzViZWZiLi5iNzhkZTEyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3Nj aGVkdWxlci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmgKQEAg LTc3LDYgKzc3LDcgQEAgc3RydWN0IGk5MTVfc2NoZWR1bGVyIHsKIAlpbnQzMl90ICAgICAgICAg ICAgIHByaW9yaXR5X2xldmVsX2J1bXA7CiAJaW50MzJfdCAgICAgICAgICAgICBwcmlvcml0eV9s ZXZlbF9wcmVlbXB0OwogCXVpbnQzMl90ICAgICAgICAgICAgbWluX2ZseWluZzsKKwl1aW50MzJf dCAgICAgICAgICAgIGZpbGVfcXVldWVfbWF4OwogfTsKIAogLyogRmxhZyBiaXRzIGZvciBpOTE1 X3NjaGVkdWxlcjo6ZmxhZ3MgKi8KQEAgLTEwMCw1ICsxMDEsNiBAQCBpbnQgaTkxNV9zY2hlZHVs ZXJfZmx1c2hfc3RhbXAoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAkJCSAgICAgICB1 bnNpZ25lZCBsb25nIHN0YW1wLCBib29sIGlzX2xvY2tlZCk7CiBib29sIGk5MTVfc2NoZWR1bGVy X2lzX3JlcXVlc3RfdHJhY2tlZChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAkJ CQkgICAgICAgYm9vbCAqY29tcGxldGVkLCBib29sICpidXN5KTsKK2Jvb2wgaTkxNV9zY2hlZHVs ZXJfZmlsZV9xdWV1ZV9pc19mdWxsKHN0cnVjdCBkcm1fZmlsZSAqZmlsZSk7CiAKICNlbmRpZiAg LyogX0k5MTVfU0NIRURVTEVSX0hfICovCi0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==