From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 12/39] drm/i915: Added scheduler hook into i915_gem_request_notify() Date: Mon, 23 Nov 2015 11:39:07 +0000 Message-ID: <1448278774-31376-13-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id C6C91721FF for ; Mon, 23 Nov 2015 03:39:47 -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 ZHVsZXIgbmVlZHMgdG8ga25vdyB3aGVuIHJlcXVlc3RzIGhhdmUgY29tcGxldGVkIHNvIHRoYXQg aXQKY2FuIGtlZXAgaXRzIG93biBpbnRlcm5hbCBzdGF0ZSB1cCB0byBkYXRlIGFuZCBjYW4gc3Vi bWl0IG5ldyByZXF1ZXN0cwp0byB0aGUgaGFyZHdhcmUgZnJvbSBpdHMgcXVldWUuCgp2MjogVXBk YXRlZCBkdWUgdG8gY2hhbmdlcyBpbiByZXF1ZXN0IGhhbmRsaW5nLiBUaGUgb3BlcmF0aW9uIGlz IG5vdwpyZXZlcnNlZCBmcm9tIGJlZm9yZS4gUmF0aGVyIHRoYW4gdGhlIHNjaGVkdWxlciBiZWlu ZyBpbiBjb250cm9sIG9mCmNvbXBsZXRpb24gZXZlbnRzLCBpdCBpcyBub3cgdGhlIHJlcXVlc3Qg Y29kZSBpdHNlbGYuIFRoZSBzY2hlZHVsZXIKbWVyZWx5IHJlY2VpdmVzIGEgbm90aWZpY2F0aW9u IGV2ZW50LiBJdCBjYW4gdGhlbiBvcHRpb25hbGx5IHJlcXVlc3QKaXQncyB3b3JrZXIgdGhyZWFk IGJlIHdva2VuIHVwIGFmdGVyIGFsbCBjb21wbGV0aW9uIHByb2Nlc3NpbmcgaXMKY29tcGxldGUu CgpDaGFuZ2UtSWQ6IEkxNDkyNTBhOGY5MzgyNTg2NTE0Y2EzMjRhYmExYzUzMDYzYjgzZTE5CkZv cjogVklaLTE1ODcKU2lnbmVkLW9mZi1ieTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29u QEludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgIHwg IDIgKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAgICAgfCAxNiArKysrKysr KysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxlci5jIHwgMjggKysr KysrKysrKysrKysrKysrLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hl ZHVsZXIuaCB8ICAxICsKIDQgZmlsZXMgY2hhbmdlZCwgMzcgaW5zZXJ0aW9ucygrKSwgMTAgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggMjNhZWQzMi4uOGM1NzZmZSAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0yMjYyLDYgKzIyNjIsOCBAQCBzdHJ1Y3QgZHJt X2k5MTVfZ2VtX3JlcXVlc3QgewogCS8qKiBwcm9jZXNzIGlkZW50aWZpZXIgc3VibWl0dGluZyB0 aGlzIHJlcXVlc3QgKi8KIAlzdHJ1Y3QgcGlkICpwaWQ7CiAKKwlzdHJ1Y3QgaTkxNV9zY2hlZHVs ZXJfcXVldWVfZW50cnkJKnNjaGVkdWxlcl9xZTsKKwogCS8qKgogCSAqIFRoZSBFTFNQIG9ubHkg YWNjZXB0cyB0d28gZWxlbWVudHMgYXQgYSB0aW1lLCBzbyB3ZSBxdWV1ZQogCSAqIGNvbnRleHQv dGFpbCBwYWlycyBvbiBhIGdpdmVuIHF1ZXVlIChyaW5nLT5leGVjbGlzdF9xdWV1ZSkgdW50aWwg dGhlCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCBkMzhlMDEzLi44YTJmYzdjIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTI3ODUsNiArMjc4NSw3IEBAIHZvaWQgaTkxNV9nZW1fcmVx dWVzdF9ub3RpZnkoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywgYm9vbCBmZW5jZV9sb2Nr ZWQpCiB7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsICpyZXFfbmV4dDsKIAl1 bnNpZ25lZCBsb25nIGZsYWdzOworCWJvb2wgd2FrZV9zY2hlZCA9IGZhbHNlOwogCXUzMiBzZXFu bzsKIAogCWlmIChsaXN0X2VtcHR5KCZyaW5nLT5mZW5jZV9zaWduYWxfbGlzdCkpIHsKQEAgLTI4 MTMsNiArMjgxNCwxNCBAQCB2b2lkIGk5MTVfZ2VtX3JlcXVlc3Rfbm90aWZ5KHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKnJpbmcsIGJvb2wgZmVuY2VfbG9ja2VkKQogCQkgKi8KIAkJbGlzdF9kZWxf aW5pdCgmcmVxLT5zaWduYWxfbGluayk7CiAKKwkJLyoKKwkJICogTkI6IE11c3Qgbm90aWZ5IHRo ZSBzY2hlZHVsZXIgYmVmb3JlIHNpZ25hbGxpbmcKKwkJICogdGhlIG5vZGUuIE90aGVyd2lzZSB0 aGUgbm9kZSBjYW4gZ2V0IHJldGlyZWQgZmlyc3QKKwkJICogYW5kIGNhbGwgc2NoZWR1bGVyX2Ns ZWFuKCkgd2hpbGUgdGhlIHNjaGVkdWxlcgorCQkgKiB0aGlua3MgaXQgaXMgc3RpbGwgYWN0aXZl LgorCQkgKi8KKwkJd2FrZV9zY2hlZCB8PSBpOTE1X3NjaGVkdWxlcl9ub3RpZnlfcmVxdWVzdChy ZXEpOworCiAJCWlmICghcmVxLT5jYW5jZWxsZWQpIHsKIAkJCWZlbmNlX3NpZ25hbF9sb2NrZWQo JnJlcS0+ZmVuY2UpOwogCQkJdHJhY2VfaTkxNV9nZW1fcmVxdWVzdF9jb21wbGV0ZShyZXEpOwpA QCAtMjgyOSw2ICsyODM4LDEzIEBAIHZvaWQgaTkxNV9nZW1fcmVxdWVzdF9ub3RpZnkoc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqcmluZywgYm9vbCBmZW5jZV9sb2NrZWQpCiAKIAlpZiAoIWZlbmNl X2xvY2tlZCkKIAkJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmcmluZy0+ZmVuY2VfbG9jaywgZmxh Z3MpOworCisJLyogTmVjZXNzYXJ5PyBPciBkb2VzIHRoZSBmZW5jZV9zaWduYWwoKSBjYWxsIGRv IGFuIGltcGxpY2l0IHdha2V1cD8gKi8KKwl3YWtlX3VwX2FsbCgmcmluZy0+aXJxX3F1ZXVlKTsK KworCS8qIEZpbmFsIHNjaGVkdWxlciBwcm9jZXNzaW5nIGFmdGVyIGFsbCBpbmRpdmlkdWFsIHVw ZGF0ZXMgYXJlIGRvbmUuICovCisJaWYgKHdha2Vfc2NoZWQpCisJCWk5MTVfc2NoZWR1bGVyX3dh a2V1cChyaW5nLT5kZXYpOwogfQogCiBzdGF0aWMgY29uc3QgY2hhciAqaTkxNV9nZW1fcmVxdWVz dF9nZXRfZHJpdmVyX25hbWUoc3RydWN0IGZlbmNlICpyZXFfZmVuY2UpCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9zY2hlZHVsZXIuYwppbmRleCAyNWU3YWRlLi5kZDljNzEwIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfc2NoZWR1bGVyLmMKQEAgLTEyMCw2ICsxMjAsOSBAQCBpbnQgaTkxNV9zY2hl ZHVsZXJfcXVldWVfZXhlY2J1ZmZlcihzdHJ1Y3QgaTkxNV9zY2hlZHVsZXJfcXVldWVfZW50cnkg KnFlKQogCW5vZGUtPnN0YW1wICA9IGppZmZpZXM7CiAJaTkxNV9nZW1fcmVxdWVzdF9yZWZlcmVu Y2Uobm9kZS0+cGFyYW1zLnJlcXVlc3QpOwogCisJQlVHX09OKG5vZGUtPnBhcmFtcy5yZXF1ZXN0 LT5zY2hlZHVsZXJfcWUpOworCW5vZGUtPnBhcmFtcy5yZXF1ZXN0LT5zY2hlZHVsZXJfcWUgPSBu b2RlOworCiAJLyogTmVlZCB0byBkZXRlcm1pbmUgdGhlIG51bWJlciBvZiBpbmNvbXBsZXRlIGVu dHJpZXMgaW4gdGhlIGxpc3QgYXMKIAkgKiB0aGF0IHdpbGwgYmUgdGhlIG1heGltdW0gc2l6ZSBv ZiB0aGUgZGVwZW5kZW5jeSBsaXN0LgogCSAqCkBAIC0zMTksMTQgKzMyMiwxNiBAQCBzdGF0aWMg dm9pZCBpOTE1X3NjaGVkdWxlcl9ub2RlX2tpbGwoc3RydWN0IGk5MTVfc2NoZWR1bGVyX3F1ZXVl X2VudHJ5ICpub2RlKQogICogY29kZSBoYXMgbWFwcGVkIGl0IGJhY2sgdG8gYSByZXF1ZXN0IGFu ZCB3aWxsIG1hcmsgdGhhdCByZXF1ZXN0IGNvbXBsZXRlLgogICogSXQgYWxzbyBjYWxscyB0aGlz IGZ1bmN0aW9uIHRvIG5vdGlmeSB0aGUgc2NoZWR1bGVyIGFib3V0IHRoZSBjb21wbGV0aW9uCiAg KiBzbyB0aGUgc2NoZWR1bGVyJ3Mgbm9kZSBjYW4gYmUgdXBkYXRlZCBhcHByb3ByaWF0ZWx5Lgot ICogUmV0dXJucyB0cnVlIGlmIHRoZSByZXF1ZXN0IGlzIHNjaGVkdWxlciBtYW5hZ2VkLCBmYWxz ZSBpZiBub3QuCisgKiBSZXR1cm5zIHRydWUgaWYgdGhlIHJlcXVlc3QgaXMgc2NoZWR1bGVyIG1h bmFnZWQsIGZhbHNlIGlmIG5vdC4gVGhlIHJldHVybgorICogdmFsdWUgaXMgY29tYmluZWQgZm9y IGFsbCBmcmVzaGx5IGNvbXBsZXRlZCByZXF1ZXN0cyBhbmQgaWYgYW55IHdlcmUgdHJ1ZQorICog dGhlbiBpOTE1X3NjaGVkdWxlcl93YWtldXAoKSBpcyBjYWxsZWQgc28gdGhlIHNjaGVkdWxlciBj YW4gZG8gZnVydGhlcgorICogcHJvY2Vzc2luZyAoc3VibWl0IG1vcmUgd29yaykgYXQgdGhlIGVu ZC4KICAqLwogYm9vbCBpOTE1X3NjaGVkdWxlcl9ub3RpZnlfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgID0gdG9faTkxNShyZXEtPnJpbmctPmRldik7CiAJc3RydWN0IGk5MTVfc2NoZWR1bGVyICAg KnNjaGVkdWxlciA9IGRldl9wcml2LT5zY2hlZHVsZXI7Ci0JLyogWFhYOiBOZWVkIHRvIG1hcCBi YWNrIGZyb20gcmVxdWVzdCB0byBub2RlICovCi0Jc3RydWN0IGk5MTVfc2NoZWR1bGVyX3F1ZXVl X2VudHJ5ICpub2RlID0gTlVMTDsKKwlzdHJ1Y3QgaTkxNV9zY2hlZHVsZXJfcXVldWVfZW50cnkg Km5vZGUgPSByZXEtPnNjaGVkdWxlcl9xZTsKIAl1bnNpZ25lZCBsb25nICAgICAgIGZsYWdzOwog CiAJaWYgKCFub2RlKQpAQCAtMzQ0LDE2ICszNDksMTggQEAgYm9vbCBpOTE1X3NjaGVkdWxlcl9u b3RpZnlfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIAogCXNwaW5f dW5sb2NrX2lycXJlc3RvcmUoJnNjaGVkdWxlci0+bG9jaywgZmxhZ3MpOwogCi0JLyoKLQkgKiBY WFg6IElmIHRoZSBpbi1mbGlnaHQgbGlzdCBpcyBub3cgZW1wdHkgdGhlbiBuZXcgd29yayBzaG91 bGQgYmUKLQkgKiBzdWJtaXR0ZWQuIEhvd2V2ZXIsIHRoaXMgZnVuY3Rpb24gaXMgY2FsbGVkIGZy b20gaW50ZXJydXB0IGNvbnRleHQKLQkgKiBhbmQgdGh1cyBjYW5ub3QgYWNxdWlyZSBtdXRleCBs b2NrcyBhbmQgb3RoZXIgc3VjaCB0aGluZ3MgdGhhdCBhcmUKLQkgKiBuZWNlc3NhcnkgZm9yIGZy ZXNoIHN1Ym1pc3Npb24uCi0JICovCi0KIAlyZXR1cm4gdHJ1ZTsKIH0KIAorLyoKKyAqIENhbGxl ZCBhdCB0aGUgZW5kIG9mIHNlcW5vIGludGVycnVwdCBwcm9jZXNzaW5nIGlmIGFueSByZXF1ZXN0 IGhhcworICogY29tcGxldGVkIHRoYXQgY29ycmVzcG9uZHMgdG8gYSBzY2hlZHVsZXIgbm9kZS4K KyAqLwordm9pZCBpOTE1X3NjaGVkdWxlcl93YWtldXAoc3RydWN0IGRybV9kZXZpY2UgKmRldikK K3sKKwkvKiBYWFg6IE5lZWQgdG8gY2FsbCBpOTE1X3NjaGVkdWxlcl9yZW1vdmUoKSB2aWEgd29y ayBoYW5kbGVyLiAqLworfQorCiBpbnQgaTkxNV9zY2hlZHVsZXJfcmVtb3ZlKHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKnJpbmcpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 ID0gcmluZy0+ZGV2LT5kZXZfcHJpdmF0ZTsKQEAgLTQ2OCw2ICs0NzUsNyBAQCBpbnQgaTkxNV9z Y2hlZHVsZXJfcmVtb3ZlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAJCQlpOTE1X2dl bV9leGVjYnVmZl9yZWxlYXNlX2JhdGNoX29iaihub2RlLT5wYXJhbXMuYmF0Y2hfb2JqKTsKIAog CQkvKiBGcmVlIGV2ZXJ5dGhpbmcgdGhhdCBpcyBvd25lZCBieSB0aGUgbm9kZTogKi8KKwkJbm9k ZS0+cGFyYW1zLnJlcXVlc3QtPnNjaGVkdWxlcl9xZSA9IE5VTEw7CiAJCWk5MTVfZ2VtX3JlcXVl c3RfdW5yZWZlcmVuY2Uobm9kZS0+cGFyYW1zLnJlcXVlc3QpOwogCQlrZnJlZShub2RlLT5wYXJh bXMuY2xpcHJlY3RzKTsKIAkJa2ZyZWUobm9kZS0+ZGVwX2xpc3QpOwpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfc2NoZWR1bGVyLmgKaW5kZXggOTczNmI4ZC4uYTBiMzhiOCAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X3NjaGVkdWxlci5oCkBAIC04OSw1ICs4OSw2IEBAIGludCAgICAgICAgIGk5MTVf c2NoZWR1bGVyX2Nsb3NlZmlsZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJCSAgICAgc3Ry dWN0IGRybV9maWxlICpmaWxlKTsKIGludCAgICAgICAgIGk5MTVfc2NoZWR1bGVyX3F1ZXVlX2V4 ZWNidWZmZXIoc3RydWN0IGk5MTVfc2NoZWR1bGVyX3F1ZXVlX2VudHJ5ICpxZSk7CiBib29sICAg ICAgICBpOTE1X3NjaGVkdWxlcl9ub3RpZnlfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl cXVlc3QgKnJlcSk7Cit2b2lkICAgICAgICBpOTE1X3NjaGVkdWxlcl93YWtldXAoc3RydWN0IGRy bV9kZXZpY2UgKmRldik7CiAKICNlbmRpZiAgLyogX0k5MTVfU0NIRURVTEVSX0hfICovCi0tIAox LjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK