From: Lucas De Marchi Subject: [PATCH 4/7] drm/i915: use name from dpll_info embedded in intel_shared_dpll Date: Mon, 19 Mar 2018 23:24:20 -0700 Message-ID: <20180320062423.9166-5-lucas.demarchi@intel.com> References: <20180320062423.9166-1-lucas.demarchi@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1135E89E9E for ; Tue, 20 Mar 2018 06:25:39 +0000 (UTC) In-Reply-To: <20180320062423.9166-1-lucas.demarchi@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 Cc: Lucas De Marchi List-Id: intel-gfx@lists.freedesktop.org UmVwbGFjZSBhbGwgdXNlcnMgb2YgcGxsLT5uYW1lIHRvIHVzZSBwbGwtPmluZm8ubmFtZS4KClNp Z25lZC1vZmYtYnk6IEx1Y2FzIERlIE1hcmNoaSA8bHVjYXMuZGVtYXJjaGlAaW50ZWwuY29tPgot LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jICAgfCAgMyArKy0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyAgfCAgNyArKysrLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcGxsX21nci5jIHwgMjYgKysrKysrKysrKysrKystLS0tLS0tLS0t LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwbGxfbWdyLmggfCAgOCArKystLS0tLQog NCBmaWxlcyBjaGFuZ2VkLCAyMyBpbnNlcnRpb25zKCspLCAyMSBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCmluZGV4IDk2NGVhMWExMjM1Ny4uODNkNTlmNmY4MDIw IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwpAQCAtMzI4NSw3ICszMjg1LDggQEAg c3RhdGljIGludCBpOTE1X3NoYXJlZF9kcGxsc19pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9p ZCAqdW51c2VkKQogCWZvciAoaSA9IDA7IGkgPCBkZXZfcHJpdi0+bnVtX3NoYXJlZF9kcGxsOyBp KyspIHsKIAkJc3RydWN0IGludGVsX3NoYXJlZF9kcGxsICpwbGwgPSAmZGV2X3ByaXYtPnNoYXJl ZF9kcGxsc1tpXTsKIAotCQlzZXFfcHJpbnRmKG0sICJEUExMJWk6ICVzLCBpZDogJWlcbiIsIGks IHBsbC0+bmFtZSwgcGxsLT5pZCk7CisJCXNlcV9wcmludGYobSwgIkRQTEwlaTogJXMsIGlkOiAl aVxuIiwgaSwgcGxsLT5pbmZvLm5hbWUsCisJCQkgICBwbGwtPmlkKTsKIAkJc2VxX3ByaW50Ziht LCAiIGNydGNfbWFzazogMHglMDh4LCBhY3RpdmU6IDB4JXgsIG9uOiAlc1xuIiwKIAkJCSAgIHBs bC0+c3RhdGUuY3J0Y19tYXNrLCBwbGwtPmFjdGl2ZV9tYXNrLCB5ZXNubyhwbGwtPm9uKSk7CiAJ CXNlcV9wcmludGYobSwgIiB0cmFja2VkIGhhcmR3YXJlIHN0YXRlOlxuIik7CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggZDhlMTk5M2I4ODNjLi41M2ZjZTQ2MzgwZTAgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTExNjQ1LDcgKzExNjQ1LDcgQEAg dmVyaWZ5X3NpbmdsZV9kcGxsX3N0YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwKIAogCW1lbXNldCgmZHBsbF9od19zdGF0ZSwgMCwgc2l6ZW9mKGRwbGxfaHdfc3RhdGUpKTsK IAotCURSTV9ERUJVR19LTVMoIiVzXG4iLCBwbGwtPm5hbWUpOworCURSTV9ERUJVR19LTVMoIiVz XG4iLCBwbGwtPmluZm8ubmFtZSk7CiAKIAlhY3RpdmUgPSBwbGwtPmluZm8uZnVuY3MtPmdldF9o d19zdGF0ZShkZXZfcHJpdiwgcGxsLCAmZHBsbF9od19zdGF0ZSk7CiAKQEAgLTE1MTM3LDcgKzE1 MTM3LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfbW9kZXNldF9yZWFkb3V0X2h3X3N0YXRlKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCiAJCXBsbC0+YWN0aXZlX21hc2sgPSBwbGwtPnN0YXRlLmNydGNf bWFzazsKIAogCQlEUk1fREVCVUdfS01TKCIlcyBodyBzdGF0ZSByZWFkb3V0OiBjcnRjX21hc2sg MHglMDh4LCBvbiAlaVxuIiwKLQkJCSAgICAgIHBsbC0+bmFtZSwgcGxsLT5zdGF0ZS5jcnRjX21h c2ssIHBsbC0+b24pOworCQkJICAgICAgcGxsLT5pbmZvLm5hbWUsIHBsbC0+c3RhdGUuY3J0Y19t YXNrLCBwbGwtPm9uKTsKIAl9CiAKIAlmb3JfZWFjaF9pbnRlbF9lbmNvZGVyKGRldiwgZW5jb2Rl cikgewpAQCAtMTUzMTEsNyArMTUzMTEsOCBAQCBpbnRlbF9tb2Rlc2V0X3NldHVwX2h3X3N0YXRl KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCWlmICghcGxsLT5vbiB8fCBwbGwtPmFjdGl2ZV9t YXNrKQogCQkJY29udGludWU7CiAKLQkJRFJNX0RFQlVHX0tNUygiJXMgZW5hYmxlZCBidXQgbm90 IGluIHVzZSwgZGlzYWJsaW5nXG4iLCBwbGwtPm5hbWUpOworCQlEUk1fREVCVUdfS01TKCIlcyBl bmFibGVkIGJ1dCBub3QgaW4gdXNlLCBkaXNhYmxpbmdcbiIsCisJCQkgICAgICBwbGwtPmluZm8u bmFtZSk7CiAKIAkJcGxsLT5pbmZvLmZ1bmNzLT5kaXNhYmxlKGRldl9wcml2LCBwbGwpOwogCQlw bGwtPm9uID0gZmFsc2U7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cGxsX21nci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBsbF9tZ3IuYwppbmRleCA0 ZTFhZmQzNWIzOGQuLjlmZTI1OTZkMmFhYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHBsbF9tZ3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcGxs X21nci5jCkBAIC0xMjEsNyArMTIxLDcgQEAgdm9pZCBhc3NlcnRfc2hhcmVkX2RwbGwoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCWN1cl9zdGF0ZSA9IHBsbC0+aW5mby5mdW5j cy0+Z2V0X2h3X3N0YXRlKGRldl9wcml2LCBwbGwsICZod19zdGF0ZSk7CiAJSTkxNV9TVEFURV9X QVJOKGN1cl9zdGF0ZSAhPSBzdGF0ZSwKIAkgICAgICIlcyBhc3NlcnRpb24gZmFpbHVyZSAoZXhw ZWN0ZWQgJXMsIGN1cnJlbnQgJXMpXG4iLAotCQkJcGxsLT5uYW1lLCBvbm9mZihzdGF0ZSksIG9u b2ZmKGN1cl9zdGF0ZSkpOworCQkJcGxsLT5pbmZvLm5hbWUsIG9ub2ZmKHN0YXRlKSwgb25vZmYo Y3VyX3N0YXRlKSk7CiB9CiAKIC8qKgpAQCAtMTQzLDcgKzE0Myw3IEBAIHZvaWQgaW50ZWxfcHJl cGFyZV9zaGFyZWRfZHBsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAltdXRleF9sb2NrKCZk ZXZfcHJpdi0+ZHBsbF9sb2NrKTsKIAlXQVJOX09OKCFwbGwtPnN0YXRlLmNydGNfbWFzayk7CiAJ aWYgKCFwbGwtPmFjdGl2ZV9tYXNrKSB7Ci0JCURSTV9ERUJVR19EUklWRVIoInNldHRpbmcgdXAg JXNcbiIsIHBsbC0+bmFtZSk7CisJCURSTV9ERUJVR19EUklWRVIoInNldHRpbmcgdXAgJXNcbiIs IHBsbC0+aW5mby5uYW1lKTsKIAkJV0FSTl9PTihwbGwtPm9uKTsKIAkJYXNzZXJ0X3NoYXJlZF9k cGxsX2Rpc2FibGVkKGRldl9wcml2LCBwbGwpOwogCkBAIC0xNzksNyArMTc5LDcgQEAgdm9pZCBp bnRlbF9lbmFibGVfc2hhcmVkX2RwbGwoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJcGxsLT5h Y3RpdmVfbWFzayB8PSBjcnRjX21hc2s7CiAKIAlEUk1fREVCVUdfS01TKCJlbmFibGUgJXMgKGFj dGl2ZSAleCwgb24/ICVkKSBmb3IgY3J0YyAlZFxuIiwKLQkJICAgICAgcGxsLT5uYW1lLCBwbGwt PmFjdGl2ZV9tYXNrLCBwbGwtPm9uLAorCQkgICAgICBwbGwtPmluZm8ubmFtZSwgcGxsLT5hY3Rp dmVfbWFzaywgcGxsLT5vbiwKIAkJICAgICAgY3J0Yy0+YmFzZS5iYXNlLmlkKTsKIAogCWlmIChv bGRfbWFzaykgewpAQCAtMTg5LDcgKzE4OSw3IEBAIHZvaWQgaW50ZWxfZW5hYmxlX3NoYXJlZF9k cGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCX0KIAlXQVJOX09OKHBsbC0+b24pOwogCi0J RFJNX0RFQlVHX0tNUygiZW5hYmxpbmcgJXNcbiIsIHBsbC0+bmFtZSk7CisJRFJNX0RFQlVHX0tN UygiZW5hYmxpbmcgJXNcbiIsIHBsbC0+aW5mby5uYW1lKTsKIAlwbGwtPmluZm8uZnVuY3MtPmVu YWJsZShkZXZfcHJpdiwgcGxsKTsKIAlwbGwtPm9uID0gdHJ1ZTsKIApAQCAtMjIxLDcgKzIyMSw3 IEBAIHZvaWQgaW50ZWxfZGlzYWJsZV9zaGFyZWRfZHBsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0 YykKIAkJZ290byBvdXQ7CiAKIAlEUk1fREVCVUdfS01TKCJkaXNhYmxlICVzIChhY3RpdmUgJXgs IG9uPyAlZCkgZm9yIGNydGMgJWRcbiIsCi0JCSAgICAgIHBsbC0+bmFtZSwgcGxsLT5hY3RpdmVf bWFzaywgcGxsLT5vbiwKKwkJICAgICAgcGxsLT5pbmZvLm5hbWUsIHBsbC0+YWN0aXZlX21hc2ss IHBsbC0+b24sCiAJCSAgICAgIGNydGMtPmJhc2UuYmFzZS5pZCk7CiAKIAlhc3NlcnRfc2hhcmVk X2RwbGxfZW5hYmxlZChkZXZfcHJpdiwgcGxsKTsKQEAgLTIzMSw3ICsyMzEsNyBAQCB2b2lkIGlu dGVsX2Rpc2FibGVfc2hhcmVkX2RwbGwoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJaWYgKHBs bC0+YWN0aXZlX21hc2spCiAJCWdvdG8gb3V0OwogCi0JRFJNX0RFQlVHX0tNUygiZGlzYWJsaW5n ICVzXG4iLCBwbGwtPm5hbWUpOworCURSTV9ERUJVR19LTVMoImRpc2FibGluZyAlc1xuIiwgcGxs LT5pbmZvLm5hbWUpOwogCXBsbC0+aW5mby5mdW5jcy0+ZGlzYWJsZShkZXZfcHJpdiwgcGxsKTsK IAlwbGwtPm9uID0gZmFsc2U7CiAKQEAgLTI2Myw3ICsyNjMsOCBAQCBpbnRlbF9maW5kX3NoYXJl ZF9kcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCQkJICAgJnNoYXJlZF9kcGxsW2ldLmh3 X3N0YXRlLAogCQkJICAgc2l6ZW9mKGNydGNfc3RhdGUtPmRwbGxfaHdfc3RhdGUpKSA9PSAwKSB7 CiAJCQlEUk1fREVCVUdfS01TKCJbQ1JUQzolZDolc10gc2hhcmluZyBleGlzdGluZyAlcyAoY3J0 YyBtYXNrIDB4JTA4eCwgYWN0aXZlICV4KVxuIiwKLQkJCQkgICAgICBjcnRjLT5iYXNlLmJhc2Uu aWQsIGNydGMtPmJhc2UubmFtZSwgcGxsLT5uYW1lLAorCQkJCSAgICAgIGNydGMtPmJhc2UuYmFz ZS5pZCwgY3J0Yy0+YmFzZS5uYW1lLAorCQkJCSAgICAgIHBsbC0+aW5mby5uYW1lLAogCQkJCSAg ICAgIHNoYXJlZF9kcGxsW2ldLmNydGNfbWFzaywKIAkJCQkgICAgICBwbGwtPmFjdGl2ZV9tYXNr KTsKIAkJCXJldHVybiBwbGw7CkBAIC0yNzUsNyArMjc2LDggQEAgaW50ZWxfZmluZF9zaGFyZWRf ZHBsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAkJcGxsID0gJmRldl9wcml2LT5zaGFyZWRf ZHBsbHNbaV07CiAJCWlmIChzaGFyZWRfZHBsbFtpXS5jcnRjX21hc2sgPT0gMCkgewogCQkJRFJN X0RFQlVHX0tNUygiW0NSVEM6JWQ6JXNdIGFsbG9jYXRlZCAlc1xuIiwKLQkJCQkgICAgICBjcnRj LT5iYXNlLmJhc2UuaWQsIGNydGMtPmJhc2UubmFtZSwgcGxsLT5uYW1lKTsKKwkJCQkgICAgICBj cnRjLT5iYXNlLmJhc2UuaWQsIGNydGMtPmJhc2UubmFtZSwKKwkJCQkgICAgICBwbGwtPmluZm8u bmFtZSk7CiAJCQlyZXR1cm4gcGxsOwogCQl9CiAJfQpAQCAtMjk4LDcgKzMwMCw3IEBAIGludGVs X3JlZmVyZW5jZV9zaGFyZWRfZHBsbChzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGwgKnBsbCwKIAkJ CWNydGNfc3RhdGUtPmRwbGxfaHdfc3RhdGU7CiAKIAljcnRjX3N0YXRlLT5zaGFyZWRfZHBsbCA9 IHBsbDsKLQlEUk1fREVCVUdfRFJJVkVSKCJ1c2luZyAlcyBmb3IgcGlwZSAlY1xuIiwgcGxsLT5u YW1lLAorCURSTV9ERUJVR19EUklWRVIoInVzaW5nICVzIGZvciBwaXBlICVjXG4iLCBwbGwtPmlu Zm8ubmFtZSwKIAkJCSBwaXBlX25hbWUoY3J0Yy0+cGlwZSkpOwogCiAJc2hhcmVkX2RwbGxbcGxs LT5pZF0uY3J0Y19tYXNrIHw9IDEgPDwgY3J0Yy0+cGlwZTsKQEAgLTQyOSw3ICs0MzEsOCBAQCBp YnhfZ2V0X2RwbGwoc3RydWN0IGludGVsX2NydGMgKmNydGMsIHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpjcnRjX3N0YXRlLAogCQlwbGwgPSAmZGV2X3ByaXYtPnNoYXJlZF9kcGxsc1tpXTsKIAog CQlEUk1fREVCVUdfS01TKCJbQ1JUQzolZDolc10gdXNpbmcgcHJlLWFsbG9jYXRlZCAlc1xuIiwK LQkJCSAgICAgIGNydGMtPmJhc2UuYmFzZS5pZCwgY3J0Yy0+YmFzZS5uYW1lLCBwbGwtPm5hbWUp OworCQkJICAgICAgY3J0Yy0+YmFzZS5iYXNlLmlkLCBjcnRjLT5iYXNlLm5hbWUsCisJCQkgICAg ICBwbGwtPmluZm8ubmFtZSk7CiAJfSBlbHNlIHsKIAkJcGxsID0gaW50ZWxfZmluZF9zaGFyZWRf ZHBsbChjcnRjLCBjcnRjX3N0YXRlLAogCQkJCQkgICAgIERQTExfSURfUENIX1BMTF9BLApAQCAt MTgyNCw3ICsxODI3LDcgQEAgYnh0X2dldF9kcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAog CXBsbCA9IGludGVsX2dldF9zaGFyZWRfZHBsbF9ieV9pZChkZXZfcHJpdiwgaSk7CiAKIAlEUk1f REVCVUdfS01TKCJbQ1JUQzolZDolc10gdXNpbmcgcHJlLWFsbG9jYXRlZCAlc1xuIiwKLQkJICAg ICAgY3J0Yy0+YmFzZS5iYXNlLmlkLCBjcnRjLT5iYXNlLm5hbWUsIHBsbC0+bmFtZSk7CisJCSAg ICAgIGNydGMtPmJhc2UuYmFzZS5pZCwgY3J0Yy0+YmFzZS5uYW1lLCBwbGwtPmluZm8ubmFtZSk7 CiAKIAlpbnRlbF9yZWZlcmVuY2Vfc2hhcmVkX2RwbGwocGxsLCBjcnRjX3N0YXRlKTsKIApAQCAt MjQxNCw3ICsyNDE3LDYgQEAgdm9pZCBpbnRlbF9zaGFyZWRfZHBsbF9pbml0KHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiAJCSAgICAgICBzaXplb2Yoc3RydWN0IGRwbGxfaW5mbykpOwogCiAJCWRl dl9wcml2LT5zaGFyZWRfZHBsbHNbaV0uaWQgPSBkcGxsX2luZm9baV0uaWQ7Ci0JCWRldl9wcml2 LT5zaGFyZWRfZHBsbHNbaV0ubmFtZSA9IGRwbGxfaW5mb1tpXS5uYW1lOwogCQlkZXZfcHJpdi0+ c2hhcmVkX2RwbGxzW2ldLmZsYWdzID0gZHBsbF9pbmZvW2ldLmZsYWdzOwogCX0KIApkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBsbF9tZ3IuaCBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2RwbGxfbWdyLmgKaW5kZXggMTMxMDMxNDM2NjE1Li4xNmE0MmNmODJi YTggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwbGxfbWdyLmgKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBsbF9tZ3IuaApAQCAtMjA5LDYgKzIwOSw5 IEBAIHN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbF9mdW5jcyB7CiAgKiBzdHJ1Y3QgZHBsbF9pbmZv IC0gZGlzcGxheSBQTEwgcGxhdGZvcm0gc3BlY2lmaWMgaW5mbwogICovCiBzdHJ1Y3QgZHBsbF9p bmZvIHsKKwkvKioKKwkgKiBAbmFtZTogRFBMTCBuYW1lOyB1c2VkIGZvciBsb2dnaW5nCisJICov CiAJY29uc3QgY2hhciAqbmFtZTsKIAljb25zdCBpbnQgaWQ7CiAJLyoqCkBAIC0yNDAsMTEgKzI0 Myw2IEBAIHN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCB7CiAJICovCiAJYm9vbCBvbjsKIAotCS8q KgotCSAqIEBuYW1lOiBEUExMIG5hbWU7IHVzZWQgZm9yIGxvZ2dpbmcKLQkgKi8KLQljb25zdCBj aGFyICpuYW1lOwotCiAJLyoqCiAJICogQGlkOiB1bmlxdWUgaW5kZW50aWZpZXIgZm9yIHRoaXMg RFBMTDsgc2hvdWxkIG1hdGNoIHRoZSBpbmRleCBpbiB0aGUKIAkgKiBkZXZfcHJpdi0+c2hhcmVk X2RwbGxzIGFycmF5Ci0tIAoyLjE0LjMKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2ludGVsLWdmeAo=