From: Dave Gordon Subject: [PATCH v2 2/5] drm/i915/guc: pass request (not client) to i915_guc_{wq_check_space, submit}() Date: Wed, 27 Apr 2016 19:03:12 +0100 Message-ID: <1461780195-17434-2-git-send-email-david.s.gordon@intel.com> References: <1461780195-17434-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id E81336E07D for ; Wed, 27 Apr 2016 18:04:07 +0000 (UTC) In-Reply-To: <1461780195-17434-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 cmVhY2hhYmxlIGZyb20pIHRoZSByZXF1ZXN0LgoKU2lnbmVkLW9mZi1ieTogRGF2ZSBHb3Jkb24g PGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2d1Y19zdWJtaXNzaW9uLmMgfCAxMSArKysrKystLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZ3VjLmggICAgICAgICAgIHwgIDUgKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2xyYy5jICAgICAgICAgICB8ICA5ICsrKy0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAxMSBp bnNlcnRpb25zKCspLCAxNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2d1Y19zdWJtaXNzaW9uLmMKaW5kZXggNDJkMmVmYS4uNjZhZjVjZSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwpAQCAtNDUxLDEwICs0NTEsMTEgQEAgc3Rh dGljIHZvaWQgZ3VjX2ZpbmlfY3R4X2Rlc2Moc3RydWN0IGludGVsX2d1YyAqZ3VjLAogCQkJICAg ICBzaXplb2YoZGVzYykgKiBjbGllbnQtPmN0eF9pbmRleCk7CiB9CiAKLWludCBpOTE1X2d1Y193 cV9jaGVja19zcGFjZShzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpnYykKK2ludCBpOTE1X2d1Y193 cV9jaGVja19zcGFjZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiB7CisJ Y29uc3Qgc2l6ZV90IHNpemUgPSBzaXplb2Yoc3RydWN0IGd1Y193cV9pdGVtKTsKKwlzdHJ1Y3Qg aTkxNV9ndWNfY2xpZW50ICpnYyA9IHJlcXVlc3QtPmk5MTUtPmd1Yy5leGVjYnVmX2NsaWVudDsK IAlzdHJ1Y3QgZ3VjX3Byb2Nlc3NfZGVzYyAqZGVzYzsKLQl1MzIgc2l6ZSA9IHNpemVvZihzdHJ1 Y3QgZ3VjX3dxX2l0ZW0pOwogCWludCByZXQgPSAtRVRJTUVET1VULCB0aW1lb3V0X2NvdW50ZXIg PSAyMDA7CiAKIAlpZiAoIWdjKQpAQCAtNTM3LDExICs1MzgsMTEgQEAgc3RhdGljIGludCBndWNf YWRkX3dvcmtxdWV1ZV9pdGVtKHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmdjLAogICoKICAqIFJl dHVybjoJMCBpZiBzdWNjZWVkCiAgKi8KLWludCBpOTE1X2d1Y19zdWJtaXQoc3RydWN0IGk5MTVf Z3VjX2NsaWVudCAqY2xpZW50LAotCQkgICAgc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpy cSkKK2ludCBpOTE1X2d1Y19zdWJtaXQoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpycSkK IHsKLQlzdHJ1Y3QgaW50ZWxfZ3VjICpndWMgPSBjbGllbnQtPmd1YzsKIAl1bnNpZ25lZCBpbnQg ZW5naW5lX2lkID0gcnEtPmVuZ2luZS0+Z3VjX2lkOworCXN0cnVjdCBpbnRlbF9ndWMgKmd1YyA9 ICZycS0+aTkxNS0+Z3VjOworCXN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmNsaWVudCA9IGd1Yy0+ ZXhlY2J1Zl9jbGllbnQ7CiAJaW50IHFfcmV0LCBiX3JldDsKIAogCXFfcmV0ID0gZ3VjX2FkZF93 b3JrcXVldWVfaXRlbShjbGllbnQsIHJxKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2d1Yy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKaW5kZXgg OWQ3OWM0Yy4uYjM3YzczMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf Z3VjLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKQEAgLTE0OCwxMCAr MTQ4LDkgQEAgZXh0ZXJuIGludCBpbnRlbF9ndWNfcmVzdW1lKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpOwogLyogaTkxNV9ndWNfc3VibWlzc2lvbi5jICovCiBpbnQgaTkxNV9ndWNfc3VibWlzc2lv bl9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogaW50IGk5MTVfZ3VjX3N1Ym1pc3Npb25f ZW5hYmxlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwotaW50IGk5MTVfZ3VjX3N1Ym1pdChzdHJ1 Y3QgaTkxNV9ndWNfY2xpZW50ICpjbGllbnQsCi0JCSAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl cXVlc3QgKnJxKTsKK2ludCBpOTE1X2d1Y193cV9jaGVja19zcGFjZShzdHJ1Y3QgZHJtX2k5MTVf Z2VtX3JlcXVlc3QgKnJxKTsKK2ludCBpOTE1X2d1Y19zdWJtaXQoc3RydWN0IGRybV9pOTE1X2dl bV9yZXF1ZXN0ICpycSk7CiB2b2lkIGk5MTVfZ3VjX3N1Ym1pc3Npb25fZGlzYWJsZShzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KTsKIHZvaWQgaTkxNV9ndWNfc3VibWlzc2lvbl9maW5pKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpOwotaW50IGk5MTVfZ3VjX3dxX2NoZWNrX3NwYWNlKHN0cnVjdCBpOTE1 X2d1Y19jbGllbnQgKmNsaWVudCk7CiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpp bmRleCAyYjdlNmJiLi5iOGVjOGM2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtNzA4 LDkgKzcwOCw3IEBAIGludCBpbnRlbF9sb2dpY2FsX3JpbmdfYWxsb2NfcmVxdWVzdF9leHRyYXMo c3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0CiAJCSAqIGdvaW5nIGFueSBmdXJ0 aGVyLCBhcyB0aGUgaTkxNV9hZGRfcmVxdWVzdCgpIGNhbGwKIAkJICogbGF0ZXIgb24gbXVzdG4n dCBmYWlsIC4uLgogCQkgKi8KLQkJc3RydWN0IGludGVsX2d1YyAqZ3VjID0gJnJlcXVlc3QtPmk5 MTUtPmd1YzsKLQotCQlyZXQgPSBpOTE1X2d1Y193cV9jaGVja19zcGFjZShndWMtPmV4ZWNidWZf Y2xpZW50KTsKKwkJcmV0ID0gaTkxNV9ndWNfd3FfY2hlY2tfc3BhY2UocmVxdWVzdCk7CiAJCWlm IChyZXQpCiAJCQlyZXR1cm4gcmV0OwogCX0KQEAgLTc3Niw3ICs3NzQsNiBAQCBzdGF0aWMgaW50 IGxvZ2ljYWxfcmluZ193YWl0X2Zvcl9zcGFjZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3Qg KnJlcSwKIGludGVsX2xvZ2ljYWxfcmluZ19hZHZhbmNlX2FuZF9zdWJtaXQoc3RydWN0IGRybV9p OTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQogewogCXN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpy aW5nYnVmID0gcmVxdWVzdC0+cmluZ2J1ZjsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPSByZXF1ZXN0LT5pOTE1OwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSA9 IHJlcXVlc3QtPmVuZ2luZTsKIAogCWludGVsX2xvZ2ljYWxfcmluZ19hZHZhbmNlKHJpbmdidWYp OwpAQCAtODA2LDggKzgwMyw4IEBAIHN0YXRpYyBpbnQgbG9naWNhbF9yaW5nX3dhaXRfZm9yX3Nw YWNlKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogCQl9CiAJfQogCi0JaWYgKGRl dl9wcml2LT5ndWMuZXhlY2J1Zl9jbGllbnQpCi0JCWk5MTVfZ3VjX3N1Ym1pdChkZXZfcHJpdi0+ Z3VjLmV4ZWNidWZfY2xpZW50LCByZXF1ZXN0KTsKKwlpZiAoaTkxNS5lbmFibGVfZ3VjX3N1Ym1p c3Npb24pCisJCWk5MTVfZ3VjX3N1Ym1pdChyZXF1ZXN0KTsKIAllbHNlCiAJCWV4ZWNsaXN0c19j b250ZXh0X3F1ZXVlKHJlcXVlc3QpOwogCi0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==