From: Jani Nikula Subject: [PATCH v2 5/6] drm/i915: abstract intel_mode_config_init() from intel_modeset_init() Date: Fri, 20 Sep 2019 21:54:20 +0300 Message-ID: <20190920185421.17822-5-jani.nikula@intel.com> References: <20190920185421.17822-1-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id EC5796FD9D for ; Fri, 20 Sep 2019 18:54:39 +0000 (UTC) In-Reply-To: <20190920185421.17822-1-jani.nikula@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: jani.nikula@intel.com List-Id: intel-gfx@lists.freedesktop.org VGhlIGk5MTUgc3BlY2lmaWMgbW9kZSBjb25maWcgaW5pdCBjb2RlIGlzIHRvbyBzcGVjaWZpYyBh bmQgZGV0YWlsZWQgdG8KaGF2ZSBvcGVuIGluIGEgaGlnaCBsZXZlbCBmdW5jdGlvbi4gQWJzdHJh Y3QgYXdheS4gTm8gZnVuY3Rpb25hbApjaGFuZ2VzLgoKdjI6IG5lc3QgZHJtX21vZGVfY29uZmln X2luaXQoKSBpbiB0aGUgZnVuY3Rpb24gdG9vIChDaHJpcykKClJldmlld2VkLWJ5OiBDaHJpcyBX aWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KU2lnbmVkLW9mZi1ieTogSmFuaSBOaWt1 bGEgPGphbmkubmlrdWxhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNw bGF5L2ludGVsX2Rpc3BsYXkuYyB8IDg3ICsrKysrKysrKysrLS0tLS0tLS0tCiAxIGZpbGUgY2hh bmdlZCwgNDcgaW5zZXJ0aW9ucygrKSwgNDAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYwppbmRleCA5ZTY4ZGY4YTk5NDUuLjljMjYy Mjg3MzdhMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9k aXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5 LmMKQEAgLTE2MTQ5LDYgKzE2MTQ5LDUyIEBAIHN0YXRpYyBpbnQgaW50ZWxfaW5pdGlhbF9jb21t aXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlyZXR1cm4gcmV0OwogfQogCitzdGF0aWMgdm9p ZCBpbnRlbF9tb2RlX2NvbmZpZ19pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQor eworCXN0cnVjdCBkcm1fbW9kZV9jb25maWcgKm1vZGVfY29uZmlnID0gJmk5MTUtPmRybS5tb2Rl X2NvbmZpZzsKKworCWRybV9tb2RlX2NvbmZpZ19pbml0KCZpOTE1LT5kcm0pOworCisJbW9kZV9j b25maWctPm1pbl93aWR0aCA9IDA7CisJbW9kZV9jb25maWctPm1pbl9oZWlnaHQgPSAwOworCisJ bW9kZV9jb25maWctPnByZWZlcnJlZF9kZXB0aCA9IDI0OworCW1vZGVfY29uZmlnLT5wcmVmZXJf c2hhZG93ID0gMTsKKworCW1vZGVfY29uZmlnLT5hbGxvd19mYl9tb2RpZmllcnMgPSB0cnVlOwor CisJbW9kZV9jb25maWctPmZ1bmNzID0gJmludGVsX21vZGVfZnVuY3M7CisKKwkvKgorCSAqIE1h eGltdW0gZnJhbWVidWZmZXIgZGltZW5zaW9ucywgY2hvc2VuIHRvIG1hdGNoCisJICogdGhlIG1h eGltdW0gcmVuZGVyIGVuZ2luZSBzdXJmYWNlIHNpemUgb24gZ2VuNCsuCisJICovCisJaWYgKElO VEVMX0dFTihpOTE1KSA+PSA3KSB7CisJCW1vZGVfY29uZmlnLT5tYXhfd2lkdGggPSAxNjM4NDsK KwkJbW9kZV9jb25maWctPm1heF9oZWlnaHQgPSAxNjM4NDsKKwl9IGVsc2UgaWYgKElOVEVMX0dF TihpOTE1KSA+PSA0KSB7CisJCW1vZGVfY29uZmlnLT5tYXhfd2lkdGggPSA4MTkyOworCQltb2Rl X2NvbmZpZy0+bWF4X2hlaWdodCA9IDgxOTI7CisJfSBlbHNlIGlmIChJU19HRU4oaTkxNSwgMykp IHsKKwkJbW9kZV9jb25maWctPm1heF93aWR0aCA9IDQwOTY7CisJCW1vZGVfY29uZmlnLT5tYXhf aGVpZ2h0ID0gNDA5NjsKKwl9IGVsc2UgeworCQltb2RlX2NvbmZpZy0+bWF4X3dpZHRoID0gMjA0 ODsKKwkJbW9kZV9jb25maWctPm1heF9oZWlnaHQgPSAyMDQ4OworCX0KKworCWlmIChJU19JODQ1 RyhpOTE1KSB8fCBJU19JODY1RyhpOTE1KSkgeworCQltb2RlX2NvbmZpZy0+Y3Vyc29yX3dpZHRo ID0gSVNfSTg0NUcoaTkxNSkgPyA2NCA6IDUxMjsKKwkJbW9kZV9jb25maWctPmN1cnNvcl9oZWln aHQgPSAxMDIzOworCX0gZWxzZSBpZiAoSVNfR0VOKGk5MTUsIDIpKSB7CisJCW1vZGVfY29uZmln LT5jdXJzb3Jfd2lkdGggPSA2NDsKKwkJbW9kZV9jb25maWctPmN1cnNvcl9oZWlnaHQgPSA2NDsK Kwl9IGVsc2UgeworCQltb2RlX2NvbmZpZy0+Y3Vyc29yX3dpZHRoID0gMjU2OworCQltb2RlX2Nv bmZpZy0+Y3Vyc29yX2hlaWdodCA9IDI1NjsKKwl9Cit9CisKIGludCBpbnRlbF9tb2Rlc2V0X2lu aXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CkBAIC0xNjE2MCwyMiArMTYyMDYsMTIgQEAgaW50IGlu dGVsX21vZGVzZXRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWRldl9wcml2LT5mbGlw X3dxID0gYWxsb2Nfd29ya3F1ZXVlKCJpOTE1X2ZsaXAiLCBXUV9ISUdIUFJJIHwKIAkJCQkJICAg IFdRX1VOQk9VTkQsIFdRX1VOQk9VTkRfTUFYX0FDVElWRSk7CiAKLQlkcm1fbW9kZV9jb25maWdf aW5pdChkZXYpOworCWludGVsX21vZGVfY29uZmlnX2luaXQoZGV2X3ByaXYpOwogCiAJcmV0ID0g aW50ZWxfYndfaW5pdChkZXZfcHJpdik7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAotCWRl di0+bW9kZV9jb25maWcubWluX3dpZHRoID0gMDsKLQlkZXYtPm1vZGVfY29uZmlnLm1pbl9oZWln aHQgPSAwOwotCi0JZGV2LT5tb2RlX2NvbmZpZy5wcmVmZXJyZWRfZGVwdGggPSAyNDsKLQlkZXYt Pm1vZGVfY29uZmlnLnByZWZlcl9zaGFkb3cgPSAxOwotCi0JZGV2LT5tb2RlX2NvbmZpZy5hbGxv d19mYl9tb2RpZmllcnMgPSB0cnVlOwotCi0JZGV2LT5tb2RlX2NvbmZpZy5mdW5jcyA9ICZpbnRl bF9tb2RlX2Z1bmNzOwotCiAJaW5pdF9sbGlzdF9oZWFkKCZkZXZfcHJpdi0+YXRvbWljX2hlbHBl ci5mcmVlX2xpc3QpOwogCUlOSVRfV09SSygmZGV2X3ByaXYtPmF0b21pY19oZWxwZXIuZnJlZV93 b3JrLAogCQkgIGludGVsX2F0b21pY19oZWxwZXJfZnJlZV9zdGF0ZV93b3JrZXIpOwpAQCAtMTYx ODgsMzUgKzE2MjI0LDYgQEAgaW50IGludGVsX21vZGVzZXRfaW5pdChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogCiAJaW50ZWxfcGFuZWxfc2FuaXRpemVfc3NjKGRldl9wcml2KTsKIAotCS8qCi0J ICogTWF4aW11bSBmcmFtZWJ1ZmZlciBkaW1lbnNpb25zLCBjaG9zZW4gdG8gbWF0Y2gKLQkgKiB0 aGUgbWF4aW11bSByZW5kZXIgZW5naW5lIHN1cmZhY2Ugc2l6ZSBvbiBnZW40Ky4KLQkgKi8KLQlp ZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA3KSB7Ci0JCWRldi0+bW9kZV9jb25maWcubWF4X3dp ZHRoID0gMTYzODQ7Ci0JCWRldi0+bW9kZV9jb25maWcubWF4X2hlaWdodCA9IDE2Mzg0OwotCX0g ZWxzZSBpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA0KSB7Ci0JCWRldi0+bW9kZV9jb25maWcu bWF4X3dpZHRoID0gODE5MjsKLQkJZGV2LT5tb2RlX2NvbmZpZy5tYXhfaGVpZ2h0ID0gODE5MjsK LQl9IGVsc2UgaWYgKElTX0dFTihkZXZfcHJpdiwgMykpIHsKLQkJZGV2LT5tb2RlX2NvbmZpZy5t YXhfd2lkdGggPSA0MDk2OwotCQlkZXYtPm1vZGVfY29uZmlnLm1heF9oZWlnaHQgPSA0MDk2Owot CX0gZWxzZSB7Ci0JCWRldi0+bW9kZV9jb25maWcubWF4X3dpZHRoID0gMjA0ODsKLQkJZGV2LT5t b2RlX2NvbmZpZy5tYXhfaGVpZ2h0ID0gMjA0ODsKLQl9Ci0KLQlpZiAoSVNfSTg0NUcoZGV2X3By aXYpIHx8IElTX0k4NjVHKGRldl9wcml2KSkgewotCQlkZXYtPm1vZGVfY29uZmlnLmN1cnNvcl93 aWR0aCA9IElTX0k4NDVHKGRldl9wcml2KSA/IDY0IDogNTEyOwotCQlkZXYtPm1vZGVfY29uZmln LmN1cnNvcl9oZWlnaHQgPSAxMDIzOwotCX0gZWxzZSBpZiAoSVNfR0VOKGRldl9wcml2LCAyKSkg ewotCQlkZXYtPm1vZGVfY29uZmlnLmN1cnNvcl93aWR0aCA9IDY0OwotCQlkZXYtPm1vZGVfY29u ZmlnLmN1cnNvcl9oZWlnaHQgPSA2NDsKLQl9IGVsc2UgewotCQlkZXYtPm1vZGVfY29uZmlnLmN1 cnNvcl93aWR0aCA9IDI1NjsKLQkJZGV2LT5tb2RlX2NvbmZpZy5jdXJzb3JfaGVpZ2h0ID0gMjU2 OwotCX0KLQogCURSTV9ERUJVR19LTVMoIiVkIGRpc3BsYXkgcGlwZSVzIGF2YWlsYWJsZS5cbiIs CiAJCSAgICAgIElOVEVMX05VTV9QSVBFUyhkZXZfcHJpdiksCiAJCSAgICAgIElOVEVMX05VTV9Q SVBFUyhkZXZfcHJpdikgPiAxID8gInMiIDogIiIpOwotLSAKMi4yMC4xCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZng=