From: Oscar Mateo Subject: [PATCH 04/13] drm/i915/guc: The Additional Data Struct (ADS) should get enabled together with GuC submission Date: Wed, 22 Mar 2017 10:39:47 -0700 Message-ID: <1490204396-3395-5-git-send-email-oscar.mateo@intel.com> References: <1490204396-3395-1-git-send-email-oscar.mateo@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 ESMTPS id DA4466E9DA for ; Thu, 23 Mar 2017 00:39:53 +0000 (UTC) In-Reply-To: <1490204396-3395-1-git-send-email-oscar.mateo@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 SXQncyBtYW5kYXRvcnkgYW5kIGl0IGdldHMgY3JlYXRlZCBpZiBhbmQgb25seSBpZiBHdUMgc3Vi bWlzc2lvbiBpcyBlbmFibGVkLCBzbyB0aGF0IHNob3VsZCBiZQp0aGUgY29uZGl0aW9uIGZvciBp bmZvcm1pbmcgdGhlIEd1QyBhYm91dCBpdC4KCkFsc28gcy9ndWNfYWRkb25fY3JlYXRlL2d1Y19h ZHNfY3JlYXRlIGFuZCBzL2d1Y19hZGRvbl9kZXN0cm95L2d1Y19hZHNfZGVzdHJveSBhbmQsIHdo aWxlCmF0IGl0LCBhZGQgYW4gZXhwbGFuYXRpb24gb2Ygd2hhdCB0aGluZ3MgZ28gaW5zaWRlIHRo ZSBBRFMgb2JqZWN0LgoKQ2M6IEpvb25hcyBMYWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxpbnV4 LmludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogT3NjYXIgTWF0ZW8gPG9zY2FyLm1hdGVvQGludGVs LmNvbT4KUmV2aWV3ZWQtYnk6IERhbmllbGUgQ2VyYW9sbyBTcHVyaW8gPGRhbmllbGUuY2VyYW9s b3NwdXJpb0BpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3Vi bWlzc2lvbi5jIHwgMTcgKysrKysrKysrKysrLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2d1Y19sb2FkZXIuYyAgICB8IDEwICsrKystLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMTYg aW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9ndWNfc3VibWlzc2lvbi5jCmluZGV4IDA4Mjg3ZjcuLmIzZDFkNWMgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKQEAgLTYyLDYgKzYyLDEzIEBACiAgKiBF TFNQIGNvbnRleHQgZGVzY3JpcHRvciBkd29yZCBpbnRvIFdvcmsgSXRlbS4KICAqIFNlZSBndWNf d3FfaXRlbV9hcHBlbmQoKQogICoKKyAqIEFEUzoKKyAqIFRoZSBBZGRpdGlvbmFsIERhdGEgU3Ry dWN0IChBRFMpIGhhcyBwb2ludGVycyBmb3IgZGlmZmVyZW50IGJ1ZmZlcnMgdXNlZCBieQorICog dGhlIEd1Qy4gT25lIHNpbmdsZSBnZW0gb2JqZWN0IGNvbnRhaW5zIHRoZSBBRFMgc3RydWN0IGl0 c2VsZiAoZ3VjX2FkcyksIHRoZQorICogc2NoZWR1bGluZyBwb2xpY2llcyAoZ3VjX3BvbGljaWVz KSwgYSBzdHJ1Y3R1cmUgZGVzY3JpYmluZyBhIGNvbGxlY3Rpb24gb2YKKyAqIHJlZ2lzdGVyIHNl dHMgKGd1Y19tbWlvX3JlZ19zdGF0ZSkgYW5kIHNvbWUgZXh0cmEgcGFnZXMgZm9yIHRoZSBHdUMg dG8gc2F2ZQorICogaXRzIGludGVybmFsIHN0YXRlIGZvciBzbGVlcC4KKyAqCiAgKi8KIAogc3Rh dGljIGlubGluZSBib29sIGlzX2hpZ2hfcHJpb3JpdHkoc3RydWN0IGk5MTVfZ3VjX2NsaWVudCog Y2xpZW50KQpAQCAtOTM3LDcgKzk0NCw3IEBAIHN0YXRpYyB2b2lkIGd1Y19wb2xpY2llc19pbml0 KHN0cnVjdCBndWNfcG9saWNpZXMgKnBvbGljaWVzKQogCXBvbGljaWVzLT5pc192YWxpZCA9IDE7 CiB9CiAKLXN0YXRpYyBpbnQgZ3VjX2FkZG9uX2NyZWF0ZShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMp CitzdGF0aWMgaW50IGd1Y19hZHNfY3JlYXRlKHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKIHsKIAlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBndWNfdG9faTkxNShndWMpOwogCXN0 cnVjdCBpOTE1X3ZtYSAqdm1hOwpAQCAtMTAwMCw3ICsxMDA3LDcgQEAgc3RhdGljIGludCBndWNf YWRkb25fY3JlYXRlKHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKIAlyZXR1cm4gMDsKIH0KIAotc3Rh dGljIHZvaWQgZ3VjX2FkZG9uX2Rlc3Ryb3koc3RydWN0IGludGVsX2d1YyAqZ3VjKQorc3RhdGlj IHZvaWQgZ3VjX2Fkc19kZXN0cm95KHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKIHsKIAlpOTE1X3Zt YV91bnBpbl9hbmRfcmVsZWFzZSgmZ3VjLT5hZHNfdm1hKTsKIH0KQEAgLTEwNTAsNyArMTA1Nyw3 IEBAIGludCBpOTE1X2d1Y19zdWJtaXNzaW9uX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KQogCWlmIChyZXQgPCAwKQogCQlnb3RvIGVycl92YWRkcjsKIAotCXJldCA9IGd1 Y19hZGRvbl9jcmVhdGUoZ3VjKTsKKwlyZXQgPSBndWNfYWRzX2NyZWF0ZShndWMpOwogCWlmIChy ZXQgPCAwKQogCQlnb3RvIGVycl9sb2c7CiAKQEAgLTEwNjksNyArMTA3Niw3IEBAIGludCBpOTE1 X2d1Y19zdWJtaXNzaW9uX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQog CXJldHVybiAwOwogCiBlcnJfYWRzOgotCWd1Y19hZGRvbl9kZXN0cm95KGd1Yyk7CisJZ3VjX2Fk c19kZXN0cm95KGd1Yyk7CiBlcnJfbG9nOgogCWludGVsX2d1Y19sb2dfZGVzdHJveShndWMpOwog ZXJyX3ZhZGRyOgpAQCAtMTA4OSw3ICsxMDk2LDcgQEAgdm9pZCBpOTE1X2d1Y19zdWJtaXNzaW9u X2Zpbmkoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWd1Y19jbGllbnRfZnJl ZShndWMtPmV4ZWNidWZfY2xpZW50KTsKIAlndWMtPmV4ZWNidWZfY2xpZW50ID0gTlVMTDsKIAlp ZGFfZGVzdHJveSgmZ3VjLT5jdHhfaWRzKTsKLQlndWNfYWRkb25fZGVzdHJveShndWMpOworCWd1 Y19hZHNfZGVzdHJveShndWMpOwogCWludGVsX2d1Y19sb2dfZGVzdHJveShndWMpOwogCWk5MTVf Z2VtX29iamVjdF91bnBpbl9tYXAoZ3VjLT5jdHhfcG9vbC0+b2JqKTsKIAlpOTE1X3ZtYV91bnBp bl9hbmRfcmVsZWFzZSgmZ3VjLT5jdHhfcG9vbCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9n dWNfbG9hZGVyLmMKaW5kZXggYjhiYTI4ZC4uNjJlYmY1NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2d1Y19sb2FkZXIuYwpAQCAtMTQ4LDE3ICsxNDgsMTUgQEAgc3RhdGljIHZvaWQgZ3Vj X3BhcmFtc19pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAl9IGVsc2UK IAkJcGFyYW1zW0dVQ19DVExfREVCVUddID0gR1VDX0xPR19ESVNBQkxFRDsKIAotCWlmIChndWMt PmFkc192bWEpIHsKLQkJdTMyIGFkcyA9IGd1Y19nZ3R0X29mZnNldChndWMtPmFkc192bWEpID4+ IFBBR0VfU0hJRlQ7Ci0JCXBhcmFtc1tHVUNfQ1RMX0RFQlVHXSB8PSBhZHMgPDwgR1VDX0FEU19B RERSX1NISUZUOwotCQlwYXJhbXNbR1VDX0NUTF9ERUJVR10gfD0gR1VDX0FEU19FTkFCTEVEOwot CX0KLQogCS8qIElmIEd1QyBzdWJtaXNzaW9uIGlzIGVuYWJsZWQsIHNldCB1cCBhZGRpdGlvbmFs IHBhcmFtZXRlcnMgaGVyZSAqLwogCWlmIChpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbikgewor CQl1MzIgYWRzID0gZ3VjX2dndHRfb2Zmc2V0KGd1Yy0+YWRzX3ZtYSkgPj4gUEFHRV9TSElGVDsK IAkJdTMyIHBncyA9IGd1Y19nZ3R0X29mZnNldChkZXZfcHJpdi0+Z3VjLmN0eF9wb29sKTsKIAkJ dTMyIGN0eF9pbl8xNiA9IEdVQ19NQVhfR1BVX0NPTlRFWFRTIC8gMTY7CiAKKwkJcGFyYW1zW0dV Q19DVExfREVCVUddIHw9IGFkcyA8PCBHVUNfQURTX0FERFJfU0hJRlQ7CisJCXBhcmFtc1tHVUNf Q1RMX0RFQlVHXSB8PSBHVUNfQURTX0VOQUJMRUQ7CisKIAkJcGdzID4+PSBQQUdFX1NISUZUOwog CQlwYXJhbXNbR1VDX0NUTF9DVFhJTkZPXSA9IChwZ3MgPDwgR1VDX0NUTF9CQVNFX0FERFJfU0hJ RlQpIHwKIAkJCShjdHhfaW5fMTYgPDwgR1VDX0NUTF9DVFhOVU1fSU4xNl9TSElGVCk7Ci0tIAox LjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==