From: Dave Gordon Subject: [PATCH v4 4/7] drm/i915/guc: pass request (not client) to i915_guc_{wq_check_space, submit}() Date: Fri, 13 May 2016 15:36:32 +0100 Message-ID: <1463150195-28805-5-git-send-email-david.s.gordon@intel.com> References: <1463150195-28805-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id E9D9E6E58E for ; Fri, 13 May 2016 14:37:10 +0000 (UTC) In-Reply-To: <1463150195-28805-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 cmVhY2hhYmxlIGZyb20pIHRoZSByZXF1ZXN0LgoKdjI6CiAgICBHRU1fQlVHX09OKCkgZm9yIGJh ZCBHdUMgY2xpZW50IChUdnJ0a28gVXJzdWxpbikuCiAgICBBZGQvdXBkYXRlIGtlcm5lbGRvYyBl eHBsYWluaW5nIGNoZWNrX3NwYWNlL3N1Ym1pdCBwcm90b2NvbAoKU2lnbmVkLW9mZi1ieTogRGF2 ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IFR2cnRrbyBV cnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIHwgNDYgKysrKysrKysrKysrKysrKysrKysrKysrLS0t LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaCAgICAgICAgICAgfCAgNSArKy0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAgICAgfCAgOSArKy0tLS0K IDMgZmlsZXMgY2hhbmdlZCwgNDIgaW5zZXJ0aW9ucygrKSwgMTggZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCmluZGV4IDkxNmNkNjcuLjg3 Y2I3MzkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Np b24uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKQEAg LTQ1MCwxNCArNDUwLDMwIEBAIHN0YXRpYyB2b2lkIGd1Y19maW5pX2N0eF9kZXNjKHN0cnVjdCBp bnRlbF9ndWMgKmd1YywKIAkJCSAgICAgc2l6ZW9mKGRlc2MpICogY2xpZW50LT5jdHhfaW5kZXgp OwogfQogCi1pbnQgaTkxNV9ndWNfd3FfY2hlY2tfc3BhY2Uoc3RydWN0IGk5MTVfZ3VjX2NsaWVu dCAqZ2MpCisvKioKKyAqIGk5MTVfZ3VjX3dxX2NoZWNrX3NwYWNlKCkgLSBjaGVjayB0aGF0IHRo ZSBHdUMgY2FuIGFjY2VwdCBhIHJlcXVlc3QKKyAqIEByZXF1ZXN0OglyZXF1ZXN0IGFzc29jaWF0 ZWQgd2l0aCB0aGUgY29tbWFuZHMKKyAqCisgKiBSZXR1cm46CTAgaWYgc3BhY2UgaXMgYXZhaWxh YmxlCisgKgkJLUVBR0FJTiBpZiBzcGFjZSBpcyBub3QgY3VycmVudGx5IGF2YWlsYWJsZQorICoK KyAqIFRoaXMgZnVuY3Rpb24gbXVzdCBiZSBjYWxsZWQgKGFuZCBtdXN0IHJldHVybiAwKSBiZWZv cmUgYSByZXF1ZXN0CisgKiBpcyBzdWJtaXR0ZWQgdG8gdGhlIEd1QyB2aWEgaTkxNV9ndWNfc3Vi bWl0KCkgYmVsb3cuIE9uY2UgYSByZXN1bHQKKyAqIG9mIDAgaGFzIGJlZW4gcmV0dXJuZWQsIGl0 IHJlbWFpbnMgdmFsaWQgdW50aWwgKGJ1dCBvbmx5IHVudGlsKQorICogdGhlIG5leHQgY2FsbCB0 byBzdWJtaXQoKS4KKyAqCisgKiBUaGlzIHByZWNoZWNrIGFsbG93cyB0aGUgY2FsbGVyIHRvIGRl dGVybWluZSBpbiBhZHZhbmNlIHRoYXQgc3BhY2UKKyAqIHdpbGwgYmUgYXZhaWxhYmxlIGZvciB0 aGUgbmV4dCBzdWJtaXNzaW9uIGJlZm9yZSBjb21taXR0aW5nIHJlc291cmNlcworICogdG8gaXQs IGFuZCBoZWxwcyBhdm9pZCBsYXRlIGZhaWx1cmVzIHdpdGggY29tcGxpY2F0ZWQgcmVjb3Zlcnkg cGF0aHMuCisgKi8KK2ludCBpOTE1X2d1Y193cV9jaGVja19zcGFjZShzdHJ1Y3QgZHJtX2k5MTVf Z2VtX3JlcXVlc3QgKnJlcXVlc3QpCiB7CisJY29uc3Qgc2l6ZV90IHNpemUgPSBzaXplb2Yoc3Ry dWN0IGd1Y193cV9pdGVtKTsKKwlzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpnYyA9IHJlcXVlc3Qt Pmk5MTUtPmd1Yy5leGVjYnVmX2NsaWVudDsKIAlzdHJ1Y3QgZ3VjX3Byb2Nlc3NfZGVzYyAqZGVz YzsKLQl1MzIgc2l6ZSA9IHNpemVvZihzdHJ1Y3QgZ3VjX3dxX2l0ZW0pOwogCWludCByZXQgPSAt RVRJTUVET1VULCB0aW1lb3V0X2NvdW50ZXIgPSAyMDA7CiAKLQlpZiAoIWdjKQotCQlyZXR1cm4g MDsKKwlHRU1fQlVHX09OKGdjID09IE5VTEwpOwogCiAJZGVzYyA9IGdjLT5jbGllbnRfYmFzZSAr IGdjLT5wcm9jX2Rlc2Nfb2Zmc2V0OwogCkBAIC01MzEsMTYgKzU0NywyOCBAQCBzdGF0aWMgaW50 IGd1Y19hZGRfd29ya3F1ZXVlX2l0ZW0oc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqZ2MsCiAKIC8q KgogICogaTkxNV9ndWNfc3VibWl0KCkgLSBTdWJtaXQgY29tbWFuZHMgdGhyb3VnaCBHdUMKLSAq IEBjbGllbnQ6CXRoZSBndWMgY2xpZW50IHdoZXJlIGNvbW1hbmRzIHdpbGwgZ28gdGhyb3VnaAog ICogQHJxOgkJcmVxdWVzdCBhc3NvY2lhdGVkIHdpdGggdGhlIGNvbW1hbmRzCiAgKgotICogUmV0 dXJuOgkwIGlmIHN1Y2NlZWQKKyAqIFJldHVybjoJMCBvbiBzdWNjZXNzLCBvdGhlcndpc2UgYW4g ZXJybm8uCisgKiAJCShOb3RlOiBub256ZXJvIHJlYWxseSBzaG91bGRuJ3QgaGFwcGVuISkKKyAq CisgKiBUaGUgY2FsbGVyIG11c3QgaGF2ZSBhbHJlYWR5IGNhbGxlZCBpOTE1X2d1Y193cV9jaGVj a19zcGFjZSgpIGFib3ZlCisgKiB3aXRoIGEgcmVzdWx0IG9mIDAgKHN1Y2Nlc3MpIHNpbmNlIHRo ZSBsYXN0IHJlcXVlc3Qgc3VibWlzc2lvbi4gVGhpcworICogZ3VhcmFudGVlcyB0aGF0IHRoZXJl IGlzIHNwYWNlIGluIHRoZSB3b3JrIHF1ZXVlIGZvciB0aGUgbmV3IHJlcXVlc3QsCisgKiBzbyBl bnF1ZXVpbmcgdGhlIGl0ZW0gY2Fubm90IGZhaWwuCisgKgorICogQmFkIFRoaW5ncyBXaWxsIEhh cHBlbiBpZiB0aGUgY2FsbGVyIHZpb2xhdGVzIHRoaXMgcHJvdG9jb2wgZS5nLiBjYWxscworICog c3VibWl0KCkgd2hlbiBjaGVjaygpIHNheXMgdGhlcmUncyBubyBzcGFjZSwgb3IgY2FsbHMgc3Vi bWl0KCkgbXVsdGlwbGUKKyAqIHRpbWVzIHdpdGggbm8gaW50ZXJ2ZW5pbmcgY2hlY2soKS4KKyAq CisgKiBUaGUgb25seSBlcnJvciBoZXJlIGFyaXNlcyBpZiB0aGUgZG9vcmJlbGwgaGFyZHdhcmUg aXNuJ3QgZnVuY3Rpb25pbmcKKyAqIGFzIGV4cGVjdGVkLCB3aGljaCByZWFsbHkgc2hvdWxuJ3Qg aGFwcGVuLgogICovCi1pbnQgaTkxNV9ndWNfc3VibWl0KHN0cnVjdCBpOTE1X2d1Y19jbGllbnQg KmNsaWVudCwKLQkJICAgIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnEpCitpbnQgaTkx NV9ndWNfc3VibWl0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnEpCiB7Ci0Jc3RydWN0 IGludGVsX2d1YyAqZ3VjID0gY2xpZW50LT5ndWM7CiAJdW5zaWduZWQgaW50IGVuZ2luZV9pZCA9 IHJxLT5lbmdpbmUtPmd1Y19pZDsKKwlzdHJ1Y3QgaW50ZWxfZ3VjICpndWMgPSAmcnEtPmk5MTUt Pmd1YzsKKwlzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpjbGllbnQgPSBndWMtPmV4ZWNidWZfY2xp ZW50OwogCWludCBxX3JldCwgYl9yZXQ7CiAKIAlxX3JldCA9IGd1Y19hZGRfd29ya3F1ZXVlX2l0 ZW0oY2xpZW50LCBycSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9n dWMuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCmluZGV4IDM5ODQxMzYuLjkx ZjMxNWMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCkBAIC0xNDgsMTAgKzE0OCw5IEBAIGV4 dGVybiBpbnQgaW50ZWxfZ3VjX3Jlc3VtZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIC8qIGk5 MTVfZ3VjX3N1Ym1pc3Npb24uYyAqLwogaW50IGk5MTVfZ3VjX3N1Ym1pc3Npb25faW5pdChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KTsKIGludCBpOTE1X2d1Y19zdWJtaXNzaW9uX2VuYWJsZShzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KTsKLWludCBpOTE1X2d1Y19zdWJtaXQoc3RydWN0IGk5MTVfZ3Vj X2NsaWVudCAqY2xpZW50LAotCQkgICAgc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpycSk7 CitpbnQgaTkxNV9ndWNfd3FfY2hlY2tfc3BhY2Uoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0 ICpycSk7CitpbnQgaTkxNV9ndWNfc3VibWl0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAq cnEpOwogdm9pZCBpOTE1X2d1Y19zdWJtaXNzaW9uX2Rpc2FibGUoc3RydWN0IGRybV9kZXZpY2Ug KmRldik7CiB2b2lkIGk5MTVfZ3VjX3N1Ym1pc3Npb25fZmluaShzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KTsKLWludCBpOTE1X2d1Y193cV9jaGVja19zcGFjZShzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50 ICpjbGllbnQpOwogCiAjZW5kaWYKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggZGIxMGM5 Ni4uYzBiZDNkYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTY5OCw5ICs2OTgsNyBA QCBpbnQgaW50ZWxfbG9naWNhbF9yaW5nX2FsbG9jX3JlcXVlc3RfZXh0cmFzKHN0cnVjdCBkcm1f aTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdAogCQkgKiBnb2luZyBhbnkgZnVydGhlciwgYXMgdGhl IGk5MTVfYWRkX3JlcXVlc3QoKSBjYWxsCiAJCSAqIGxhdGVyIG9uIG11c3RuJ3QgZmFpbCAuLi4K IAkJICovCi0JCXN0cnVjdCBpbnRlbF9ndWMgKmd1YyA9ICZyZXF1ZXN0LT5pOTE1LT5ndWM7Ci0K LQkJcmV0ID0gaTkxNV9ndWNfd3FfY2hlY2tfc3BhY2UoZ3VjLT5leGVjYnVmX2NsaWVudCk7CisJ CXJldCA9IGk5MTVfZ3VjX3dxX2NoZWNrX3NwYWNlKHJlcXVlc3QpOwogCQlpZiAocmV0KQogCQkJ cmV0dXJuIHJldDsKIAl9CkBAIC03NDksNyArNzQ3LDYgQEAgaW50IGludGVsX2xvZ2ljYWxfcmlu Z19hbGxvY19yZXF1ZXN0X2V4dHJhcyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVl c3QKIGludGVsX2xvZ2ljYWxfcmluZ19hZHZhbmNlX2FuZF9zdWJtaXQoc3RydWN0IGRybV9pOTE1 X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQogewogCXN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5n YnVmID0gcmVxdWVzdC0+cmluZ2J1ZjsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSByZXF1ZXN0LT5pOTE1OwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSA9IHJl cXVlc3QtPmVuZ2luZTsKIAogCWludGVsX2xvZ2ljYWxfcmluZ19hZHZhbmNlKHJpbmdidWYpOwpA QCAtNzc3LDggKzc3NCw4IEBAIGludCBpbnRlbF9sb2dpY2FsX3JpbmdfYWxsb2NfcmVxdWVzdF9l eHRyYXMoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0CiAJcmVxdWVzdC0+cHJl dmlvdXNfY29udGV4dCA9IGVuZ2luZS0+bGFzdF9jb250ZXh0OwogCWVuZ2luZS0+bGFzdF9jb250 ZXh0ID0gcmVxdWVzdC0+Y3R4OwogCi0JaWYgKGRldl9wcml2LT5ndWMuZXhlY2J1Zl9jbGllbnQp Ci0JCWk5MTVfZ3VjX3N1Ym1pdChkZXZfcHJpdi0+Z3VjLmV4ZWNidWZfY2xpZW50LCByZXF1ZXN0 KTsKKwlpZiAoaTkxNS5lbmFibGVfZ3VjX3N1Ym1pc3Npb24pCisJCWk5MTVfZ3VjX3N1Ym1pdChy ZXF1ZXN0KTsKIAllbHNlCiAJCWV4ZWNsaXN0c19jb250ZXh0X3F1ZXVlKHJlcXVlc3QpOwogCi0t IAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==