From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tony Lindgren Subject: [PATCHv2] drm/omap: dsi: Fix PM for display blank with paired dss_pll calls Date: Thu, 7 Feb 2019 07:45:16 -0800 Message-ID: <20190207154516.57549-1-tony@atomide.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from muru.com (muru.com [72.249.23.125]) by gabe.freedesktop.org (Postfix) with ESMTP id C4CC46EC62 for ; Thu, 7 Feb 2019 15:45:22 +0000 (UTC) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Tomi Valkeinen Cc: linux-omap@vger.kernel.org, Laurent Pinchart , dri-devel@lists.freedesktop.org, Sebastian Reichel List-Id: dri-devel@lists.freedesktop.org Q3VycmVudGx5IGRzaV9kaXNwbGF5X2luaXRfZHNpKCkgY2FsbHMgZHNzX3BsbF9lbmFibGUoKSBi dXQgaXQgaXMgbm90CnBhaXJlZCB3aXRoIGRzc19wbGxfZGlzYWJsZSgpIGluIGRzaV9kaXNwbGF5 X3VuaW5pdF9kc2koKS4gVGhpcyBsZWF2ZXMKdGhlIERTUyBjbG9ja3MgZW5hYmxlZCB3aGVuIHRo ZSBkaXNwbGF5IGlzIGJsYW5rZWQgd2FzdGluZyBhYm91dCBleHRyYQo1bVcgb2YgcG93ZXIgd2hp bGUgaWRsZS4KClRoZSBjbG9jayB0aGF0IGlzIGxlZnQgb24gYnkgbm90IGNhbGxpbmcgZHNzX3Bs bF9kaXNhYmxlKCkgaXMKRFNTX0NMS0NUUkwgYml0IDEwIE9QVEZDTEtFTl9TWVNfQ0xLIHRoYXQg aXMgdGhlIHNvdXJjZSBjbG9jayBmb3IKRFNJIFBMTC4KCldlIGNhbiBmaXggdGhpcyBpc3N1ZSBi eSBieSBtYWtpbmcgdGhlIGN1cnJlbnQgZHNpX3BsbF91bmluaXQoKSBpbnRvCmRzaV9wbGxfZGlz YWJsZSgpLiBUaGlzIHdheSB3ZSBjYW4ganVzdCBjYWxsIGRzc19wbGxfZGlzYWJsZSgpIGZyb20K ZHNpX2Rpc3BsYXlfdW5pbml0X2RzaSgpIGFuZCB0aGUgY29kZSBiZWNvbWVzIGEgYml0IGVhc2ll ciB0byBmb2xsb3cuCgpIb3dldmVyLCB3ZSBuZWVkIHRvIGFsc28gY29uc2lkZXIgdGhhdCBEU0kg UExMIGNhbiBiZSBtdXhlZCBmb3IgRFZJIHRvbwphcyBwb2ludGVkIG91dCBieSBUb21pIFZhbGtl aW5lbiA8dG9taS52YWxrZWluZW5AdGkuY29tPi4gSW4gdGhlIERWSQpjYXNlLCB3ZSB3YW50IHRv IHVuY29uZGl0aW9uYWxseSBkaXNhYmxlIHRoZSBjbG9ja3MuIFRvIGdldCBhcm91bmQgdGhpcwpp c3N1ZSwgd2Ugc2VwYXJhdGUgb3V0IHRoZSBEU0kgbGFuZSBoYW5kbGluZyBmcm9tIGRzaV9wbGxf ZW5hYmxlKCkgYW5kCmRzaV9wbGxfZGlzYWJsZSgpIGFzIHN1Z2dlc3RlZCBieSBUb21pIGluIGFu IGVhcmxpZXIgZXhwZXJpbWVudGFsIHBhdGNoLgoKU28gd2UgbXVzdCBvbmx5IHRvZ2dsZSB0aGUg RFNJIHJlZ3VsYXRvciBiYXNlZCBvbiB0aGUgdmRkc19kc2lfZW5hYmxlZApmbGFnIGZyb20gZHNp X2Rpc3BsYXlfaW5pdF9kc2koKSBhbmQgZHNpX2Rpc3BsYXlfdW5pbml0X2RzaSgpLgoKV2UgbmVl ZCB0byBtYWtlIHRoZXNlIHR3byBjaGFuZ2VzIHRvZ2V0aGVyIHRvIGF2b2lkIGJyZWFraW5nIHRo aW5ncwpmb3IgRFZJIHdoZW4gZml4aW5nIHRoZSBEU0kgY2xvY2sgaGFuZGxpbmcuIEFuZCB0aGlz IGFsbCBjYXVzZXMgYQpzbGlnaHQgcmVudW1iZXJpbmcgb2YgdGhlIGVycm9yIHBhdGggZm9yIGRz aV9kaXNwbGF5X2luaXRfZHNpKCkuCgpTdWdnZXN0ZWQtYnk6IFRvbWkgVmFsa2VpbmVuIDx0b21p LnZhbGtlaW5lbkB0aS5jb20+ClNpZ25lZC1vZmYtYnk6IFRvbnkgTGluZGdyZW4gPHRvbnlAYXRv bWlkZS5jb20+Ci0tLQoKQ2hhbmdlcyBzaW5jZSB2MToKLSBVcGRhdGVkIHdpdGggVG9taSdzIHN1 Z2dlc3RlZCBjaGFuZ2VzIHRvIG5vdCBicmVhayBEVkkgd2l0aAogIHJlZ3VsYXRvcl9lbmFibGUo KSBtYWRlIGNvbmRpdGlvbmFsIGZvciBkc2lfZGlzcGxheV9pbml0X2RzaSgpCgotIFVwZGF0ZWQg Y29tbWVudHMgdG8gYmV0dGVyIGRlc2NyaWJlIHdoYXQgYWxsIGdvZXMgd3JvbmcKCi0tLQogZHJp dmVycy9ncHUvZHJtL29tYXBkcm0vZHNzL2RzaS5jIHwgNjAgKysrKysrKysrKysrKysrKy0tLS0t LS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDMxIGluc2VydGlvbnMoKyksIDI5IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9vbWFwZHJtL2Rzcy9kc2kuYyBiL2Ry aXZlcnMvZ3B1L2RybS9vbWFwZHJtL2Rzcy9kc2kuYwotLS0gYS9kcml2ZXJzL2dwdS9kcm0vb21h cGRybS9kc3MvZHNpLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL29tYXBkcm0vZHNzL2RzaS5jCkBA IC0xMzQyLDEyICsxMzQyLDkgQEAgc3RhdGljIGludCBkc2lfcGxsX2VuYWJsZShzdHJ1Y3QgZHNz X3BsbCAqcGxsKQogCSAqLwogCWRzaV9lbmFibGVfc2NwX2Nsayhkc2kpOwogCi0JaWYgKCFkc2kt PnZkZHNfZHNpX2VuYWJsZWQpIHsKLQkJciA9IHJlZ3VsYXRvcl9lbmFibGUoZHNpLT52ZGRzX2Rz aV9yZWcpOwotCQlpZiAocikKLQkJCWdvdG8gZXJyMDsKLQkJZHNpLT52ZGRzX2RzaV9lbmFibGVk ID0gdHJ1ZTsKLQl9CisJciA9IHJlZ3VsYXRvcl9lbmFibGUoZHNpLT52ZGRzX2RzaV9yZWcpOwor CWlmIChyKQorCQlnb3RvIGVycjA7CiAKIAkvKiBYWFggUExMIGRvZXMgbm90IGNvbWUgb3V0IG9m IHJlc2V0IHdpdGhvdXQgdGhpcy4uLiAqLwogCWRpc3BjX3Bja19mcmVlX2VuYWJsZShkc2ktPmRz cy0+ZGlzcGMsIDEpOwpAQCAtMTM3MiwzNiArMTM2OSwyNSBAQCBzdGF0aWMgaW50IGRzaV9wbGxf ZW5hYmxlKHN0cnVjdCBkc3NfcGxsICpwbGwpCiAKIAlyZXR1cm4gMDsKIGVycjE6Ci0JaWYgKGRz aS0+dmRkc19kc2lfZW5hYmxlZCkgewotCQlyZWd1bGF0b3JfZGlzYWJsZShkc2ktPnZkZHNfZHNp X3JlZyk7Ci0JCWRzaS0+dmRkc19kc2lfZW5hYmxlZCA9IGZhbHNlOwotCX0KKwlyZWd1bGF0b3Jf ZGlzYWJsZShkc2ktPnZkZHNfZHNpX3JlZyk7CiBlcnIwOgogCWRzaV9kaXNhYmxlX3NjcF9jbGso ZHNpKTsKIAlkc2lfcnVudGltZV9wdXQoZHNpKTsKIAlyZXR1cm4gcjsKIH0KIAotc3RhdGljIHZv aWQgZHNpX3BsbF91bmluaXQoc3RydWN0IGRzaV9kYXRhICpkc2ksIGJvb2wgZGlzY29ubmVjdF9s YW5lcykKK3N0YXRpYyB2b2lkIGRzaV9wbGxfZGlzYWJsZShzdHJ1Y3QgZHNzX3BsbCAqcGxsKQog eworCXN0cnVjdCBkc2lfZGF0YSAqZHNpID0gY29udGFpbmVyX29mKHBsbCwgc3RydWN0IGRzaV9k YXRhLCBwbGwpOworCiAJZHNpX3BsbF9wb3dlcihkc2ksIERTSV9QTExfUE9XRVJfT0ZGKTsKLQlp ZiAoZGlzY29ubmVjdF9sYW5lcykgewotCQlXQVJOX09OKCFkc2ktPnZkZHNfZHNpX2VuYWJsZWQp OwotCQlyZWd1bGF0b3JfZGlzYWJsZShkc2ktPnZkZHNfZHNpX3JlZyk7Ci0JCWRzaS0+dmRkc19k c2lfZW5hYmxlZCA9IGZhbHNlOwotCX0KKworCXJlZ3VsYXRvcl9kaXNhYmxlKGRzaS0+dmRkc19k c2lfcmVnKTsKIAogCWRzaV9kaXNhYmxlX3NjcF9jbGsoZHNpKTsKIAlkc2lfcnVudGltZV9wdXQo ZHNpKTsKIAotCURTU0RCRygiUExMIHVuaW5pdCBkb25lXG4iKTsKLX0KLQotc3RhdGljIHZvaWQg ZHNpX3BsbF9kaXNhYmxlKHN0cnVjdCBkc3NfcGxsICpwbGwpCi17Ci0Jc3RydWN0IGRzaV9kYXRh ICpkc2kgPSBjb250YWluZXJfb2YocGxsLCBzdHJ1Y3QgZHNpX2RhdGEsIHBsbCk7Ci0KLQlkc2lf cGxsX3VuaW5pdChkc2ksIHRydWUpOworCURTU0RCRygiUExMIGRpc2FibGUgZG9uZVxuIik7CiB9 CiAKIHN0YXRpYyBpbnQgZHNpX2R1bXBfZHNpX2Nsb2NrcyhzdHJ1Y3Qgc2VxX2ZpbGUgKnMsIHZv aWQgKnApCkBAIC00MDk2LDExICs0MDgyLDExIEBAIHN0YXRpYyBpbnQgZHNpX2Rpc3BsYXlfaW5p dF9kc2koc3RydWN0IGRzaV9kYXRhICpkc2kpCiAKIAlyID0gZHNzX3BsbF9lbmFibGUoJmRzaS0+ cGxsKTsKIAlpZiAocikKLQkJZ290byBlcnIwOworCQlyZXR1cm4gcjsKIAogCXIgPSBkc2lfY29u ZmlndXJlX2RzaV9jbG9ja3MoZHNpKTsKIAlpZiAocikKLQkJZ290byBlcnIxOworCQlnb3RvIGVy cjA7CiAKIAlkc3Nfc2VsZWN0X2RzaV9jbGtfc291cmNlKGRzaS0+ZHNzLCBkc2ktPm1vZHVsZV9p ZCwKIAkJCQkgIGRzaS0+bW9kdWxlX2lkID09IDAgPwpAQCAtNDEwOCw2ICs0MDk0LDE0IEBAIHN0 YXRpYyBpbnQgZHNpX2Rpc3BsYXlfaW5pdF9kc2koc3RydWN0IGRzaV9kYXRhICpkc2kpCiAKIAlE U1NEQkcoIlBMTCBPS1xuIik7CiAKKwlpZiAoIWRzaS0+dmRkc19kc2lfZW5hYmxlZCkgeworCQly ID0gcmVndWxhdG9yX2VuYWJsZShkc2ktPnZkZHNfZHNpX3JlZyk7CisJCWlmIChyKQorCQkJZ290 byBlcnIxOworCisJCWRzaS0+dmRkc19kc2lfZW5hYmxlZCA9IHRydWU7CisJfQorCiAJciA9IGRz aV9jaW9faW5pdChkc2kpOwogCWlmIChyKQogCQlnb3RvIGVycjI7CkBAIC00MTM2LDEwICs0MTMw LDEzIEBAIHN0YXRpYyBpbnQgZHNpX2Rpc3BsYXlfaW5pdF9kc2koc3RydWN0IGRzaV9kYXRhICpk c2kpCiBlcnIzOgogCWRzaV9jaW9fdW5pbml0KGRzaSk7CiBlcnIyOgotCWRzc19zZWxlY3RfZHNp X2Nsa19zb3VyY2UoZHNpLT5kc3MsIGRzaS0+bW9kdWxlX2lkLCBEU1NfQ0xLX1NSQ19GQ0spOwor CXJlZ3VsYXRvcl9kaXNhYmxlKGRzaS0+dmRkc19kc2lfcmVnKTsKKwlkc2ktPnZkZHNfZHNpX2Vu YWJsZWQgPSBmYWxzZTsKIGVycjE6Ci0JZHNzX3BsbF9kaXNhYmxlKCZkc2ktPnBsbCk7CisJZHNz X3NlbGVjdF9kc2lfY2xrX3NvdXJjZShkc2ktPmRzcywgZHNpLT5tb2R1bGVfaWQsIERTU19DTEtf U1JDX0ZDSyk7CiBlcnIwOgorCWRzc19wbGxfZGlzYWJsZSgmZHNpLT5wbGwpOworCiAJcmV0dXJu IHI7CiB9CiAKQEAgLTQxNTgsNyArNDE1NSwxMiBAQCBzdGF0aWMgdm9pZCBkc2lfZGlzcGxheV91 bmluaXRfZHNpKHN0cnVjdCBkc2lfZGF0YSAqZHNpLCBib29sIGRpc2Nvbm5lY3RfbGFuZXMsCiAK IAlkc3Nfc2VsZWN0X2RzaV9jbGtfc291cmNlKGRzaS0+ZHNzLCBkc2ktPm1vZHVsZV9pZCwgRFNT X0NMS19TUkNfRkNLKTsKIAlkc2lfY2lvX3VuaW5pdChkc2kpOwotCWRzaV9wbGxfdW5pbml0KGRz aSwgZGlzY29ubmVjdF9sYW5lcyk7CisJZHNzX3BsbF9kaXNhYmxlKCZkc2ktPnBsbCk7CisKKwlp ZiAoZGlzY29ubmVjdF9sYW5lcykgeworCQlyZWd1bGF0b3JfZGlzYWJsZShkc2ktPnZkZHNfZHNp X3JlZyk7CisJCWRzaS0+dmRkc19kc2lfZW5hYmxlZCA9IGZhbHNlOworCX0KIH0KIAogc3RhdGlj IGludCBkc2lfZGlzcGxheV9lbmFibGUoc3RydWN0IG9tYXBfZHNzX2RldmljZSAqZHNzZGV2KQot LSAKMi4yMC4xCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=