From: Zhi Wang Subject: [PATCH v11 3/9] drm/i915: Fold vGPU active check into inner functions Date: Tue, 14 Jun 2016 09:21:15 -0400 Message-ID: <1465910481-11212-4-git-send-email-zhi.a.wang@intel.com> References: <1465910481-11212-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 056556E66A for ; Tue, 14 Jun 2016 13:21:46 +0000 (UTC) In-Reply-To: <1465910481-11212-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 Cc: zhiyuan.lv@intel.com List-Id: intel-gfx@lists.freedesktop.org djU6Ci0gTGV0IGZ1bmN0aW9ucyB0YWtlIHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICouIChUdnJ0 a28pCgotIEZvbGQgdkdQVSByZWxhdGVkIGFjdGl2ZSBjaGVjayBpbnRvIHRoZSBpbm5lciBmdW5j dGlvbnMuIChLZXZpbikKClJldmlld2VkLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3Vs aW5AbGludXguaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMu bGFodGluZW5AbGludXguaW50ZWwuY29tPgpTdWdnZXN0ZWQtYnk6IEtldmluIFRpYW4gPGtldmlu LnRpYW5AaW50ZWwuY29tPgpDYzogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGxpbnV4 LmludGVsLmNvbT4KQ2M6IEpvb25hcyBMYWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxpbnV4Lmlu dGVsLmNvbT4KQ2M6IEtldmluIFRpYW4gPGtldmluLnRpYW5AaW50ZWwuY29tPgpTaWduZWQtb2Zm LWJ5OiBaaGkgV2FuZyA8emhpLmEud2FuZ0BpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fZ3R0LmMgfCAxMSArKysrLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV92Z3B1LmMgICAgfCAxMyArKysrKysrKystLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X3ZncHUuaCAgICB8ICA0ICsrLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTUgaW5zZXJ0aW9u cygrKSwgMTMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fZ3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRl eCA3YTEzOWE2Li41ODkwMDE3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9ndHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpAQCAt Mjc5NCwxMSArMjc5NCw5IEBAIHN0YXRpYyBpbnQgaTkxNV9nZW1fc2V0dXBfZ2xvYmFsX2d0dChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCWk5MTVfYWRkcmVzc19zcGFjZV9pbml0KCZnZ3R0LT5i YXNlLCBkZXZfcHJpdik7CiAJZ2d0dC0+YmFzZS50b3RhbCArPSBQQUdFX1NJWkU7CiAKLQlpZiAo aW50ZWxfdmdwdV9hY3RpdmUoZGV2X3ByaXYpKSB7Ci0JCXJldCA9IGludGVsX3ZndF9iYWxsb29u KGRldik7Ci0JCWlmIChyZXQpCi0JCQlyZXR1cm4gcmV0OwotCX0KKwlyZXQgPSBpbnRlbF92Z3Rf YmFsbG9vbihkZXZfcHJpdik7CisJaWYgKHJldCkKKwkJcmV0dXJuIHJldDsKIAogCWlmICghSEFT X0xMQyhkZXYpKQogCQlnZ3R0LT5iYXNlLm1tLmNvbG9yX2FkanVzdCA9IGk5MTVfZ3R0X2NvbG9y X2FkanVzdDsKQEAgLTI4OTgsOCArMjg5Niw3IEBAIHZvaWQgaTkxNV9nZ3R0X2NsZWFudXBfaHco c3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpOTE1X2dlbV9jbGVhbnVwX3N0b2xlbihkZXYpOwog CiAJaWYgKGRybV9tbV9pbml0aWFsaXplZCgmZ2d0dC0+YmFzZS5tbSkpIHsKLQkJaWYgKGludGVs X3ZncHVfYWN0aXZlKGRldl9wcml2KSkKLQkJCWludGVsX3ZndF9kZWJhbGxvb24oKTsKKwkJaW50 ZWxfdmd0X2RlYmFsbG9vbihkZXZfcHJpdik7CiAKIAkJZHJtX21tX3Rha2Vkb3duKCZnZ3R0LT5i YXNlLm1tKTsKIAkJbGlzdF9kZWwoJmdndHQtPmJhc2UuZ2xvYmFsX2xpbmspOwpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV92Z3B1LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X3ZncHUuYwppbmRleCBjM2M2YzY0Li5mNmFjYjVhIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X3ZncHUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X3ZncHUuYwpAQCAtMTAxLDEwICsxMDEsMTMgQEAgc3RhdGljIHN0cnVjdCBfYmFsbG9vbl9pbmZv XyBibF9pbmZvOwogICogVGhpcyBmdW5jdGlvbiBpcyBjYWxsZWQgdG8gZGVhbGxvY2F0ZSB0aGUg YmFsbG9vbmVkLW91dCBncmFwaGljIG1lbW9yeSwgd2hlbgogICogZHJpdmVyIGlzIHVubG9hZGVk IG9yIHdoZW4gYmFsbG9vbmluZyBmYWlscy4KICAqLwotdm9pZCBpbnRlbF92Z3RfZGViYWxsb29u KHZvaWQpCit2b2lkIGludGVsX3ZndF9kZWJhbGxvb24oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KQogewogCWludCBpOwogCisJaWYgKCFpbnRlbF92Z3B1X2FjdGl2ZShkZXZfcHJp dikpCisJCXJldHVybjsKKwogCURSTV9ERUJVRygiVkdUIGRlYmFsbG9vbi5cbiIpOwogCiAJZm9y IChpID0gMDsgaSA8IDQ7IGkrKykgewpAQCAtMTc3LDkgKzE4MCw4IEBAIHN0YXRpYyBpbnQgdmd0 X2JhbGxvb25fc3BhY2Uoc3RydWN0IGRybV9tbSAqbW0sCiAgKiBSZXR1cm5zOgogICogemVybyBv biBzdWNjZXNzLCBub24temVybyBpZiBjb25maWd1cmF0aW9uIGludmFsaWQgb3IgYmFsbG9vbmlu ZyBmYWlsZWQKICAqLwotaW50IGludGVsX3ZndF9iYWxsb29uKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCitpbnQgaW50ZWxfdmd0X2JhbGxvb24oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2 KTsKIAlzdHJ1Y3QgaTkxNV9nZ3R0ICpnZ3R0ID0gJmRldl9wcml2LT5nZ3R0OwogCXVuc2lnbmVk IGxvbmcgZ2d0dF9lbmQgPSBnZ3R0LT5iYXNlLnN0YXJ0ICsgZ2d0dC0+YmFzZS50b3RhbDsKIApA QCAtMTg3LDYgKzE4OSw5IEBAIGludCBpbnRlbF92Z3RfYmFsbG9vbihzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogCXVuc2lnbmVkIGxvbmcgdW5tYXBwYWJsZV9iYXNlLCB1bm1hcHBhYmxlX3NpemUs IHVubWFwcGFibGVfZW5kOwogCWludCByZXQ7CiAKKwlpZiAoIWludGVsX3ZncHVfYWN0aXZlKGRl dl9wcml2KSkKKwkJcmV0dXJuIDA7CisKIAltYXBwYWJsZV9iYXNlID0gSTkxNV9SRUFEKHZndGlm X3JlZyhhdmFpbF9ycy5tYXBwYWJsZV9nbWFkci5iYXNlKSk7CiAJbWFwcGFibGVfc2l6ZSA9IEk5 MTVfUkVBRCh2Z3RpZl9yZWcoYXZhaWxfcnMubWFwcGFibGVfZ21hZHIuc2l6ZSkpOwogCXVubWFw cGFibGVfYmFzZSA9IEk5MTVfUkVBRCh2Z3RpZl9yZWcoYXZhaWxfcnMubm9ubWFwcGFibGVfZ21h ZHIuYmFzZSkpOwpAQCAtMjU4LDYgKzI2Myw2IEBAIGludCBpbnRlbF92Z3RfYmFsbG9vbihzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQogCiBlcnI6CiAJRFJNX0VSUk9SKCJWR1QgYmFsbG9vbiBmYWls XG4iKTsKLQlpbnRlbF92Z3RfZGViYWxsb29uKCk7CisJaW50ZWxfdmd0X2RlYmFsbG9vbihkZXZf cHJpdik7CiAJcmV0dXJuIHJldDsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfdmdwdS5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV92Z3B1LmgKaW5kZXggMDdl NjdkNS4uZjg5MTdjNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV92Z3B1 LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV92Z3B1LmgKQEAgLTI3LDcgKzI3LDcg QEAKICNpbmNsdWRlICJpOTE1X3B2aW5mby5oIgogCiBleHRlcm4gdm9pZCBpOTE1X2NoZWNrX3Zn cHUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKLWV4dGVybiBpbnQgaW50ZWxf dmd0X2JhbGxvb24oc3RydWN0IGRybV9kZXZpY2UgKmRldik7Ci1leHRlcm4gdm9pZCBpbnRlbF92 Z3RfZGViYWxsb29uKHZvaWQpOworZXh0ZXJuIGludCBpbnRlbF92Z3RfYmFsbG9vbihzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOworZXh0ZXJuIHZvaWQgaW50ZWxfdmd0X2RlYmFs bG9vbihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogCiAjZW5kaWYgLyogX0k5 MTVfVkdQVV9IXyAqLwotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2ludGVsLWdmeAo=