From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 28/39] drm/i915: Added scheduler queue throttling by DRM file handle Date: Mon, 23 Nov 2015 11:39:23 +0000 Message-ID: <1448278774-31376-29-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 1BACF6E517 for ; Mon, 23 Nov 2015 03:40:08 -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 ZHVsZXIgZGVjb3VwbGVzIHRoZSBzdWJtaXNzaW9uIG9mIGJhdGNoIGJ1ZmZlcnMgdG8gdGhlIGRy aXZlciBmcm9tIHRoZWlyCnN1YnNlcXVlbnQgc3VibWlzc2lvbiB0byB0aGUgaGFyZHdhcmUuIFRo aXMgbWVhbnMgdGhhdCBhbiBhcHBsaWNhdGlvbiB3aGljaCBpcwpjb250aW51b3VzbHkgc3VibWl0 dGluZyBidWZmZXJzIGFzIGZhc3QgYXMgaXQgY2FuIGNvdWxkIHBvdGVudGlhbHkgZmxvb2QgdGhl CmRyaXZlci4gVG8gcHJldmVudCB0aGlzLCB0aGUgZHJpdmVyIG5vdyB0cmFja3MgaG93IG1hbnkg YnVmZmVycyBhcmUgaW4gcHJvZ3Jlc3MKKHF1ZXVlZCBpbiBzb2Z0d2FyZSBvciBleGVjdXRpbmcg aW4gaGFyZHdhcmUpIGFuZCBsaW1pdHMgdGhpcyB0byBhIGdpdmVuCih0dW5hYmxlKSBudW1iZXIu IElmIHRoaXMgbnVtYmVyIGlzIGV4Y2VlZGVkIHRoZW4gdGhlIHF1ZXVlIHRvIHRoZSBkcml2ZXIg d2lsbApyZXR1cm4gRUFHQUlOIGFuZCB0aHVzIHByZXZlbnQgdGhlIHNjaGVkdWxlcidzIHF1ZXVl IGJlY29taW5nIGFyYml0cmFyaWx5IGxhcmdlLgoKQ2hhbmdlLUlkOiBJODMyNTgyNDBhZWM3Yzgx MGRiMDhjMDA2YTMwNjJkNDZhYTkxMzYzZgpGb3I6IFZJWi0xNTg3ClNpZ25lZC1vZmYtYnk6IEpv aG4gSGFycmlzb24gPEpvaG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgICAgIHwgIDIgKysKIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyB8ICA4ICsrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfc2NoZWR1bGVyLmMgICAgICB8IDM0ICsrKysrKysrKysrKysrKysrKysrKysrKysr KysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIuaCAgICAgIHwgIDIgKysK IDQgZmlsZXMgY2hhbmdlZCwgNDYgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o CmluZGV4IDQxODdlNzUuLjRlY2I2ZTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMzQy LDYgKzM0Miw4IEBAIHN0cnVjdCBkcm1faTkxNV9maWxlX3ByaXZhdGUgewogCX0gcnBzOwogCiAJ c3RydWN0IGludGVsX2VuZ2luZV9jcyAqYnNkX3Jpbmc7CisKKwl1MzIgc2NoZWR1bGVyX3F1ZXVl X2xlbmd0aDsKIH07CiAKIGVudW0gaW50ZWxfZHBsbF9pZCB7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKaW5kZXggZTc0OGZkMy4uOGFjYTM3NCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwpAQCAtMTg1Nyw2ICsxODU3LDEw IEBAIGk5MTVfZ2VtX2V4ZWNidWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0 YSwKIAkJcmV0dXJuIC1FSU5WQUw7CiAJfQogCisJLyogVGhyb3R0bGUgYmF0Y2ggcmVxdWVzdHMg cGVyIGRldmljZSBmaWxlICovCisJaWYgKGk5MTVfc2NoZWR1bGVyX2ZpbGVfcXVldWVfaXNfZnVs bChmaWxlKSkKKwkJcmV0dXJuIC1FQUdBSU47CisKIAkvKiBDb3B5IGluIHRoZSBleGVjIGxpc3Qg ZnJvbSB1c2VybGFuZCAqLwogCWV4ZWNfbGlzdCA9IGRybV9tYWxsb2NfYWIoc2l6ZW9mKCpleGVj X2xpc3QpLCBhcmdzLT5idWZmZXJfY291bnQpOwogCWV4ZWMyX2xpc3QgPSBkcm1fbWFsbG9jX2Fi KHNpemVvZigqZXhlYzJfbGlzdCksIGFyZ3MtPmJ1ZmZlcl9jb3VudCk7CkBAIC0xOTQwLDYgKzE5 NDQsMTAgQEAgaTkxNV9nZW1fZXhlY2J1ZmZlcjIoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9p ZCAqZGF0YSwKIAkJcmV0dXJuIC1FSU5WQUw7CiAJfQogCisJLyogVGhyb3R0bGUgYmF0Y2ggcmVx dWVzdHMgcGVyIGRldmljZSBmaWxlICovCisJaWYgKGk5MTVfc2NoZWR1bGVyX2ZpbGVfcXVldWVf aXNfZnVsbChmaWxlKSkKKwkJcmV0dXJuIC1FQUdBSU47CisKIAlleGVjMl9saXN0ID0ga21hbGxv YyhzaXplb2YoKmV4ZWMyX2xpc3QpKmFyZ3MtPmJ1ZmZlcl9jb3VudCwKIAkJCSAgICAgR0ZQX1RF TVBPUkFSWSB8IF9fR0ZQX05PV0FSTiB8IF9fR0ZQX05PUkVUUlkpOwogCWlmIChleGVjMl9saXN0 ID09IE5VTEwpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxl ci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIuYwppbmRleCAwOThmNjlh Li5mZjY0NjBlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxl ci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmMKQEAgLTQwLDYg KzQwLDggQEAgc3RhdGljIHZvaWQgICAgICAgIGk5MTVfc2NoZWR1bGVyX3ByaW9yaXR5X2J1bXBf Y2xlYXIoc3RydWN0IGk5MTVfc2NoZWR1bGVyICpzY2gKIHN0YXRpYyBpbnQgICAgICAgICBpOTE1 X3NjaGVkdWxlcl9wcmlvcml0eV9idW1wKHN0cnVjdCBpOTE1X3NjaGVkdWxlciAqc2NoZWR1bGVy LAogCQkJCQkJc3RydWN0IGk5MTVfc2NoZWR1bGVyX3F1ZXVlX2VudHJ5ICp0YXJnZXQsCiAJCQkJ CQl1aW50MzJfdCBidW1wKTsKK3N0YXRpYyB2b2lkICAgICAgICBpOTE1X3NjaGVkdWxlcl9maWxl X3F1ZXVlX2luYyhzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpOworc3RhdGljIHZvaWQgICAgICAgIGk5 MTVfc2NoZWR1bGVyX2ZpbGVfcXVldWVfZGVjKHN0cnVjdCBkcm1fZmlsZSAqZmlsZSk7CiAKIGJv b2wgaTkxNV9zY2hlZHVsZXJfaXNfZW5hYmxlZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewpA QCAtNzQsNiArNzYsNyBAQCBpbnQgaTkxNV9zY2hlZHVsZXJfaW5pdChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogCXNjaGVkdWxlci0+cHJpb3JpdHlfbGV2ZWxfbWF4ICAgICA9IDEwMjM7CiAJc2No ZWR1bGVyLT5wcmlvcml0eV9sZXZlbF9wcmVlbXB0ID0gOTAwOwogCXNjaGVkdWxlci0+bWluX2Zs eWluZyAgICAgICAgICAgICA9IDI7CisJc2NoZWR1bGVyLT5maWxlX3F1ZXVlX21heCAgICAgICAg ID0gNjQ7CiAKIAlkZXZfcHJpdi0+c2NoZWR1bGVyID0gc2NoZWR1bGVyOwogCkBAIC0yNDQsNiAr MjQ3LDggQEAgaW50IGk5MTVfc2NoZWR1bGVyX3F1ZXVlX2V4ZWNidWZmZXIoc3RydWN0IGk5MTVf c2NoZWR1bGVyX3F1ZXVlX2VudHJ5ICpxZSkKIAogCWxpc3RfYWRkX3RhaWwoJm5vZGUtPmxpbmss ICZzY2hlZHVsZXItPm5vZGVfcXVldWVbcmluZy0+aWRdKTsKIAorCWk5MTVfc2NoZWR1bGVyX2Zp bGVfcXVldWVfaW5jKG5vZGUtPnBhcmFtcy5maWxlKTsKKwogCWlmIChpOTE1LnNjaGVkdWxlcl9v dmVycmlkZSAmIGk5MTVfc29fc3VibWl0X29uX3F1ZXVlKQogCQlub3RfZmx5aW5nID0gdHJ1ZTsK IAllbHNlCkBAIC01MjMsNiArNTI4LDEyIEBAIHN0YXRpYyBpbnQgaTkxNV9zY2hlZHVsZXJfcmVt b3ZlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAJCS8qIFN0cmlwIHRoZSBkZXBlbmRl bmN5IGluZm8gd2hpbGUgdGhlIG11dGV4IGlzIHN0aWxsIGxvY2tlZCAqLwogCQlpOTE1X3NjaGVk dWxlcl9yZW1vdmVfZGVwZW5kZW50KHNjaGVkdWxlciwgbm9kZSk7CiAKKwkJLyogTGlrZXdpc2Ug Y2xlYW4gdXAgdGhlIGZpbGUgZGVzY3JpcHRvciBiZWZvcmUgaXQgbWlnaHQgZGlzYXBwZWFyLiAq LworCQlpZiAobm9kZS0+cGFyYW1zLmZpbGUpIHsKKwkJCWk5MTVfc2NoZWR1bGVyX2ZpbGVfcXVl dWVfZGVjKG5vZGUtPnBhcmFtcy5maWxlKTsKKwkJCW5vZGUtPnBhcmFtcy5maWxlID0gTlVMTDsK KwkJfQorCiAJCWNvbnRpbnVlOwogCX0KIApAQCAtMTI1NiwzICsxMjY3LDI2IEBAIGludCBpOTE1 X3NjaGVkdWxlcl9jbG9zZWZpbGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9m aWxlICpmaWxlKQogCiAJcmV0dXJuIDA7CiB9CisKK2Jvb2wgaTkxNV9zY2hlZHVsZXJfZmlsZV9x dWV1ZV9pc19mdWxsKHN0cnVjdCBkcm1fZmlsZSAqZmlsZSkKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVf ZmlsZV9wcml2YXRlICpmaWxlX3ByaXYgPSBmaWxlLT5kcml2ZXJfcHJpdjsKKwlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAgICAgICpkZXZfcHJpdiAgPSBmaWxlX3ByaXYtPmRldl9wcml2OworCXN0 cnVjdCBpOTE1X3NjaGVkdWxlciAgICAgICAgKnNjaGVkdWxlciA9IGRldl9wcml2LT5zY2hlZHVs ZXI7CisKKwlyZXR1cm4gZmlsZV9wcml2LT5zY2hlZHVsZXJfcXVldWVfbGVuZ3RoID49IHNjaGVk dWxlci0+ZmlsZV9xdWV1ZV9tYXg7Cit9CisKK3N0YXRpYyB2b2lkIGk5MTVfc2NoZWR1bGVyX2Zp bGVfcXVldWVfaW5jKHN0cnVjdCBkcm1fZmlsZSAqZmlsZSkKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVf ZmlsZV9wcml2YXRlICpmaWxlX3ByaXYgPSBmaWxlLT5kcml2ZXJfcHJpdjsKKworCWZpbGVfcHJp di0+c2NoZWR1bGVyX3F1ZXVlX2xlbmd0aCsrOworfQorCitzdGF0aWMgdm9pZCBpOTE1X3NjaGVk dWxlcl9maWxlX3F1ZXVlX2RlYyhzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpCit7CisJc3RydWN0IGRy bV9pOTE1X2ZpbGVfcHJpdmF0ZSAqZmlsZV9wcml2ID0gZmlsZS0+ZHJpdmVyX3ByaXY7CisKKwlm aWxlX3ByaXYtPnNjaGVkdWxlcl9xdWV1ZV9sZW5ndGgtLTsKK30KZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X3NjaGVkdWxlci5oCmluZGV4IGFkZmExZTAuLjc0ZDczMjEgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9zY2hlZHVsZXIuaApAQCAtODEsNiArODEsNyBAQCBzdHJ1Y3QgaTkxNV9zY2hlZHVs ZXIgewogCWludDMyX3QgICAgICAgICAgICAgcHJpb3JpdHlfbGV2ZWxfbWF4OwogCWludDMyX3Qg ICAgICAgICAgICAgcHJpb3JpdHlfbGV2ZWxfcHJlZW1wdDsKIAl1aW50MzJfdCAgICAgICAgICAg IG1pbl9mbHlpbmc7CisJdWludDMyX3QgICAgICAgICAgICBmaWxlX3F1ZXVlX21heDsKIH07CiAK IC8qIEZsYWcgYml0cyBmb3IgaTkxNV9zY2hlZHVsZXI6OmZsYWdzICovCkBAIC0xMTEsNSArMTEy LDYgQEAgaW50ICAgICAgICAgaTkxNV9zY2hlZHVsZXJfZmx1c2hfcmVxdWVzdChzdHJ1Y3QgZHJt X2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAkJCQkJIGJvb2wgaXNfbG9ja2VkKTsKIGJvb2wgICAg ICAgIGk5MTVfc2NoZWR1bGVyX2lzX3JlcXVlc3RfdHJhY2tlZChzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X3JlcXVlc3QgKnJlcSwKIAkJCQkJICAgICAgYm9vbCAqY29tcGxldGVkLCBib29sICpidXN5KTsK K2Jvb2wgICAgICAgIGk5MTVfc2NoZWR1bGVyX2ZpbGVfcXVldWVfaXNfZnVsbChzdHJ1Y3QgZHJt X2ZpbGUgKmZpbGUpOwogCiAjZW5kaWYgIC8qIF9JOTE1X1NDSEVEVUxFUl9IXyAqLwotLSAKMS45 LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVs LWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==