From: Shuo Liu Subject: [PATCH v3 1/2] drm/i915/gvt: Change log function of kvmgt to common ones Date: Thu, 14 Sep 2017 10:59:46 +0800 Message-ID: <1505357987-9983-1-git-send-email-shuo.a.liu@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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, intel-gvt-dev@lists.freedesktop.org Cc: Shuo Liu List-Id: intel-gfx@lists.freedesktop.org VGhpcyBjYW4gcmVtb3ZlIHRoZSBkZXBlbmRlbmNlIG9mIGk5MTUgbW9kdWxlIGlmIHdlIGNoYW5n ZSBndnRfZGJnXyogdG8KZnVuY3Rpb24gaW4gaTkxNSBtb2R1bGUuCgpTaWduZWQtb2ZmLWJ5OiBT aHVvIExpdSA8c2h1by5hLmxpdUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv Z3Z0L2t2bWd0LmMgfCA1NSArKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0t CiAxIGZpbGUgY2hhbmdlZCwgMzYgaW5zZXJ0aW9ucygrKSwgMTkgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L2t2bWd0LmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9ndnQva3ZtZ3QuYwppbmRleCBmZDBjODVmLi5jOTMyNWU4IDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQva3ZtZ3QuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9ndnQva3ZtZ3QuYwpAQCAtODksNiArODksMjAgQEAgc3RhdGljIGlubGluZSBib29sIGhhbmRs ZV92YWxpZCh1bnNpZ25lZCBsb25nIGhhbmRsZSkKIHN0YXRpYyB2b2lkIGludGVsX3ZncHVfcmVs ZWFzZV93b3JrKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yayk7CiBzdGF0aWMgYm9vbCBrdm1ndF9n dWVzdF9leGl0KHN0cnVjdCBrdm1ndF9ndWVzdF9pbmZvICppbmZvKTsKIAorc3RhdGljIHZvaWQg Z3Z0X2t2bWd0X2RiZyhjb25zdCBjaGFyICpmb3JtYXQsIC4uLikKK3sKKwlzdHJ1Y3QgdmFfZm9y bWF0IHZhZjsKKwl2YV9saXN0IGFyZ3M7CisKKwl2YV9zdGFydChhcmdzLCBmb3JtYXQpOworCXZh Zi5mbXQgPSBmb3JtYXQ7CisJdmFmLnZhID0gJmFyZ3M7CisKKwlwcl9kZWJ1ZygiW2d2dC1tcHQ6 JXBzXSAlcFYiLCBfX2J1aWx0aW5fcmV0dXJuX2FkZHJlc3MoMCksICZ2YWYpOworCisJdmFfZW5k KGFyZ3MpOworfQorCiBzdGF0aWMgaW50IGd2dF9kbWFfbWFwX2lvdmEoc3RydWN0IGludGVsX3Zn cHUgKnZncHUsIGt2bV9wZm5fdCBwZm4sCiAJCXVuc2lnbmVkIGxvbmcgKmlvdmEpCiB7CkBAIC00 NDMsNyArNDU3LDcgQEAgc3RhdGljIGludCBpbnRlbF92Z3B1X2NyZWF0ZShzdHJ1Y3Qga29iamVj dCAqa29iaiwgc3RydWN0IG1kZXZfZGV2aWNlICptZGV2KQogCiAJdHlwZSA9IGludGVsX2d2dF9m aW5kX3ZncHVfdHlwZShndnQsIGtvYmplY3RfbmFtZShrb2JqKSk7CiAJaWYgKCF0eXBlKSB7Ci0J CWd2dF92Z3B1X2VycigiZmFpbGVkIHRvIGZpbmQgdHlwZSAlcyB0byBjcmVhdGVcbiIsCisJCXBy X2VycigiZmFpbGVkIHRvIGZpbmQgdHlwZSAlcyB0byBjcmVhdGVcbiIsCiAJCQkJCQlrb2JqZWN0 X25hbWUoa29iaikpOwogCQlyZXQgPSAtRUlOVkFMOwogCQlnb3RvIG91dDsKQEAgLTQ1Miw3ICs0 NjYsNyBAQCBzdGF0aWMgaW50IGludGVsX3ZncHVfY3JlYXRlKHN0cnVjdCBrb2JqZWN0ICprb2Jq LCBzdHJ1Y3QgbWRldl9kZXZpY2UgKm1kZXYpCiAJdmdwdSA9IGludGVsX2d2dF9vcHMtPnZncHVf Y3JlYXRlKGd2dCwgdHlwZSk7CiAJaWYgKElTX0VSUl9PUl9OVUxMKHZncHUpKSB7CiAJCXJldCA9 IHZncHUgPT0gTlVMTCA/IC1FRkFVTFQgOiBQVFJfRVJSKHZncHUpOwotCQlndnRfdmdwdV9lcnIo ImZhaWxlZCB0byBjcmVhdGUgaW50ZWwgdmdwdTogJWRcbiIsIHJldCk7CisJCXByX2VycigiZmFp bGVkIHRvIGNyZWF0ZSBpbnRlbCB2Z3B1OiAlZFxuIiwgcmV0KTsKIAkJZ290byBvdXQ7CiAJfQog CkBAIC00NjEsOCArNDc1LDcgQEAgc3RhdGljIGludCBpbnRlbF92Z3B1X2NyZWF0ZShzdHJ1Y3Qg a29iamVjdCAqa29iaiwgc3RydWN0IG1kZXZfZGV2aWNlICptZGV2KQogCXZncHUtPnZkZXYubWRl diA9IG1kZXY7CiAJbWRldl9zZXRfZHJ2ZGF0YShtZGV2LCB2Z3B1KTsKIAotCWd2dF9kYmdfY29y ZSgiaW50ZWxfdmdwdV9jcmVhdGUgc3VjY2VlZGVkIGZvciBtZGV2OiAlc1xuIiwKLQkJICAgICBk ZXZfbmFtZShtZGV2X2RldihtZGV2KSkpOworCWd2dF9rdm1ndF9kYmcoInN1Y2NlZWRlZCBmb3Ig bWRldjogJXNcbiIsIGRldl9uYW1lKG1kZXZfZGV2KG1kZXYpKSk7CiAJcmV0ID0gMDsKIAogb3V0 OgpAQCAtNTMyLDggKzU0NSw4IEBAIHN0YXRpYyBpbnQgaW50ZWxfdmdwdV9vcGVuKHN0cnVjdCBt ZGV2X2RldmljZSAqbWRldikKIAlyZXQgPSB2ZmlvX3JlZ2lzdGVyX25vdGlmaWVyKG1kZXZfZGV2 KG1kZXYpLCBWRklPX0lPTU1VX05PVElGWSwgJmV2ZW50cywKIAkJCQkmdmdwdS0+dmRldi5pb21t dV9ub3RpZmllcik7CiAJaWYgKHJldCAhPSAwKSB7Ci0JCWd2dF92Z3B1X2VycigidmZpb19yZWdp c3Rlcl9ub3RpZmllciBmb3IgaW9tbXUgZmFpbGVkOiAlZFxuIiwKLQkJCXJldCk7CisJCXByX2Vy cigidmdwdVslZF06IHZmaW9fcmVnaXN0ZXJfbm90aWZpZXIgZm9yIGlvbW11IGZhaWxlZDolZFxu IiwKKwkJCXZncHUtPmlkLCByZXQpOwogCQlnb3RvIG91dDsKIAl9CiAKQEAgLTU0MSw4ICs1NTQs OCBAQCBzdGF0aWMgaW50IGludGVsX3ZncHVfb3BlbihzdHJ1Y3QgbWRldl9kZXZpY2UgKm1kZXYp CiAJcmV0ID0gdmZpb19yZWdpc3Rlcl9ub3RpZmllcihtZGV2X2RldihtZGV2KSwgVkZJT19HUk9V UF9OT1RJRlksICZldmVudHMsCiAJCQkJJnZncHUtPnZkZXYuZ3JvdXBfbm90aWZpZXIpOwogCWlm IChyZXQgIT0gMCkgewotCQlndnRfdmdwdV9lcnIoInZmaW9fcmVnaXN0ZXJfbm90aWZpZXIgZm9y IGdyb3VwIGZhaWxlZDogJWRcbiIsCi0JCQlyZXQpOworCQlwcl9lcnIoInZncHVbJWRdOiB2Zmlv X3JlZ2lzdGVyX25vdGlmaWVyIGZvciBncm91cCBmYWlsZWQ6JWRcbiIsCisJCQl2Z3B1LT5pZCwg cmV0KTsKIAkJZ290byB1bmRvX2lvbW11OwogCX0KIApAQCAtNjQ3LDcgKzY2MCw3IEBAIHN0YXRp YyBzc2l6ZV90IGludGVsX3ZncHVfcncoc3RydWN0IG1kZXZfZGV2aWNlICptZGV2LCBjaGFyICpi dWYsCiAKIAogCWlmIChpbmRleCA+PSBWRklPX1BDSV9OVU1fUkVHSU9OUykgewotCQlndnRfdmdw dV9lcnIoImludmFsaWQgaW5kZXg6ICV1XG4iLCBpbmRleCk7CisJCXByX2VycigidmdwdVslZF06 IGludmFsaWQgaW5kZXg6ICV1XG4iLCB2Z3B1LT5pZCwgaW5kZXgpOwogCQlyZXR1cm4gLUVJTlZB TDsKIAl9CiAKQEAgLTY4MSw3ICs2OTQsNyBAQCBzdGF0aWMgc3NpemVfdCBpbnRlbF92Z3B1X3J3 KHN0cnVjdCBtZGV2X2RldmljZSAqbWRldiwgY2hhciAqYnVmLAogCWNhc2UgVkZJT19QQ0lfVkdB X1JFR0lPTl9JTkRFWDoKIAljYXNlIFZGSU9fUENJX1JPTV9SRUdJT05fSU5ERVg6CiAJZGVmYXVs dDoKLQkJZ3Z0X3ZncHVfZXJyKCJ1bnN1cHBvcnRlZCByZWdpb246ICV1XG4iLCBpbmRleCk7CisJ CXByX2VycigidmdwdVslZF06IHVuc3VwcG9ydGVkIHJlZ2lvbjogJXVcbiIsIHZncHUtPmlkLCBp bmRleCk7CiAJfQogCiAJcmV0dXJuIHJldCA9PSAwID8gY291bnQgOiByZXQ7CkBAIC04NzMsNyAr ODg2LDggQEAgc3RhdGljIGludCBpbnRlbF92Z3B1X3NldF9tc2lfdHJpZ2dlcihzdHJ1Y3QgaW50 ZWxfdmdwdSAqdmdwdSwKIAogCQl0cmlnZ2VyID0gZXZlbnRmZF9jdHhfZmRnZXQoZmQpOwogCQlp ZiAoSVNfRVJSKHRyaWdnZXIpKSB7Ci0JCQlndnRfdmdwdV9lcnIoImV2ZW50ZmRfY3R4X2ZkZ2V0 IGZhaWxlZFxuIik7CisJCQlwcl9lcnIoInZncHVbJWRdOiBldmVudGZkX2N0eF9mZGdldCBmYWls ZWRcbiIsCisJCQkJCXZncHUtPmlkKTsKIAkJCXJldHVybiBQVFJfRVJSKHRyaWdnZXIpOwogCQl9 CiAJCXZncHUtPnZkZXYubXNpX3RyaWdnZXIgPSB0cmlnZ2VyOwpAQCAtOTI5LDcgKzk0Myw3IEBA IHN0YXRpYyBsb25nIGludGVsX3ZncHVfaW9jdGwoc3RydWN0IG1kZXZfZGV2aWNlICptZGV2LCB1 bnNpZ25lZCBpbnQgY21kLAogCXN0cnVjdCBpbnRlbF92Z3B1ICp2Z3B1ID0gbWRldl9nZXRfZHJ2 ZGF0YShtZGV2KTsKIAl1bnNpZ25lZCBsb25nIG1pbnN6OwogCi0JZ3Z0X2RiZ19jb3JlKCJ2Z3B1 JWQgaW9jdGwsIGNtZDogJWRcbiIsIHZncHUtPmlkLCBjbWQpOworCWd2dF9rdm1ndF9kYmcoInZn cHUlZCBpb2N0bCwgY21kOiAlZFxuIiwgdmdwdS0+aWQsIGNtZCk7CiAKIAlpZiAoY21kID09IFZG SU9fREVWSUNFX0dFVF9JTkZPKSB7CiAJCXN0cnVjdCB2ZmlvX2RldmljZV9pbmZvIGluZm87CkBA IC0xMDE2LDEyICsxMDMwLDEyIEBAIHN0YXRpYyBsb25nIGludGVsX3ZncHVfaW9jdGwoc3RydWN0 IG1kZXZfZGV2aWNlICptZGV2LCB1bnNpZ25lZCBpbnQgY21kLAogCQkJaW5mby5zaXplID0gMDsK IAogCQkJaW5mby5mbGFncyA9IDA7Ci0JCQlndnRfZGJnX2NvcmUoImdldCByZWdpb24gaW5mbyBi YXI6JWRcbiIsIGluZm8uaW5kZXgpOworCQkJZ3Z0X2t2bWd0X2RiZygiZ2V0IHJlZ2lvbiBpbmZv IGJhcjolZFxuIiwgaW5mby5pbmRleCk7CiAJCQlicmVhazsKIAogCQljYXNlIFZGSU9fUENJX1JP TV9SRUdJT05fSU5ERVg6CiAJCWNhc2UgVkZJT19QQ0lfVkdBX1JFR0lPTl9JTkRFWDoKLQkJCWd2 dF9kYmdfY29yZSgiZ2V0IHJlZ2lvbiBpbmZvIGluZGV4OiVkXG4iLCBpbmZvLmluZGV4KTsKKwkJ CWd2dF9rdm1ndF9kYmcoImdldCByZWdpb24gaW5mbyBpbmRleDolZFxuIiwgaW5mby5pbmRleCk7 CiAJCQlicmVhazsKIAkJZGVmYXVsdDoKIAkJCXsKQEAgLTExMzIsNyArMTE0Niw4IEBAIHN0YXRp YyBsb25nIGludGVsX3ZncHVfaW9jdGwoc3RydWN0IG1kZXZfZGV2aWNlICptZGV2LCB1bnNpZ25l ZCBpbnQgY21kLAogCQkJcmV0ID0gdmZpb19zZXRfaXJxc192YWxpZGF0ZV9hbmRfcHJlcGFyZSgm aGRyLCBtYXgsCiAJCQkJCQlWRklPX1BDSV9OVU1fSVJRUywgJmRhdGFfc2l6ZSk7CiAJCQlpZiAo cmV0KSB7Ci0JCQkJZ3Z0X3ZncHVfZXJyKCJpbnRlbDp2ZmlvX3NldF9pcnFzX3ZhbGlkYXRlX2Fu ZF9wcmVwYXJlIGZhaWxlZFxuIik7CisJCQkJcHJfZXJyKCJ2Z3B1WyVkXTp2ZmlvX3NldF9pcnFz X3ZhbGlkYXRlX2FuZF9wcmVwYXJlIGZhaWxlZFxuIiwKKwkJCQkJCXZncHUtPmlkKTsKIAkJCQly ZXR1cm4gLUVJTlZBTDsKIAkJCX0KIAkJCWlmIChkYXRhX3NpemUpIHsKQEAgLTEzNTQsNyArMTM2 OSw4IEBAIHN0YXRpYyBpbnQga3ZtZ3RfZ3Vlc3RfaW5pdChzdHJ1Y3QgbWRldl9kZXZpY2UgKm1k ZXYpCiAKIAlrdm0gPSB2Z3B1LT52ZGV2Lmt2bTsKIAlpZiAoIWt2bSB8fCBrdm0tPm1tICE9IGN1 cnJlbnQtPm1tKSB7Ci0JCWd2dF92Z3B1X2VycigiS1ZNIGlzIHJlcXVpcmVkIHRvIHVzZSBJbnRl bCB2R1BVXG4iKTsKKwkJcHJfZXJyKCJ2Z3B1WyVkXTogS1ZNIGlzIHJlcXVpcmVkIHRvIHVzZSBJ bnRlbCB2R1BVXG4iLAorCQkJCXZncHUtPmlkKTsKIAkJcmV0dXJuIC1FU1JDSDsKIAl9CiAKQEAg LTE0NDAsMTQgKzE0NTYsMTUgQEAgc3RhdGljIHVuc2lnbmVkIGxvbmcga3ZtZ3RfZ2ZuX3RvX3Bm bih1bnNpZ25lZCBsb25nIGhhbmRsZSwgdW5zaWduZWQgbG9uZyBnZm4pCiAJZGV2ID0gbWRldl9k ZXYoaW5mby0+dmdwdS0+dmRldi5tZGV2KTsKIAlyYyA9IHZmaW9fcGluX3BhZ2VzKGRldiwgJmdm biwgMSwgSU9NTVVfUkVBRCB8IElPTU1VX1dSSVRFLCAmcGZuKTsKIAlpZiAocmMgIT0gMSkgewot CQlndnRfdmdwdV9lcnIoInZmaW9fcGluX3BhZ2VzIGZhaWxlZCBmb3IgZ2ZuIDB4JWx4OiAlZFxu IiwKLQkJCWdmbiwgcmMpOworCQlwcl9lcnIoInZncHVbJWRdOiB2ZmlvX3Bpbl9wYWdlcyBmYWls ZWQgZm9yIGdmbiAweCVseDogJWRcbiIsCisJCQl2Z3B1LT5pZCwgZ2ZuLCByYyk7CiAJCXJldHVy biBJTlRFTF9HVlRfSU5WQUxJRF9BRERSOwogCX0KIAkvKiB0cmFuc2ZlciB0byBob3N0IGlvdmEg Zm9yIEdGWCB0byB1c2UgRE1BICovCiAJcmMgPSBndnRfZG1hX21hcF9pb3ZhKGluZm8tPnZncHUs IHBmbiwgJmlvdmEpOwogCWlmIChyYykgewotCQlndnRfdmdwdV9lcnIoImd2dF9kbWFfbWFwX2lv dmEgZmFpbGVkIGZvciBnZm46IDB4JWx4XG4iLCBnZm4pOworCQlwcl9lcnIoInZncHVbJWRdOiBn dnRfZG1hX21hcF9pb3ZhIGZhaWxlZCBmb3IgZ2ZuOiAweCVseFxuIiwKKwkJCQl2Z3B1LT5pZCwg Z2ZuKTsKIAkJdmZpb191bnBpbl9wYWdlcyhkZXYsICZnZm4sIDEpOwogCQlyZXR1cm4gSU5URUxf R1ZUX0lOVkFMSURfQUREUjsKIAl9Ci0tIAoxLjkuNAoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==