From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: [PATCH 05/13] drm/i915: abstract intel_mode_config_init() from intel_modeset_init() Date: Thu, 19 Sep 2019 17:03:52 +0300 Message-ID: <0e7b95296179189308cb170958e5ce2037538dc7.1568901239.git.jani.nikula@intel.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id BE48B6F7EC for ; Thu, 19 Sep 2019 14:04:40 +0000 (UTC) In-Reply-To: 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 Y3QgYXdheS4gTm8gZnVuY3Rpb25hbApjaGFuZ2VzLgoKU2lnbmVkLW9mZi1ieTogSmFuaSBOaWt1 bGEgPGphbmkubmlrdWxhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNw bGF5L2ludGVsX2Rpc3BsYXkuYyB8IDg1ICsrKysrKysrKysrLS0tLS0tLS0tCiAxIGZpbGUgY2hh bmdlZCwgNDYgaW5zZXJ0aW9ucygrKSwgMzkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYwppbmRleCBlZTBkMzRkNzZiMDguLjA0MGVl MDA2YjA0NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9k aXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5 LmMKQEAgLTE2MTAwLDYgKzE2MTAwLDUwIEBAIHN0YXRpYyBpbnQgaW50ZWxfaW5pdGlhbF9jb21t aXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlyZXR1cm4gcmV0OwogfQogCitzdGF0aWMgdm9p ZCBpbnRlbF9tb2RlX2NvbmZpZ19pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQor eworCXN0cnVjdCBkcm1fbW9kZV9jb25maWcgKm1vZGVfY29uZmlnID0gJmk5MTUtPmRybS5tb2Rl X2NvbmZpZzsKKworCW1vZGVfY29uZmlnLT5taW5fd2lkdGggPSAwOworCW1vZGVfY29uZmlnLT5t aW5faGVpZ2h0ID0gMDsKKworCW1vZGVfY29uZmlnLT5wcmVmZXJyZWRfZGVwdGggPSAyNDsKKwlt b2RlX2NvbmZpZy0+cHJlZmVyX3NoYWRvdyA9IDE7CisKKwltb2RlX2NvbmZpZy0+YWxsb3dfZmJf bW9kaWZpZXJzID0gdHJ1ZTsKKworCW1vZGVfY29uZmlnLT5mdW5jcyA9ICZpbnRlbF9tb2RlX2Z1 bmNzOworCisJLyoKKwkgKiBNYXhpbXVtIGZyYW1lYnVmZmVyIGRpbWVuc2lvbnMsIGNob3NlbiB0 byBtYXRjaAorCSAqIHRoZSBtYXhpbXVtIHJlbmRlciBlbmdpbmUgc3VyZmFjZSBzaXplIG9uIGdl bjQrLgorCSAqLworCWlmIChJTlRFTF9HRU4oaTkxNSkgPj0gNykgeworCQltb2RlX2NvbmZpZy0+ bWF4X3dpZHRoID0gMTYzODQ7CisJCW1vZGVfY29uZmlnLT5tYXhfaGVpZ2h0ID0gMTYzODQ7CisJ fSBlbHNlIGlmIChJTlRFTF9HRU4oaTkxNSkgPj0gNCkgeworCQltb2RlX2NvbmZpZy0+bWF4X3dp ZHRoID0gODE5MjsKKwkJbW9kZV9jb25maWctPm1heF9oZWlnaHQgPSA4MTkyOworCX0gZWxzZSBp ZiAoSVNfR0VOKGk5MTUsIDMpKSB7CisJCW1vZGVfY29uZmlnLT5tYXhfd2lkdGggPSA0MDk2Owor CQltb2RlX2NvbmZpZy0+bWF4X2hlaWdodCA9IDQwOTY7CisJfSBlbHNlIHsKKwkJbW9kZV9jb25m aWctPm1heF93aWR0aCA9IDIwNDg7CisJCW1vZGVfY29uZmlnLT5tYXhfaGVpZ2h0ID0gMjA0ODsK Kwl9CisKKwlpZiAoSVNfSTg0NUcoaTkxNSkgfHwgSVNfSTg2NUcoaTkxNSkpIHsKKwkJbW9kZV9j b25maWctPmN1cnNvcl93aWR0aCA9IElTX0k4NDVHKGk5MTUpID8gNjQgOiA1MTI7CisJCW1vZGVf Y29uZmlnLT5jdXJzb3JfaGVpZ2h0ID0gMTAyMzsKKwl9IGVsc2UgaWYgKElTX0dFTihpOTE1LCAy KSkgeworCQltb2RlX2NvbmZpZy0+Y3Vyc29yX3dpZHRoID0gNjQ7CisJCW1vZGVfY29uZmlnLT5j dXJzb3JfaGVpZ2h0ID0gNjQ7CisJfSBlbHNlIHsKKwkJbW9kZV9jb25maWctPmN1cnNvcl93aWR0 aCA9IDI1NjsKKwkJbW9kZV9jb25maWctPmN1cnNvcl9oZWlnaHQgPSAyNTY7CisJfQorfQorCiBp bnQgaW50ZWxfbW9kZXNldF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwpAQCAtMTYxMTMsMjAg KzE2MTU3LDEyIEBAIGludCBpbnRlbF9tb2Rlc2V0X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRl dikKIAogCWRybV9tb2RlX2NvbmZpZ19pbml0KGRldik7CiAKKwlpbnRlbF9tb2RlX2NvbmZpZ19p bml0KGRldl9wcml2KTsKKwogCXJldCA9IGludGVsX2J3X2luaXQoZGV2X3ByaXYpOwogCWlmIChy ZXQpCiAJCXJldHVybiByZXQ7CiAKLQlkZXYtPm1vZGVfY29uZmlnLm1pbl93aWR0aCA9IDA7Ci0J ZGV2LT5tb2RlX2NvbmZpZy5taW5faGVpZ2h0ID0gMDsKLQotCWRldi0+bW9kZV9jb25maWcucHJl ZmVycmVkX2RlcHRoID0gMjQ7Ci0JZGV2LT5tb2RlX2NvbmZpZy5wcmVmZXJfc2hhZG93ID0gMTsK LQotCWRldi0+bW9kZV9jb25maWcuYWxsb3dfZmJfbW9kaWZpZXJzID0gdHJ1ZTsKLQotCWRldi0+ bW9kZV9jb25maWcuZnVuY3MgPSAmaW50ZWxfbW9kZV9mdW5jczsKLQogCWluaXRfbGxpc3RfaGVh ZCgmZGV2X3ByaXYtPmF0b21pY19oZWxwZXIuZnJlZV9saXN0KTsKIAlJTklUX1dPUksoJmRldl9w cml2LT5hdG9taWNfaGVscGVyLmZyZWVfd29yaywKIAkJICBpbnRlbF9hdG9taWNfaGVscGVyX2Zy ZWVfc3RhdGVfd29ya2VyKTsKQEAgLTE2MTM5LDM1ICsxNjE3NSw2IEBAIGludCBpbnRlbF9tb2Rl c2V0X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAogCWludGVsX3BhbmVsX3Nhbml0aXpl X3NzYyhkZXZfcHJpdik7CiAKLQkvKgotCSAqIE1heGltdW0gZnJhbWVidWZmZXIgZGltZW5zaW9u cywgY2hvc2VuIHRvIG1hdGNoCi0JICogdGhlIG1heGltdW0gcmVuZGVyIGVuZ2luZSBzdXJmYWNl IHNpemUgb24gZ2VuNCsuCi0JICovCi0JaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gNykgewot CQlkZXYtPm1vZGVfY29uZmlnLm1heF93aWR0aCA9IDE2Mzg0OwotCQlkZXYtPm1vZGVfY29uZmln Lm1heF9oZWlnaHQgPSAxNjM4NDsKLQl9IGVsc2UgaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0g NCkgewotCQlkZXYtPm1vZGVfY29uZmlnLm1heF93aWR0aCA9IDgxOTI7Ci0JCWRldi0+bW9kZV9j b25maWcubWF4X2hlaWdodCA9IDgxOTI7Ci0JfSBlbHNlIGlmIChJU19HRU4oZGV2X3ByaXYsIDMp KSB7Ci0JCWRldi0+bW9kZV9jb25maWcubWF4X3dpZHRoID0gNDA5NjsKLQkJZGV2LT5tb2RlX2Nv bmZpZy5tYXhfaGVpZ2h0ID0gNDA5NjsKLQl9IGVsc2UgewotCQlkZXYtPm1vZGVfY29uZmlnLm1h eF93aWR0aCA9IDIwNDg7Ci0JCWRldi0+bW9kZV9jb25maWcubWF4X2hlaWdodCA9IDIwNDg7Ci0J fQotCi0JaWYgKElTX0k4NDVHKGRldl9wcml2KSB8fCBJU19JODY1RyhkZXZfcHJpdikpIHsKLQkJ ZGV2LT5tb2RlX2NvbmZpZy5jdXJzb3Jfd2lkdGggPSBJU19JODQ1RyhkZXZfcHJpdikgPyA2NCA6 IDUxMjsKLQkJZGV2LT5tb2RlX2NvbmZpZy5jdXJzb3JfaGVpZ2h0ID0gMTAyMzsKLQl9IGVsc2Ug aWYgKElTX0dFTihkZXZfcHJpdiwgMikpIHsKLQkJZGV2LT5tb2RlX2NvbmZpZy5jdXJzb3Jfd2lk dGggPSA2NDsKLQkJZGV2LT5tb2RlX2NvbmZpZy5jdXJzb3JfaGVpZ2h0ID0gNjQ7Ci0JfSBlbHNl IHsKLQkJZGV2LT5tb2RlX2NvbmZpZy5jdXJzb3Jfd2lkdGggPSAyNTY7Ci0JCWRldi0+bW9kZV9j b25maWcuY3Vyc29yX2hlaWdodCA9IDI1NjsKLQl9Ci0KIAlEUk1fREVCVUdfS01TKCIlZCBkaXNw bGF5IHBpcGUlcyBhdmFpbGFibGUuXG4iLAogCQkgICAgICBJTlRFTF9OVU1fUElQRVMoZGV2X3By aXYpLAogCQkgICAgICBJTlRFTF9OVU1fUElQRVMoZGV2X3ByaXYpID4gMSA/ICJzIiA6ICIiKTsK LS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4