From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v2 08/13] drm/i915: Make shared dpll functions take crtc_state Date: Thu, 4 Oct 2018 11:45:59 +0200 Message-ID: <20181004094604.2646-9-maarten.lankhorst@linux.intel.com> References: <20181004094604.2646-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id DF46D6E593 for ; Thu, 4 Oct 2018 09:46:09 +0000 (UTC) In-Reply-To: <20181004094604.2646-1-maarten.lankhorst@linux.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 List-Id: intel-gfx@lists.freedesktop.org RG8gbm90IHJlbHkgb24gY3J0Yy0+Y29uZmlnIGFueSBtb3JlLiBSZW1vdmUgdGhlIGFzc2VydGlv biBmcm9tCmlieF9wY2hfZHBsbF9kaXNhYmxlLCBiZWNhdXNlIHdlIHRoZSBkcGxsIHN0YXRlIHRy YWNraW5nIHNob3VsZAphbHJlYWR5IGhhbmRsZSB0aGlzIGNhc2UgY29ycmVjdGx5LgoKU2lnbmVk LW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVs LmNvbT4KUmV2aWV3ZWQtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5p bnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jICB8IDE0 ICsrKysrKy0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBsbF9tZ3IuYyB8IDMx ICsrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHBsbF9tZ3IuaCB8ICA2ICsrKy0tLQogMyBmaWxlcyBjaGFuZ2VkLCAyMiBpbnNlcnRpb25zKCsp LCAyOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXgg ZmU4Y2NiZGQ0ZWExLi40ZGY0MjkzYTc5MTcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMKQEAgLTQ3NDksNyArNDc0OSw3IEBAIHN0YXRpYyB2b2lkIGlyb25sYWtlX3BjaF9lbmFi bGUoY29uc3Qgc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAJICogTm90ZSB0aGF0 IGVuYWJsZV9zaGFyZWRfZHBsbCB0cmllcyB0byBkbyB0aGUgcmlnaHQgdGhpbmcsIGJ1dAogCSAq IGdldF9zaGFyZWRfZHBsbCB1bmNvbmRpdGlvbmFsbHkgcmVzZXRzIHRoZSBwbGwgLSB3ZSBuZWVk IHRoYXQgdG8gaGF2ZQogCSAqIHRoZSByaWdodCBMVkRTIGVuYWJsZSBzZXF1ZW5jZS4gKi8KLQlp bnRlbF9lbmFibGVfc2hhcmVkX2RwbGwoY3J0Yyk7CisJaW50ZWxfZW5hYmxlX3NoYXJlZF9kcGxs KGNydGNfc3RhdGUpOwogCiAJLyogc2V0IHRyYW5zY29kZXIgdGltaW5nLCBwYW5lbCBtdXN0IGFs bG93IGl0ICovCiAJYXNzZXJ0X3BhbmVsX3VubG9ja2VkKGRldl9wcml2LCBwaXBlKTsKQEAgLTU1 OTEsOCArNTU5MSw4IEBAIHN0YXRpYyB2b2lkIGlyb25sYWtlX2NydGNfZW5hYmxlKHN0cnVjdCBp bnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZywKIAlpbnRlbF9zZXRfY3B1X2ZpZm9fdW5kZXJy dW5fcmVwb3J0aW5nKGRldl9wcml2LCBwaXBlLCBmYWxzZSk7CiAJaW50ZWxfc2V0X3BjaF9maWZv X3VuZGVycnVuX3JlcG9ydGluZyhkZXZfcHJpdiwgcGlwZSwgZmFsc2UpOwogCi0JaWYgKGludGVs X2NydGMtPmNvbmZpZy0+aGFzX3BjaF9lbmNvZGVyKQotCQlpbnRlbF9wcmVwYXJlX3NoYXJlZF9k cGxsKGludGVsX2NydGMpOworCWlmIChwaXBlX2NvbmZpZy0+aGFzX3BjaF9lbmNvZGVyKQorCQlp bnRlbF9wcmVwYXJlX3NoYXJlZF9kcGxsKHBpcGVfY29uZmlnKTsKIAogCWlmIChpbnRlbF9jcnRj X2hhc19kcF9lbmNvZGVyKGludGVsX2NydGMtPmNvbmZpZykpCiAJCWludGVsX2RwX3NldF9tX24o aW50ZWxfY3J0YywgTTFfTjEpOwpAQCAtNTcxMCw4ICs1NzEwLDggQEAgc3RhdGljIHZvaWQgaGFz d2VsbF9jcnRjX2VuYWJsZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcsCiAK IAlpbnRlbF9lbmNvZGVyc19wcmVfcGxsX2VuYWJsZShjcnRjLCBwaXBlX2NvbmZpZywgb2xkX3N0 YXRlKTsKIAotCWlmIChpbnRlbF9jcnRjLT5jb25maWctPnNoYXJlZF9kcGxsKQotCQlpbnRlbF9l bmFibGVfc2hhcmVkX2RwbGwoaW50ZWxfY3J0Yyk7CisJaWYgKHBpcGVfY29uZmlnLT5zaGFyZWRf ZHBsbCkKKwkJaW50ZWxfZW5hYmxlX3NoYXJlZF9kcGxsKHBpcGVfY29uZmlnKTsKIAogCWlmIChJ TlRFTF9HRU4oZGV2X3ByaXYpID49IDExKQogCQlpY2xfbWFwX3BsbHNfdG9fcG9ydHMoY3J0Yywg cGlwZV9jb25maWcsIG9sZF9zdGF0ZSk7CkBAIC02Mjg2LDcgKzYyODYsNyBAQCBzdGF0aWMgdm9p ZCBpbnRlbF9jcnRjX2Rpc2FibGVfbm9hdG9taWMoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCiAJ aW50ZWxfZmJjX2Rpc2FibGUoaW50ZWxfY3J0Yyk7CiAJaW50ZWxfdXBkYXRlX3dhdGVybWFya3Mo aW50ZWxfY3J0Yyk7Ci0JaW50ZWxfZGlzYWJsZV9zaGFyZWRfZHBsbChpbnRlbF9jcnRjKTsKKwlp bnRlbF9kaXNhYmxlX3NoYXJlZF9kcGxsKGNydGNfc3RhdGUpOwogCiAJZG9tYWlucyA9IGludGVs X2NydGMtPmVuYWJsZWRfcG93ZXJfZG9tYWluczsKIAlmb3JfZWFjaF9wb3dlcl9kb21haW4oZG9t YWluLCBkb21haW5zKQpAQCAtMTI3MzUsNyArMTI3MzUsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9h dG9taWNfY29tbWl0X3RhaWwoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCQkJZGV2 X3ByaXYtPmRpc3BsYXkuY3J0Y19kaXNhYmxlKG9sZF9pbnRlbF9jcnRjX3N0YXRlLCBzdGF0ZSk7 CiAJCQlpbnRlbF9jcnRjLT5hY3RpdmUgPSBmYWxzZTsKIAkJCWludGVsX2ZiY19kaXNhYmxlKGlu dGVsX2NydGMpOwotCQkJaW50ZWxfZGlzYWJsZV9zaGFyZWRfZHBsbChpbnRlbF9jcnRjKTsKKwkJ CWludGVsX2Rpc2FibGVfc2hhcmVkX2RwbGwob2xkX2ludGVsX2NydGNfc3RhdGUpOwogCiAJCQkv KgogCQkJICogVW5kZXJydW5zIGRvbid0IGFsd2F5cyByYWlzZQpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBsbF9tZ3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2RwbGxfbWdyLmMKaW5kZXggZTZjYWM5MjI1NTM2Li41NDY2MmM5NzRjMGIgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwbGxfbWdyLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHBsbF9tZ3IuYwpAQCAtMTMxLDEzICsxMzEsMTMgQEAgdm9pZCBh c3NlcnRfc2hhcmVkX2RwbGwoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogICog VGhpcyBjYWxscyB0aGUgUExMJ3MgcHJlcGFyZSBob29rIGlmIGl0IGhhcyBvbmUgYW5kIGlmIHRo ZSBQTEwgaXMgbm90CiAgKiBhbHJlYWR5IGVuYWJsZWQuIFRoZSBwcmVwYXJlIGhvb2sgaXMgcGxh dGZvcm0gc3BlY2lmaWMuCiAgKi8KLXZvaWQgaW50ZWxfcHJlcGFyZV9zaGFyZWRfZHBsbChzdHJ1 Y3QgaW50ZWxfY3J0YyAqY3J0YykKK3ZvaWQgaW50ZWxfcHJlcGFyZV9zaGFyZWRfZHBsbChjb25z dCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIHsKLQlzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2ID0gY3J0Yy0+YmFzZS5kZXY7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gdG9faTkxNShkZXYpOwotCXN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCAqcGxsID0g Y3J0Yy0+Y29uZmlnLT5zaGFyZWRfZHBsbDsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YyA9IHRv X2ludGVsX2NydGMoY3J0Y19zdGF0ZS0+YmFzZS5jcnRjKTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGNydGMtPmJhc2UuZGV2KTsKKwlzdHJ1Y3QgaW50ZWxf c2hhcmVkX2RwbGwgKnBsbCA9IGNydGNfc3RhdGUtPnNoYXJlZF9kcGxsOwogCi0JaWYgKFdBUk5f T04ocGxsID09IE5VTEwpKQorCWlmICghV0FSTl9PTighcGxsKSkKIAkJcmV0dXJuOwogCiAJbXV0 ZXhfbG9jaygmZGV2X3ByaXYtPmRwbGxfbG9jayk7CkBAIC0xNTgsMTEgKzE1OCwxMSBAQCB2b2lk IGludGVsX3ByZXBhcmVfc2hhcmVkX2RwbGwoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAgKgog ICogRW5hYmxlIHRoZSBzaGFyZWQgRFBMTCB1c2VkIGJ5IEBjcnRjLgogICovCi12b2lkIGludGVs X2VuYWJsZV9zaGFyZWRfZHBsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKK3ZvaWQgaW50ZWxf ZW5hYmxlX3NoYXJlZF9kcGxsKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0 YXRlKQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5iYXNlLmRldjsKLQlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Ci0Jc3RydWN0IGlu dGVsX3NoYXJlZF9kcGxsICpwbGwgPSBjcnRjLT5jb25maWctPnNoYXJlZF9kcGxsOworCXN0cnVj dCBpbnRlbF9jcnRjICpjcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjX3N0YXRlLT5iYXNlLmNydGMp OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoY3J0Yy0+YmFz ZS5kZXYpOworCXN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCAqcGxsID0gY3J0Y19zdGF0ZS0+c2hh cmVkX2RwbGw7CiAJdW5zaWduZWQgaW50IGNydGNfbWFzayA9IGRybV9jcnRjX21hc2soJmNydGMt PmJhc2UpOwogCXVuc2lnbmVkIGludCBvbGRfbWFzazsKIApAQCAtMjAzLDEwICsyMDMsMTEgQEAg dm9pZCBpbnRlbF9lbmFibGVfc2hhcmVkX2RwbGwoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAg KgogICogRGlzYWJsZSB0aGUgc2hhcmVkIERQTEwgdXNlZCBieSBAY3J0Yy4KICAqLwotdm9pZCBp bnRlbF9kaXNhYmxlX3NoYXJlZF9kcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQordm9pZCBp bnRlbF9kaXNhYmxlX3NoYXJlZF9kcGxsKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpj cnRjX3N0YXRlKQogeworCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjID0gdG9faW50ZWxfY3J0Yyhj cnRjX3N0YXRlLT5iYXNlLmNydGMpOwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diA9IHRvX2k5MTUoY3J0Yy0+YmFzZS5kZXYpOwotCXN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCAq cGxsID0gY3J0Yy0+Y29uZmlnLT5zaGFyZWRfZHBsbDsKKwlzdHJ1Y3QgaW50ZWxfc2hhcmVkX2Rw bGwgKnBsbCA9IGNydGNfc3RhdGUtPnNoYXJlZF9kcGxsOwogCXVuc2lnbmVkIGludCBjcnRjX21h c2sgPSBkcm1fY3J0Y19tYXNrKCZjcnRjLT5iYXNlKTsKIAogCS8qIFBDSCBvbmx5IGF2YWlsYWJs ZSBvbiBJTEsrICovCkBAIC00MDksMTQgKzQxMCw2IEBAIHN0YXRpYyB2b2lkIGlieF9wY2hfZHBs bF9kaXNhYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQkgc3RydWN0 IGludGVsX3NoYXJlZF9kcGxsICpwbGwpCiB7CiAJY29uc3QgZW51bSBpbnRlbF9kcGxsX2lkIGlk ID0gcGxsLT5pbmZvLT5pZDsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gJmRldl9wcml2LT5k cm07Ci0Jc3RydWN0IGludGVsX2NydGMgKmNydGM7Ci0KLQkvKiBNYWtlIHN1cmUgbm8gdHJhbnNj b2RlciBpc24ndCBzdGlsbCBkZXBlbmRpbmcgb24gdXMuICovCi0JZm9yX2VhY2hfaW50ZWxfY3J0 YyhkZXYsIGNydGMpIHsKLQkJaWYgKGNydGMtPmNvbmZpZy0+c2hhcmVkX2RwbGwgPT0gcGxsKQot CQkJYXNzZXJ0X3BjaF90cmFuc2NvZGVyX2Rpc2FibGVkKGRldl9wcml2LCBjcnRjLT5waXBlKTsK LQl9CiAKIAlJOTE1X1dSSVRFKFBDSF9EUExMKGlkKSwgMCk7CiAJUE9TVElOR19SRUFEKFBDSF9E UExMKGlkKSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcGxsX21n ci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBsbF9tZ3IuaAppbmRleCBiZjBkZThh NGRjNjMuLjljMDMzMjM2ZjJiYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZHBsbF9tZ3IuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcGxsX21nci5o CkBAIC0zMzQsOSArMzM0LDkgQEAgc3RydWN0IGludGVsX3NoYXJlZF9kcGxsICppbnRlbF9nZXRf c2hhcmVkX2RwbGwoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiB2b2lkIGludGVsX3JlbGVhc2Vf c2hhcmVkX2RwbGwoc3RydWN0IGludGVsX3NoYXJlZF9kcGxsICpkcGxsLAogCQkJICAgICAgIHN0 cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCQkJICAgICAgIHN0cnVjdCBkcm1fYXRvbWljX3N0YXRl ICpzdGF0ZSk7Ci12b2lkIGludGVsX3ByZXBhcmVfc2hhcmVkX2RwbGwoc3RydWN0IGludGVsX2Ny dGMgKmNydGMpOwotdm9pZCBpbnRlbF9lbmFibGVfc2hhcmVkX2RwbGwoc3RydWN0IGludGVsX2Ny dGMgKmNydGMpOwotdm9pZCBpbnRlbF9kaXNhYmxlX3NoYXJlZF9kcGxsKHN0cnVjdCBpbnRlbF9j cnRjICpjcnRjKTsKK3ZvaWQgaW50ZWxfcHJlcGFyZV9zaGFyZWRfZHBsbChjb25zdCBzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSk7Cit2b2lkIGludGVsX2VuYWJsZV9zaGFyZWRf ZHBsbChjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSk7Cit2b2lkIGlu dGVsX2Rpc2FibGVfc2hhcmVkX2RwbGwoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNy dGNfc3RhdGUpOwogdm9pZCBpbnRlbF9zaGFyZWRfZHBsbF9zd2FwX3N0YXRlKHN0cnVjdCBkcm1f YXRvbWljX3N0YXRlICpzdGF0ZSk7CiB2b2lkIGludGVsX3NoYXJlZF9kcGxsX2luaXQoc3RydWN0 IGRybV9kZXZpY2UgKmRldik7CiAKLS0gCjIuMTkuMAoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==