From: Zhi Wang Subject: [PATCH 2/9] drm/i915/gvt: Fold vGPU active check into inner functions Date: Tue, 17 May 2016 04:19:02 -0400 Message-ID: <1463473149-5876-3-git-send-email-zhi.a.wang@intel.com> References: <1463473149-5876-1-git-send-email-zhi.a.wang@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 ESMTP id D1BA26E646 for ; Tue, 17 May 2016 08:19:19 +0000 (UTC) In-Reply-To: <1463473149-5876-1-git-send-email-zhi.a.wang@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, tvrtko.ursulin@linux.intel.com, joonas.lahtinen@linux.intel.com, chris@chris-wilson.co.uk, kevin.tian@intel.com, zhiyuan.lv@intel.com List-Id: intel-gfx@lists.freedesktop.org djU6Ci0gTGV0IGZ1bmN0aW9ucyB0YWtlIHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICouIChUdnJ0 a28pCgotIEZvbGQgdkdQVSByZWxhdGVkIGFjdGl2ZSBjaGVjayBpbnRvIHRoZSBpbm5lciBmdW5j dGlvbnMuIChLZXZpbikKClNpZ25lZC1vZmYtYnk6IFpoaSBXYW5nIDx6aGkuYS53YW5nQGludGVs LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyB8IDExICsrKyst LS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3ZncHUuYyAgICB8IDEzICsrKysrKysr Ky0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfdmdwdS5oICAgIHwgIDQgKystLQogMyBm aWxlcyBjaGFuZ2VkLCAxNSBpbnNlcnRpb25zKCspLCAxMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4IDdlYWI2MTkuLjgyMGI1OWUgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC0yNzM3LDExICsyNzM3LDkgQEAgc3RhdGljIGludCBp OTE1X2dlbV9zZXR1cF9nbG9iYWxfZ3R0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJaTkxNV9h ZGRyZXNzX3NwYWNlX2luaXQoJmdndHQtPmJhc2UsIGRldl9wcml2KTsKIAlnZ3R0LT5iYXNlLnRv dGFsICs9IFBBR0VfU0laRTsKIAotCWlmIChpbnRlbF92Z3B1X2FjdGl2ZShkZXZfcHJpdikpIHsK LQkJcmV0ID0gaW50ZWxfdmd0X2JhbGxvb24oZGV2KTsKLQkJaWYgKHJldCkKLQkJCXJldHVybiBy ZXQ7Ci0JfQorCXJldCA9IGludGVsX3ZndF9iYWxsb29uKGRldl9wcml2KTsKKwlpZiAocmV0KQor CQlyZXR1cm4gcmV0OwogCiAJaWYgKCFIQVNfTExDKGRldikpCiAJCWdndHQtPmJhc2UubW0uY29s b3JfYWRqdXN0ID0gaTkxNV9ndHRfY29sb3JfYWRqdXN0OwpAQCAtMjg0MSw4ICsyODM5LDcgQEAg dm9pZCBpOTE1X2dndHRfY2xlYW51cF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWk5MTVf Z2VtX2NsZWFudXBfc3RvbGVuKGRldik7CiAKIAlpZiAoZHJtX21tX2luaXRpYWxpemVkKCZnZ3R0 LT5iYXNlLm1tKSkgewotCQlpZiAoaW50ZWxfdmdwdV9hY3RpdmUoZGV2X3ByaXYpKQotCQkJaW50 ZWxfdmd0X2RlYmFsbG9vbigpOworCQlpbnRlbF92Z3RfZGViYWxsb29uKGRldl9wcml2KTsKIAog CQlkcm1fbW1fdGFrZWRvd24oJmdndHQtPmJhc2UubW0pOwogCQlsaXN0X2RlbCgmZ2d0dC0+YmFz ZS5nbG9iYWxfbGluayk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3Zn cHUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfdmdwdS5jCmluZGV4IGQ1YTdhNWUuLjUz MTI4MTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfdmdwdS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfdmdwdS5jCkBAIC0xMDEsMTAgKzEwMSwxMyBAQCBz dGF0aWMgc3RydWN0IF9iYWxsb29uX2luZm9fIGJsX2luZm87CiAgKiBUaGlzIGZ1bmN0aW9uIGlz IGNhbGxlZCB0byBkZWFsbG9jYXRlIHRoZSBiYWxsb29uZWQtb3V0IGdyYXBoaWMgbWVtb3J5LCB3 aGVuCiAgKiBkcml2ZXIgaXMgdW5sb2FkZWQgb3Igd2hlbiBiYWxsb29uaW5nIGZhaWxzLgogICov Ci12b2lkIGludGVsX3ZndF9kZWJhbGxvb24odm9pZCkKK3ZvaWQgaW50ZWxfdmd0X2RlYmFsbG9v bihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJaW50IGk7CiAKKwlpZiAo IWludGVsX3ZncHVfYWN0aXZlKGRldl9wcml2KSkKKwkJcmV0dXJuOworCiAJRFJNX0RFQlVHKCJW R1QgZGViYWxsb29uLlxuIik7CiAKIAlmb3IgKGkgPSAwOyBpIDwgNDsgaSsrKSB7CkBAIC0xNzcs OSArMTgwLDggQEAgc3RhdGljIGludCB2Z3RfYmFsbG9vbl9zcGFjZShzdHJ1Y3QgZHJtX21tICpt bSwKICAqIFJldHVybnM6CiAgKiB6ZXJvIG9uIHN1Y2Nlc3MsIG5vbi16ZXJvIGlmIGNvbmZpZ3Vy YXRpb24gaW52YWxpZCBvciBiYWxsb29uaW5nIGZhaWxlZAogICovCi1pbnQgaW50ZWxfdmd0X2Jh bGxvb24oc3RydWN0IGRybV9kZXZpY2UgKmRldikKK2ludCBpbnRlbF92Z3RfYmFsbG9vbihzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCXN0cnVjdCBpOTE1X2dndHQgKmdndHQgPSAm ZGV2X3ByaXYtPmdndHQ7CiAJdW5zaWduZWQgbG9uZyBnZ3R0X2VuZCA9IGdndHQtPmJhc2Uuc3Rh cnQgKyBnZ3R0LT5iYXNlLnRvdGFsOwogCkBAIC0xODcsNiArMTg5LDkgQEAgaW50IGludGVsX3Zn dF9iYWxsb29uKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJdW5zaWduZWQgbG9uZyB1bm1hcHBh YmxlX2Jhc2UsIHVubWFwcGFibGVfc2l6ZSwgdW5tYXBwYWJsZV9lbmQ7CiAJaW50IHJldDsKIAor CWlmICghaW50ZWxfdmdwdV9hY3RpdmUoZGV2X3ByaXYpKQorCQlyZXR1cm4gMDsKKwogCW1hcHBh YmxlX2Jhc2UgPSBJOTE1X1JFQUQodmd0aWZfcmVnKGF2YWlsX3JzLm1hcHBhYmxlX2dtYWRyLmJh c2UpKTsKIAltYXBwYWJsZV9zaXplID0gSTkxNV9SRUFEKHZndGlmX3JlZyhhdmFpbF9ycy5tYXBw YWJsZV9nbWFkci5zaXplKSk7CiAJdW5tYXBwYWJsZV9iYXNlID0gSTkxNV9SRUFEKHZndGlmX3Jl ZyhhdmFpbF9ycy5ub25tYXBwYWJsZV9nbWFkci5iYXNlKSk7CkBAIC0yNTgsNiArMjYzLDYgQEAg aW50IGludGVsX3ZndF9iYWxsb29uKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIGVycjoKIAlE Uk1fRVJST1IoIlZHVCBiYWxsb29uIGZhaWxcbiIpOwotCWludGVsX3ZndF9kZWJhbGxvb24oKTsK KwlpbnRlbF92Z3RfZGViYWxsb29uKGRldl9wcml2KTsKIAlyZXR1cm4gcmV0OwogfQpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV92Z3B1LmggYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X3ZncHUuaAppbmRleCAwN2U2N2Q1Li5mODkxN2M2IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3ZncHUuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X3ZncHUuaApAQCAtMjcsNyArMjcsNyBAQAogI2luY2x1ZGUgImk5MTVfcHZpbmZvLmgiCiAK IGV4dGVybiB2b2lkIGk5MTVfY2hlY2tfdmdwdShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYpOwotZXh0ZXJuIGludCBpbnRlbF92Z3RfYmFsbG9vbihzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KTsKLWV4dGVybiB2b2lkIGludGVsX3ZndF9kZWJhbGxvb24odm9pZCk7CitleHRlcm4gaW50 IGludGVsX3ZndF9iYWxsb29uKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7Citl eHRlcm4gdm9pZCBpbnRlbF92Z3RfZGViYWxsb29uKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdik7CiAKICNlbmRpZiAvKiBfSTkxNV9WR1BVX0hfICovCi0tIAoxLjkuMQoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxp bmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==