From: Dave Gordon Subject: [PATCH v3 1/6] drm/i915/guc: distinguish HAS_GUC() from HAS_GUC_UCODE/HAS_GUC_SCHED Date: Fri, 6 May 2016 20:31:30 +0100 Message-ID: <1462563095-13233-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 mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id 12DF66E2C2 for ; Fri, 6 May 2016 19:31:55 +0000 (UTC) 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 Rm9yIG5vdywgYW55dGhpbmcgd2l0aCBhIEd1QyByZXF1aXJlcyB1Q29kZSBsb2FkaW5nLCBhbmQg dGhlbiBzdXBwb3J0cwpjb21tYW5kIHN1Ym1pc3Npb24gb25jZSBsb2FkZWQuIEJ1dCB0aGVzZSBh cmUgbG9naWNhbGx5IGRpc3RpbmN0IGZyb20Kc2ltcGx5ICJoYXZpbmcgYSBHdUMiLCBzbyB3ZSBu ZWVkIGEgc2VwYXJhdGUgbWFjcm8gZm9yIHRoZSBsYXR0ZXIuIFRoZW4sCnRoZSB0ZXN0IGluIGlu dGVsX2d1Y19yZXNldCgpIHNob3VsZCBkZXBlbmQgb25seSBvbiB3aGV0aGVyIHRoZSBHdUMKZXhp c3RzLCBub3Qgd2hldGhlciB3ZSdyZSB0cnlpbmcgdG8gdXNlIGl0IGZvciBzdWJtaXNzaW9uLgoK U2lnbmVkLW9mZi1ieTogRGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICB8IDEwICsrKysrKysrLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jIHwgIDIgKy0KIDIgZmlsZXMgY2hhbmdl ZCwgOSBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o CmluZGV4IGQ1NDk2YWIuLjExNDJjYjMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjcw NCw4ICsyNzA0LDE0IEBAIHN0cnVjdCBkcm1faTkxNV9jbWRfdGFibGUgewogCiAjZGVmaW5lIEhB U19DU1IoZGV2KQkoSVNfR0VOOShkZXYpKQogCi0jZGVmaW5lIEhBU19HVUNfVUNPREUoZGV2KQko SVNfR0VOOShkZXYpICYmICFJU19LQUJZTEFLRShkZXYpKQotI2RlZmluZSBIQVNfR1VDX1NDSEVE KGRldikJKElTX0dFTjkoZGV2KSAmJiAhSVNfS0FCWUxBS0UoZGV2KSkKKy8qCisgKiBGb3Igbm93 LCBhbnl0aGluZyB3aXRoIGEgR3VDIHJlcXVpcmVzIHVDb2RlIGxvYWRpbmcsIGFuZCB0aGVuIHN1 cHBvcnRzCisgKiBjb21tYW5kIHN1Ym1pc3Npb24gb25jZSBsb2FkZWQuIEJ1dCB0aGVzZSBhcmUg bG9naWNhbGx5IGluZGVwZW5kZW50CisgKiBwcm9wZXJ0aWVzLCBzbyB3ZSBoYXZlIHNlcGFyYXRl IG1hY3JvcyB0byB0ZXN0IHRoZW0uCisgKi8KKyNkZWZpbmUgSEFTX0dVQyhkZXYpCQkoSVNfR0VO OShkZXYpICYmICFJU19LQUJZTEFLRShkZXYpKQorI2RlZmluZSBIQVNfR1VDX1VDT0RFKGRldikJ KEhBU19HVUMoZGV2KSkKKyNkZWZpbmUgSEFTX0dVQ19TQ0hFRChkZXYpCShIQVNfR1VDKGRldikp CiAKICNkZWZpbmUgSEFTX1JFU09VUkNFX1NUUkVBTUVSKGRldikgKElTX0hBU1dFTEwoZGV2KSB8 fCBcCiAJCQkJICAgIElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDgpCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3VuY29yZS5jCmluZGV4IDRmMWRmZTYuLmNkZDYzOTcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3VuY29yZS5jCkBAIC0xNzU4LDcgKzE3NTgsNyBAQCBpbnQgaW50ZWxfZ3VjX3Jlc2V0KHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlpbnQgcmV0OwogCXVuc2lnbmVkIGxv bmcgaXJxZmxhZ3M7CiAKLQlpZiAoIWk5MTUuZW5hYmxlX2d1Y19zdWJtaXNzaW9uKQorCWlmICgh SEFTX0dVQyhkZXZfcHJpdikpCiAJCXJldHVybiAtRUlOVkFMOwogCiAJaW50ZWxfdW5jb3JlX2Zv cmNld2FrZV9nZXQoZGV2X3ByaXYsIEZPUkNFV0FLRV9BTEwpOwotLSAKMS45LjEKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=