From: Oscar Mateo Subject: [PATCH 04/12] drm/i915/guc: The Additional Data Struct (ADS) should get enabled together with GuC submission Date: Tue, 21 Mar 2017 02:02:49 -0700 Message-ID: <1490086977-9282-5-git-send-email-oscar.mateo@intel.com> References: <1490086977-9282-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 EA7896E710 for ; Tue, 21 Mar 2017 16:03:03 +0000 (UTC) In-Reply-To: <1490086977-9282-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 ZSBBRFMgb2JqZWN0LgoKQ2M6IERhbmllbGUgQ2VyYW9sbyBTcHVyaW8gPGRhbmllbGUuY2VyYW9s b3NwdXJpb0BpbnRlbC5jb20+CkNjOiBKb29uYXMgTGFodGluZW4gPGpvb25hcy5sYWh0aW5lbkBs aW51eC5pbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IE9zY2FyIE1hdGVvIDxvc2Nhci5tYXRlb0Bp bnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5j IHwgMTcgKysrKysrKysrKysrLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19s b2FkZXIuYyAgICB8IDEwICsrKystLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMTYgaW5zZXJ0aW9u cygrKSwgMTEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9ndWNfc3VibWlzc2lvbi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3Vi bWlzc2lvbi5jCmluZGV4IGIyNDYwMmIuLmZmODIzNWExIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCkBAIC02Miw2ICs2MiwxMyBAQAogICogRUxTUCBjb250 ZXh0IGRlc2NyaXB0b3IgZHdvcmQgaW50byBXb3JrIEl0ZW0uCiAgKiBTZWUgZ3VjX3dxX2l0ZW1f YXBwZW5kKCkKICAqCisgKiBBRFM6CisgKiBUaGUgQWRkaXRpb25hbCBEYXRhIFN0cnVjdCAoQURT KSBoYXMgcG9pbnRlcnMgZm9yIGRpZmZlcmVudCBidWZmZXJzIHVzZWQgYnkKKyAqIHRoZSBHdUMu IE9uZSBzaW5nbGUgZ2VtIG9iamVjdCBjb250YWlucyB0aGUgQURTIHN0cnVjdCBpdHNlbGYgKGd1 Y19hZHMpLCB0aGUKKyAqIHNjaGVkdWxpbmcgcG9saWNpZXMgKGd1Y19wb2xpY2llcyksIGEgc3Ry dWN0dXJlIGRlc2NyaWJpbmcgYSBjb2xsZWN0aW9uIG9mCisgKiByZWdpc3RlciBzZXRzIChndWNf bW1pb19yZWdfc3RhdGUpIGFuZCBzb21lIGV4dHJhIHBhZ2VzIGZvciB0aGUgR3VDIHRvIHNhdmUK KyAqIGl0cyBpbnRlcm5hbCBzdGF0ZSBmb3Igc2xlZXAuCisgKgogICovCiAKIHN0YXRpYyBpbmxp bmUgYm9vbCBpc19oaWdoX3ByaW9yaXR5KHN0cnVjdCBpOTE1X2d1Y19jbGllbnQqIGNsaWVudCkK QEAgLTkzNyw3ICs5NDQsNyBAQCBzdGF0aWMgdm9pZCBndWNfcG9saWNpZXNfaW5pdChzdHJ1Y3Qg Z3VjX3BvbGljaWVzICpwb2xpY2llcykKIAlwb2xpY2llcy0+aXNfdmFsaWQgPSAxOwogfQogCi1z dGF0aWMgaW50IGd1Y19hZGRvbl9jcmVhdGUoc3RydWN0IGludGVsX2d1YyAqZ3VjKQorc3RhdGlj IGludCBndWNfYWRzX2NyZWF0ZShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiB7CiAJc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZ3VjX3RvX2k5MTUoZ3VjKTsKIAlzdHJ1Y3QgaTkx NV92bWEgKnZtYTsKQEAgLTEwMDAsNyArMTAwNyw3IEBAIHN0YXRpYyBpbnQgZ3VjX2FkZG9uX2Ny ZWF0ZShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyB2b2lk IGd1Y19hZGRvbl9kZXN0cm95KHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKK3N0YXRpYyB2b2lkIGd1 Y19hZHNfZGVzdHJveShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiB7CiAJaTkxNV92bWFfdW5waW5f YW5kX3JlbGVhc2UoJmd1Yy0+YWRzX3ZtYSk7CiB9CkBAIC0xMDUwLDcgKzEwNTcsNyBAQCBpbnQg aTkxNV9ndWNfc3VibWlzc2lvbl9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp dikKIAlpZiAocmV0IDwgMCkKIAkJZ290byBlcnJfdmFkZHI7CiAKLQlyZXQgPSBndWNfYWRkb25f Y3JlYXRlKGd1Yyk7CisJcmV0ID0gZ3VjX2Fkc19jcmVhdGUoZ3VjKTsKIAlpZiAocmV0IDwgMCkK IAkJZ290byBlcnJfbG9nOwogCkBAIC0xMDY5LDcgKzEwNzYsNyBAQCBpbnQgaTkxNV9ndWNfc3Vi bWlzc2lvbl9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlyZXR1cm4g MDsKIAogZXJyX2FkczoKLQlndWNfYWRkb25fZGVzdHJveShndWMpOworCWd1Y19hZHNfZGVzdHJv eShndWMpOwogZXJyX2xvZzoKIAlpbnRlbF9ndWNfbG9nX2Rlc3Ryb3koZ3VjKTsKIGVycl92YWRk cjoKQEAgLTEwODksNyArMTA5Niw3IEBAIHZvaWQgaTkxNV9ndWNfc3VibWlzc2lvbl9maW5pKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlndWNfY2xpZW50X2ZyZWUoZ3VjLT5l eGVjYnVmX2NsaWVudCk7CiAJZ3VjLT5leGVjYnVmX2NsaWVudCA9IE5VTEw7CiAJaWRhX2Rlc3Ry b3koJmd1Yy0+Y3R4X2lkcyk7Ci0JZ3VjX2FkZG9uX2Rlc3Ryb3koZ3VjKTsKKwlndWNfYWRzX2Rl c3Ryb3koZ3VjKTsKIAlpbnRlbF9ndWNfbG9nX2Rlc3Ryb3koZ3VjKTsKIAlpOTE1X2dlbV9vYmpl Y3RfdW5waW5fbWFwKGd1Yy0+Y3R4X3Bvb2wtPm9iaik7CiAJaTkxNV92bWFfdW5waW5fYW5kX3Jl bGVhc2UoJmd1Yy0+Y3R4X3Bvb2wpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZ3VjX2xvYWRlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRl ci5jCmluZGV4IGI4YmEyOGQuLjYyZWJmNTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2d1Y19sb2FkZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9n dWNfbG9hZGVyLmMKQEAgLTE0OCwxNyArMTQ4LDE1IEBAIHN0YXRpYyB2b2lkIGd1Y19wYXJhbXNf aW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJfSBlbHNlCiAJCXBhcmFt c1tHVUNfQ1RMX0RFQlVHXSA9IEdVQ19MT0dfRElTQUJMRUQ7CiAKLQlpZiAoZ3VjLT5hZHNfdm1h KSB7Ci0JCXUzMiBhZHMgPSBndWNfZ2d0dF9vZmZzZXQoZ3VjLT5hZHNfdm1hKSA+PiBQQUdFX1NI SUZUOwotCQlwYXJhbXNbR1VDX0NUTF9ERUJVR10gfD0gYWRzIDw8IEdVQ19BRFNfQUREUl9TSElG VDsKLQkJcGFyYW1zW0dVQ19DVExfREVCVUddIHw9IEdVQ19BRFNfRU5BQkxFRDsKLQl9Ci0KIAkv KiBJZiBHdUMgc3VibWlzc2lvbiBpcyBlbmFibGVkLCBzZXQgdXAgYWRkaXRpb25hbCBwYXJhbWV0 ZXJzIGhlcmUgKi8KIAlpZiAoaTkxNS5lbmFibGVfZ3VjX3N1Ym1pc3Npb24pIHsKKwkJdTMyIGFk cyA9IGd1Y19nZ3R0X29mZnNldChndWMtPmFkc192bWEpID4+IFBBR0VfU0hJRlQ7CiAJCXUzMiBw Z3MgPSBndWNfZ2d0dF9vZmZzZXQoZGV2X3ByaXYtPmd1Yy5jdHhfcG9vbCk7CiAJCXUzMiBjdHhf aW5fMTYgPSBHVUNfTUFYX0dQVV9DT05URVhUUyAvIDE2OwogCisJCXBhcmFtc1tHVUNfQ1RMX0RF QlVHXSB8PSBhZHMgPDwgR1VDX0FEU19BRERSX1NISUZUOworCQlwYXJhbXNbR1VDX0NUTF9ERUJV R10gfD0gR1VDX0FEU19FTkFCTEVEOworCiAJCXBncyA+Pj0gUEFHRV9TSElGVDsKIAkJcGFyYW1z W0dVQ19DVExfQ1RYSU5GT10gPSAocGdzIDw8IEdVQ19DVExfQkFTRV9BRERSX1NISUZUKSB8CiAJ CQkoY3R4X2luXzE2IDw8IEdVQ19DVExfQ1RYTlVNX0lOMTZfU0hJRlQpOwotLSAKMS45LjEKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=