From: Zhi Wang Subject: [PATCH 02/15] drm/i915/gvt: Fold vGPU active check into inner functions Date: Mon, 16 May 2016 01:32:40 +0800 Message-ID: <1463333573-25112-3-git-send-email-zhi.a.wang@intel.com> References: <1463333573-25112-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 6D6286E395 for ; Sun, 15 May 2016 17:38:11 +0000 (UTC) In-Reply-To: <1463333573-25112-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, david.s.gordon@intel.com, joonas.lahtinen@linux.intel.com, kevin.tian@intel.com, zhiyuan.lv@intel.com List-Id: intel-gfx@lists.freedesktop.org Rm9sZCB2R1BVIHJlbGF0ZWQgYWN0aXZlIGNoZWNrIGludG8gdGhlIGlubmVyIGZ1bmN0aW9ucy4g KEtldmluKQoKU2lnbmVkLW9mZi1ieTogWmhpIFdhbmcgPHpoaS5hLndhbmdAaW50ZWwuY29tPgot LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIHwgMTEgKysrKy0tLS0tLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfdmdwdS5jICAgIHwgMTAgKysrKysrKystLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV92Z3B1LmggICAgfCAgMiArLQogMyBmaWxlcyBjaGFuZ2Vk LCAxMyBpbnNlcnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX2d0dC5jCmluZGV4IDdlYWI2MTkuLjVjMDJjNWEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX2d0dC5jCkBAIC0yNzM3LDExICsyNzM3LDkgQEAgc3RhdGljIGludCBpOTE1X2dlbV9zZXR1 cF9nbG9iYWxfZ3R0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJaTkxNV9hZGRyZXNzX3NwYWNl X2luaXQoJmdndHQtPmJhc2UsIGRldl9wcml2KTsKIAlnZ3R0LT5iYXNlLnRvdGFsICs9IFBBR0Vf U0laRTsKIAotCWlmIChpbnRlbF92Z3B1X2FjdGl2ZShkZXZfcHJpdikpIHsKLQkJcmV0ID0gaW50 ZWxfdmd0X2JhbGxvb24oZGV2KTsKLQkJaWYgKHJldCkKLQkJCXJldHVybiByZXQ7Ci0JfQorCXJl dCA9IGludGVsX3ZndF9iYWxsb29uKGRldik7CisJaWYgKHJldCkKKwkJcmV0dXJuIHJldDsKIAog CWlmICghSEFTX0xMQyhkZXYpKQogCQlnZ3R0LT5iYXNlLm1tLmNvbG9yX2FkanVzdCA9IGk5MTVf Z3R0X2NvbG9yX2FkanVzdDsKQEAgLTI4NDEsOCArMjgzOSw3IEBAIHZvaWQgaTkxNV9nZ3R0X2Ns ZWFudXBfaHcoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpOTE1X2dlbV9jbGVhbnVwX3N0b2xl bihkZXYpOwogCiAJaWYgKGRybV9tbV9pbml0aWFsaXplZCgmZ2d0dC0+YmFzZS5tbSkpIHsKLQkJ aWYgKGludGVsX3ZncHVfYWN0aXZlKGRldl9wcml2KSkKLQkJCWludGVsX3ZndF9kZWJhbGxvb24o KTsKKwkJaW50ZWxfdmd0X2RlYmFsbG9vbihkZXYpOwogCiAJCWRybV9tbV90YWtlZG93bigmZ2d0 dC0+YmFzZS5tbSk7CiAJCWxpc3RfZGVsKCZnZ3R0LT5iYXNlLmdsb2JhbF9saW5rKTsKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfdmdwdS5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV92Z3B1LmMKaW5kZXggZDVhN2E1ZS4uMGI3NmM3MCAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV92Z3B1LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV92Z3B1LmMKQEAgLTEwMSwxMCArMTAxLDEzIEBAIHN0YXRpYyBzdHJ1Y3QgX2JhbGxvb25f aW5mb18gYmxfaW5mbzsKICAqIFRoaXMgZnVuY3Rpb24gaXMgY2FsbGVkIHRvIGRlYWxsb2NhdGUg dGhlIGJhbGxvb25lZC1vdXQgZ3JhcGhpYyBtZW1vcnksIHdoZW4KICAqIGRyaXZlciBpcyB1bmxv YWRlZCBvciB3aGVuIGJhbGxvb25pbmcgZmFpbHMuCiAgKi8KLXZvaWQgaW50ZWxfdmd0X2RlYmFs bG9vbih2b2lkKQordm9pZCBpbnRlbF92Z3RfZGViYWxsb29uKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiB7CiAJaW50IGk7CiAKKwlpZiAoIWludGVsX3ZncHVfYWN0aXZlKHRvX2k5MTUoZGV2KSkp CisJCXJldHVybjsKKwogCURSTV9ERUJVRygiVkdUIGRlYmFsbG9vbi5cbiIpOwogCiAJZm9yIChp ID0gMDsgaSA8IDQ7IGkrKykgewpAQCAtMTg3LDYgKzE5MCw5IEBAIGludCBpbnRlbF92Z3RfYmFs bG9vbihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCXVuc2lnbmVkIGxvbmcgdW5tYXBwYWJsZV9i YXNlLCB1bm1hcHBhYmxlX3NpemUsIHVubWFwcGFibGVfZW5kOwogCWludCByZXQ7CiAKKwlpZiAo IWludGVsX3ZncHVfYWN0aXZlKHRvX2k5MTUoZGV2KSkpCisJCXJldHVybiAwOworCiAJbWFwcGFi bGVfYmFzZSA9IEk5MTVfUkVBRCh2Z3RpZl9yZWcoYXZhaWxfcnMubWFwcGFibGVfZ21hZHIuYmFz ZSkpOwogCW1hcHBhYmxlX3NpemUgPSBJOTE1X1JFQUQodmd0aWZfcmVnKGF2YWlsX3JzLm1hcHBh YmxlX2dtYWRyLnNpemUpKTsKIAl1bm1hcHBhYmxlX2Jhc2UgPSBJOTE1X1JFQUQodmd0aWZfcmVn KGF2YWlsX3JzLm5vbm1hcHBhYmxlX2dtYWRyLmJhc2UpKTsKQEAgLTI1OCw2ICsyNjQsNiBAQCBp bnQgaW50ZWxfdmd0X2JhbGxvb24oc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAogZXJyOgogCURS TV9FUlJPUigiVkdUIGJhbGxvb24gZmFpbFxuIik7Ci0JaW50ZWxfdmd0X2RlYmFsbG9vbigpOwor CWludGVsX3ZndF9kZWJhbGxvb24oZGV2KTsKIAlyZXR1cm4gcmV0OwogfQpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV92Z3B1LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X3ZncHUuaAppbmRleCAwN2U2N2Q1Li5jMGU5NTY5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X3ZncHUuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3Zn cHUuaApAQCAtMjgsNiArMjgsNiBAQAogCiBleHRlcm4gdm9pZCBpOTE1X2NoZWNrX3ZncHUoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIGV4dGVybiBpbnQgaW50ZWxfdmd0X2Jh bGxvb24oc3RydWN0IGRybV9kZXZpY2UgKmRldik7Ci1leHRlcm4gdm9pZCBpbnRlbF92Z3RfZGVi YWxsb29uKHZvaWQpOworZXh0ZXJuIHZvaWQgaW50ZWxfdmd0X2RlYmFsbG9vbihzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KTsKIAogI2VuZGlmIC8qIF9JOTE1X1ZHUFVfSF8gKi8KLS0gCjEuOS4xCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK