From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH] drm/i915: vlv: reserve the GT power context only once during driver init Date: Mon, 31 Mar 2014 15:10:44 +0300 Message-ID: <1396267844-9235-1-git-send-email-imre.deak@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 1D25D6E25F for ; Mon, 31 Mar 2014 05:12:10 -0700 (PDT) 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 QXRtIHdlIHJlc2VydmUvYWxsb2NhdGUgYW5kIGZyZWUgdGhlIHBvd2VyIGNvbnRleHQgZHVyaW5n IEdUIHBvd2VyCmVuYWJsZS9kaXNhYmxlIHRpbWUuIFRoZXJlIGlzIG5vIG5lZWQgdG8gZG8gdGhp cywgd2UgY2FuIHJlc2VydmUvYWxsb2NhdGUKdGhlIGJ1ZmZlciBvbmNlIGR1cmluZyBkcml2ZXIg bG9hZGluZyBhbmQgZnJlZSBpdCBkdXJpbmcgZHJpdmVyIGNsZWFudXAuClRoZSByZS1yZXNlcnZh dGlvbiBjYW4gYWxzbyBmYWlsIGluIGNhc2UgdGhlIGRyaXZlciBwcmV2aW91c2x5IG1hbmFnZXMg dG8KYWxsb2NhdGUgc29tZXRoaW5nIG9uIHRoZSBnaXZlbiBmaXhlZCBhZGRyZXNzLgoKVGhlIGJ1 ZmZlciBpc24ndCBleGVwZWN0ZWQgdG8gbW92ZSBldmVuIGlmIGFsbG9jYXRlZCBieSB0aGUgQklP UywgZm9yCnNhZmV0eSBhZGQgYW4gYXNzZXJ0IHRvIGNoZWNrIHRoaXMgYXNzdW1wdGlvbi4KClRo aXMgYWxzbyBmaXhlZCBhIGJ1ZyBmb3IgVmlsbGUsIHdoZXJlIHJlLXJlc2VydmluZyB0aGUgY29u dGV4dCBmYWlsZWQKZHVyaW5nIGEgR1BVIHJlc2V0IChJIGFzc3VtZSBiZWNhdXNlIHNvbWV0aGlu ZyBlbHNlIGdvdCBhbGxvY2F0ZWQgb24gaXRzCmZpeGVkIGFkZHJlc3MpLgoKVGVzdGVkLWJ5OiBW aWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgpTaWduZWQtb2Zm LWJ5OiBJbXJlIERlYWsgPGltcmUuZGVha0BpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgIDggKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZHJ2LmggICAgIHwgIDIgKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMg ICAgICB8IDQxICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLQogMyBmaWxlcyBj aGFuZ2VkLCA0NCBpbnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYwppbmRleCBlY2MwMWY1Li4wNjg0MjE1IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xMTc1OSw2ICsxMTc1OSwxMCBAQCB2b2lkIGludGVsX21v ZGVzZXRfZ2VtX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlzdHJ1Y3QgZHJtX2NydGMg KmM7CiAJc3RydWN0IGludGVsX2ZyYW1lYnVmZmVyICpmYjsKIAorCW11dGV4X2xvY2soJmRldi0+ c3RydWN0X211dGV4KTsKKwlpbnRlbF9pbml0X2d0X3Bvd2Vyc2F2ZShkZXYpOworCW11dGV4X3Vu bG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOworCiAJaW50ZWxfbW9kZXNldF9pbml0X2h3KGRldik7 CiAKIAlpbnRlbF9zZXR1cF9vdmVybGF5KGRldik7CkBAIC0xMTg0NSw2ICsxMTg0OSwxMCBAQCB2 b2lkIGludGVsX21vZGVzZXRfY2xlYW51cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWRybV9t b2RlX2NvbmZpZ19jbGVhbnVwKGRldik7CiAKIAlpbnRlbF9jbGVhbnVwX292ZXJsYXkoZGV2KTsK KworCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKKwlpbnRlbF9jbGVhbnVwX2d0X3Bv d2Vyc2F2ZShkZXYpOworCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogfQogCiAv KgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCA5MDAyZTc3Li43YjIxNTcxIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtODk3LDYgKzg5Nyw4IEBAIHZvaWQgaW50ZWxfZGlzcGxh eV9wb3dlcl9nZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogdm9pZCBpbnRl bF9kaXNwbGF5X3Bvd2VyX3B1dChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJ CQkgICAgIGVudW0gaW50ZWxfZGlzcGxheV9wb3dlcl9kb21haW4gZG9tYWluKTsKIHZvaWQgaW50 ZWxfcG93ZXJfZG9tYWluc19pbml0X2h3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp dik7Cit2b2lkIGludGVsX2luaXRfZ3RfcG93ZXJzYXZlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp Owordm9pZCBpbnRlbF9jbGVhbnVwX2d0X3Bvd2Vyc2F2ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KTsKIHZvaWQgaW50ZWxfZW5hYmxlX2d0X3Bvd2Vyc2F2ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KTsKIHZvaWQgaW50ZWxfZGlzYWJsZV9ndF9wb3dlcnNhdmUoc3RydWN0IGRybV9kZXZpY2UgKmRl dik7CiB2b2lkIGlyb25sYWtlX3RlYXJkb3duX3JjNihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDg0ODJhNWIuLjEwOTViM2UgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcG0uYwpAQCAtMzIwMSwxMSArMzIwMSw2IEBAIHN0YXRpYyB2b2lkIHZhbGxleXZp ZXdfZGlzYWJsZV9ycHMoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlJOTE1X1dSSVRFKEdFTjZf UkNfQ09OVFJPTCwgMCk7CiAKIAlnZW42X2Rpc2FibGVfcnBzX2ludGVycnVwdHMoZGV2KTsKLQot CWlmIChkZXZfcHJpdi0+dmx2X3BjdHgpIHsKLQkJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2Uo JmRldl9wcml2LT52bHZfcGN0eC0+YmFzZSk7Ci0JCWRldl9wcml2LT52bHZfcGN0eCA9IE5VTEw7 Ci0JfQogfQogCiBzdGF0aWMgdm9pZCBpbnRlbF9wcmludF9yYzZfaW5mbyhzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LCB1MzIgbW9kZSkKQEAgLTM1NDksNiArMzU0NCwxNSBAQCBpbnQgdmFsbGV5dmll d19ycHNfbWluX2ZyZXEoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCXJldHVy biB2bHZfcHVuaXRfcmVhZChkZXZfcHJpdiwgUFVOSVRfUkVHX0dQVV9MRk0pICYgMHhmZjsKIH0K IAorLyogQ2hlY2sgdGhhdCB0aGUgcGN0eCBidWZmZXIgd2Fzbid0IG1vdmUgdW5kZXIgdXMuICov CitzdGF0aWMgdm9pZCB2YWxsZXl2aWV3X2NoZWNrX3BjdHgoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KQoreworCXVuc2lnbmVkIGxvbmcgcGN0eF9hZGRyID0gSTkxNV9SRUFEKFZM Vl9QQ0JSKSAmIH40MDk1OworCisJV0FSTl9PTihwY3R4X2FkZHIgIT0gZGV2X3ByaXYtPm1tLnN0 b2xlbl9iYXNlICsKKwkJCSAgICAgZGV2X3ByaXYtPnZsdl9wY3R4LT5zdG9sZW4tPnN0YXJ0KTsK K30KKwogc3RhdGljIHZvaWQgdmFsbGV5dmlld19zZXR1cF9wY3R4KHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZf cHJpdmF0ZTsKQEAgLTM1OTMsNiArMzU5NywxNyBAQCBvdXQ6CiAJZGV2X3ByaXYtPnZsdl9wY3R4 ID0gcGN0eDsKIH0KIAorc3RhdGljIHZvaWQgdmFsbGV5dmlld19jbGVhbnVwX3BjdHgoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSBkZXYtPmRldl9wcml2YXRlOworCisJaWYgKFdBUk5fT04oIWRldl9wcml2LT52bHZfcGN0eCkp CisJCXJldHVybjsKKworCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlKCZkZXZfcHJpdi0+dmx2 X3BjdHgtPmJhc2UpOworCWRldl9wcml2LT52bHZfcGN0eCA9IE5VTEw7Cit9CisKIHN0YXRpYyB2 b2lkIHZhbGxleXZpZXdfZW5hYmxlX3JwcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CkBAIC0z NjAyLDYgKzM2MTcsOCBAQCBzdGF0aWMgdm9pZCB2YWxsZXl2aWV3X2VuYWJsZV9ycHMoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKIAogCVdBUk5fT04oIW11dGV4X2lzX2xvY2tlZCgmZGV2X3ByaXYt PnJwcy5od19sb2NrKSk7CiAKKwl2YWxsZXl2aWV3X2NoZWNrX3BjdHgoZGV2X3ByaXYpOworCiAJ aWYgKChndGZpZm9kYmcgPSBJOTE1X1JFQUQoR1RGSUZPREJHKSkpIHsKIAkJRFJNX0RFQlVHX0RS SVZFUigiR1QgZmlmbyBoYWQgYSBwcmV2aW91cyBlcnJvciAleFxuIiwKIAkJCQkgZ3RmaWZvZGJn KTsKQEAgLTQ0MTgsNiArNDQzNSwxOCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9pbml0X2Vtb24oc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKIAlkZXZfcHJpdi0+aXBzLmNvcnIgPSAobGNmdXNlICYgTENG VVNFX0hJVl9NQVNLKTsKIH0KIAordm9pZCBpbnRlbF9pbml0X2d0X3Bvd2Vyc2F2ZShzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KQoreworCWlmIChJU19WQUxMRVlWSUVXKGRldikpCisJCXZhbGxleXZp ZXdfc2V0dXBfcGN0eChkZXYpOworfQorCit2b2lkIGludGVsX2NsZWFudXBfZ3RfcG93ZXJzYXZl KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCit7CisJaWYgKElTX1ZBTExFWVZJRVcoZGV2KSkKKwkJ dmFsbGV5dmlld19jbGVhbnVwX3BjdHgoZGV2KTsKK30KKwogdm9pZCBpbnRlbF9kaXNhYmxlX2d0 X3Bvd2Vyc2F2ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CkBAIC00NDcyLDggKzQ1MDEsNiBA QCB2b2lkIGludGVsX2VuYWJsZV9ndF9wb3dlcnNhdmUoc3RydWN0IGRybV9kZXZpY2UgKmRldikK IAkJaXJvbmxha2VfZW5hYmxlX3JjNihkZXYpOwogCQlpbnRlbF9pbml0X2Vtb24oZGV2KTsKIAl9 IGVsc2UgaWYgKElTX0dFTjYoZGV2KSB8fCBJU19HRU43KGRldikpIHsKLQkJaWYgKElTX1ZBTExF WVZJRVcoZGV2KSkKLQkJCXZhbGxleXZpZXdfc2V0dXBfcGN0eChkZXYpOwogCQkvKgogCQkgKiBQ Q1UgY29tbXVuaWNhdGlvbiBpcyBzbG93IGFuZCB0aGlzIGRvZXNuJ3QgbmVlZCB0byBiZQogCQkg KiBkb25lIGF0IGFueSBzcGVjaWZpYyB0aW1lLCBzbyBkbyB0aGlzIG91dCBvZiBvdXIgZmFzdCBw YXRoCi0tIAoxLjguNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n ZngK