From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH v4 12/38] drm/i915: Added scheduler hook into i915_gem_request_notify() Date: Mon, 11 Jan 2016 18:42:41 +0000 Message-ID: <1452537788-32136-13-git-send-email-John.C.Harrison@Intel.com> References: <1448278774-31376-1-git-send-email-John.C.Harrison@Intel.com> <1452537788-32136-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id A2BB86E519 for ; Mon, 11 Jan 2016 10:43:22 -0800 (PST) In-Reply-To: <1452537788-32136-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 Cgp2NDogRG93bmdyYWRlZCBhIEJVR19PTiB0byBhIFdBUk5fT04gYXMgdGhlIGxhdHRlciBpcyBw cmVmZXJyZWQuCgpGb3I6IFZJWi0xNTg3ClNpZ25lZC1vZmYtYnk6IEpvaG4gSGFycmlzb24gPEpv aG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaCAgICAgICB8ICAyICsrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICAg IHwgMTYgKysrKysrKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVs ZXIuYyB8IDI4ICsrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfc2NoZWR1bGVyLmggfCAgMSArCiA0IGZpbGVzIGNoYW5nZWQsIDM3IGluc2VydGlv bnMoKyksIDEwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDM4ZjQy M2IuLmFjNGQ0NGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjI2Miw2ICsyMjYyLDgg QEAgc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0IHsKIAkvKiogcHJvY2VzcyBpZGVudGlmaWVy IHN1Ym1pdHRpbmcgdGhpcyByZXF1ZXN0ICovCiAJc3RydWN0IHBpZCAqcGlkOwogCisJc3RydWN0 IGk5MTVfc2NoZWR1bGVyX3F1ZXVlX2VudHJ5CSpzY2hlZHVsZXJfcWU7CisKIAkvKioKIAkgKiBU aGUgRUxTUCBvbmx5IGFjY2VwdHMgdHdvIGVsZW1lbnRzIGF0IGEgdGltZSwgc28gd2UgcXVldWUK IAkgKiBjb250ZXh0L3RhaWwgcGFpcnMgb24gYSBnaXZlbiBxdWV1ZSAocmluZy0+ZXhlY2xpc3Rf cXVldWUpIHVudGlsIHRoZQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggZDRmMWQ2My4uM2Qx MDliNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0yODE3LDYgKzI4MTcsNyBAQCB2b2lk IGk5MTVfZ2VtX3JlcXVlc3Rfbm90aWZ5KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsIGJv b2wgZmVuY2VfbG9ja2VkKQogewogCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLCAq cmVxX25leHQ7CiAJdW5zaWduZWQgbG9uZyBmbGFnczsKKwlib29sIHdha2Vfc2NoZWQgPSBmYWxz ZTsKIAl1MzIgc2Vxbm87CiAKIAlpZiAobGlzdF9lbXB0eSgmcmluZy0+ZmVuY2Vfc2lnbmFsX2xp c3QpKSB7CkBAIC0yODUyLDYgKzI4NTMsMTQgQEAgdm9pZCBpOTE1X2dlbV9yZXF1ZXN0X25vdGlm eShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLCBib29sIGZlbmNlX2xvY2tlZCkKIAkJICov CiAJCWxpc3RfZGVsX2luaXQoJnJlcS0+c2lnbmFsX2xpbmspOwogCisJCS8qCisJCSAqIE5COiBN dXN0IG5vdGlmeSB0aGUgc2NoZWR1bGVyIGJlZm9yZSBzaWduYWxsaW5nCisJCSAqIHRoZSBub2Rl LiBPdGhlcndpc2UgdGhlIG5vZGUgY2FuIGdldCByZXRpcmVkIGZpcnN0CisJCSAqIGFuZCBjYWxs IHNjaGVkdWxlcl9jbGVhbigpIHdoaWxlIHRoZSBzY2hlZHVsZXIKKwkJICogdGhpbmtzIGl0IGlz IHN0aWxsIGFjdGl2ZS4KKwkJICovCisJCXdha2Vfc2NoZWQgfD0gaTkxNV9zY2hlZHVsZXJfbm90 aWZ5X3JlcXVlc3QocmVxKTsKKwogCQlpZiAoIXJlcS0+Y2FuY2VsbGVkKSB7CiAJCQlmZW5jZV9z aWduYWxfbG9ja2VkKCZyZXEtPmZlbmNlKTsKIAkJCXRyYWNlX2k5MTVfZ2VtX3JlcXVlc3RfY29t cGxldGUocmVxKTsKQEAgLTI4NjgsNiArMjg3NywxMyBAQCB2b2lkIGk5MTVfZ2VtX3JlcXVlc3Rf bm90aWZ5KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsIGJvb2wgZmVuY2VfbG9ja2VkKQog CiAJaWYgKCFmZW5jZV9sb2NrZWQpCiAJCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJnJpbmctPmZl bmNlX2xvY2ssIGZsYWdzKTsKKworCS8qIE5lY2Vzc2FyeT8gT3IgZG9lcyB0aGUgZmVuY2Vfc2ln bmFsKCkgY2FsbCBkbyBhbiBpbXBsaWNpdCB3YWtldXA/ICovCisJd2FrZV91cF9hbGwoJnJpbmct PmlycV9xdWV1ZSk7CisKKwkvKiBGaW5hbCBzY2hlZHVsZXIgcHJvY2Vzc2luZyBhZnRlciBhbGwg aW5kaXZpZHVhbCB1cGRhdGVzIGFyZSBkb25lLiAqLworCWlmICh3YWtlX3NjaGVkKQorCQlpOTE1 X3NjaGVkdWxlcl93YWtldXAocmluZy0+ZGV2KTsKIH0KIAogc3RhdGljIGNvbnN0IGNoYXIgKmk5 MTVfZ2VtX3JlcXVlc3RfZ2V0X2RyaXZlcl9uYW1lKHN0cnVjdCBmZW5jZSAqcmVxX2ZlbmNlKQpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmMKaW5kZXggMjZjZDA4OC4uYWMwYTYxNzIg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIuYwpAQCAtMTc0LDYgKzE3NCw5IEBA IGludCBpOTE1X3NjaGVkdWxlcl9xdWV1ZV9leGVjYnVmZmVyKHN0cnVjdCBpOTE1X3NjaGVkdWxl cl9xdWV1ZV9lbnRyeSAqcWUpCiAJbm9kZS0+c3RhbXAgID0gamlmZmllczsKIAlpOTE1X2dlbV9y ZXF1ZXN0X3JlZmVyZW5jZShub2RlLT5wYXJhbXMucmVxdWVzdCk7CiAKKwlXQVJOX09OKG5vZGUt PnBhcmFtcy5yZXF1ZXN0LT5zY2hlZHVsZXJfcWUpOworCW5vZGUtPnBhcmFtcy5yZXF1ZXN0LT5z Y2hlZHVsZXJfcWUgPSBub2RlOworCiAJLyogTmVlZCB0byBkZXRlcm1pbmUgdGhlIG51bWJlciBv ZiBpbmNvbXBsZXRlIGVudHJpZXMgaW4gdGhlIGxpc3QgYXMKIAkgKiB0aGF0IHdpbGwgYmUgdGhl IG1heGltdW0gc2l6ZSBvZiB0aGUgZGVwZW5kZW5jeSBsaXN0LgogCSAqCkBAIC0zNTAsMTQgKzM1 MywxNiBAQCBzdGF0aWMgdm9pZCBpOTE1X3NjaGVkdWxlcl9ub2RlX2tpbGwoc3RydWN0IGk5MTVf c2NoZWR1bGVyX3F1ZXVlX2VudHJ5ICpub2RlKQogICogY29kZSBoYXMgbWFwcGVkIGl0IGJhY2sg dG8gYSByZXF1ZXN0IGFuZCB3aWxsIG1hcmsgdGhhdCByZXF1ZXN0IGNvbXBsZXRlLgogICogSXQg YWxzbyBjYWxscyB0aGlzIGZ1bmN0aW9uIHRvIG5vdGlmeSB0aGUgc2NoZWR1bGVyIGFib3V0IHRo ZSBjb21wbGV0aW9uCiAgKiBzbyB0aGUgc2NoZWR1bGVyJ3Mgbm9kZSBjYW4gYmUgdXBkYXRlZCBh cHByb3ByaWF0ZWx5LgotICogUmV0dXJucyB0cnVlIGlmIHRoZSByZXF1ZXN0IGlzIHNjaGVkdWxl ciBtYW5hZ2VkLCBmYWxzZSBpZiBub3QuCisgKiBSZXR1cm5zIHRydWUgaWYgdGhlIHJlcXVlc3Qg aXMgc2NoZWR1bGVyIG1hbmFnZWQsIGZhbHNlIGlmIG5vdC4gVGhlIHJldHVybgorICogdmFsdWUg aXMgY29tYmluZWQgZm9yIGFsbCBmcmVzaGx5IGNvbXBsZXRlZCByZXF1ZXN0cyBhbmQgaWYgYW55 IHdlcmUgdHJ1ZQorICogdGhlbiBpOTE1X3NjaGVkdWxlcl93YWtldXAoKSBpcyBjYWxsZWQgc28g dGhlIHNjaGVkdWxlciBjYW4gZG8gZnVydGhlcgorICogcHJvY2Vzc2luZyAoc3VibWl0IG1vcmUg d29yaykgYXQgdGhlIGVuZC4KICAqLwogYm9vbCBpOTE1X3NjaGVkdWxlcl9ub3RpZnlfcmVxdWVz dChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYgID0gdG9faTkxNShyZXEtPnJpbmctPmRldik7CiAJc3RydWN0IGk5 MTVfc2NoZWR1bGVyICAgKnNjaGVkdWxlciA9IGRldl9wcml2LT5zY2hlZHVsZXI7Ci0JLyogWFhY OiBOZWVkIHRvIG1hcCBiYWNrIGZyb20gcmVxdWVzdCB0byBub2RlICovCi0Jc3RydWN0IGk5MTVf c2NoZWR1bGVyX3F1ZXVlX2VudHJ5ICpub2RlID0gTlVMTDsKKwlzdHJ1Y3QgaTkxNV9zY2hlZHVs ZXJfcXVldWVfZW50cnkgKm5vZGUgPSByZXEtPnNjaGVkdWxlcl9xZTsKIAl1bnNpZ25lZCBsb25n ICAgICAgIGZsYWdzOwogCiAJaWYgKCFub2RlKQpAQCAtMzc1LDE2ICszODAsMTggQEAgYm9vbCBp OTE1X3NjaGVkdWxlcl9ub3RpZnlfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3Qg KnJlcSkKIAogCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJnNjaGVkdWxlci0+bG9jaywgZmxhZ3Mp OwogCi0JLyoKLQkgKiBYWFg6IElmIHRoZSBpbi1mbGlnaHQgbGlzdCBpcyBub3cgZW1wdHkgdGhl biBuZXcgd29yayBzaG91bGQgYmUKLQkgKiBzdWJtaXR0ZWQuIEhvd2V2ZXIsIHRoaXMgZnVuY3Rp b24gaXMgY2FsbGVkIGZyb20gaW50ZXJydXB0IGNvbnRleHQKLQkgKiBhbmQgdGh1cyBjYW5ub3Qg YWNxdWlyZSBtdXRleCBsb2NrcyBhbmQgb3RoZXIgc3VjaCB0aGluZ3MgdGhhdCBhcmUKLQkgKiBu ZWNlc3NhcnkgZm9yIGZyZXNoIHN1Ym1pc3Npb24uCi0JICovCi0KIAlyZXR1cm4gdHJ1ZTsKIH0K IAorLyoKKyAqIENhbGxlZCBhdCB0aGUgZW5kIG9mIHNlcW5vIGludGVycnVwdCBwcm9jZXNzaW5n IGlmIGFueSByZXF1ZXN0IGhhcworICogY29tcGxldGVkIHRoYXQgY29ycmVzcG9uZHMgdG8gYSBz Y2hlZHVsZXIgbm9kZS4KKyAqLwordm9pZCBpOTE1X3NjaGVkdWxlcl93YWtldXAoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKK3sKKwkvKiBYWFg6IE5lZWQgdG8gY2FsbCBpOTE1X3NjaGVkdWxlcl9y ZW1vdmUoKSB2aWEgd29yayBoYW5kbGVyLiAqLworfQorCiBpbnQgaTkxNV9zY2hlZHVsZXJfcmVt b3ZlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiB7CiAJc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gcmluZy0+ZGV2LT5kZXZfcHJpdmF0ZTsKQEAgLTUwMCw2ICs1MDcs NyBAQCBpbnQgaTkxNV9zY2hlZHVsZXJfcmVtb3ZlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJp bmcpCiAJCQlpOTE1X2dlbV9leGVjYnVmZl9yZWxlYXNlX2JhdGNoX29iaihub2RlLT5wYXJhbXMu YmF0Y2hfb2JqKTsKIAogCQkvKiBGcmVlIGV2ZXJ5dGhpbmcgdGhhdCBpcyBvd25lZCBieSB0aGUg bm9kZTogKi8KKwkJbm9kZS0+cGFyYW1zLnJlcXVlc3QtPnNjaGVkdWxlcl9xZSA9IE5VTEw7CiAJ CWk5MTVfZ2VtX3JlcXVlc3RfdW5yZWZlcmVuY2Uobm9kZS0+cGFyYW1zLnJlcXVlc3QpOwogCQlr ZnJlZShub2RlLT5wYXJhbXMuY2xpcHJlY3RzKTsKIAkJa2ZyZWUobm9kZS0+ZGVwX2xpc3QpOwpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIuaCBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmgKaW5kZXggMDJhYzZmMi4uOWY1NDc4NiAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIuaAorKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxlci5oCkBAIC05MCw1ICs5MCw2IEBAIGlu dCAgICAgICAgIGk5MTVfc2NoZWR1bGVyX2Nsb3NlZmlsZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LAogCQkJCSAgICAgc3RydWN0IGRybV9maWxlICpmaWxlKTsKIGludCAgICAgICAgIGk5MTVfc2No ZWR1bGVyX3F1ZXVlX2V4ZWNidWZmZXIoc3RydWN0IGk5MTVfc2NoZWR1bGVyX3F1ZXVlX2VudHJ5 ICpxZSk7CiBib29sICAgICAgICBpOTE1X3NjaGVkdWxlcl9ub3RpZnlfcmVxdWVzdChzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSk7Cit2b2lkICAgICAgICBpOTE1X3NjaGVkdWxlcl93 YWtldXAoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiAKICNlbmRpZiAgLyogX0k5MTVfU0NIRURV TEVSX0hfICovCi0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK