From: Piotr Piorkowski Subject: [PATCH v2 1/7] drm/i915/guc: Don't store runtime GuC log level in modparam Date: Mon, 4 Jun 2018 16:19:41 +0200 Message-ID: <20180604141947.8299-1-piotr.piorkowski@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3CB966EB35 for ; Mon, 4 Jun 2018 14:20:01 +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 RnJvbTogUGlvdHIgUGnDs3Jrb3dza2kgPHBpb3RyLnBpb3Jrb3dza2lAaW50ZWwuY29tPgoKQ3Vy cmVudGx5IHdlIGFyZSB1c2luZyBtb2RwYXJhbSBhcyBwbGFjZWhvbGRlciBmb3IgR3VDIGxvZyBs ZXZlbC4KU3RvcCBkb2luZyB0aGlzIGFuZCBrZWVwIHJ1bnRpbWUgR3VDIGxldmVsIGluIGludGVs X2d1Y19sb2cgc3RydWN0LgoKdjI6Ci0gcmVuYW1lIGZ1bmN0aW9ucyBpbnRlbF9ndWNfbG9nX2xl dmVsX1tnZXR8c2V0XSB0bwppbnRlbF9ndWNfbG9nX1tnZXR8c2V0XV9sZXZlbCAoTWljaGHFgiBX YWpkZWN6a28pCi0gcmVtb3ZlIEdFTV9CVUdfT04gZnJvbSBpbnRlbF9ndWNfbG9nX2dldF9sZXZl bCgpIChNaWNoYcWCIFdhamRlY3prbykKClNpZ25lZC1vZmYtYnk6IFBpb3RyIFBpw7Nya293c2tp IDxwaW90ci5waW9ya293c2tpQGludGVsLmNvbT4KQ2M6IE1pY2hhbCBXYWpkZWN6a28gPG1pY2hh bC53YWpkZWN6a29AaW50ZWwuY29tPgpDYzogTWljaGHFgiBXaW5pYXJza2kgPG1pY2hhbC53aW5p YXJza2lAaW50ZWwuY29tPgpDYzogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGlu dXguaW50ZWwuY29tPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ ClJldmlld2VkLWJ5OiBNaWNoYWwgV2FqZGVjemtvIDxtaWNoYWwud2FqZGVjemtvQGludGVsLmNv bT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyAgfCAgNCArKy0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuYyAgICAgfCAgOCArKystLS0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvZy5jIHwgMjggKysrKysrKysrKy0tLS0tLS0tLS0t LS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvZy5oIHwgMTAgKysrKysr KystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuYyAgICAgIHwgIDIgKy0KIDUgZmls ZXMgY2hhbmdlZCwgMjQgaW5zZXJ0aW9ucygrKSwgMjggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2RlYnVnZnMuYwppbmRleCAxNWU4NmQzNGE4MWMuLmEwZmNkZDM3OTNhOSAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKQEAgLTI1MzYsNyArMjUzNiw3IEBAIHN0YXRp YyBpbnQgaTkxNV9ndWNfbG9nX2xldmVsX2dldCh2b2lkICpkYXRhLCB1NjQgKnZhbCkKIAlpZiAo IVVTRVNfR1VDKGRldl9wcml2KSkKIAkJcmV0dXJuIC1FTk9ERVY7CiAKLQkqdmFsID0gaW50ZWxf Z3VjX2xvZ19sZXZlbF9nZXQoJmRldl9wcml2LT5ndWMubG9nKTsKKwkqdmFsID0gaW50ZWxfZ3Vj X2xvZ19nZXRfbGV2ZWwoJmRldl9wcml2LT5ndWMubG9nKTsKIAogCXJldHVybiAwOwogfQpAQCAt MjU0OCw3ICsyNTQ4LDcgQEAgc3RhdGljIGludCBpOTE1X2d1Y19sb2dfbGV2ZWxfc2V0KHZvaWQg KmRhdGEsIHU2NCB2YWwpCiAJaWYgKCFVU0VTX0dVQyhkZXZfcHJpdikpCiAJCXJldHVybiAtRU5P REVWOwogCi0JcmV0dXJuIGludGVsX2d1Y19sb2dfbGV2ZWxfc2V0KCZkZXZfcHJpdi0+Z3VjLmxv ZywgdmFsKTsKKwlyZXR1cm4gaW50ZWxfZ3VjX2xvZ19zZXRfbGV2ZWwoJmRldl9wcml2LT5ndWMu bG9nLCB2YWwpOwogfQogCiBERUZJTkVfU0lNUExFX0FUVFJJQlVURShpOTE1X2d1Y19sb2dfbGV2 ZWxfZm9wcywKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmMKaW5kZXggZTI4YTk5NmI5NjA0Li45NTFh MmRmMDQ5NmUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5jCkBAIC0yMDMsMTMgKzIwMywxMSBA QCB2b2lkIGludGVsX2d1Y19maW5pKHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKIAlndWNfc2hhcmVk X2RhdGFfZGVzdHJveShndWMpOwogfQogCi1zdGF0aWMgdTMyIGdldF9sb2dfY29udHJvbF9mbGFn cyh2b2lkKQorc3RhdGljIHUzMiBndWNfY3RsX2RlYnVnX2ZsYWdzKHN0cnVjdCBpbnRlbF9ndWMg Kmd1YykKIHsKLQl1MzIgbGV2ZWwgPSBpOTE1X21vZHBhcmFtcy5ndWNfbG9nX2xldmVsOworCXUz MiBsZXZlbCA9IGludGVsX2d1Y19sb2dfZ2V0X2xldmVsKCZndWMtPmxvZyk7CiAJdTMyIGZsYWdz ID0gMDsKIAotCUdFTV9CVUdfT04obGV2ZWwgPCAwKTsKLQogCWlmICghR1VDX0xPR19MRVZFTF9J U19FTkFCTEVEKGxldmVsKSkKIAkJZmxhZ3MgfD0gR1VDX0xPR19ERUZBVUxUX0RJU0FCTEVEOwog CkBAIC0yNTAsNyArMjQ4LDcgQEAgdm9pZCBpbnRlbF9ndWNfaW5pdF9wYXJhbXMoc3RydWN0IGlu dGVsX2d1YyAqZ3VjKQogCiAJcGFyYW1zW0dVQ19DVExfTE9HX1BBUkFNU10gPSBndWMtPmxvZy5m bGFnczsKIAotCXBhcmFtc1tHVUNfQ1RMX0RFQlVHXSA9IGdldF9sb2dfY29udHJvbF9mbGFncygp OworCXBhcmFtc1tHVUNfQ1RMX0RFQlVHXSA9IGd1Y19jdGxfZGVidWdfZmxhZ3MoZ3VjKTsKIAog CS8qIElmIEd1QyBzdWJtaXNzaW9uIGlzIGVuYWJsZWQsIHNldCB1cCBhZGRpdGlvbmFsIHBhcmFt ZXRlcnMgaGVyZSAqLwogCWlmIChVU0VTX0dVQ19TVUJNSVNTSU9OKGRldl9wcml2KSkgewpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvZy5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvZy5jCmluZGV4IDQwMWUxNzA0ZDYxZS4uZDM1ZDg4M2Q0 OGUxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9nLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvZy5jCkBAIC00NzUsMTEgKzQ3NSwx MiBAQCBpbnQgaW50ZWxfZ3VjX2xvZ19jcmVhdGUoc3RydWN0IGludGVsX2d1Y19sb2cgKmxvZykK IAlvZmZzZXQgPSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLCB2bWEpID4+IFBBR0VfU0hJRlQ7 CiAJbG9nLT5mbGFncyA9IChvZmZzZXQgPDwgR1VDX0xPR19CVUZfQUREUl9TSElGVCkgfCBmbGFn czsKIAorCWxvZy0+bGV2ZWwgPSBpOTE1X21vZHBhcmFtcy5ndWNfbG9nX2xldmVsOworCiAJcmV0 dXJuIDA7CiAKIGVycjoKLQkvKiBsb2dnaW5nIHdpbGwgYmUgb2ZmICovCi0JaTkxNV9tb2RwYXJh bXMuZ3VjX2xvZ19sZXZlbCA9IDA7CisJRFJNX0VSUk9SKCJGYWlsZWQgdG8gYWxsb2NhdGUgR3VD IGxvZyBidWZmZXIuICVkXG4iLCByZXQpOwogCXJldHVybiByZXQ7CiB9CiAKQEAgLTQ4OCwxNSAr NDg5LDcgQEAgdm9pZCBpbnRlbF9ndWNfbG9nX2Rlc3Ryb3koc3RydWN0IGludGVsX2d1Y19sb2cg KmxvZykKIAlpOTE1X3ZtYV91bnBpbl9hbmRfcmVsZWFzZSgmbG9nLT52bWEpOwogfQogCi1pbnQg aW50ZWxfZ3VjX2xvZ19sZXZlbF9nZXQoc3RydWN0IGludGVsX2d1Y19sb2cgKmxvZykKLXsKLQlH RU1fQlVHX09OKCFsb2ctPnZtYSk7Ci0JR0VNX0JVR19PTihpOTE1X21vZHBhcmFtcy5ndWNfbG9n X2xldmVsIDwgMCk7Ci0KLQlyZXR1cm4gaTkxNV9tb2RwYXJhbXMuZ3VjX2xvZ19sZXZlbDsKLX0K LQotaW50IGludGVsX2d1Y19sb2dfbGV2ZWxfc2V0KHN0cnVjdCBpbnRlbF9ndWNfbG9nICpsb2cs IHU2NCB2YWwpCitpbnQgaW50ZWxfZ3VjX2xvZ19zZXRfbGV2ZWwoc3RydWN0IGludGVsX2d1Y19s b2cgKmxvZywgdTMyIGxldmVsKQogewogCXN0cnVjdCBpbnRlbF9ndWMgKmd1YyA9IGxvZ190b19n dWMobG9nKTsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBndWNfdG9faTkx NShndWMpOwpAQCAtNTA0LDMzICs0OTcsMzIgQEAgaW50IGludGVsX2d1Y19sb2dfbGV2ZWxfc2V0 KHN0cnVjdCBpbnRlbF9ndWNfbG9nICpsb2csIHU2NCB2YWwpCiAKIAlCVUlMRF9CVUdfT04oR1VD X0xPR19WRVJCT1NJVFlfTUlOICE9IDApOwogCUdFTV9CVUdfT04oIWxvZy0+dm1hKTsKLQlHRU1f QlVHX09OKGk5MTVfbW9kcGFyYW1zLmd1Y19sb2dfbGV2ZWwgPCAwKTsKIAogCS8qCiAJICogR3VD IGlzIHJlY29nbml6aW5nIGxvZyBsZXZlbHMgc3RhcnRpbmcgZnJvbSAwIHRvIG1heCwgd2UncmUg dXNpbmcgMAogCSAqIGFzIGluZGljYXRpb24gdGhhdCBsb2dnaW5nIHNob3VsZCBiZSBkaXNhYmxl ZC4KIAkgKi8KLQlpZiAodmFsIDwgR1VDX0xPR19MRVZFTF9ESVNBQkxFRCB8fCB2YWwgPiBHVUNf TE9HX0xFVkVMX01BWCkKKwlpZiAobGV2ZWwgPCBHVUNfTE9HX0xFVkVMX0RJU0FCTEVEIHx8IGxl dmVsID4gR1VDX0xPR19MRVZFTF9NQVgpCiAJCXJldHVybiAtRUlOVkFMOwogCiAJbXV0ZXhfbG9j aygmZGV2X3ByaXYtPmRybS5zdHJ1Y3RfbXV0ZXgpOwogCi0JaWYgKGk5MTVfbW9kcGFyYW1zLmd1 Y19sb2dfbGV2ZWwgPT0gdmFsKSB7CisJaWYgKGxvZy0+bGV2ZWwgPT0gbGV2ZWwpIHsKIAkJcmV0 ID0gMDsKIAkJZ290byBvdXRfdW5sb2NrOwogCX0KIAogCWludGVsX3J1bnRpbWVfcG1fZ2V0KGRl dl9wcml2KTsKLQlyZXQgPSBndWNfYWN0aW9uX2NvbnRyb2xfbG9nKGd1YywgR1VDX0xPR19MRVZF TF9JU19WRVJCT1NFKHZhbCksCi0JCQkJICAgICBHVUNfTE9HX0xFVkVMX0lTX0VOQUJMRUQodmFs KSwKLQkJCQkgICAgIEdVQ19MT0dfTEVWRUxfVE9fVkVSQk9TSVRZKHZhbCkpOworCXJldCA9IGd1 Y19hY3Rpb25fY29udHJvbF9sb2coZ3VjLCBHVUNfTE9HX0xFVkVMX0lTX1ZFUkJPU0UobGV2ZWwp LAorCQkJCSAgICAgR1VDX0xPR19MRVZFTF9JU19FTkFCTEVEKGxldmVsKSwKKwkJCQkgICAgIEdV Q19MT0dfTEVWRUxfVE9fVkVSQk9TSVRZKGxldmVsKSk7CiAJaW50ZWxfcnVudGltZV9wbV9wdXQo ZGV2X3ByaXYpOwogCWlmIChyZXQpIHsKIAkJRFJNX0RFQlVHX0RSSVZFUigiZ3VjX2xvZ19jb250 cm9sIGFjdGlvbiBmYWlsZWQgJWRcbiIsIHJldCk7CiAJCWdvdG8gb3V0X3VubG9jazsKIAl9CiAK LQlpOTE1X21vZHBhcmFtcy5ndWNfbG9nX2xldmVsID0gdmFsOworCWxvZy0+bGV2ZWwgPSBsZXZl bDsKIAogb3V0X3VubG9jazoKIAltdXRleF91bmxvY2soJmRldl9wcml2LT5kcm0uc3RydWN0X211 dGV4KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2cuaCBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2cuaAppbmRleCBmYTgwNTM1YTZmOWQu LmYzOGM0ODk1MGVkNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3Vj X2xvZy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2cuaApAQCAtMzAs NiArMzAsNyBAQAogI2luY2x1ZGUgPGxpbnV4L3dvcmtxdWV1ZS5oPgogCiAjaW5jbHVkZSAiaW50 ZWxfZ3VjX2Z3aWYuaCIKKyNpbmNsdWRlICJpOTE1X2dlbS5oIgogCiBzdHJ1Y3QgaW50ZWxfZ3Vj OwogCkBAIC01OCw2ICs1OSw3IEBAIHN0cnVjdCBpbnRlbF9ndWM7CiAjZGVmaW5lIEdVQ19MT0df TEVWRUxfTUFYIEdVQ19WRVJCT1NJVFlfVE9fTE9HX0xFVkVMKEdVQ19MT0dfVkVSQk9TSVRZX01B WCkKIAogc3RydWN0IGludGVsX2d1Y19sb2cgeworCXUzMiBsZXZlbDsKIAl1MzIgZmxhZ3M7CiAJ c3RydWN0IGk5MTVfdm1hICp2bWE7CiAJc3RydWN0IHsKQEAgLTgwLDggKzgyLDcgQEAgdm9pZCBp bnRlbF9ndWNfbG9nX2luaXRfZWFybHkoc3RydWN0IGludGVsX2d1Y19sb2cgKmxvZyk7CiBpbnQg aW50ZWxfZ3VjX2xvZ19jcmVhdGUoc3RydWN0IGludGVsX2d1Y19sb2cgKmxvZyk7CiB2b2lkIGlu dGVsX2d1Y19sb2dfZGVzdHJveShzdHJ1Y3QgaW50ZWxfZ3VjX2xvZyAqbG9nKTsKIAotaW50IGlu dGVsX2d1Y19sb2dfbGV2ZWxfZ2V0KHN0cnVjdCBpbnRlbF9ndWNfbG9nICpsb2cpOwotaW50IGlu dGVsX2d1Y19sb2dfbGV2ZWxfc2V0KHN0cnVjdCBpbnRlbF9ndWNfbG9nICpsb2csIHU2NCBjb250 cm9sX3ZhbCk7CitpbnQgaW50ZWxfZ3VjX2xvZ19zZXRfbGV2ZWwoc3RydWN0IGludGVsX2d1Y19s b2cgKmxvZywgdTMyIGxldmVsKTsKIGJvb2wgaW50ZWxfZ3VjX2xvZ19yZWxheV9lbmFibGVkKGNv bnN0IHN0cnVjdCBpbnRlbF9ndWNfbG9nICpsb2cpOwogaW50IGludGVsX2d1Y19sb2dfcmVsYXlf b3BlbihzdHJ1Y3QgaW50ZWxfZ3VjX2xvZyAqbG9nKTsKIHZvaWQgaW50ZWxfZ3VjX2xvZ19yZWxh eV9mbHVzaChzdHJ1Y3QgaW50ZWxfZ3VjX2xvZyAqbG9nKTsKQEAgLTg5LDQgKzkwLDkgQEAgdm9p ZCBpbnRlbF9ndWNfbG9nX3JlbGF5X2Nsb3NlKHN0cnVjdCBpbnRlbF9ndWNfbG9nICpsb2cpOwog CiB2b2lkIGludGVsX2d1Y19sb2dfaGFuZGxlX2ZsdXNoX2V2ZW50KHN0cnVjdCBpbnRlbF9ndWNf bG9nICpsb2cpOwogCitzdGF0aWMgaW5saW5lIHUzMiBpbnRlbF9ndWNfbG9nX2dldF9sZXZlbChz dHJ1Y3QgaW50ZWxfZ3VjX2xvZyAqbG9nKQoreworCXJldHVybiBsb2ctPmxldmVsOworfQorCiAj ZW5kaWYKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5jCmluZGV4IDZhNzNlODFmMzczYi4uOTRlODg2M2Jk OTdjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmMKQEAgLTIwNyw3ICsyMDcsNyBAQCB2b2lkIGlu dGVsX3VjX2luaXRfbW1pbyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKIAogc3RhdGlj IHZvaWQgZ3VjX2NhcHR1cmVfbG9hZF9lcnJfbG9nKHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKIHsK LQlpZiAoIWd1Yy0+bG9nLnZtYSB8fCAhaTkxNV9tb2RwYXJhbXMuZ3VjX2xvZ19sZXZlbCkKKwlp ZiAoIWd1Yy0+bG9nLnZtYSB8fCAhaW50ZWxfZ3VjX2xvZ19nZXRfbGV2ZWwoJmd1Yy0+bG9nKSkK IAkJcmV0dXJuOwogCiAJaWYgKCFndWMtPmxvYWRfZXJyX2xvZykKLS0gCjIuMTQuMwoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxp bmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==