From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH] drm/i915: Make shared dpll functions take crtc_state, v2. Date: Thu, 4 Oct 2018 15:27:07 +0200 Message-ID: <20181004132707.8300-1-maarten.lankhorst@linux.intel.com> References: <20181004125755.GQ9144@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 A4DEC6E29D for ; Thu, 4 Oct 2018 13:27:09 +0000 (UTC) In-Reply-To: <20181004125755.GQ9144@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 YWNraW5nIHNob3VsZAphbHJlYWR5IGhhbmRsZSB0aGlzIGNhc2UgY29ycmVjdGx5LgoKQ2hhbmdl cyBzaW5jZSB2MToKLSBGaXh1cCBhY2NpZGVudGFsIGVhcmx5IHJldHVybiBpbiBpbnRlbF9wcmVw YXJlX3NoYXJlZF9kcGxsLCBvb3BzIQoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3Qg PG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IFZpbGxlIFN5 cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jICB8IDE0ICsrKysrKy0tLS0tLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2RwbGxfbWdyLmMgfCAyOSArKysrKysrKysrLS0tLS0tLS0tLS0tLS0t LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwbGxfbWdyLmggfCAgNiArKystLS0KIDMg ZmlsZXMgY2hhbmdlZCwgMjEgaW5zZXJ0aW9ucygrKSwgMjggZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGZlOGNjYmRkNGVhMS4uNGRmNDI5M2E3OTE3 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC00NzQ5LDcgKzQ3NDksNyBA QCBzdGF0aWMgdm9pZCBpcm9ubGFrZV9wY2hfZW5hYmxlKGNvbnN0IHN0cnVjdCBpbnRlbF9hdG9t aWNfc3RhdGUgKnN0YXRlLAogCSAqIE5vdGUgdGhhdCBlbmFibGVfc2hhcmVkX2RwbGwgdHJpZXMg dG8gZG8gdGhlIHJpZ2h0IHRoaW5nLCBidXQKIAkgKiBnZXRfc2hhcmVkX2RwbGwgdW5jb25kaXRp b25hbGx5IHJlc2V0cyB0aGUgcGxsIC0gd2UgbmVlZCB0aGF0IHRvIGhhdmUKIAkgKiB0aGUgcmln aHQgTFZEUyBlbmFibGUgc2VxdWVuY2UuICovCi0JaW50ZWxfZW5hYmxlX3NoYXJlZF9kcGxsKGNy dGMpOworCWludGVsX2VuYWJsZV9zaGFyZWRfZHBsbChjcnRjX3N0YXRlKTsKIAogCS8qIHNldCB0 cmFuc2NvZGVyIHRpbWluZywgcGFuZWwgbXVzdCBhbGxvdyBpdCAqLwogCWFzc2VydF9wYW5lbF91 bmxvY2tlZChkZXZfcHJpdiwgcGlwZSk7CkBAIC01NTkxLDggKzU1OTEsOCBAQCBzdGF0aWMgdm9p ZCBpcm9ubGFrZV9jcnRjX2VuYWJsZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25m aWcsCiAJaW50ZWxfc2V0X2NwdV9maWZvX3VuZGVycnVuX3JlcG9ydGluZyhkZXZfcHJpdiwgcGlw ZSwgZmFsc2UpOwogCWludGVsX3NldF9wY2hfZmlmb191bmRlcnJ1bl9yZXBvcnRpbmcoZGV2X3By aXYsIHBpcGUsIGZhbHNlKTsKIAotCWlmIChpbnRlbF9jcnRjLT5jb25maWctPmhhc19wY2hfZW5j b2RlcikKLQkJaW50ZWxfcHJlcGFyZV9zaGFyZWRfZHBsbChpbnRlbF9jcnRjKTsKKwlpZiAocGlw ZV9jb25maWctPmhhc19wY2hfZW5jb2RlcikKKwkJaW50ZWxfcHJlcGFyZV9zaGFyZWRfZHBsbChw aXBlX2NvbmZpZyk7CiAKIAlpZiAoaW50ZWxfY3J0Y19oYXNfZHBfZW5jb2RlcihpbnRlbF9jcnRj LT5jb25maWcpKQogCQlpbnRlbF9kcF9zZXRfbV9uKGludGVsX2NydGMsIE0xX04xKTsKQEAgLTU3 MTAsOCArNTcxMCw4IEBAIHN0YXRpYyB2b2lkIGhhc3dlbGxfY3J0Y19lbmFibGUoc3RydWN0IGlu dGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnLAogCiAJaW50ZWxfZW5jb2RlcnNfcHJlX3BsbF9l bmFibGUoY3J0YywgcGlwZV9jb25maWcsIG9sZF9zdGF0ZSk7CiAKLQlpZiAoaW50ZWxfY3J0Yy0+ Y29uZmlnLT5zaGFyZWRfZHBsbCkKLQkJaW50ZWxfZW5hYmxlX3NoYXJlZF9kcGxsKGludGVsX2Ny dGMpOworCWlmIChwaXBlX2NvbmZpZy0+c2hhcmVkX2RwbGwpCisJCWludGVsX2VuYWJsZV9zaGFy ZWRfZHBsbChwaXBlX2NvbmZpZyk7CiAKIAlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSAxMSkK IAkJaWNsX21hcF9wbGxzX3RvX3BvcnRzKGNydGMsIHBpcGVfY29uZmlnLCBvbGRfc3RhdGUpOwpA QCAtNjI4Niw3ICs2Mjg2LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfY3J0Y19kaXNhYmxlX25vYXRv bWljKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAogCWludGVsX2ZiY19kaXNhYmxlKGludGVsX2Ny dGMpOwogCWludGVsX3VwZGF0ZV93YXRlcm1hcmtzKGludGVsX2NydGMpOwotCWludGVsX2Rpc2Fi bGVfc2hhcmVkX2RwbGwoaW50ZWxfY3J0Yyk7CisJaW50ZWxfZGlzYWJsZV9zaGFyZWRfZHBsbChj cnRjX3N0YXRlKTsKIAogCWRvbWFpbnMgPSBpbnRlbF9jcnRjLT5lbmFibGVkX3Bvd2VyX2RvbWFp bnM7CiAJZm9yX2VhY2hfcG93ZXJfZG9tYWluKGRvbWFpbiwgZG9tYWlucykKQEAgLTEyNzM1LDcg KzEyNzM1LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfYXRvbWljX2NvbW1pdF90YWlsKHN0cnVjdCBk cm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAkJCWRldl9wcml2LT5kaXNwbGF5LmNydGNfZGlzYWJs ZShvbGRfaW50ZWxfY3J0Y19zdGF0ZSwgc3RhdGUpOwogCQkJaW50ZWxfY3J0Yy0+YWN0aXZlID0g ZmFsc2U7CiAJCQlpbnRlbF9mYmNfZGlzYWJsZShpbnRlbF9jcnRjKTsKLQkJCWludGVsX2Rpc2Fi bGVfc2hhcmVkX2RwbGwoaW50ZWxfY3J0Yyk7CisJCQlpbnRlbF9kaXNhYmxlX3NoYXJlZF9kcGxs KG9sZF9pbnRlbF9jcnRjX3N0YXRlKTsKIAogCQkJLyoKIAkJCSAqIFVuZGVycnVucyBkb24ndCBh bHdheXMgcmFpc2UKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwbGxf bWdyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcGxsX21nci5jCmluZGV4IGU2Y2Fj OTIyNTUzNi4uMTBlODIwODA0ZWVlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcGxsX21nci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwbGxfbWdy LmMKQEAgLTEzMSwxMSArMTMxLDExIEBAIHZvaWQgYXNzZXJ0X3NoYXJlZF9kcGxsKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKICAqIFRoaXMgY2FsbHMgdGhlIFBMTCdzIHByZXBh cmUgaG9vayBpZiBpdCBoYXMgb25lIGFuZCBpZiB0aGUgUExMIGlzIG5vdAogICogYWxyZWFkeSBl bmFibGVkLiBUaGUgcHJlcGFyZSBob29rIGlzIHBsYXRmb3JtIHNwZWNpZmljLgogICovCi12b2lk IGludGVsX3ByZXBhcmVfc2hhcmVkX2RwbGwoc3RydWN0IGludGVsX2NydGMgKmNydGMpCit2b2lk IGludGVsX3ByZXBhcmVfc2hhcmVkX2RwbGwoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUg KmNydGNfc3RhdGUpCiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2UuZGV2 OwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKLQlz dHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGwgKnBsbCA9IGNydGMtPmNvbmZpZy0+c2hhcmVkX2RwbGw7 CisJc3RydWN0IGludGVsX2NydGMgKmNydGMgPSB0b19pbnRlbF9jcnRjKGNydGNfc3RhdGUtPmJh c2UuY3J0Yyk7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShj cnRjLT5iYXNlLmRldik7CisJc3RydWN0IGludGVsX3NoYXJlZF9kcGxsICpwbGwgPSBjcnRjX3N0 YXRlLT5zaGFyZWRfZHBsbDsKIAogCWlmIChXQVJOX09OKHBsbCA9PSBOVUxMKSkKIAkJcmV0dXJu OwpAQCAtMTU4LDExICsxNTgsMTEgQEAgdm9pZCBpbnRlbF9wcmVwYXJlX3NoYXJlZF9kcGxsKHN0 cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogICoKICAqIEVuYWJsZSB0aGUgc2hhcmVkIERQTEwgdXNl ZCBieSBAY3J0Yy4KICAqLwotdm9pZCBpbnRlbF9lbmFibGVfc2hhcmVkX2RwbGwoc3RydWN0IGlu dGVsX2NydGMgKmNydGMpCit2b2lkIGludGVsX2VuYWJsZV9zaGFyZWRfZHBsbChjb25zdCBzdHJ1 Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2ID0gY3J0Yy0+YmFzZS5kZXY7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 ID0gdG9faTkxNShkZXYpOwotCXN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCAqcGxsID0gY3J0Yy0+ Y29uZmlnLT5zaGFyZWRfZHBsbDsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YyA9IHRvX2ludGVs X2NydGMoY3J0Y19zdGF0ZS0+YmFzZS5jcnRjKTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSB0b19pOTE1KGNydGMtPmJhc2UuZGV2KTsKKwlzdHJ1Y3QgaW50ZWxfc2hhcmVk X2RwbGwgKnBsbCA9IGNydGNfc3RhdGUtPnNoYXJlZF9kcGxsOwogCXVuc2lnbmVkIGludCBjcnRj X21hc2sgPSBkcm1fY3J0Y19tYXNrKCZjcnRjLT5iYXNlKTsKIAl1bnNpZ25lZCBpbnQgb2xkX21h c2s7CiAKQEAgLTIwMywxMCArMjAzLDExIEBAIHZvaWQgaW50ZWxfZW5hYmxlX3NoYXJlZF9kcGxs KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogICoKICAqIERpc2FibGUgdGhlIHNoYXJlZCBEUExM IHVzZWQgYnkgQGNydGMuCiAgKi8KLXZvaWQgaW50ZWxfZGlzYWJsZV9zaGFyZWRfZHBsbChzdHJ1 Y3QgaW50ZWxfY3J0YyAqY3J0YykKK3ZvaWQgaW50ZWxfZGlzYWJsZV9zaGFyZWRfZHBsbChjb25z dCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIHsKKwlzdHJ1Y3QgaW50ZWxf Y3J0YyAqY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Y19zdGF0ZS0+YmFzZS5jcnRjKTsKIAlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGNydGMtPmJhc2UuZGV2KTsK LQlzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGwgKnBsbCA9IGNydGMtPmNvbmZpZy0+c2hhcmVkX2Rw bGw7CisJc3RydWN0IGludGVsX3NoYXJlZF9kcGxsICpwbGwgPSBjcnRjX3N0YXRlLT5zaGFyZWRf ZHBsbDsKIAl1bnNpZ25lZCBpbnQgY3J0Y19tYXNrID0gZHJtX2NydGNfbWFzaygmY3J0Yy0+YmFz ZSk7CiAKIAkvKiBQQ0ggb25seSBhdmFpbGFibGUgb24gSUxLKyAqLwpAQCAtNDA5LDE0ICs0MTAs NiBAQCBzdGF0aWMgdm9pZCBpYnhfcGNoX2RwbGxfZGlzYWJsZShzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsCiAJCQkJIHN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCAqcGxsKQogewog CWNvbnN0IGVudW0gaW50ZWxfZHBsbF9pZCBpZCA9IHBsbC0+aW5mby0+aWQ7Ci0Jc3RydWN0IGRy bV9kZXZpY2UgKmRldiA9ICZkZXZfcHJpdi0+ZHJtOwotCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRj OwotCi0JLyogTWFrZSBzdXJlIG5vIHRyYW5zY29kZXIgaXNuJ3Qgc3RpbGwgZGVwZW5kaW5nIG9u IHVzLiAqLwotCWZvcl9lYWNoX2ludGVsX2NydGMoZGV2LCBjcnRjKSB7Ci0JCWlmIChjcnRjLT5j b25maWctPnNoYXJlZF9kcGxsID09IHBsbCkKLQkJCWFzc2VydF9wY2hfdHJhbnNjb2Rlcl9kaXNh YmxlZChkZXZfcHJpdiwgY3J0Yy0+cGlwZSk7Ci0JfQogCiAJSTkxNV9XUklURShQQ0hfRFBMTChp ZCksIDApOwogCVBPU1RJTkdfUkVBRChQQ0hfRFBMTChpZCkpOwpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBsbF9tZ3IuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2RwbGxfbWdyLmgKaW5kZXggYmYwZGU4YTRkYzYzLi45YzAzMzIzNmYyYmEgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwbGxfbWdyLmgKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHBsbF9tZ3IuaApAQCAtMzM0LDkgKzMzNCw5IEBAIHN0cnVjdCBp bnRlbF9zaGFyZWRfZHBsbCAqaW50ZWxfZ2V0X3NoYXJlZF9kcGxsKHN0cnVjdCBpbnRlbF9jcnRj ICpjcnRjLAogdm9pZCBpbnRlbF9yZWxlYXNlX3NoYXJlZF9kcGxsKHN0cnVjdCBpbnRlbF9zaGFy ZWRfZHBsbCAqZHBsbCwKIAkJCSAgICAgICBzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAkJCSAg ICAgICBzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpOwotdm9pZCBpbnRlbF9wcmVwYXJl X3NoYXJlZF9kcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKTsKLXZvaWQgaW50ZWxfZW5hYmxl X3NoYXJlZF9kcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKTsKLXZvaWQgaW50ZWxfZGlzYWJs ZV9zaGFyZWRfZHBsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0Yyk7Cit2b2lkIGludGVsX3ByZXBh cmVfc2hhcmVkX2RwbGwoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUp Owordm9pZCBpbnRlbF9lbmFibGVfc2hhcmVkX2RwbGwoY29uc3Qgc3RydWN0IGludGVsX2NydGNf c3RhdGUgKmNydGNfc3RhdGUpOwordm9pZCBpbnRlbF9kaXNhYmxlX3NoYXJlZF9kcGxsKGNvbnN0 IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKTsKIHZvaWQgaW50ZWxfc2hhcmVk X2RwbGxfc3dhcF9zdGF0ZShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpOwogdm9pZCBp bnRlbF9zaGFyZWRfZHBsbF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogCi0tIAoyLjE5 LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVs LWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=