From: Ander Conselvan de Oliveira Subject: [PATCH 03/13] drm/i915: Split intel_get_shared_dpll() into smaller functions Date: Fri, 26 Feb 2016 15:54:16 +0200 Message-ID: <1456494866-7665-4-git-send-email-ander.conselvan.de.oliveira@intel.com> References: <1456494866-7665-1-git-send-email-ander.conselvan.de.oliveira@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id A2C956EAE7 for ; Fri, 26 Feb 2016 13:54:36 +0000 (UTC) In-Reply-To: <1456494866-7665-1-git-send-email-ander.conselvan.de.oliveira@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: Ander Conselvan de Oliveira List-Id: intel-gfx@lists.freedesktop.org TWFrZSB0aGUgY29kZSBuZWF0ZXIgYnkgc3BsaXR0aW5nIHRoZSBjb2RlIGZvciBwbGF0Zm9ybXMg d2l0aCBmaXhlZCBQTEwKdG8gdGhlaXIgb3duIGZ1bmN0aW9ucyBhbmQgc3BsaXR0aW5nIHRoZSBs b2dpYyBmb3IgZmluZGluZyBhIHNoYXJlYWJsZQpvciB1bnVzZWQgcGxsIGZyb20gdGhlIGxvZ2lj IGZvciBzZXR0aW5nIGl0IHVwLgoKU2lnbmVkLW9mZi1ieTogQW5kZXIgQ29uc2VsdmFuIGRlIE9s aXZlaXJhIDxhbmRlci5jb25zZWx2YW4uZGUub2xpdmVpcmFAaW50ZWwuY29tPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwbGxfbWdyLmMgfCAxMDkgKysrKysrKysrKysrKysrKysr KysrKystLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDc0IGluc2VydGlvbnMoKyksIDM1IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwbGxf bWdyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcGxsX21nci5jCmluZGV4IDZiZTBj ZDAuLjExZWZmZTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwbGxf bWdyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBsbF9tZ3IuYwpAQCAtMTQ1 LDUyICsxNDUsNjUgQEAgdm9pZCBpbnRlbF9kaXNhYmxlX3NoYXJlZF9kcGxsKHN0cnVjdCBpbnRl bF9jcnRjICpjcnRjKQogCWludGVsX2Rpc3BsYXlfcG93ZXJfcHV0KGRldl9wcml2LCBQT1dFUl9E T01BSU5fUExMUyk7CiB9CiAKLXN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCAqaW50ZWxfZ2V0X3No YXJlZF9kcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAotCQkJCQkJc3RydWN0IGludGVsX2Ny dGNfc3RhdGUgKmNydGNfc3RhdGUpCitzdGF0aWMgZW51bSBpbnRlbF9kcGxsX2lkCitpYnhfZ2V0 X2ZpeGVkX2RwbGwoc3RydWN0IGludGVsX2NydGMgKmNydGMsCisJCSAgIHN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICpjcnRjX3N0YXRlKQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IGNydGMtPmJhc2UuZGV2LT5kZXZfcHJpdmF0ZTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGNydGMtPmJhc2UuZGV2KTsKIAlzdHJ1Y3QgaW50ZWxf c2hhcmVkX2RwbGwgKnBsbDsKLQlzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGxfY29uZmlnICpzaGFy ZWRfZHBsbDsKIAllbnVtIGludGVsX2RwbGxfaWQgaTsKLQlpbnQgbWF4ID0gZGV2X3ByaXYtPm51 bV9zaGFyZWRfZHBsbDsKIAotCXNoYXJlZF9kcGxsID0gaW50ZWxfYXRvbWljX2dldF9zaGFyZWRf ZHBsbF9zdGF0ZShjcnRjX3N0YXRlLT5iYXNlLnN0YXRlKTsKKwkvKiBJcm9ubGFrZSBQQ0ggaGFz IGEgZml4ZWQgUExMLT5QQ0ggcGlwZSBtYXBwaW5nLiAqLworCWkgPSAoZW51bSBpbnRlbF9kcGxs X2lkKSBjcnRjLT5waXBlOworCXBsbCA9ICZkZXZfcHJpdi0+c2hhcmVkX2RwbGxzW2ldOwogCi0J aWYgKEhBU19QQ0hfSUJYKGRldl9wcml2LT5kZXYpKSB7Ci0JCS8qIElyb25sYWtlIFBDSCBoYXMg YSBmaXhlZCBQTEwtPlBDSCBwaXBlIG1hcHBpbmcuICovCi0JCWkgPSAoZW51bSBpbnRlbF9kcGxs X2lkKSBjcnRjLT5waXBlOwotCQlwbGwgPSAmZGV2X3ByaXYtPnNoYXJlZF9kcGxsc1tpXTsKKwlE Uk1fREVCVUdfS01TKCJDUlRDOiVkIHVzaW5nIHByZS1hbGxvY2F0ZWQgJXNcbiIsCisJCSAgICAg IGNydGMtPmJhc2UuYmFzZS5pZCwgcGxsLT5uYW1lKTsKIAotCQlEUk1fREVCVUdfS01TKCJDUlRD OiVkIHVzaW5nIHByZS1hbGxvY2F0ZWQgJXNcbiIsCi0JCQkgICAgICBjcnRjLT5iYXNlLmJhc2Uu aWQsIHBsbC0+bmFtZSk7CisJcmV0dXJuIGk7Cit9CiAKLQkJV0FSTl9PTihzaGFyZWRfZHBsbFtp XS5jcnRjX21hc2spOworc3RhdGljIGVudW0gaW50ZWxfZHBsbF9pZAorYnh0X2dldF9maXhlZF9k cGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAorCQkgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqY3J0Y19zdGF0ZSkKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0 b19pOTE1KGNydGMtPmJhc2UuZGV2KTsKKwlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcjsK KwlzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydDsKKwlzdHJ1Y3QgaW50 ZWxfc2hhcmVkX2RwbGwgKnBsbDsKKwllbnVtIGludGVsX2RwbGxfaWQgaTsKIAotCQlnb3RvIGZv dW5kOwotCX0KKwkvKiBQTEwgaXMgYXR0YWNoZWQgdG8gcG9ydCBpbiBieHQgKi8KKwllbmNvZGVy ID0gaW50ZWxfZGRpX2dldF9jcnRjX25ld19lbmNvZGVyKGNydGNfc3RhdGUpOworCWlmIChXQVJO X09OKCFlbmNvZGVyKSkKKwkJcmV0dXJuIERQTExfSURfUFJJVkFURTsKIAotCWlmIChJU19CUk9Y VE9OKGRldl9wcml2LT5kZXYpKSB7Ci0JCS8qIFBMTCBpcyBhdHRhY2hlZCB0byBwb3J0IGluIGJ4 dCAqLwotCQlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcjsKLQkJc3RydWN0IGludGVsX2Rp Z2l0YWxfcG9ydCAqaW50ZWxfZGlnX3BvcnQ7CisJaW50ZWxfZGlnX3BvcnQgPSBlbmNfdG9fZGln X3BvcnQoJmVuY29kZXItPmJhc2UpOworCS8qIDE6MSBtYXBwaW5nIGJldHdlZW4gcG9ydHMgYW5k IFBMTHMgKi8KKwlpID0gKGVudW0gaW50ZWxfZHBsbF9pZClpbnRlbF9kaWdfcG9ydC0+cG9ydDsK KwlwbGwgPSAmZGV2X3ByaXYtPnNoYXJlZF9kcGxsc1tpXTsKKwlEUk1fREVCVUdfS01TKCJDUlRD OiVkIHVzaW5nIHByZS1hbGxvY2F0ZWQgJXNcbiIsCisJCWNydGMtPmJhc2UuYmFzZS5pZCwgcGxs LT5uYW1lKTsKIAotCQllbmNvZGVyID0gaW50ZWxfZGRpX2dldF9jcnRjX25ld19lbmNvZGVyKGNy dGNfc3RhdGUpOwotCQlpZiAoV0FSTl9PTighZW5jb2RlcikpCi0JCQlyZXR1cm4gTlVMTDsKKwly ZXR1cm4gaTsKK30KIAotCQlpbnRlbF9kaWdfcG9ydCA9IGVuY190b19kaWdfcG9ydCgmZW5jb2Rl ci0+YmFzZSk7Ci0JCS8qIDE6MSBtYXBwaW5nIGJldHdlZW4gcG9ydHMgYW5kIFBMTHMgKi8KLQkJ aSA9IChlbnVtIGludGVsX2RwbGxfaWQpaW50ZWxfZGlnX3BvcnQtPnBvcnQ7Ci0JCXBsbCA9ICZk ZXZfcHJpdi0+c2hhcmVkX2RwbGxzW2ldOwotCQlEUk1fREVCVUdfS01TKCJDUlRDOiVkIHVzaW5n IHByZS1hbGxvY2F0ZWQgJXNcbiIsCi0JCQljcnRjLT5iYXNlLmJhc2UuaWQsIHBsbC0+bmFtZSk7 Ci0JCVdBUk5fT04oc2hhcmVkX2RwbGxbaV0uY3J0Y19tYXNrKTsKK3N0YXRpYyBlbnVtIGludGVs X2RwbGxfaWQKK2ludGVsX2ZpbmRfc2hhcmVkX2RwbGwoc3RydWN0IGludGVsX2NydGMgKmNydGMs CisJCSAgICAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKK3sKKwlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBjcnRjLT5iYXNlLmRldi0+ZGV2X3ByaXZh dGU7CisJc3RydWN0IGludGVsX3NoYXJlZF9kcGxsICpwbGw7CisJc3RydWN0IGludGVsX3NoYXJl ZF9kcGxsX2NvbmZpZyAqc2hhcmVkX2RwbGw7CisJZW51bSBpbnRlbF9kcGxsX2lkIGk7CisJaW50 IG1heCA9IGRldl9wcml2LT5udW1fc2hhcmVkX2RwbGw7CiAKLQkJZ290byBmb3VuZDsKLQl9IGVs c2UgaWYgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5nZW4gPCA5ICYmIEhBU19EREkoZGV2X3ByaXYp KQorCWlmIChJTlRFTF9JTkZPKGRldl9wcml2KS0+Z2VuIDwgOSAmJiBIQVNfRERJKGRldl9wcml2 KSkKIAkJLyogRG8gbm90IGNvbnNpZGVyIFNQTEwgKi8KIAkJbWF4ID0gMjsKIAorCXNoYXJlZF9k cGxsID0gaW50ZWxfYXRvbWljX2dldF9zaGFyZWRfZHBsbF9zdGF0ZShjcnRjX3N0YXRlLT5iYXNl LnN0YXRlKTsKKwogCWZvciAoaSA9IDA7IGkgPCBtYXg7IGkrKykgewogCQlwbGwgPSAmZGV2X3By aXYtPnNoYXJlZF9kcGxsc1tpXTsKIApAQCAtMjA1LDcgKzIxOCw3IEBAIHN0cnVjdCBpbnRlbF9z aGFyZWRfZHBsbCAqaW50ZWxfZ2V0X3NoYXJlZF9kcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRj LAogCQkJCSAgICAgIGNydGMtPmJhc2UuYmFzZS5pZCwgcGxsLT5uYW1lLAogCQkJCSAgICAgIHNo YXJlZF9kcGxsW2ldLmNydGNfbWFzaywKIAkJCQkgICAgICBwbGwtPmFjdGl2ZSk7Ci0JCQlnb3Rv IGZvdW5kOworCQkJcmV0dXJuIGk7CiAJCX0KIAl9CiAKQEAgLTIxNSwxMyArMjI4LDM5IEBAIHN0 cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCAqaW50ZWxfZ2V0X3NoYXJlZF9kcGxsKHN0cnVjdCBpbnRl bF9jcnRjICpjcnRjLAogCQlpZiAoc2hhcmVkX2RwbGxbaV0uY3J0Y19tYXNrID09IDApIHsKIAkJ CURSTV9ERUJVR19LTVMoIkNSVEM6JWQgYWxsb2NhdGVkICVzXG4iLAogCQkJCSAgICAgIGNydGMt PmJhc2UuYmFzZS5pZCwgcGxsLT5uYW1lKTsKLQkJCWdvdG8gZm91bmQ7CisJCQlyZXR1cm4gaTsK IAkJfQogCX0KIAotCXJldHVybiBOVUxMOworCXJldHVybiBEUExMX0lEX1BSSVZBVEU7Cit9CisK K3N0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCAqCitpbnRlbF9nZXRfc2hhcmVkX2RwbGwoc3RydWN0 IGludGVsX2NydGMgKmNydGMsCisJCSAgICAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRj X3N0YXRlKQoreworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGNydGMtPmJh c2UuZGV2LT5kZXZfcHJpdmF0ZTsKKwlzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGwgKnBsbDsKKwlz dHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGxfY29uZmlnICpzaGFyZWRfZHBsbDsKKwllbnVtIGludGVs X2RwbGxfaWQgaTsKKworCXNoYXJlZF9kcGxsID0gaW50ZWxfYXRvbWljX2dldF9zaGFyZWRfZHBs bF9zdGF0ZShjcnRjX3N0YXRlLT5iYXNlLnN0YXRlKTsKKworCWlmIChIQVNfUENIX0lCWChkZXZf cHJpdi0+ZGV2KSkgeworCQlpID0gaWJ4X2dldF9maXhlZF9kcGxsKGNydGMsIGNydGNfc3RhdGUp OworCQlXQVJOX09OKHNoYXJlZF9kcGxsW2ldLmNydGNfbWFzayk7CisJfSBlbHNlIGlmIChJU19C Uk9YVE9OKGRldl9wcml2LT5kZXYpKSB7CisJCWkgPSBieHRfZ2V0X2ZpeGVkX2RwbGwoY3J0Yywg Y3J0Y19zdGF0ZSk7CisJCVdBUk5fT04oc2hhcmVkX2RwbGxbaV0uY3J0Y19tYXNrKTsKKwl9IGVs c2UgeworCQlpID0gaW50ZWxfZmluZF9zaGFyZWRfZHBsbChjcnRjLCBjcnRjX3N0YXRlKTsKKwl9 CisKKwlpZiAoaSA8IDApCisJCXJldHVybiBOVUxMOworCisJcGxsID0gJmRldl9wcml2LT5zaGFy ZWRfZHBsbHNbaV07CiAKLWZvdW5kOgogCWlmIChzaGFyZWRfZHBsbFtpXS5jcnRjX21hc2sgPT0g MCkKIAkJc2hhcmVkX2RwbGxbaV0uaHdfc3RhdGUgPQogCQkJY3J0Y19zdGF0ZS0+ZHBsbF9od19z dGF0ZTsKLS0gCjIuNC4zCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK