From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [RFC 30/39] drm/i915: Added scheduler queue throttling by DRM file handle Date: Fri, 17 Jul 2015 15:33:39 +0100 Message-ID: <1437143628-6329-31-git-send-email-John.C.Harrison@Intel.com> References: <1437143628-6329-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 7D1C56ED88 for ; Fri, 17 Jul 2015 07:34:26 -0700 (PDT) In-Reply-To: <1437143628-6329-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 aXZlciBmcm9tIHRoZWlyCnN1YnNlcXVlbnQgc3VibWlzc2lvbiB0byB0aGUgaGFyZHdhcmUuIFRo aXMgbWVhbnMgdGhhdCBhbiBhcHBsaWNhdGlvbiB3aGljaCBpcwpjb250aW51b3VzbHkgc3VibWl0 dGluZyBidWZmZXJzIGFzIGZhc3QgYXMgaXQgY2FuIGNvdWxkIHBvdGVudGlhbHkgZmxvb2QgdGhl CmRyaXZlci4gVG8gcHJldmVudCB0aGlzLCB0aGUgZHJpdmVyIG5vdyB0cmFja3MgaG93IG1hbnkg YnVmZmVycyBhcmUgaW4gcHJvZ3Jlc3MKKHF1ZXVlZCBpbiBzb2Z0d2FyZSBvciBleGVjdXRpbmcg aW4gaGFyZHdhcmUpIGFuZCBsaW1pdHMgdGhpcyB0byBhIGdpdmVuCih0dW5hYmxlKSBudW1iZXIu IElmIHRoaXMgbnVtYmVyIGlzIGV4Y2VlZGVkIHRoZW4gdGhlIHF1ZXVlIHRvIHRoZSBkcml2ZXIg d2lsbApyZXR1cm4gRUFHQUlOIGFuZCB0aHVzIHByZXZlbnQgdGhlIHNjaGVkdWxlcidzIHF1ZXVl IGJlY29taW5nIGFyYml0cmFyaWx5IGxhcmdlLgoKQ2hhbmdlLUlkOiBJODMyNTgyNDBhZWM3Yzgx MGRiMDhjMDA2YTMwNjJkNDZhYTkxMzYzZgpGb3I6IFZJWi0xNTg3ClNpZ25lZC1vZmYtYnk6IEpv aG4gSGFycmlzb24gPEpvaG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgICAgIHwgIDIgKysKIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyB8ICA4ICsrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfc2NoZWR1bGVyLmMgICAgICB8IDM0ICsrKysrKysrKysrKysrKysrKysrKysrKysr KysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIuaCAgICAgIHwgIDIgKysK IDQgZmlsZXMgY2hhbmdlZCwgNDYgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o CmluZGV4IGI1Njg0MzIuLmUyMzA2MzIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMzM0 LDYgKzMzNCw4IEBAIHN0cnVjdCBkcm1faTkxNV9maWxlX3ByaXZhdGUgewogCX0gcnBzOwogCiAJ c3RydWN0IGludGVsX2VuZ2luZV9jcyAqYnNkX3Jpbmc7CisKKwl1MzIgc2NoZWR1bGVyX3F1ZXVl X2xlbmd0aDsKIH07CiAKIGVudW0gaW50ZWxfZHBsbF9pZCB7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKaW5kZXggZjkwYTJjOC4uYzJhNjlkOCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwpAQCAtMTkzNSw2ICsxOTM1LDEw IEBAIGk5MTVfZ2VtX2V4ZWNidWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0 YSwKIAkJcmV0dXJuIC1FSU5WQUw7CiAJfQogCisJLyogVGhyb3R0bGUgYmF0Y2ggcmVxdWVzdHMg cGVyIGRldmljZSBmaWxlICovCisJaWYgKGk5MTVfc2NoZWR1bGVyX2ZpbGVfcXVldWVfaXNfZnVs bChmaWxlKSkKKwkJcmV0dXJuIC1FQUdBSU47CisKIAkvKiBDb3B5IGluIHRoZSBleGVjIGxpc3Qg ZnJvbSB1c2VybGFuZCAqLwogCWV4ZWNfbGlzdCA9IGRybV9tYWxsb2NfYWIoc2l6ZW9mKCpleGVj X2xpc3QpLCBhcmdzLT5idWZmZXJfY291bnQpOwogCWV4ZWMyX2xpc3QgPSBkcm1fbWFsbG9jX2Fi KHNpemVvZigqZXhlYzJfbGlzdCksIGFyZ3MtPmJ1ZmZlcl9jb3VudCk7CkBAIC0yMDE4LDYgKzIw MjIsMTAgQEAgaTkxNV9nZW1fZXhlY2J1ZmZlcjIoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9p ZCAqZGF0YSwKIAkJcmV0dXJuIC1FSU5WQUw7CiAJfQogCisJLyogVGhyb3R0bGUgYmF0Y2ggcmVx dWVzdHMgcGVyIGRldmljZSBmaWxlICovCisJaWYgKGk5MTVfc2NoZWR1bGVyX2ZpbGVfcXVldWVf aXNfZnVsbChmaWxlKSkKKwkJcmV0dXJuIC1FQUdBSU47CisKIAlleGVjMl9saXN0ID0ga21hbGxv YyhzaXplb2YoKmV4ZWMyX2xpc3QpKmFyZ3MtPmJ1ZmZlcl9jb3VudCwKIAkJCSAgICAgR0ZQX1RF TVBPUkFSWSB8IF9fR0ZQX05PV0FSTiB8IF9fR0ZQX05PUkVUUlkpOwogCWlmIChleGVjMl9saXN0 ID09IE5VTEwpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxl ci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIuYwppbmRleCA0MDhiZWRj Li5mMGM5OWFkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxl ci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmMKQEAgLTQwLDYg KzQwLDggQEAgc3RhdGljIHZvaWQgICAgICAgIGk5MTVfc2NoZWR1bGVyX3ByaW9yaXR5X2J1bXBf Y2xlYXIoc3RydWN0IGk5MTVfc2NoZWR1bGVyICpzY2gKIHN0YXRpYyBpbnQgICAgICAgICBpOTE1 X3NjaGVkdWxlcl9wcmlvcml0eV9idW1wKHN0cnVjdCBpOTE1X3NjaGVkdWxlciAqc2NoZWR1bGVy LAogCQkJCQkJc3RydWN0IGk5MTVfc2NoZWR1bGVyX3F1ZXVlX2VudHJ5ICp0YXJnZXQsCiAJCQkJ CQl1aW50MzJfdCBidW1wKTsKK3N0YXRpYyB2b2lkICAgICAgICBpOTE1X3NjaGVkdWxlcl9maWxl X3F1ZXVlX2luYyhzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpOworc3RhdGljIHZvaWQgICAgICAgIGk5 MTVfc2NoZWR1bGVyX2ZpbGVfcXVldWVfZGVjKHN0cnVjdCBkcm1fZmlsZSAqZmlsZSk7CiAKIGJv b2wgaTkxNV9zY2hlZHVsZXJfaXNfZW5hYmxlZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewpA QCAtNzUsNiArNzcsNyBAQCBpbnQgaTkxNV9zY2hlZHVsZXJfaW5pdChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogCXNjaGVkdWxlci0+cHJpb3JpdHlfbGV2ZWxfbWF4ICAgICA9IH4wVTsKIAlzY2hl ZHVsZXItPnByaW9yaXR5X2xldmVsX3ByZWVtcHQgPSA5MDA7CiAJc2NoZWR1bGVyLT5taW5fZmx5 aW5nICAgICAgICAgICAgID0gMjsKKwlzY2hlZHVsZXItPmZpbGVfcXVldWVfbWF4ICAgICAgICAg PSA2NDsKIAogCWRldl9wcml2LT5zY2hlZHVsZXIgPSBzY2hlZHVsZXI7CiAKQEAgLTI0OSw2ICsy NTIsOCBAQCBpbnQgaTkxNV9zY2hlZHVsZXJfcXVldWVfZXhlY2J1ZmZlcihzdHJ1Y3QgaTkxNV9z Y2hlZHVsZXJfcXVldWVfZW50cnkgKnFlKQogCiAJbGlzdF9hZGRfdGFpbCgmbm9kZS0+bGluaywg JnNjaGVkdWxlci0+bm9kZV9xdWV1ZVtyaW5nLT5pZF0pOwogCisJaTkxNV9zY2hlZHVsZXJfZmls ZV9xdWV1ZV9pbmMobm9kZS0+cGFyYW1zLmZpbGUpOworCiAJaWYgKGk5MTUuc2NoZWR1bGVyX292 ZXJyaWRlICYgaTkxNV9zb19zdWJtaXRfb25fcXVldWUpCiAJCW5vdF9mbHlpbmcgPSB0cnVlOwog CWVsc2UKQEAgLTYzMCw2ICs2MzUsMTIgQEAgc3RhdGljIGludCBpOTE1X3NjaGVkdWxlcl9yZW1v dmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIAkJLyogU3RyaXAgdGhlIGRlcGVuZGVu Y3kgaW5mbyB3aGlsZSB0aGUgbXV0ZXggaXMgc3RpbGwgbG9ja2VkICovCiAJCWk5MTVfc2NoZWR1 bGVyX3JlbW92ZV9kZXBlbmRlbnQoc2NoZWR1bGVyLCBub2RlKTsKIAorCQkvKiBMaWtld2lzZSBj bGVhbiB1cCB0aGUgZmlsZSBkZXNjcmlwdG9yIGJlZm9yZSBpdCBtaWdodCBkaXNhcHBlYXIuICov CisJCWlmIChub2RlLT5wYXJhbXMuZmlsZSkgeworCQkJaTkxNV9zY2hlZHVsZXJfZmlsZV9xdWV1 ZV9kZWMobm9kZS0+cGFyYW1zLmZpbGUpOworCQkJbm9kZS0+cGFyYW1zLmZpbGUgPSBOVUxMOwor CQl9CisKIAkJY29udGludWU7CiAJfQogCkBAIC0xMzMwLDMgKzEzNDEsMjYgQEAgaW50IGk5MTVf c2NoZWR1bGVyX2Nsb3NlZmlsZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2Zp bGUgKmZpbGUpCiAKIAlyZXR1cm4gMDsKIH0KKworYm9vbCBpOTE1X3NjaGVkdWxlcl9maWxlX3F1 ZXVlX2lzX2Z1bGwoc3RydWN0IGRybV9maWxlICpmaWxlKQoreworCXN0cnVjdCBkcm1faTkxNV9m aWxlX3ByaXZhdGUgKmZpbGVfcHJpdiA9IGZpbGUtPmRyaXZlcl9wcml2OworCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICAgICAgKmRldl9wcml2ICA9IGZpbGVfcHJpdi0+ZGV2X3ByaXY7CisJc3Ry dWN0IGk5MTVfc2NoZWR1bGVyICAgICAgICAqc2NoZWR1bGVyID0gZGV2X3ByaXYtPnNjaGVkdWxl cjsKKworCXJldHVybiBmaWxlX3ByaXYtPnNjaGVkdWxlcl9xdWV1ZV9sZW5ndGggPj0gc2NoZWR1 bGVyLT5maWxlX3F1ZXVlX21heDsKK30KKworc3RhdGljIHZvaWQgaTkxNV9zY2hlZHVsZXJfZmls ZV9xdWV1ZV9pbmMoc3RydWN0IGRybV9maWxlICpmaWxlKQoreworCXN0cnVjdCBkcm1faTkxNV9m aWxlX3ByaXZhdGUgKmZpbGVfcHJpdiA9IGZpbGUtPmRyaXZlcl9wcml2OworCisJZmlsZV9wcml2 LT5zY2hlZHVsZXJfcXVldWVfbGVuZ3RoKys7Cit9CisKK3N0YXRpYyB2b2lkIGk5MTVfc2NoZWR1 bGVyX2ZpbGVfcXVldWVfZGVjKHN0cnVjdCBkcm1fZmlsZSAqZmlsZSkKK3sKKwlzdHJ1Y3QgZHJt X2k5MTVfZmlsZV9wcml2YXRlICpmaWxlX3ByaXYgPSBmaWxlLT5kcml2ZXJfcHJpdjsKKworCWZp bGVfcHJpdi0+c2NoZWR1bGVyX3F1ZXVlX2xlbmd0aC0tOworfQpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfc2NoZWR1bGVyLmgKaW5kZXggM2Y5NDUxMi4uMzAxYzU2NyAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X3NjaGVkdWxlci5oCkBAIC04Nyw2ICs4Nyw3IEBAIHN0cnVjdCBpOTE1X3NjaGVkdWxl ciB7CiAJdWludDMyX3QgICAgICAgICAgICBwcmlvcml0eV9sZXZlbF9tYXg7CiAJdWludDMyX3Qg ICAgICAgICAgICBwcmlvcml0eV9sZXZlbF9wcmVlbXB0OwogCXVpbnQzMl90ICAgICAgICAgICAg bWluX2ZseWluZzsKKwl1aW50MzJfdCAgICAgICAgICAgIGZpbGVfcXVldWVfbWF4OwogfTsKIAog LyogRmxhZyBiaXRzIGZvciBpOTE1X3NjaGVkdWxlcjo6ZmxhZ3MgKi8KQEAgLTEyMCw1ICsxMjEs NiBAQCBpbnQgICAgICAgICBpOTE1X3NjaGVkdWxlcl9mbHVzaF9yZXF1ZXN0KHN0cnVjdCBkcm1f aTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogCQkJCQkgYm9vbCBpc19sb2NrZWQpOwogYm9vbCAgICAg ICAgaTkxNV9zY2hlZHVsZXJfaXNfcmVxdWVzdF90cmFja2VkKHN0cnVjdCBkcm1faTkxNV9nZW1f cmVxdWVzdCAqcmVxLAogCQkJCQkgICAgICBib29sICpjb21wbGV0ZWQsIGJvb2wgKmJ1c3kpOwor Ym9vbCAgICAgICAgaTkxNV9zY2hlZHVsZXJfZmlsZV9xdWV1ZV9pc19mdWxsKHN0cnVjdCBkcm1f ZmlsZSAqZmlsZSk7CiAKICNlbmRpZiAgLyogX0k5MTVfU0NIRURVTEVSX0hfICovCi0tIAoxLjku MQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK