From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH 08/13] drm/i915: Make shared dpll functions take
 crtc_state
Date: Wed,  3 Oct 2018 15:37:10 +0200
Message-ID: <20181003133715.3713-9-maarten.lankhorst@linux.intel.com>
References: <20181003133715.3713-1-maarten.lankhorst@linux.intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mblankhorst.nl (mblankhorst.nl
 [IPv6:2a02:2308::216:3eff:fe92:dfa3])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 4DAFD6E4AD
 for <intel-gfx@lists.freedesktop.org>; Wed,  3 Oct 2018 13:37:19 +0000 (UTC)
In-Reply-To: <20181003133715.3713-1-maarten.lankhorst@linux.intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

RG8gbm90IHJlbHkgb24gY3J0Yy0+Y29uZmlnIGFueSBtb3JlLiBSZW1vdmUgdGhlIGFzc2VydGlv
biBmcm9tCmlieF9wY2hfZHBsbF9kaXNhYmxlLCBiZWNhdXNlIHdlIHRoZSBkcGxsIHN0YXRlIHRy
YWNraW5nIHNob3VsZAphbHJlYWR5IGhhbmRsZSB0aGlzIGNhc2UgY29ycmVjdGx5LgoKU2lnbmVk
LW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVs
LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgIHwgMTQgKysr
KysrLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcGxsX21nci5jIHwgMzEgKysr
KysrKysrKystLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcGxs
X21nci5oIHwgIDYgKysrLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDIyIGluc2VydGlvbnMoKyksIDI5
IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp
c3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA1N2M4
MWU4ZTQ0YmUuLjIyZjU1NmI4MjRmOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku
YwpAQCAtNDc0OSw3ICs0NzQ5LDcgQEAgc3RhdGljIHZvaWQgaXJvbmxha2VfcGNoX2VuYWJsZShj
b25zdCBzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICpzdGF0ZSwKIAkgKiBOb3RlIHRoYXQgZW5h
YmxlX3NoYXJlZF9kcGxsIHRyaWVzIHRvIGRvIHRoZSByaWdodCB0aGluZywgYnV0CiAJICogZ2V0
X3NoYXJlZF9kcGxsIHVuY29uZGl0aW9uYWxseSByZXNldHMgdGhlIHBsbCAtIHdlIG5lZWQgdGhh
dCB0byBoYXZlCiAJICogdGhlIHJpZ2h0IExWRFMgZW5hYmxlIHNlcXVlbmNlLiAqLwotCWludGVs
X2VuYWJsZV9zaGFyZWRfZHBsbChjcnRjKTsKKwlpbnRlbF9lbmFibGVfc2hhcmVkX2RwbGwoY3J0
Y19zdGF0ZSk7CiAKIAkvKiBzZXQgdHJhbnNjb2RlciB0aW1pbmcsIHBhbmVsIG11c3QgYWxsb3cg
aXQgKi8KIAlhc3NlcnRfcGFuZWxfdW5sb2NrZWQoZGV2X3ByaXYsIHBpcGUpOwpAQCAtNTU5MSw4
ICs1NTkxLDggQEAgc3RhdGljIHZvaWQgaXJvbmxha2VfY3J0Y19lbmFibGUoc3RydWN0IGludGVs
X2NydGNfc3RhdGUgKnBpcGVfY29uZmlnLAogCWludGVsX3NldF9jcHVfZmlmb191bmRlcnJ1bl9y
ZXBvcnRpbmcoZGV2X3ByaXYsIHBpcGUsIGZhbHNlKTsKIAlpbnRlbF9zZXRfcGNoX2ZpZm9fdW5k
ZXJydW5fcmVwb3J0aW5nKGRldl9wcml2LCBwaXBlLCBmYWxzZSk7CiAKLQlpZiAoaW50ZWxfY3J0
Yy0+Y29uZmlnLT5oYXNfcGNoX2VuY29kZXIpCi0JCWludGVsX3ByZXBhcmVfc2hhcmVkX2RwbGwo
aW50ZWxfY3J0Yyk7CisJaWYgKHBpcGVfY29uZmlnLT5oYXNfcGNoX2VuY29kZXIpCisJCWludGVs
X3ByZXBhcmVfc2hhcmVkX2RwbGwocGlwZV9jb25maWcpOwogCiAJaWYgKGludGVsX2NydGNfaGFz
X2RwX2VuY29kZXIoaW50ZWxfY3J0Yy0+Y29uZmlnKSkKIAkJaW50ZWxfZHBfc2V0X21fbihpbnRl
bF9jcnRjLCBNMV9OMSk7CkBAIC01NzEwLDggKzU3MTAsOCBAQCBzdGF0aWMgdm9pZCBoYXN3ZWxs
X2NydGNfZW5hYmxlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZywKIAogCWlu
dGVsX2VuY29kZXJzX3ByZV9wbGxfZW5hYmxlKGNydGMsIHBpcGVfY29uZmlnLCBvbGRfc3RhdGUp
OwogCi0JaWYgKGludGVsX2NydGMtPmNvbmZpZy0+c2hhcmVkX2RwbGwpCi0JCWludGVsX2VuYWJs
ZV9zaGFyZWRfZHBsbChpbnRlbF9jcnRjKTsKKwlpZiAocGlwZV9jb25maWctPnNoYXJlZF9kcGxs
KQorCQlpbnRlbF9lbmFibGVfc2hhcmVkX2RwbGwocGlwZV9jb25maWcpOwogCiAJaWYgKElOVEVM
X0dFTihkZXZfcHJpdikgPj0gMTEpCiAJCWljbF9tYXBfcGxsc190b19wb3J0cyhjcnRjLCBwaXBl
X2NvbmZpZywgb2xkX3N0YXRlKTsKQEAgLTYyODYsNyArNjI4Niw3IEBAIHN0YXRpYyB2b2lkIGlu
dGVsX2NydGNfZGlzYWJsZV9ub2F0b21pYyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAKIAlpbnRl
bF9mYmNfZGlzYWJsZShpbnRlbF9jcnRjKTsKIAlpbnRlbF91cGRhdGVfd2F0ZXJtYXJrcyhpbnRl
bF9jcnRjKTsKLQlpbnRlbF9kaXNhYmxlX3NoYXJlZF9kcGxsKGludGVsX2NydGMpOworCWludGVs
X2Rpc2FibGVfc2hhcmVkX2RwbGwoY3J0Y19zdGF0ZSk7CiAKIAlkb21haW5zID0gaW50ZWxfY3J0
Yy0+ZW5hYmxlZF9wb3dlcl9kb21haW5zOwogCWZvcl9lYWNoX3Bvd2VyX2RvbWFpbihkb21haW4s
IGRvbWFpbnMpCkBAIC0xMjczNSw3ICsxMjczNSw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2F0b21p
Y19jb21taXRfdGFpbChzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiAJCQlkZXZfcHJp
di0+ZGlzcGxheS5jcnRjX2Rpc2FibGUob2xkX2ludGVsX2NydGNfc3RhdGUsIHN0YXRlKTsKIAkJ
CWludGVsX2NydGMtPmFjdGl2ZSA9IGZhbHNlOwogCQkJaW50ZWxfZmJjX2Rpc2FibGUoaW50ZWxf
Y3J0Yyk7Ci0JCQlpbnRlbF9kaXNhYmxlX3NoYXJlZF9kcGxsKGludGVsX2NydGMpOworCQkJaW50
ZWxfZGlzYWJsZV9zaGFyZWRfZHBsbChvbGRfaW50ZWxfY3J0Y19zdGF0ZSk7CiAKIAkJCS8qCiAJ
CQkgKiBVbmRlcnJ1bnMgZG9uJ3QgYWx3YXlzIHJhaXNlCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pbnRlbF9kcGxsX21nci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
ZHBsbF9tZ3IuYwppbmRleCBlNmNhYzkyMjU1MzYuLjU0NjYyYzk3NGMwYiAxMDA2NDQKLS0tIGEv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBsbF9tZ3IuYworKysgYi9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pbnRlbF9kcGxsX21nci5jCkBAIC0xMzEsMTMgKzEzMSwxMyBAQCB2b2lkIGFzc2Vy
dF9zaGFyZWRfZHBsbChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAgKiBUaGlz
IGNhbGxzIHRoZSBQTEwncyBwcmVwYXJlIGhvb2sgaWYgaXQgaGFzIG9uZSBhbmQgaWYgdGhlIFBM
TCBpcyBub3QKICAqIGFscmVhZHkgZW5hYmxlZC4gVGhlIHByZXBhcmUgaG9vayBpcyBwbGF0Zm9y
bSBzcGVjaWZpYy4KICAqLwotdm9pZCBpbnRlbF9wcmVwYXJlX3NoYXJlZF9kcGxsKHN0cnVjdCBp
bnRlbF9jcnRjICpjcnRjKQordm9pZCBpbnRlbF9wcmVwYXJlX3NoYXJlZF9kcGxsKGNvbnN0IHN0
cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQogewotCXN0cnVjdCBkcm1fZGV2aWNl
ICpkZXYgPSBjcnRjLT5iYXNlLmRldjsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By
aXYgPSB0b19pOTE1KGRldik7Ci0Jc3RydWN0IGludGVsX3NoYXJlZF9kcGxsICpwbGwgPSBjcnRj
LT5jb25maWctPnNoYXJlZF9kcGxsOworCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjID0gdG9faW50
ZWxfY3J0YyhjcnRjX3N0YXRlLT5iYXNlLmNydGMpOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl
ICpkZXZfcHJpdiA9IHRvX2k5MTUoY3J0Yy0+YmFzZS5kZXYpOworCXN0cnVjdCBpbnRlbF9zaGFy
ZWRfZHBsbCAqcGxsID0gY3J0Y19zdGF0ZS0+c2hhcmVkX2RwbGw7CiAKLQlpZiAoV0FSTl9PTihw
bGwgPT0gTlVMTCkpCisJaWYgKCFXQVJOX09OKCFwbGwpKQogCQlyZXR1cm47CiAKIAltdXRleF9s
b2NrKCZkZXZfcHJpdi0+ZHBsbF9sb2NrKTsKQEAgLTE1OCwxMSArMTU4LDExIEBAIHZvaWQgaW50
ZWxfcHJlcGFyZV9zaGFyZWRfZHBsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKICAqCiAgKiBF
bmFibGUgdGhlIHNoYXJlZCBEUExMIHVzZWQgYnkgQGNydGMuCiAgKi8KLXZvaWQgaW50ZWxfZW5h
YmxlX3NoYXJlZF9kcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQordm9pZCBpbnRlbF9lbmFi
bGVfc2hhcmVkX2RwbGwoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUp
CiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2UuZGV2OwotCXN0cnVjdCBk
cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKLQlzdHJ1Y3QgaW50ZWxf
c2hhcmVkX2RwbGwgKnBsbCA9IGNydGMtPmNvbmZpZy0+c2hhcmVkX2RwbGw7CisJc3RydWN0IGlu
dGVsX2NydGMgKmNydGMgPSB0b19pbnRlbF9jcnRjKGNydGNfc3RhdGUtPmJhc2UuY3J0Yyk7CisJ
c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShjcnRjLT5iYXNlLmRl
dik7CisJc3RydWN0IGludGVsX3NoYXJlZF9kcGxsICpwbGwgPSBjcnRjX3N0YXRlLT5zaGFyZWRf
ZHBsbDsKIAl1bnNpZ25lZCBpbnQgY3J0Y19tYXNrID0gZHJtX2NydGNfbWFzaygmY3J0Yy0+YmFz
ZSk7CiAJdW5zaWduZWQgaW50IG9sZF9tYXNrOwogCkBAIC0yMDMsMTAgKzIwMywxMSBAQCB2b2lk
IGludGVsX2VuYWJsZV9zaGFyZWRfZHBsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKICAqCiAg
KiBEaXNhYmxlIHRoZSBzaGFyZWQgRFBMTCB1c2VkIGJ5IEBjcnRjLgogICovCi12b2lkIGludGVs
X2Rpc2FibGVfc2hhcmVkX2RwbGwoc3RydWN0IGludGVsX2NydGMgKmNydGMpCit2b2lkIGludGVs
X2Rpc2FibGVfc2hhcmVkX2RwbGwoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNf
c3RhdGUpCiB7CisJc3RydWN0IGludGVsX2NydGMgKmNydGMgPSB0b19pbnRlbF9jcnRjKGNydGNf
c3RhdGUtPmJhc2UuY3J0Yyk7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g
dG9faTkxNShjcnRjLT5iYXNlLmRldik7Ci0Jc3RydWN0IGludGVsX3NoYXJlZF9kcGxsICpwbGwg
PSBjcnRjLT5jb25maWctPnNoYXJlZF9kcGxsOworCXN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCAq
cGxsID0gY3J0Y19zdGF0ZS0+c2hhcmVkX2RwbGw7CiAJdW5zaWduZWQgaW50IGNydGNfbWFzayA9
IGRybV9jcnRjX21hc2soJmNydGMtPmJhc2UpOwogCiAJLyogUENIIG9ubHkgYXZhaWxhYmxlIG9u
IElMSysgKi8KQEAgLTQwOSwxNCArNDEwLDYgQEAgc3RhdGljIHZvaWQgaWJ4X3BjaF9kcGxsX2Rp
c2FibGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJCSBzdHJ1Y3QgaW50
ZWxfc2hhcmVkX2RwbGwgKnBsbCkKIHsKIAljb25zdCBlbnVtIGludGVsX2RwbGxfaWQgaWQgPSBw
bGwtPmluZm8tPmlkOwotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSAmZGV2X3ByaXYtPmRybTsK
LQlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YzsKLQotCS8qIE1ha2Ugc3VyZSBubyB0cmFuc2NvZGVy
IGlzbid0IHN0aWxsIGRlcGVuZGluZyBvbiB1cy4gKi8KLQlmb3JfZWFjaF9pbnRlbF9jcnRjKGRl
diwgY3J0YykgewotCQlpZiAoY3J0Yy0+Y29uZmlnLT5zaGFyZWRfZHBsbCA9PSBwbGwpCi0JCQlh
c3NlcnRfcGNoX3RyYW5zY29kZXJfZGlzYWJsZWQoZGV2X3ByaXYsIGNydGMtPnBpcGUpOwotCX0K
IAogCUk5MTVfV1JJVEUoUENIX0RQTEwoaWQpLCAwKTsKIAlQT1NUSU5HX1JFQUQoUENIX0RQTEwo
aWQpKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwbGxfbWdyLmgg
Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcGxsX21nci5oCmluZGV4IGJmMGRlOGE0ZGM2
My4uOWMwMzMyMzZmMmJhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k
cGxsX21nci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwbGxfbWdyLmgKQEAg
LTMzNCw5ICszMzQsOSBAQCBzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGwgKmludGVsX2dldF9zaGFy
ZWRfZHBsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIHZvaWQgaW50ZWxfcmVsZWFzZV9zaGFy
ZWRfZHBsbChzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGwgKmRwbGwsCiAJCQkgICAgICAgc3RydWN0
IGludGVsX2NydGMgKmNydGMsCiAJCQkgICAgICAgc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0
YXRlKTsKLXZvaWQgaW50ZWxfcHJlcGFyZV9zaGFyZWRfZHBsbChzdHJ1Y3QgaW50ZWxfY3J0YyAq
Y3J0Yyk7Ci12b2lkIGludGVsX2VuYWJsZV9zaGFyZWRfZHBsbChzdHJ1Y3QgaW50ZWxfY3J0YyAq
Y3J0Yyk7Ci12b2lkIGludGVsX2Rpc2FibGVfc2hhcmVkX2RwbGwoc3RydWN0IGludGVsX2NydGMg
KmNydGMpOwordm9pZCBpbnRlbF9wcmVwYXJlX3NoYXJlZF9kcGxsKGNvbnN0IHN0cnVjdCBpbnRl
bF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKTsKK3ZvaWQgaW50ZWxfZW5hYmxlX3NoYXJlZF9kcGxs
KGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKTsKK3ZvaWQgaW50ZWxf
ZGlzYWJsZV9zaGFyZWRfZHBsbChjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19z
dGF0ZSk7CiB2b2lkIGludGVsX3NoYXJlZF9kcGxsX3N3YXBfc3RhdGUoc3RydWN0IGRybV9hdG9t
aWNfc3RhdGUgKnN0YXRlKTsKIHZvaWQgaW50ZWxfc2hhcmVkX2RwbGxfaW5pdChzdHJ1Y3QgZHJt
X2RldmljZSAqZGV2KTsKIAotLSAKMi4xOS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0
cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s
aXN0aW5mby9pbnRlbC1nZngK