From: Dave Gordon Subject: [PATCH v3 3/6] drm/i915/guc: pass request (not client) to i915_guc_{wq_check_space, submit}() Date: Fri, 6 May 2016 20:31:32 +0100 Message-ID: <1462563095-13233-3-git-send-email-david.s.gordon@intel.com> References: <1462563095-13233-1-git-send-email-david.s.gordon@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id 374886E2C3 for ; Fri, 6 May 2016 19:31:55 +0000 (UTC) In-Reply-To: <1462563095-13233-1-git-send-email-david.s.gordon@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 VGhlIGtub3dsZWRnZSBvZiBob3cgdG8gZGVyaXZlIHRoZSByZWxldmFudCBjbGllbnQgZnJvbSB0 aGUgcmVxdWVzdApzaG91bGQgYmUgbG9jYWxpc2VkIHdpdGhpbiBpOTE1X2d1Y19zdWJtaXNzaW9u LmM7IHRoZSBMUkMgY29kZSBzaG91bGRuJ3QKaGF2ZSB0byBrbm93IGFib3V0IHRoZSBpbnRlcm5h bCBkZXRhaWxzIG9mIHRoZSBHdUMgc3VibWlzc2lvbiBwcm9jZXNzLgpBbmQgYWxsIHRoZSBpbmZv cm1hdGlvbiB0aGUgR3VDIGNvZGUgbmVlZHMgc2hvdWxkIGJlIGVuY2Fwc3VsYXRlZCBpbiAob3IK cmVhY2hhYmxlIGZyb20pIHRoZSByZXF1ZXN0LgoKdjM6CiAgICBHRU1fQlVHX09OKCkgZm9yIGJh ZCBHdUMgY2xpZW50IChUdnJ0a28gVXJzdWxpbikuCiAgICBBZGQvdXBkYXRlIGtlcm5lbGRvYyBl eHBsYWluaW5nIGNoZWNrX3NwYWNlL3N1Ym1pdCBwcm90b2NvbAoKU2lnbmVkLW9mZi1ieTogRGF2 ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMgfCA0NiArKysrKysrKysrKysrKysrKysrKysrKyst LS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oICAgICAgICAgICB8ICA1ICsr LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAgICAgICAgICB8ICA5ICsrLS0t LQogMyBmaWxlcyBjaGFuZ2VkLCA0MiBpbnNlcnRpb25zKCspLCAxOCBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKaW5kZXggZTZhZjY3Mi4u OWUzMDc2MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlz c2lvbi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwpA QCAtNDUxLDE0ICs0NTEsMzAgQEAgc3RhdGljIHZvaWQgZ3VjX2ZpbmlfY3R4X2Rlc2Moc3RydWN0 IGludGVsX2d1YyAqZ3VjLAogCQkJICAgICBzaXplb2YoZGVzYykgKiBjbGllbnQtPmN0eF9pbmRl eCk7CiB9CiAKLWludCBpOTE1X2d1Y193cV9jaGVja19zcGFjZShzdHJ1Y3QgaTkxNV9ndWNfY2xp ZW50ICpnYykKKy8qKgorICogaTkxNV9ndWNfd3FfY2hlY2tfc3BhY2UoKSAtIGNoZWNrIHRoYXQg dGhlIEd1QyBjYW4gYWNjZXB0IGEgcmVxdWVzdAorICogQHJlcXVlc3Q6CXJlcXVlc3QgYXNzb2Np YXRlZCB3aXRoIHRoZSBjb21tYW5kcworICoKKyAqIFJldHVybjoJMCBpZiBzcGFjZSBpcyBhdmFp bGFibGUKKyAqCQktRUFHQUlOIGlmIHNwYWNlIGlzIG5vdCBjdXJyZW50bHkgYXZhaWxhYmxlCisg KgorICogVGhpcyBmdW5jdGlvbiBtdXN0IGJlIGNhbGxlZCAoYW5kIG11c3QgcmV0dXJuIDApIGJl Zm9yZSBhIHJlcXVlc3QKKyAqIGlzIHN1Ym1pdHRlZCB0byB0aGUgR3VDIHZpYSBpOTE1X2d1Y19z dWJtaXQoKSBiZWxvdy4gT25jZSBhIHJlc3VsdAorICogb2YgMCBoYXMgYmVlbiByZXR1cm5lZCwg aXQgcmVtYWlucyB2YWxpZCB1bnRpbCAoYnV0IG9ubHkgdW50aWwpCisgKiB0aGUgbmV4dCBjYWxs IHRvIHN1Ym1pdCgpLgorICoKKyAqIFRoaXMgcHJlY2hlY2sgYWxsb3dzIHRoZSBjYWxsZXIgdG8g ZGV0ZXJtaW5lIGluIGFkdmFuY2UgdGhhdCBzcGFjZQorICogd2lsbCBiZSBhdmFpbGFibGUgZm9y IHRoZSBuZXh0IHN1Ym1pc3Npb24gYmVmb3JlIGNvbW1pdHRpbmcgcmVzb3VyY2VzCisgKiB0byBp dCwgYW5kIGhlbHBzIGF2b2lkIGxhdGUgZmFpbHVyZXMgd2l0aCBjb21wbGljYXRlZCByZWNvdmVy eSBwYXRocy4KKyAqLworaW50IGk5MTVfZ3VjX3dxX2NoZWNrX3NwYWNlKHN0cnVjdCBkcm1faTkx NV9nZW1fcmVxdWVzdCAqcmVxdWVzdCkKIHsKKwljb25zdCBzaXplX3Qgc2l6ZSA9IHNpemVvZihz dHJ1Y3QgZ3VjX3dxX2l0ZW0pOworCXN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmdjID0gcmVxdWVz dC0+aTkxNS0+Z3VjLmV4ZWNidWZfY2xpZW50OwogCXN0cnVjdCBndWNfcHJvY2Vzc19kZXNjICpk ZXNjOwotCXUzMiBzaXplID0gc2l6ZW9mKHN0cnVjdCBndWNfd3FfaXRlbSk7CiAJaW50IHJldCA9 IC1FVElNRURPVVQsIHRpbWVvdXRfY291bnRlciA9IDIwMDsKIAotCWlmICghZ2MpCi0JCXJldHVy biAwOworCUdFTV9CVUdfT04oZ2MgPT0gTlVMTCk7CiAKIAlkZXNjID0gZ2MtPmNsaWVudF9iYXNl ICsgZ2MtPnByb2NfZGVzY19vZmZzZXQ7CiAKQEAgLTUzMiwxNiArNTQ4LDI4IEBAIHN0YXRpYyBp bnQgZ3VjX2FkZF93b3JrcXVldWVfaXRlbShzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpnYywKIAog LyoqCiAgKiBpOTE1X2d1Y19zdWJtaXQoKSAtIFN1Ym1pdCBjb21tYW5kcyB0aHJvdWdoIEd1Qwot ICogQGNsaWVudDoJdGhlIGd1YyBjbGllbnQgd2hlcmUgY29tbWFuZHMgd2lsbCBnbyB0aHJvdWdo CiAgKiBAcnE6CQlyZXF1ZXN0IGFzc29jaWF0ZWQgd2l0aCB0aGUgY29tbWFuZHMKICAqCi0gKiBS ZXR1cm46CTAgaWYgc3VjY2VlZAorICogUmV0dXJuOgkwIG9uIHN1Y2Nlc3MsIG90aGVyd2lzZSBh biBlcnJuby4KKyAqIAkJKE5vdGU6IG5vbnplcm8gcmVhbGx5IHNob3VsZG4ndCBoYXBwZW4hKQor ICoKKyAqIFRoZSBjYWxsZXIgbXVzdCBoYXZlIGFscmVhZHkgY2FsbGVkIGk5MTVfZ3VjX3dxX2No ZWNrX3NwYWNlKCkgYWJvdmUKKyAqIHdpdGggYSByZXN1bHQgb2YgMCAoc3VjY2Vzcykgc2luY2Ug dGhlIGxhc3QgcmVxdWVzdCBzdWJtaXNzaW9uLiBUaGlzCisgKiBndWFyYW50ZWVzIHRoYXQgdGhl cmUgaXMgc3BhY2UgaW4gdGhlIHdvcmsgcXVldWUgZm9yIHRoZSBuZXcgcmVxdWVzdCwKKyAqIHNv IGVucXVldWluZyB0aGUgaXRlbSBjYW5ub3QgZmFpbC4KKyAqCisgKiBCYWQgVGhpbmdzIFdpbGwg SGFwcGVuIGlmIHRoZSBjYWxsZXIgdmlvbGF0ZXMgdGhpcyBwcm90b2NvbCBlLmcuIGNhbGxzCisg KiBzdWJtaXQoKSB3aGVuIGNoZWNrKCkgc2F5cyB0aGVyZSdzIG5vIHNwYWNlLCBvciBjYWxscyBz dWJtaXQoKSBtdWx0aXBsZQorICogdGltZXMgd2l0aCBubyBpbnRlcnZlbmluZyBjaGVjaygpLgor ICoKKyAqIFRoZSBvbmx5IGVycm9yIGhlcmUgYXJpc2VzIGlmIHRoZSBkb29yYmVsbCBoYXJkd2Fy ZSBpc24ndCBmdW5jdGlvbmluZworICogYXMgZXhwZWN0ZWQsIHdoaWNoIHJlYWxseSBzaG91bG4n dCBoYXBwZW4uCiAgKi8KLWludCBpOTE1X2d1Y19zdWJtaXQoc3RydWN0IGk5MTVfZ3VjX2NsaWVu dCAqY2xpZW50LAotCQkgICAgc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpycSkKK2ludCBp OTE1X2d1Y19zdWJtaXQoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpycSkKIHsKLQlzdHJ1 Y3QgaW50ZWxfZ3VjICpndWMgPSBjbGllbnQtPmd1YzsKIAl1bnNpZ25lZCBpbnQgZW5naW5lX2lk ID0gcnEtPmVuZ2luZS0+Z3VjX2lkOworCXN0cnVjdCBpbnRlbF9ndWMgKmd1YyA9ICZycS0+aTkx NS0+Z3VjOworCXN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmNsaWVudCA9IGd1Yy0+ZXhlY2J1Zl9j bGllbnQ7CiAJaW50IHFfcmV0LCBiX3JldDsKIAogCXFfcmV0ID0gZ3VjX2FkZF93b3JrcXVldWVf aXRlbShjbGllbnQsIHJxKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2d1Yy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKaW5kZXggOWQ3OWM0Yy4u YjM3YzczMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKQEAgLTE0OCwxMCArMTQ4LDkgQEAg ZXh0ZXJuIGludCBpbnRlbF9ndWNfcmVzdW1lKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogLyog aTkxNV9ndWNfc3VibWlzc2lvbi5jICovCiBpbnQgaTkxNV9ndWNfc3VibWlzc2lvbl9pbml0KHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogaW50IGk5MTVfZ3VjX3N1Ym1pc3Npb25fZW5hYmxlKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpOwotaW50IGk5MTVfZ3VjX3N1Ym1pdChzdHJ1Y3QgaTkxNV9n dWNfY2xpZW50ICpjbGllbnQsCi0JCSAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJx KTsKK2ludCBpOTE1X2d1Y193cV9jaGVja19zcGFjZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVl c3QgKnJxKTsKK2ludCBpOTE1X2d1Y19zdWJtaXQoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0 ICpycSk7CiB2b2lkIGk5MTVfZ3VjX3N1Ym1pc3Npb25fZGlzYWJsZShzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KTsKIHZvaWQgaTkxNV9ndWNfc3VibWlzc2lvbl9maW5pKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpOwotaW50IGk5MTVfZ3VjX3dxX2NoZWNrX3NwYWNlKHN0cnVjdCBpOTE1X2d1Y19jbGll bnQgKmNsaWVudCk7CiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCBkODc2 MzUyLi43OTMwMmUxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtNjk4LDkgKzY5OCw3 IEBAIGludCBpbnRlbF9sb2dpY2FsX3JpbmdfYWxsb2NfcmVxdWVzdF9leHRyYXMoc3RydWN0IGRy bV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0CiAJCSAqIGdvaW5nIGFueSBmdXJ0aGVyLCBhcyB0 aGUgaTkxNV9hZGRfcmVxdWVzdCgpIGNhbGwKIAkJICogbGF0ZXIgb24gbXVzdG4ndCBmYWlsIC4u LgogCQkgKi8KLQkJc3RydWN0IGludGVsX2d1YyAqZ3VjID0gJnJlcXVlc3QtPmk5MTUtPmd1YzsK LQotCQlyZXQgPSBpOTE1X2d1Y193cV9jaGVja19zcGFjZShndWMtPmV4ZWNidWZfY2xpZW50KTsK KwkJcmV0ID0gaTkxNV9ndWNfd3FfY2hlY2tfc3BhY2UocmVxdWVzdCk7CiAJCWlmIChyZXQpCiAJ CQlyZXR1cm4gcmV0OwogCX0KQEAgLTc0OSw3ICs3NDcsNiBAQCBpbnQgaW50ZWxfbG9naWNhbF9y aW5nX2FsbG9jX3JlcXVlc3RfZXh0cmFzKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVx dWVzdAogaW50ZWxfbG9naWNhbF9yaW5nX2FkdmFuY2VfYW5kX3N1Ym1pdChzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiB7CiAJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJp bmdidWYgPSByZXF1ZXN0LT5yaW5nYnVmOwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IHJlcXVlc3QtPmk5MTU7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lID0g cmVxdWVzdC0+ZW5naW5lOwogCiAJaW50ZWxfbG9naWNhbF9yaW5nX2FkdmFuY2UocmluZ2J1Zik7 CkBAIC03NzcsOCArNzc0LDggQEAgaW50IGludGVsX2xvZ2ljYWxfcmluZ19hbGxvY19yZXF1ZXN0 X2V4dHJhcyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QKIAlyZXF1ZXN0LT5w cmV2aW91c19jb250ZXh0ID0gZW5naW5lLT5sYXN0X2NvbnRleHQ7CiAJZW5naW5lLT5sYXN0X2Nv bnRleHQgPSByZXF1ZXN0LT5jdHg7CiAKLQlpZiAoZGV2X3ByaXYtPmd1Yy5leGVjYnVmX2NsaWVu dCkKLQkJaTkxNV9ndWNfc3VibWl0KGRldl9wcml2LT5ndWMuZXhlY2J1Zl9jbGllbnQsIHJlcXVl c3QpOworCWlmIChpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbikKKwkJaTkxNV9ndWNfc3VibWl0 KHJlcXVlc3QpOwogCWVsc2UKIAkJZXhlY2xpc3RzX2NvbnRleHRfcXVldWUocmVxdWVzdCk7CiAK LS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK