From: Dave Gordon Subject: [PATCH v3 3/6] drm/i915/guc: add engine mask to GuC client & pass to GuC Date: Tue, 9 Aug 2016 15:19:21 +0100 Message-ID: <1470752364-26940-4-git-send-email-david.s.gordon@intel.com> References: <1470752364-26940-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 1A53D6E5C2 for ; Tue, 9 Aug 2016 14:19:41 +0000 (UTC) In-Reply-To: <1470752364-26940-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 LCBidXQgaWYgd2UgaGFkIGEgc2VwYXJhdGUgY2xpZW50IGZvciBlYWNoCmVuZ2luZSwgd2UgY291 bGQgYmUgbW9yZSBwcmVjaXNlLCBhbmQgc2V0IG9ubHkgdGhlIGJpdCBmb3IgdGhlIGVuZ2luZQp0 aGF0IHRoZSBjbGllbnQgd2FzIGFzc29jaWF0ZWQgd2l0aC4gU28gdGhpcyBwYXRjaCBlbmFibGVz IHRoaXMgdXNhZ2UsCmluIHByZXBhcmF0aW9uIGZvciBoYXZpbmcgbXVsdGlwbGUgY2xpZW50cywg dGhvdWdoIGF0IHRoaXMgcG9pbnQgdGhlcmUKaXMgc3RpbGwgb25seSBhIHNpbmdsZSBjbGllbnQg dXNlZCBmb3IgYWxsIHN1cHBvcnRlZCBlbmdpbmVzLgoKU2lnbmVkLW9mZi1ieTogRGF2ZSBHb3Jk b24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IFR2cnRrbyBVcnN1bGlu IDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9ndWNfc3VibWlzc2lvbi5jIHwgMTUgKysrKysrKysrKy0tLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9ndWMuaCAgICAgICAgICAgfCAgMyArKy0KIDIgZmlsZXMgY2hhbmdlZCwgMTIg aW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2d1Y19zdWJtaXNzaW9uLmMKaW5kZXggYWY1YzRjZi4uNDA1ZTQ0NSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwpAQCAtMzQwLDcgKzM0MCw3IEBAIHN0YXRp YyB2b2lkIGd1Y19pbml0X2N0eF9kZXNjKHN0cnVjdCBpbnRlbF9ndWMgKmd1YywKIAlkZXNjLnBy aW9yaXR5ID0gY2xpZW50LT5wcmlvcml0eTsKIAlkZXNjLmRiX2lkID0gY2xpZW50LT5kb29yYmVs bF9pZDsKIAotCWZvcl9lYWNoX2VuZ2luZShlbmdpbmUsIGRldl9wcml2KSB7CisJZm9yX2VhY2hf ZW5naW5lX21hc2tlZChlbmdpbmUsIGRldl9wcml2LCBjbGllbnQtPmVuZ2luZXMpIHsKIAkJc3Ry dWN0IGludGVsX2NvbnRleHQgKmNlID0gJmN0eC0+ZW5naW5lW2VuZ2luZS0+aWRdOwogCQlzdHJ1 Y3QgZ3VjX2V4ZWNsaXN0X2NvbnRleHQgKmxyYyA9ICZkZXNjLmxyY1tlbmdpbmUtPmd1Y19pZF07 CiAJCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7CkBAIC0zNzQsNiArMzc0LDggQEAg c3RhdGljIHZvaWQgZ3VjX2luaXRfY3R4X2Rlc2Moc3RydWN0IGludGVsX2d1YyAqZ3VjLAogCQlk ZXNjLmVuZ2luZXNfdXNlZCB8PSAoMSA8PCBlbmdpbmUtPmd1Y19pZCk7CiAJfQogCisJRFJNX0RF QlVHX0RSSVZFUigiSG9zdCBlbmdpbmVzIDB4JXggPT4gR3VDIGVuZ2luZXMgdXNlZCAweCV4XG4i LAorCQkJY2xpZW50LT5lbmdpbmVzLCBkZXNjLmVuZ2luZXNfdXNlZCk7CiAJV0FSTl9PTihkZXNj LmVuZ2luZXNfdXNlZCA9PSAwKTsKIAogCS8qCkBAIC03NjQsNiArNzY2LDcgQEAgc3RhdGljIHZv aWQgZ3VjX2luaXRfZG9vcmJlbGxfaHcoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogICovCiBzdGF0 aWMgc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqCiBndWNfY2xpZW50X2FsbG9jKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiwKKwkJIHVpbnQzMl90IGVuZ2luZXMsCiAJCSB1aW50MzJf dCBwcmlvcml0eSwKIAkJIHN0cnVjdCBpOTE1X2dlbV9jb250ZXh0ICpjdHgpCiB7CkBAIC03NzYs MTAgKzc3OSwxMSBAQCBzdGF0aWMgdm9pZCBndWNfaW5pdF9kb29yYmVsbF9odyhzdHJ1Y3QgaW50 ZWxfZ3VjICpndWMpCiAJaWYgKCFjbGllbnQpCiAJCXJldHVybiBOVUxMOwogCi0JY2xpZW50LT5k b29yYmVsbF9pZCA9IEdVQ19JTlZBTElEX0RPT1JCRUxMX0lEOwotCWNsaWVudC0+cHJpb3JpdHkg PSBwcmlvcml0eTsKIAljbGllbnQtPm93bmVyID0gY3R4OwogCWNsaWVudC0+Z3VjID0gZ3VjOwor CWNsaWVudC0+ZW5naW5lcyA9IGVuZ2luZXM7CisJY2xpZW50LT5wcmlvcml0eSA9IHByaW9yaXR5 OworCWNsaWVudC0+ZG9vcmJlbGxfaWQgPSBHVUNfSU5WQUxJRF9ET09SQkVMTF9JRDsKIAogCWNs aWVudC0+Y3R4X2luZGV4ID0gKHVpbnQzMl90KWlkYV9zaW1wbGVfZ2V0KCZndWMtPmN0eF9pZHMs IDAsCiAJCQlHVUNfTUFYX0dQVV9DT05URVhUUywgR0ZQX0tFUk5FTCk7CkBAIC04MjEsOCArODI1 LDggQEAgc3RhdGljIHZvaWQgZ3VjX2luaXRfZG9vcmJlbGxfaHcoc3RydWN0IGludGVsX2d1YyAq Z3VjKQogCWlmIChndWNfaW5pdF9kb29yYmVsbChndWMsIGNsaWVudCwgZGJfaWQpKQogCQlnb3Rv IGVycjsKIAotCURSTV9ERUJVR19EUklWRVIoIm5ldyBwcmlvcml0eSAldSBjbGllbnQgJXA6IGN0 eF9pbmRleCAldVxuIiwKLQkJcHJpb3JpdHksIGNsaWVudCwgY2xpZW50LT5jdHhfaW5kZXgpOwor CURSTV9ERUJVR19EUklWRVIoIm5ldyBwcmlvcml0eSAldSBjbGllbnQgJXAgZm9yIGVuZ2luZShz KSAweCV4OiBjdHhfaW5kZXggJXVcbiIsCisJCXByaW9yaXR5LCBjbGllbnQsIGNsaWVudC0+ZW5n aW5lcywgY2xpZW50LT5jdHhfaW5kZXgpOwogCURSTV9ERUJVR19EUklWRVIoImRvb3JiZWxsIGlk ICV1LCBjYWNoZWxpbmUgb2Zmc2V0IDB4JXhcbiIsCiAJCWNsaWVudC0+ZG9vcmJlbGxfaWQsIGNs aWVudC0+ZG9vcmJlbGxfb2Zmc2V0KTsKIApAQCAtMTAwNiw2ICsxMDEwLDcgQEAgaW50IGk5MTVf Z3VjX3N1Ym1pc3Npb25fZW5hYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK IAogCS8qIGNsaWVudCBmb3IgZXhlY2J1ZiBzdWJtaXNzaW9uICovCiAJY2xpZW50ID0gZ3VjX2Ns aWVudF9hbGxvYyhkZXZfcHJpdiwKKwkJCQkgIElOVEVMX0lORk8oZGV2X3ByaXYpLT5yaW5nX21h c2ssCiAJCQkJICBHVUNfQ1RYX1BSSU9SSVRZX0tNRF9OT1JNQUwsCiAJCQkJICBkZXZfcHJpdi0+ a2VybmVsX2NvbnRleHQpOwogCWlmICghY2xpZW50KSB7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9ndWMuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5o CmluZGV4IDYyM2NmMjYuLmU1NzY2MWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2d1Yy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCkBAIC02 Nyw2ICs2Nyw4IEBAIHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgewogCXZvaWQgKmNsaWVudF9iYXNl OwkJLyogZmlyc3QgcGFnZSAob25seSkgb2YgYWJvdmUJKi8KIAlzdHJ1Y3QgaTkxNV9nZW1fY29u dGV4dCAqb3duZXI7CiAJc3RydWN0IGludGVsX2d1YyAqZ3VjOworCisJdWludDMyX3QgZW5naW5l czsJCS8qIGJpdG1hcCBvZiAoaG9zdCkgZW5naW5lIGlkcwkqLwogCXVpbnQzMl90IHByaW9yaXR5 OwogCXVpbnQzMl90IGN0eF9pbmRleDsKIApAQCAtNzksNyArODEsNiBAQCBzdHJ1Y3QgaTkxNV9n dWNfY2xpZW50IHsKIAl1aW50MzJfdCB3cV9vZmZzZXQ7CiAJdWludDMyX3Qgd3Ffc2l6ZTsKIAl1 aW50MzJfdCB3cV90YWlsOwotCXVpbnQzMl90IHVudXNlZDsJCS8qIFdhcyAnd3FfaGVhZCcJCSov CiAKIAl1aW50MzJfdCBub193cV9zcGFjZTsKIAl1aW50MzJfdCBxX2ZhaWw7CQkvKiBObyBsb25n ZXIgdXNlZAkJKi8KLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK