From mboxrd@z Thu Jan 1 00:00:00 1970 From: Egbert Eich Subject: [PATCH 5/5] drm/i915/eDP: Move pps_lock() and edp_panel_vdd_on() to top Date: Mon, 24 Nov 2014 18:16:27 +0100 Message-ID: <1416849387-20984-6-git-send-email-eich@suse.de> References: <1416849387-20984-1-git-send-email-eich@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by gabe.freedesktop.org (Postfix) with ESMTP id 043216E3CC for ; Mon, 24 Nov 2014 09:17:33 -0800 (PST) In-Reply-To: <1416849387-20984-1-git-send-email-eich@suse.de> 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: Egbert Eich List-Id: intel-gfx@lists.freedesktop.org T24gZURQIGVhY2ggbG93IGxldmVsIHRyYW5zZmVyIGlzIHdyYXBwZWQgYnkgcHBzX2xvY2soKS91 bmxvY2soKQphbmQgZWRwX3BhbmVsX3ZkZF9vbigpL29mZigpLiBTaW5jZSBQUFMgbG9ja2luZyBj YW4gYmUgcXVpdGUgZXhwZW5zaXZlCmFuZCBlYWNoIGNhbGwgdG8gbWFzdGVyX3hmZXIoKSBvciBk cGNkX2FjY2VzcygpIG1heSBjYWxsIHRoZXNlIGxvdyBsZXZlbAp0cmFuc2ZlciBmdW5jdGlvbnMg bWFueSB0aW1lcyBpdCBtYXkgaW50cm9kdWNlIGEgY29uc2lkZXJhYmxlIGRlbGF5LgpNb3ZlIGxv Y2tpbmcvVkREIGVuYWJsZW1lbnQgdG8gdGhlIHRvcCBzbyB0aGF0IGl0IGlzIHBlcmZvcm1lZCBv bmx5Cm9uY2UgcGVyIG1hc3Rlcl94ZmVyKCkgb3IgZHBjZF9hY2Nlc3MoKS4KVGhpcyBmaXhlcyBo dHRwczovL2J1Z3MuZnJlZWRlc2t0b3Aub3JnL3Nob3dfYnVnLmNnaT9pZD04NjIwMQoKU2lnbmVk LW9mZi1ieTogRWdiZXJ0IEVpY2ggPGVpY2hAc3VzZS5kZT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcC5jICB8IDExNiArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0t LS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIHwgICA1ICsrCiAyIGZpbGVz IGNoYW5nZWQsIDEwMCBpbnNlcnRpb25zKCspLCAyMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZHAuYwppbmRleCBhMjRjOGNjNy4uMTY0ZjgwZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cC5jCkBAIC04MDcsMTkgKzgwNyw2IEBAIGludGVsX2RwX2F1eF9jaChzdHJ1Y3QgaW50ZWxfZHAg KmludGVsX2RwLAogCXVpbnQzMl90IHN0YXR1czsKIAlpbnQgdHJ5LCBjbG9jayA9IDA7CiAJYm9v bCBoYXNfYXV4X2lycSA9IEhBU19BVVhfSVJRKGRldik7Ci0JYm9vbCB2ZGQgPSBmYWxzZTsKLQot CWlmIChpc19lZHAoaW50ZWxfZHApKSB7Ci0JCXBwc19sb2NrKGludGVsX2RwKTsKLQotCQkvKgot CQkgKiBXZSB3aWxsIGJlIGNhbGxlZCB3aXRoIFZERCBhbHJlYWR5IGVuYWJsZWQgZm9yIGRwY2Qv ZWRpZC9vdWkgcmVhZHMuCi0JCSAqIEluIHN1Y2ggY2FzZXMgd2Ugd2FudCB0byBsZWF2ZSBWREQg ZW5hYmxlZCBhbmQgaXQncyB1cCB0byB1cHBlciBsYXllcnMKLQkJICogdG8gdHVybiBpdCBvZmYu IEJ1dCBmb3IgZWcuIGkyYy1kZXYgYWNjZXNzIHdlIG5lZWQgdG8gdHVybiBpdCBvbi9vZmYKLQkJ ICogb3Vyc2VsdmVzLgotCQkgKi8KLQkJdmRkID0gZWRwX3BhbmVsX3ZkZF9vbihpbnRlbF9kcCk7 Ci0JfQogCiAJLyogZHAgYXV4IGlzIGV4dHJlbWVseSBzZW5zaXRpdmUgdG8gaXJxIGxhdGVuY3ks IGhlbmNlIHJlcXVlc3QgdGhlCiAJICogbG93ZXN0IHBvc3NpYmxlIHdha2V1cCBsYXRlbmN5IGFu ZCBzbyBwcmV2ZW50IHRoZSBjcHUgZnJvbSBnb2luZyBpbnRvCkBAIC05MjYsMTMgKzkxMyw2IEBA IG91dDoKIAlwbV9xb3NfdXBkYXRlX3JlcXVlc3QoJmRldl9wcml2LT5wbV9xb3MsIFBNX1FPU19E RUZBVUxUX1ZBTFVFKTsKIAlpbnRlbF9hdXhfZGlzcGxheV9ydW50aW1lX3B1dChkZXZfcHJpdik7 CiAKLQlpZiAoaXNfZWRwKGludGVsX2RwKSkgewotCQlpZiAodmRkKQotCQkJZWRwX3BhbmVsX3Zk ZF9vZmYoaW50ZWxfZHAsIGZhbHNlKTsKLQotCQlwcHNfdW5sb2NrKGludGVsX2RwKTsKLQl9Ci0K IAlyZXR1cm4gcmV0OwogfQogCkBAIC0xMDAxLDYgKzk4MSw5NyBAQCBpbnRlbF9kcF9hdXhfdHJh bnNmZXIoc3RydWN0IGRybV9kcF9hdXggKmF1eCwgc3RydWN0IGRybV9kcF9hdXhfbXNnICptc2cp CiAJcmV0dXJuIHJldDsKIH0KIAoraW50IGludGVsX2VkcF9kcGNkX2FjY2VzcyhzdHJ1Y3QgZHJt X2RwX2F1eCAqYXV4LCB1OCByZXF1ZXN0LAorCQkJICAgICAgdW5zaWduZWQgaW50IG9mZnNldCwg dm9pZCAqYnVmZmVyLCBzaXplX3Qgc2l6ZSkKK3sKKwlzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2Rw ID0gY29udGFpbmVyX29mKGF1eCwgc3RydWN0IGludGVsX2RwLCBhdXgpOworCWJvb2wgdmRkID0g ZmFsc2U7CisJaW50IHJldDsKKworCXBwc19sb2NrKGludGVsX2RwKTsKKwkvKgorCSAqIFdlIHdp bGwgYmUgY2FsbGVkIHdpdGggVkREIGFscmVhZHkgZW5hYmxlZCBmb3IgZHBjZC9lZGlkL291aSBy ZWFkcy4KKwkgKiBJbiBzdWNoIGNhc2VzIHdlIHdhbnQgdG8gbGVhdmUgVkREIGVuYWJsZWQgYW5k IGl0J3MgdXAgdG8gdXBwZXIKKwkgKiBsYXllcnMgdG8gdHVybiBpdCBvZmYuIEJ1dCBmb3IgZWcu IGkyYy1kZXYgYWNjZXNzIHdlIG5lZWQgdG8gdHVybgorCSAqIGl0IG9uL29mZiBvdXJzZWx2ZXMu CisJICovCisJdmRkID0gZWRwX3BhbmVsX3ZkZF9vbihpbnRlbF9kcCk7CisKKwlyZXQgPSBkcm1f ZHBfZHBjZF9hY2Nlc3MoYXV4LCByZXF1ZXN0LCBvZmZzZXQsIGJ1ZmZlciwgc2l6ZSk7CisKKwlp ZiAodmRkKQorCQllZHBfcGFuZWxfdmRkX29mZihpbnRlbF9kcCwgZmFsc2UpOworCisJcHBzX3Vu bG9jayhpbnRlbF9kcCk7CisKKwlyZXR1cm4gcmV0OworfQorCitzdGF0aWMgaW50CitpbnRlbF9l ZHBfaTJjX3hmZXIoc3RydWN0IGkyY19hZGFwdGVyICphZGFwdGVyLCBzdHJ1Y3QgaTJjX21zZyAq bXNncywKKwkJCSAgaW50IG51bSkKK3sKKwlzdHJ1Y3QgZHJtX2RwX2F1eCAqYXV4ID0gYWRhcHRl ci0+YWxnb19kYXRhOworCXN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAgPSBjb250YWluZXJfb2Yo YXV4LCBzdHJ1Y3QgaW50ZWxfZHAsIGF1eCk7CisJYm9vbCB2ZGQgPSBmYWxzZTsKKwlpbnQgcmV0 OworCisJcHBzX2xvY2soaW50ZWxfZHApOworCS8qCisJICogV2Ugd2lsbCBiZSBjYWxsZWQgd2l0 aCBWREQgYWxyZWFkeSBlbmFibGVkIGZvciBkcGNkL2VkaWQvb3VpIHJlYWRzLgorCSAqIEluIHN1 Y2ggY2FzZXMgd2Ugd2FudCB0byBsZWF2ZSBWREQgZW5hYmxlZCBhbmQgaXQncyB1cCB0byB1cHBl cgorCSAqIGxheWVycyB0byB0dXJuIGl0IG9mZi4gQnV0IGZvciBlZy4gaTJjLWRldiBhY2Nlc3Mg d2UgbmVlZCB0byB0dXJuCisJICogaXQgb24vb2ZmIG91cnNlbHZlcy4KKwkgKi8KKwl2ZGQgPSBl ZHBfcGFuZWxfdmRkX29uKGludGVsX2RwKTsKKworCXJldCA9IGRybV9kcF9pMmNfeGZlcihhZGFw dGVyLCBtc2dzLCBudW0pOworCisJaWYgKHZkZCkKKwkJZWRwX3BhbmVsX3ZkZF9vZmYoaW50ZWxf ZHAsIGZhbHNlKTsKKworCXBwc191bmxvY2soaW50ZWxfZHApOworCisJcmV0dXJuIHJldDsKK30K Kworc3RhdGljIHUzMiBpbnRlbF9lZHBfaTJjX2Z1bmN0aW9uYWxpdHkoc3RydWN0IGkyY19hZGFw dGVyICphZGFwdGVyKQoreworCXJldHVybiBJMkNfRlVOQ19JMkMgfCBJMkNfRlVOQ19TTUJVU19F TVVMIHwKKwkgICAgICAgSTJDX0ZVTkNfU01CVVNfUkVBRF9CTE9DS19EQVRBIHwKKwkgICAgICAg STJDX0ZVTkNfU01CVVNfQkxPQ0tfUFJPQ19DQUxMIHwKKwkgICAgICAgSTJDX0ZVTkNfMTBCSVRf QUREUjsKK30KKworc3RhdGljIGNvbnN0IHN0cnVjdCBpMmNfYWxnb3JpdGhtIGludGVsX2VkcF9p MmNfYWxnbyA9IHsKKwkuZnVuY3Rpb25hbGl0eSA9IGludGVsX2VkcF9pMmNfZnVuY3Rpb25hbGl0 eSwKKwkubWFzdGVyX3hmZXIgPSBpbnRlbF9lZHBfaTJjX3hmZXIsCit9OworCisvKgorICogaW50 ZWxfZWRwX2F1eF9yZWdpc3RlcigpIC0gSW50ZWwgcmVwbGFjZW1lbnQgZm9yCisgKiAgICAgICAg ICAgICAgICAgICAgICAgICAgIGRybV9kcF9hdXhfcmVnaXN0ZXIoKS4KKyAqLworc3RhdGljIGlu dCBpbnRlbF9lZHBfYXV4X3JlZ2lzdGVyKHN0cnVjdCBkcm1fZHBfYXV4ICphdXgpCit7CisJbXV0 ZXhfaW5pdCgmYXV4LT5od19tdXRleCk7CisJYXV4LT5kcGNkX2FjY2VzcyA9IGludGVsX2VkcF9k cGNkX2FjY2VzczsKKworCWF1eC0+ZGRjLmFsZ28gPSAmaW50ZWxfZWRwX2kyY19hbGdvOworCWF1 eC0+ZGRjLmFsZ29fZGF0YSA9IGF1eDsKKwlhdXgtPmRkYy5yZXRyaWVzID0gMzsKKworCWF1eC0+ ZGRjLmNsYXNzID0gSTJDX0NMQVNTX0REQzsKKwlhdXgtPmRkYy5vd25lciA9IFRISVNfTU9EVUxF OworCWF1eC0+ZGRjLmRldi5wYXJlbnQgPSBhdXgtPmRldjsKKwlhdXgtPmRkYy5kZXYub2Zfbm9k ZSA9IGF1eC0+ZGV2LT5vZl9ub2RlOworCisJc3RybGNweShhdXgtPmRkYy5uYW1lLCBhdXgtPm5h bWUgPyBhdXgtPm5hbWUgOiBkZXZfbmFtZShhdXgtPmRldiksCisJCXNpemVvZihhdXgtPmRkYy5u YW1lKSk7CisKKwlyZXR1cm4gaTJjX2FkZF9hZGFwdGVyKCZhdXgtPmRkYyk7Cit9CisKIHN0YXRp YyB2b2lkCiBpbnRlbF9kcF9hdXhfaW5pdChzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLCBzdHJ1 Y3QgaW50ZWxfY29ubmVjdG9yICpjb25uZWN0b3IpCiB7CkBAIC0xMDUwLDcgKzExMjEsMTAgQEAg aW50ZWxfZHBfYXV4X2luaXQoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCwgc3RydWN0IGludGVs X2Nvbm5lY3RvciAqY29ubmVjdG9yKQogCURSTV9ERUJVR19LTVMoInJlZ2lzdGVyaW5nICVzIGJ1 cyBmb3IgJXNcbiIsIG5hbWUsCiAJCSAgICAgIGNvbm5lY3Rvci0+YmFzZS5rZGV2LT5rb2JqLm5h bWUpOwogCi0JcmV0ID0gZHJtX2RwX2F1eF9yZWdpc3RlcigmaW50ZWxfZHAtPmF1eCk7CisJaWYg KCFpc19lZHAoaW50ZWxfZHApKQorCQlyZXQgPSBkcm1fZHBfYXV4X3JlZ2lzdGVyKCZpbnRlbF9k cC0+YXV4KTsKKwllbHNlCisJCXJldCA9IGludGVsX2VkcF9hdXhfcmVnaXN0ZXIoJmludGVsX2Rw LT5hdXgpOwogCWlmIChyZXQgPCAwKSB7CiAJCURSTV9FUlJPUigiZHJtX2RwX2F1eF9yZWdpc3Rl cigpIGZvciAlcyBmYWlsZWQgKCVkKVxuIiwKIAkJCSAgbmFtZSwgcmV0KTsKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZHJ2LmgKaW5kZXggNDRiMTUzYzUuLjc4MzI2MWEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rydi5oCkBAIC01ODksNiArNTg5LDExIEBAIHN0cnVjdCBpbnRlbF9kcCB7CiAJdWludDhfdCBw c3JfZHBjZFtFRFBfUFNSX1JFQ0VJVkVSX0NBUF9TSVpFXTsKIAl1aW50OF90IGRvd25zdHJlYW1f cG9ydHNbRFBfTUFYX0RPV05TVFJFQU1fUE9SVFNdOwogCXN0cnVjdCBkcm1fZHBfYXV4IGF1eDsK KwlzdHJ1Y3QgaTJjX2FsZ29yaXRobSBkZGNfYWxnbzsKKwlpbnQgKCphdXhfbWFzdGVyX3hmZXIp KHN0cnVjdCBpMmNfYWRhcHRlciAqYWRhcCwgc3RydWN0IGkyY19tc2cgKm1zZ3MsCisJCQkgICBp bnQgbnVtKTsKKwlpbnQgKCpkcGNkX2FjY2Vzcykoc3RydWN0IGRybV9kcF9hdXggKmF1eCwgdTgg cmVxdWVzdCwKKwkJCSAgIHVuc2lnbmVkIGludCBvZmZzZXQsIHZvaWQgKmJ1ZmZlciwgc2l6ZV90 IHNpemUpOwogCXVpbnQ4X3QgdHJhaW5fc2V0WzRdOwogCWludCBwYW5lbF9wb3dlcl91cF9kZWxh eTsKIAlpbnQgcGFuZWxfcG93ZXJfZG93bl9kZWxheTsKLS0gCjEuOC40LjUKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==