From: Dave Gordon Subject: [CI-Resend v2 4/6] drm/i915/guc: add engine mask to GuC client & pass to GuC Date: Fri, 22 Jul 2016 16:15:34 +0100 Message-ID: <1469200537-5279-5-git-send-email-david.s.gordon@intel.com> References: <1469200537-5279-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 E254B6EBD6 for ; Fri, 22 Jul 2016 15:16:14 +0000 (UTC) In-Reply-To: <1469200537-5279-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 VGhlIENvbnRleHQgRGVzY3JpcHRvciBwYXNzZWQgYnkgdGhlIGtlcm5lbCB0byB0aGUgR3VDIGNv bnRhaW5zIGEgZmllbGQKc3BlY2lmeWluZyB3aGljaCBlbmdpbmUocykgdGhlIGNvbnRleHQgd2ls bCB1c2UuIEhpc3RvcmljYWxseSwgdGhpcyB3YXMKYWx3YXlzIHNldCB0byAiYWxsIG9mIHRoZW0i LCBidXQgbm93IHRoYXQgd2UgaGF2ZSBvbmUgY2xpZW50IHBlciBlbmdpbmUsCndlIGNhbiBiZSBt b3JlIHByZWNpc2UsIGFuZCBzZXQgb25seSB0aGUgc2luZ2xlIGJpdCBmb3IgdGhlIGVuZ2luZSB0 aGF0CnRoZSBjbGllbnQgaXMgYXNzb2NpYXRlZCB3aXRoLgoKU2lnbmVkLW9mZi1ieTogRGF2ZSBH b3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IFR2cnRrbyBVcnN1 bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9ndWNfc3VibWlzc2lvbi5jIHwgMTUgKysrKysrKysrKy0tLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9ndWMuaCAgICAgICAgICAgfCAgMyArKy0KIDIgZmlsZXMgY2hhbmdlZCwg MTIgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2d1Y19zdWJtaXNzaW9uLmMKaW5kZXggOTk5OTc5Ny4uNjc1NmRiMCAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwpAQCAtMzQwLDcgKzM0MCw3IEBAIHN0 YXRpYyB2b2lkIGd1Y19pbml0X2N0eF9kZXNjKHN0cnVjdCBpbnRlbF9ndWMgKmd1YywKIAlkZXNj LnByaW9yaXR5ID0gY2xpZW50LT5wcmlvcml0eTsKIAlkZXNjLmRiX2lkID0gY2xpZW50LT5kb29y YmVsbF9pZDsKIAotCWZvcl9lYWNoX2VuZ2luZShlbmdpbmUsIGRldl9wcml2KSB7CisJZm9yX2Vh Y2hfZW5naW5lX21hc2tlZChlbmdpbmUsIGRldl9wcml2LCBjbGllbnQtPmVuZ2luZXMpIHsKIAkJ c3RydWN0IGludGVsX2NvbnRleHQgKmNlID0gJmN0eC0+ZW5naW5lW2VuZ2luZS0+aWRdOwogCQlz dHJ1Y3QgZ3VjX2V4ZWNsaXN0X2NvbnRleHQgKmxyYyA9ICZkZXNjLmxyY1tlbmdpbmUtPmd1Y19p ZF07CiAJCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7CkBAIC0zNzQsNiArMzc0LDgg QEAgc3RhdGljIHZvaWQgZ3VjX2luaXRfY3R4X2Rlc2Moc3RydWN0IGludGVsX2d1YyAqZ3VjLAog CQlkZXNjLmVuZ2luZXNfdXNlZCB8PSAoMSA8PCBlbmdpbmUtPmd1Y19pZCk7CiAJfQogCisJRFJN X0RFQlVHX0RSSVZFUigiSG9zdCBlbmdpbmVzIDB4JXggPT4gR3VDIGVuZ2luZXMgdXNlZCAweCV4 XG4iLAorCQkJY2xpZW50LT5lbmdpbmVzLCBkZXNjLmVuZ2luZXNfdXNlZCk7CiAJV0FSTl9PTihk ZXNjLmVuZ2luZXNfdXNlZCA9PSAwKTsKIAogCS8qCkBAIC03NjgsNiArNzcwLDcgQEAgc3RhdGlj IHZvaWQgZ3VjX2luaXRfZG9vcmJlbGxfaHcoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogICovCiBz dGF0aWMgc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqCiBndWNfY2xpZW50X2FsbG9jKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKKwkJIHVpbnQzMl90IGVuZ2luZXMsCiAJCSB1aW50 MzJfdCBwcmlvcml0eSwKIAkJIHN0cnVjdCBpOTE1X2dlbV9jb250ZXh0ICpjdHgpCiB7CkBAIC03 ODAsMTAgKzc4MywxMSBAQCBzdGF0aWMgdm9pZCBndWNfaW5pdF9kb29yYmVsbF9odyhzdHJ1Y3Qg aW50ZWxfZ3VjICpndWMpCiAJaWYgKCFjbGllbnQpCiAJCXJldHVybiBOVUxMOwogCi0JY2xpZW50 LT5kb29yYmVsbF9pZCA9IEdVQ19JTlZBTElEX0RPT1JCRUxMX0lEOwotCWNsaWVudC0+cHJpb3Jp dHkgPSBwcmlvcml0eTsKIAljbGllbnQtPm93bmVyID0gY3R4OwogCWNsaWVudC0+Z3VjID0gZ3Vj OworCWNsaWVudC0+ZW5naW5lcyA9IGVuZ2luZXM7CisJY2xpZW50LT5wcmlvcml0eSA9IHByaW9y aXR5OworCWNsaWVudC0+ZG9vcmJlbGxfaWQgPSBHVUNfSU5WQUxJRF9ET09SQkVMTF9JRDsKIAog CWNsaWVudC0+Y3R4X2luZGV4ID0gKHVpbnQzMl90KWlkYV9zaW1wbGVfZ2V0KCZndWMtPmN0eF9p ZHMsIDAsCiAJCQlHVUNfTUFYX0dQVV9DT05URVhUUywgR0ZQX0tFUk5FTCk7CkBAIC04MjUsOCAr ODI5LDggQEAgc3RhdGljIHZvaWQgZ3VjX2luaXRfZG9vcmJlbGxfaHcoc3RydWN0IGludGVsX2d1 YyAqZ3VjKQogCWlmIChndWNfaW5pdF9kb29yYmVsbChndWMsIGNsaWVudCwgZGJfaWQpKQogCQln b3RvIGVycjsKIAotCURSTV9ERUJVR19EUklWRVIoIm5ldyBwcmlvcml0eSAldSBjbGllbnQgJXA6 IGN0eF9pbmRleCAldVxuIiwKLQkJcHJpb3JpdHksIGNsaWVudCwgY2xpZW50LT5jdHhfaW5kZXgp OworCURSTV9ERUJVR19EUklWRVIoIm5ldyBwcmlvcml0eSAldSBjbGllbnQgJXAgZm9yIGVuZ2lu ZShzKSAweCV4OiBjdHhfaW5kZXggJXVcbiIsCisJCXByaW9yaXR5LCBjbGllbnQsIGNsaWVudC0+ ZW5naW5lcywgY2xpZW50LT5jdHhfaW5kZXgpOwogCURSTV9ERUJVR19EUklWRVIoImRvb3JiZWxs IGlkICV1LCBjYWNoZWxpbmUgb2Zmc2V0IDB4JXhcbiIsCiAJCWNsaWVudC0+ZG9vcmJlbGxfaWQs IGNsaWVudC0+ZG9vcmJlbGxfb2Zmc2V0KTsKIApAQCAtMTAxMSw2ICsxMDE1LDcgQEAgaW50IGk5 MTVfZ3VjX3N1Ym1pc3Npb25fZW5hYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp dikKIAlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCBkZXZfcHJpdikgewogCQkvKiBjbGllbnQgZm9y IGV4ZWNidWYgc3VibWlzc2lvbiAqLwogCQljbGllbnQgPSBndWNfY2xpZW50X2FsbG9jKGRldl9w cml2LAorCQkJCQkgIGludGVsX2VuZ2luZV9mbGFnKGVuZ2luZSksCiAJCQkJCSAgR1VDX0NUWF9Q UklPUklUWV9LTURfTk9STUFMLAogCQkJCQkgIGRldl9wcml2LT5rZXJuZWxfY29udGV4dCk7CiAJ CWlmICghY2xpZW50KSB7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9n dWMuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCmluZGV4IDdiNGNjNGQuLjUz ZDQxYjUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCkBAIC02Nyw2ICs2Nyw4IEBAIHN0cnVj dCBpOTE1X2d1Y19jbGllbnQgewogCXZvaWQgKmNsaWVudF9iYXNlOwkJLyogZmlyc3QgcGFnZSAo b25seSkgb2YgYWJvdmUJKi8KIAlzdHJ1Y3QgaTkxNV9nZW1fY29udGV4dCAqb3duZXI7CiAJc3Ry dWN0IGludGVsX2d1YyAqZ3VjOworCisJdWludDMyX3QgZW5naW5lczsJCS8qIGJpdG1hcCBvZiAo aG9zdCkgZW5naW5lIGlkcwkqLwogCXVpbnQzMl90IHByaW9yaXR5OwogCXVpbnQzMl90IGN0eF9p bmRleDsKIApAQCAtNzksNyArODEsNiBAQCBzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50IHsKIAl1aW50 MzJfdCB3cV9vZmZzZXQ7CiAJdWludDMyX3Qgd3Ffc2l6ZTsKIAl1aW50MzJfdCB3cV90YWlsOwot CXVpbnQzMl90IHVudXNlZDsJCS8qIFdhcyAnd3FfaGVhZCcJCSovCiAKIAl1aW50MzJfdCBub193 cV9zcGFjZTsKIAl1aW50MzJfdCBxX2ZhaWw7CQkvKiBObyBsb25nZXIgdXNlZAkJKi8KLS0gCjEu OS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK