From: Dave Gordon Subject: [PATCH v4 2/7] drm/i915/guc: distinguish HAS_GUC() from HAS_GUC_UCODE/HAS_GUC_SCHED Date: Fri, 13 May 2016 15:36:30 +0100 Message-ID: <1463150195-28805-3-git-send-email-david.s.gordon@intel.com> References: <1463150195-28805-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 EAD596E58E for ; Fri, 13 May 2016 14:37:08 +0000 (UTC) In-Reply-To: <1463150195-28805-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 Rm9yIG5vdywgYW55dGhpbmcgd2l0aCBhIEd1QyByZXF1aXJlcyB1Q29kZSBsb2FkaW5nLCBhbmQg dGhlbiBzdXBwb3J0cwpjb21tYW5kIHN1Ym1pc3Npb24gb25jZSBsb2FkZWQuIEJ1dCB0aGVzZSBh cmUgbG9naWNhbGx5IGRpc3RpbmN0IGZyb20Kc2ltcGx5ICJoYXZpbmcgYSBHdUMiLCBzbyB3ZSBu ZWVkIGEgc2VwYXJhdGUgbWFjcm8gZm9yIHRoZSBsYXR0ZXIuIFRoZW4sCnZhcmlvdXMgdGVzdHMg c2hvdWxkIHVzZSB0aGlzIG5ldyBtYWNybyByYXRoZXIgdGhhbiBIQVNfR1VDX1VDT0RFKCkgb3IK dGVzdGluZyBlbmFibGVfZ3VjX3N1Ym1pc3Npb24uCgp2NDoKICAgIEFkZGVkIGEgY291cGxlIG1v cmUgdXNlcyBvZiB0aGUgbmV3IG1hY3JvLgoKU2lnbmVkLW9mZi1ieTogRGF2ZSBHb3Jkb24gPGRh dmlkLnMuZ29yZG9uQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oICAgICB8IDEwICsrKysrKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMg ICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgICAgIHwgIDIgKy0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jIHwgIDIgKy0KIDQgZmlsZXMgY2hh bmdlZCwgMTEgaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaAppbmRleCBkOWQwN2I3Li4zYjllZTUxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAg LTI3MjYsOCArMjcyNiwxNCBAQCBzdHJ1Y3QgZHJtX2k5MTVfY21kX3RhYmxlIHsKIAogI2RlZmlu ZSBIQVNfQ1NSKGRldikJKElTX0dFTjkoZGV2KSkKIAotI2RlZmluZSBIQVNfR1VDX1VDT0RFKGRl dikJKElTX0dFTjkoZGV2KSAmJiAhSVNfS0FCWUxBS0UoZGV2KSkKLSNkZWZpbmUgSEFTX0dVQ19T Q0hFRChkZXYpCShJU19HRU45KGRldikgJiYgIUlTX0tBQllMQUtFKGRldikpCisvKgorICogRm9y IG5vdywgYW55dGhpbmcgd2l0aCBhIEd1QyByZXF1aXJlcyB1Q29kZSBsb2FkaW5nLCBhbmQgdGhl biBzdXBwb3J0cworICogY29tbWFuZCBzdWJtaXNzaW9uIG9uY2UgbG9hZGVkLiBCdXQgdGhlc2Ug YXJlIGxvZ2ljYWxseSBpbmRlcGVuZGVudAorICogcHJvcGVydGllcywgc28gd2UgaGF2ZSBzZXBh cmF0ZSBtYWNyb3MgdG8gdGVzdCB0aGVtLgorICovCisjZGVmaW5lIEhBU19HVUMoZGV2KQkJKElT X0dFTjkoZGV2KSAmJiAhSVNfS0FCWUxBS0UoZGV2KSkKKyNkZWZpbmUgSEFTX0dVQ19VQ09ERShk ZXYpCShIQVNfR1VDKGRldikpCisjZGVmaW5lIEhBU19HVUNfU0NIRUQoZGV2KQkoSEFTX0dVQyhk ZXYpKQogCiAjZGVmaW5lIEhBU19SRVNPVVJDRV9TVFJFQU1FUihkZXYpIChJU19IQVNXRUxMKGRl dikgfHwgXAogCQkJCSAgICBJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA4KQpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtLmMKaW5kZXggNDNlNDViNy4uMmE3YmU3MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5j CkBAIC00ODY2LDcgKzQ4NjYsNyBAQCBpbnQgaTkxNV9nZW1faW5pdF9lbmdpbmVzKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCiAJaW50ZWxfbW9jc19pbml0X2wzY2NfdGFibGUoZGV2KTsKIAogCS8q IFdlIGNhbid0IGVuYWJsZSBjb250ZXh0cyB1bnRpbCBhbGwgZmlybXdhcmUgaXMgbG9hZGVkICov Ci0JaWYgKEhBU19HVUNfVUNPREUoZGV2KSkgeworCWlmIChIQVNfR1VDKGRldikpIHsKIAkJcmV0 ID0gaW50ZWxfZ3VjX3NldHVwKGRldik7CiAJCWlmIChyZXQpIHsKIAkJCURSTV9FUlJPUigiRmFp bGVkIHRvIGluaXRpYWxpemUgR3VDLCBlcnJvciAlZFxuIiwgcmV0KTsKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9wbS5jCmluZGV4IDFiYjBmOWEuLmM1ODQyODIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpA QCAtNDg0NCw3ICs0ODQ0LDcgQEAgc3RhdGljIHZvaWQgZ2VuOV9lbmFibGVfcmM2KHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCBkZXZf cHJpdikKIAkJSTkxNV9XUklURShSSU5HX01BWF9JRExFKGVuZ2luZS0+bW1pb19iYXNlKSwgMTAp OwogCi0JaWYgKEhBU19HVUNfVUNPREUoZGV2X3ByaXYpKQorCWlmIChIQVNfR1VDKGRldl9wcml2 KSkKIAkJSTkxNV9XUklURShHVUNfTUFYX0lETEVfQ09VTlQsIDB4QSk7CiAKIAlJOTE1X1dSSVRF KEdFTjZfUkNfU0xFRVAsIDApOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfdW5jb3JlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYwppbmRleCAz ODUxMTRiLi5jMWNhNDU4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91 bmNvcmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYwpAQCAtMTcx NSw3ICsxNzE1LDcgQEAgaW50IGludGVsX2d1Y19yZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYpCiAJaW50IHJldDsKIAl1bnNpZ25lZCBsb25nIGlycWZsYWdzOwogCi0JaWYg KCFpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbikKKwlpZiAoIUhBU19HVUMoZGV2X3ByaXYpKQog CQlyZXR1cm4gLUVJTlZBTDsKIAogCWludGVsX3VuY29yZV9mb3JjZXdha2VfZ2V0KGRldl9wcml2 LCBGT1JDRVdBS0VfQUxMKTsKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK