From mboxrd@z Thu Jan  1 00:00:00 1970
From: =?UTF-8?q?Micha=C5=82=20Winiarski?= <michal.winiarski@intel.com>
Subject: [PATCH v2] drm/i915/guc: Don't try to enable GuC
 logging when we're not using GuC
Date: Tue, 20 Mar 2018 09:49:29 +0100
Message-ID: <20180320084929.5038-1-michal.winiarski@intel.com>
References: <20180320001337.23676-1-michal.winiarski@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga12.intel.com (mga12.intel.com [192.55.52.136])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 3EECC6E6CF
 for <intel-gfx@lists.freedesktop.org>; Tue, 20 Mar 2018 08:49:56 +0000 (UTC)
In-Reply-To: <20180320001337.23676-1-michal.winiarski@intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

V2hlbiBjaGFuZ2luZyB0aGUgZGVmYXVsdCB2YWx1ZXMgZm9yIGd1Y19sb2dfbGV2ZWwsIHdlIGFj
Y2lkZW50YWxseSBsZWZ0CnRoZSBsb2cgZW5hYmxlZCBvbiBub24tZ3VjIHBsYXRmb3Jtcy4gTGV0
J3MgZml4IHRoYXQuCgp2MjogRGVmaW5lIHRoZSBsZXZlbHMgdXNlZCBhbmQgcmVtb3ZlIChub3cg
b2Jzb2xldGUpIGNvbW1lbnRzIChDaHJpcykKCkZpeGVzOiA5NjA1ZDFjZTdjNmIgKCJkcm0vaTkx
NS9ndWM6IERlZmF1bHQgdG8gbm9uLXZlcmJvc2UgR3VDIGxvZ2dpbmciKQpSZXBvcnRlZC1ieTog
Q2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ClNpZ25lZC1vZmYtYnk6IE1p
Y2hhxYIgV2luaWFyc2tpIDxtaWNoYWwud2luaWFyc2tpQGludGVsLmNvbT4KQ2M6IENocmlzIFdp
bHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpDYzogU2FnYXIgQXJ1biBLYW1ibGUgPHNh
Z2FyLmEua2FtYmxlQGludGVsLmNvbT4KQ2M6IE1pY2hhbCBXYWpkZWN6a28gPG1pY2hhbC53YWpk
ZWN6a29AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2cu
YyB8ICAzICstLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvZy5oIHwgMTAgKysr
KysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuYyAgICAgIHwgMjEgKysrKysr
KysrKy0tLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDE3IGluc2VydGlvbnMoKyksIDE3IGRl
bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19s
b2cuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2cuYwppbmRleCA0Y2I0MjJj
ZWIyODMuLjE2ZDIwNjY4MGVkZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfZ3VjX2xvZy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2cuYwpA
QCAtNTE1LDggKzUxNSw3IEBAIGludCBpbnRlbF9ndWNfbG9nX2xldmVsX3NldChzdHJ1Y3QgaW50
ZWxfZ3VjX2xvZyAqbG9nLCB1NjQgdmFsKQogCSAqIEd1QyBpcyByZWNvZ25pemluZyBsb2cgbGV2
ZWxzIHN0YXJ0aW5nIGZyb20gMCB0byBtYXgsIHdlJ3JlIHVzaW5nIDAKIAkgKiBhcyBpbmRpY2F0
aW9uIHRoYXQgbG9nZ2luZyBzaG91bGQgYmUgZGlzYWJsZWQuCiAJICovCi0JaWYgKHZhbCA8IEdV
Q19MT0dfTEVWRUxfRElTQUJMRUQgfHwKLQkgICAgdmFsID4gR1VDX1ZFUkJPU0lUWV9UT19MT0df
TEVWRUwoR1VDX0xPR19WRVJCT1NJVFlfTUFYKSkKKwlpZiAodmFsIDwgR1VDX0xPR19MRVZFTF9E
SVNBQkxFRCB8fCB2YWwgPiBHVUNfTE9HX0xFVkVMX01BWCkKIAkJcmV0dXJuIC1FSU5WQUw7CiAK
IAltdXRleF9sb2NrKCZkZXZfcHJpdi0+ZHJtLnN0cnVjdF9tdXRleCk7CmRpZmYgLS1naXQgYS9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9nLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9ndWNfbG9nLmgKaW5kZXggYWYxNTMyYzBkM2U0Li41NzkzZGI4ZjljMDkgMTAwNjQ0
Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2cuaAorKysgYi9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9nLmgKQEAgLTQ2LDE0ICs0NiwxNiBAQCBzdHJ1Y3Qg
aW50ZWxfZ3VjOwogICogbG9nIGVuYWJsaW5nLCBhbmQgc2VwYXJhdGUgYml0IGZvciBkZWZhdWx0
IGxvZ2dpbmcgLSB3aGljaCAiY29udmVuaWVudGx5IgogICogaWdub3JlcyB0aGUgZW5hYmxlIGJp
dC4KICAqLwotI2RlZmluZSBHVUNfTE9HX0xFVkVMX0RJU0FCTEVECQkJMAotI2RlZmluZSBHVUNf
TE9HX0xFVkVMX1RPX0VOQUJMRUQoeCkJCSgoeCkgPiAwKQotI2RlZmluZSBHVUNfTE9HX0xFVkVM
X1RPX1ZFUkJPU0UoeCkJCSgoeCkgPiAxKQorI2RlZmluZSBHVUNfTE9HX0xFVkVMX0RJU0FCTEVE
CQkwCisjZGVmaW5lIEdVQ19MT0dfTEVWRUxfTk9OX1ZFUkJPU0UJMQorI2RlZmluZSBHVUNfTE9H
X0xFVkVMX1RPX0VOQUJMRUQoeCkJKCh4KSA+IEdVQ19MT0dfTEVWRUxfRElTQUJMRUQpCisjZGVm
aW5lIEdVQ19MT0dfTEVWRUxfVE9fVkVSQk9TRSh4KQkoKHgpID4gR1VDX0xPR19MRVZFTF9OT05f
VkVSQk9TRSkKICNkZWZpbmUgR1VDX0xPR19MRVZFTF9UT19WRVJCT1NJVFkoeCkgKHsJCVwKIAl0
eXBlb2YoeCkgX3ggPSAoeCk7CQkJCVwKIAlHVUNfTE9HX0xFVkVMX1RPX1ZFUkJPU0UoX3gpID8g
X3ggLSAyIDogMDsJXAogfSkKLSNkZWZpbmUgR1VDX1ZFUkJPU0lUWV9UT19MT0dfTEVWRUwoeCkJ
CSgoeCkgKyAyKQorI2RlZmluZSBHVUNfVkVSQk9TSVRZX1RPX0xPR19MRVZFTCh4KQkoKHgpICsg
MikKKyNkZWZpbmUgR1VDX0xPR19MRVZFTF9NQVggR1VDX1ZFUkJPU0lUWV9UT19MT0dfTEVWRUwo
R1VDX0xPR19WRVJCT1NJVFlfTUFYKQogCiBzdHJ1Y3QgaW50ZWxfZ3VjX2xvZyB7CiAJdTMyIGZs
YWdzOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuYyBiL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmMKaW5kZXggMzRlODQ3ZDBlZTRjLi5iNTI1NDExYWU2
MzEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmMKKysrIGIvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuYwpAQCAtNjksMTQgKzY5LDE1IEBAIHN0YXRpYyBp
bnQgX19nZXRfcGxhdGZvcm1fZW5hYmxlX2d1YyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2
X3ByaXYpCiAKIHN0YXRpYyBpbnQgX19nZXRfZGVmYXVsdF9ndWNfbG9nX2xldmVsKHN0cnVjdCBk
cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKLQlpbnQgZ3VjX2xvZ19sZXZlbCA9IDE7IC8q
IG5vbi12ZXJib3NlICovCisJaW50IGd1Y19sb2dfbGV2ZWw7CiAKLQkvKiBFbmFibGUgaWYgd2Un
cmUgcnVubmluZyBvbiBwbGF0Zm9ybSB3aXRoIEd1QyBhbmQgZGVidWcgY29uZmlnICovCi0JaWYg
KEhBU19HVUMoZGV2X3ByaXYpICYmIGludGVsX3VjX2lzX3VzaW5nX2d1YygpICYmCi0JICAgIChJ
U19FTkFCTEVEKENPTkZJR19EUk1fSTkxNV9ERUJVRykgfHwKLQkgICAgIElTX0VOQUJMRUQoQ09O
RklHX0RSTV9JOTE1X0RFQlVHX0dFTSkpKQotCQlndWNfbG9nX2xldmVsID0KLQkJCUdVQ19WRVJC
T1NJVFlfVE9fTE9HX0xFVkVMKEdVQ19MT0dfVkVSQk9TSVRZX01BWCk7CisJaWYgKCFIQVNfR1VD
KGRldl9wcml2KSB8fCAhaW50ZWxfdWNfaXNfdXNpbmdfZ3VjKCkpCisJCWd1Y19sb2dfbGV2ZWwg
PSBHVUNfTE9HX0xFVkVMX0RJU0FCTEVEOworCWVsc2UgaWYgKElTX0VOQUJMRUQoQ09ORklHX0RS
TV9JOTE1X0RFQlVHKSB8fAorCQkgSVNfRU5BQkxFRChDT05GSUdfRFJNX0k5MTVfREVCVUdfR0VN
KSkKKwkJZ3VjX2xvZ19sZXZlbCA9IEdVQ19MT0dfTEVWRUxfTUFYOworCWVsc2UKKwkJZ3VjX2xv
Z19sZXZlbCA9IEdVQ19MT0dfTEVWRUxfTk9OX1ZFUkJPU0U7CiAKIAkvKiBBbnkgcGxhdGZvcm0g
c3BlY2lmaWMgZmluZS10dW5pbmcgY2FuIGJlIGRvbmUgaGVyZSAqLwogCkBAIC0xNDMsMTMgKzE0
NCwxMSBAQCBzdGF0aWMgdm9pZCBzYW5pdGl6ZV9vcHRpb25zX2Vhcmx5KHN0cnVjdCBkcm1faTkx
NV9wcml2YXRlICpkZXZfcHJpdikKIAkJaTkxNV9tb2RwYXJhbXMuZ3VjX2xvZ19sZXZlbCA9IDA7
CiAJfQogCi0JaWYgKGk5MTVfbW9kcGFyYW1zLmd1Y19sb2dfbGV2ZWwgPgotCSAgICBHVUNfVkVS
Qk9TSVRZX1RPX0xPR19MRVZFTChHVUNfTE9HX1ZFUkJPU0lUWV9NQVgpKSB7CisJaWYgKGk5MTVf
bW9kcGFyYW1zLmd1Y19sb2dfbGV2ZWwgPiBHVUNfTE9HX0xFVkVMX01BWCkgewogCQlEUk1fV0FS
TigiSW5jb21wYXRpYmxlIG9wdGlvbiBkZXRlY3RlZDogJXM9JWQsICVzIVxuIiwKIAkJCSAiZ3Vj
X2xvZ19sZXZlbCIsIGk5MTVfbW9kcGFyYW1zLmd1Y19sb2dfbGV2ZWwsCiAJCQkgInZlcmJvc2l0
eSB0b28gaGlnaCIpOwotCQlpOTE1X21vZHBhcmFtcy5ndWNfbG9nX2xldmVsID0KLQkJCUdVQ19W
RVJCT1NJVFlfVE9fTE9HX0xFVkVMKEdVQ19MT0dfVkVSQk9TSVRZX01BWCk7CisJCWk5MTVfbW9k
cGFyYW1zLmd1Y19sb2dfbGV2ZWwgPSBHVUNfTE9HX0xFVkVMX01BWDsKIAl9CiAKIAlEUk1fREVC
VUdfRFJJVkVSKCJndWNfbG9nX2xldmVsPSVkIChlbmFibGVkOiVzLCB2ZXJib3NlOiVzLCB2ZXJi
b3NpdHk6JWQpXG4iLAotLSAKMi4xNC4zCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m
cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0
aW5mby9pbnRlbC1nZngK