From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville Syrjala Subject: [PATCH 6/9] drm/i915: Nuke ironlake_get_initial_plane_config() Date: Wed, 11 Oct 2017 19:04:52 +0300 Message-ID: <20171011160455.1874-7-ville.syrjala@linux.intel.com> References: <20171011160455.1874-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6A1F96E6E4 for ; Wed, 11 Oct 2017 16:05:17 +0000 (UTC) In-Reply-To: <20171011160455.1874-1-ville.syrjala@linux.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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClRo ZSBvbmx5IHJlbGV2YW50IGRpZmZlcmVuY2UgYmV0d2VlbiBpOXh4X2dldF9pbml0aWFsX3BsYW5l X2NvbmZpZygpIGFuZAppcm9ubGFrZV9nZXRfaW5pdGlhbF9wbGFuZV9jb25maWcoKSBpcyB0aGUg SFNXL0JEVyBUSUxFT0ZGIGhhbmRsaW5nLgpBZGQgdGhhdCB0byBpOXh4X2dldF9pbml0aWFsX3Bs YW5lX2NvbmZpZygpIGFuZCBudWtlCmlyb25sYWtlX2dldF9pbml0aWFsX3BsYW5lX2NvbmZpZygp LgoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4Lmlu dGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA3OSAr KystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA2IGlu c2VydGlvbnMoKyksIDczIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYwppbmRleCAyMTE2MGEwNmFiMzYuLjgyYmUyMzQyZDFjNiAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYwpAQCAtNzQ5MCw3ICs3NDkwLDEwIEBAIGk5eHhfZ2V0X2luaXRpYWxf cGxhbmVfY29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCWZvdXJjYyA9IGk5eHhfZm9y bWF0X3RvX2ZvdXJjYyhwaXhlbF9mb3JtYXQpOwogCWZiLT5mb3JtYXQgPSBkcm1fZm9ybWF0X2lu Zm8oZm91cmNjKTsKIAotCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDQpIHsKKwlpZiAoSVNf SEFTV0VMTChkZXZfcHJpdikgfHwgSVNfQlJPQURXRUxMKGRldl9wcml2KSkgeworCQlvZmZzZXQg PSBJOTE1X1JFQUQoRFNQT0ZGU0VUKHBsYW5lX2lkKSk7CisJCWJhc2UgPSBJOTE1X1JFQUQoRFNQ U1VSRihwbGFuZV9pZCkpICYgMHhmZmZmZjAwMDsKKwl9IGVsc2UgaWYgKElOVEVMX0dFTihkZXZf cHJpdikgPj0gNCkgewogCQlpZiAocGxhbmVfY29uZmlnLT50aWxpbmcpCiAJCQlvZmZzZXQgPSBJ OTE1X1JFQUQoRFNQVElMRU9GRihwbGFuZV9pZCkpOwogCQllbHNlCkBAIC04NTkyLDc2ICs4NTk1 LDYgQEAgc3RhdGljIHZvaWQgaXJvbmxha2VfZ2V0X3BmaXRfY29uZmlnKHN0cnVjdCBpbnRlbF9j cnRjICpjcnRjLAogCX0KIH0KIAotc3RhdGljIHZvaWQKLWlyb25sYWtlX2dldF9pbml0aWFsX3Bs YW5lX2NvbmZpZyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKLQkJCQkgIHN0cnVjdCBpbnRlbF9p bml0aWFsX3BsYW5lX2NvbmZpZyAqcGxhbmVfY29uZmlnKQotewotCXN0cnVjdCBkcm1fZGV2aWNl ICpkZXYgPSBjcnRjLT5iYXNlLmRldjsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSB0b19pOTE1KGRldik7Ci0Jc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSA9IHRvX2ludGVs X3BsYW5lKGNydGMtPmJhc2UucHJpbWFyeSk7Ci0JZW51bSBvbGRfcGxhbmVfaWQgcGxhbmVfaWQg PSBwbGFuZS0+cGxhbmU7Ci0JZW51bSBwaXBlIHBpcGUgPSBjcnRjLT5waXBlOwotCXUzMiB2YWws IGJhc2UsIG9mZnNldDsKLQlpbnQgZm91cmNjLCBwaXhlbF9mb3JtYXQ7Ci0JdW5zaWduZWQgaW50 IGFsaWduZWRfaGVpZ2h0OwotCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiOwotCXN0cnVjdCBp bnRlbF9mcmFtZWJ1ZmZlciAqaW50ZWxfZmI7Ci0KLQl2YWwgPSBJOTE1X1JFQUQoRFNQQ05UUihw bGFuZV9pZCkpOwotCWlmICghKHZhbCAmIERJU1BMQVlfUExBTkVfRU5BQkxFKSkKLQkJcmV0dXJu OwotCi0JaW50ZWxfZmIgPSBremFsbG9jKHNpemVvZigqaW50ZWxfZmIpLCBHRlBfS0VSTkVMKTsK LQlpZiAoIWludGVsX2ZiKSB7Ci0JCURSTV9ERUJVR19LTVMoImZhaWxlZCB0byBhbGxvYyBmYlxu Iik7Ci0JCXJldHVybjsKLQl9Ci0KLQlmYiA9ICZpbnRlbF9mYi0+YmFzZTsKLQotCWZiLT5kZXYg PSBkZXY7Ci0KLQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA0KSB7Ci0JCWlmICh2YWwgJiBE SVNQUExBTkVfVElMRUQpIHsKLQkJCXBsYW5lX2NvbmZpZy0+dGlsaW5nID0gSTkxNV9USUxJTkdf WDsKLQkJCWZiLT5tb2RpZmllciA9IEk5MTVfRk9STUFUX01PRF9YX1RJTEVEOwotCQl9Ci0JfQot Ci0JcGl4ZWxfZm9ybWF0ID0gdmFsICYgRElTUFBMQU5FX1BJWEZPUk1BVF9NQVNLOwotCWZvdXJj YyA9IGk5eHhfZm9ybWF0X3RvX2ZvdXJjYyhwaXhlbF9mb3JtYXQpOwotCWZiLT5mb3JtYXQgPSBk cm1fZm9ybWF0X2luZm8oZm91cmNjKTsKLQotCWJhc2UgPSBJOTE1X1JFQUQoRFNQU1VSRihwbGFu ZV9pZCkpICYgMHhmZmZmZjAwMDsKLQlpZiAoSVNfSEFTV0VMTChkZXZfcHJpdikgfHwgSVNfQlJP QURXRUxMKGRldl9wcml2KSkgewotCQlvZmZzZXQgPSBJOTE1X1JFQUQoRFNQT0ZGU0VUKHBsYW5l X2lkKSk7Ci0JfSBlbHNlIHsKLQkJaWYgKHBsYW5lX2NvbmZpZy0+dGlsaW5nKQotCQkJb2Zmc2V0 ID0gSTkxNV9SRUFEKERTUFRJTEVPRkYocGxhbmVfaWQpKTsKLQkJZWxzZQotCQkJb2Zmc2V0ID0g STkxNV9SRUFEKERTUExJTk9GRihwbGFuZV9pZCkpOwotCX0KLQlwbGFuZV9jb25maWctPmJhc2Ug PSBiYXNlOwotCi0JdmFsID0gSTkxNV9SRUFEKFBJUEVTUkMocGlwZSkpOwotCWZiLT53aWR0aCA9 ICgodmFsID4+IDE2KSAmIDB4ZmZmKSArIDE7Ci0JZmItPmhlaWdodCA9ICgodmFsID4+IDApICYg MHhmZmYpICsgMTsKLQotCXZhbCA9IEk5MTVfUkVBRChEU1BTVFJJREUocGxhbmVfaWQpKTsKLQlm Yi0+cGl0Y2hlc1swXSA9IHZhbCAmIDB4ZmZmZmZmYzA7Ci0KLQlhbGlnbmVkX2hlaWdodCA9IGlu dGVsX2ZiX2FsaWduX2hlaWdodChmYiwgMCwgZmItPmhlaWdodCk7Ci0KLQlwbGFuZV9jb25maWct PnNpemUgPSBmYi0+cGl0Y2hlc1swXSAqIGFsaWduZWRfaGVpZ2h0OwotCi0JRFJNX0RFQlVHX0tN UygiJXMvJXMgd2l0aCBmYjogc2l6ZT0lZHglZEAlZCwgb2Zmc2V0PSV4LCBwaXRjaCAlZCwgc2l6 ZSAweCV4XG4iLAotCQkgICAgICBjcnRjLT5iYXNlLm5hbWUsIHBsYW5lLT5iYXNlLm5hbWUsIGZi LT53aWR0aCwgZmItPmhlaWdodCwKLQkJICAgICAgZmItPmZvcm1hdC0+Y3BwWzBdICogOCwgYmFz ZSwgZmItPnBpdGNoZXNbMF0sCi0JCSAgICAgIHBsYW5lX2NvbmZpZy0+c2l6ZSk7Ci0KLQlwbGFu ZV9jb25maWctPmZiID0gaW50ZWxfZmI7Ci19Ci0KIHN0YXRpYyBib29sIGlyb25sYWtlX2dldF9w aXBlX2NvbmZpZyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAkJCQkgICAgIHN0cnVjdCBpbnRl bF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZykKIHsKQEAgLTE0MTQwLDcgKzE0MDczLDcgQEAgdm9p ZCBpbnRlbF9pbml0X2Rpc3BsYXlfaG9va3Moc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KQogCX0gZWxzZSBpZiAoSEFTX0RESShkZXZfcHJpdikpIHsKIAkJZGV2X3ByaXYtPmRpc3Bs YXkuZ2V0X3BpcGVfY29uZmlnID0gaGFzd2VsbF9nZXRfcGlwZV9jb25maWc7CiAJCWRldl9wcml2 LT5kaXNwbGF5LmdldF9pbml0aWFsX3BsYW5lX2NvbmZpZyA9Ci0JCQlpcm9ubGFrZV9nZXRfaW5p dGlhbF9wbGFuZV9jb25maWc7CisJCQlpOXh4X2dldF9pbml0aWFsX3BsYW5lX2NvbmZpZzsKIAkJ ZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19jb21wdXRlX2Nsb2NrID0KIAkJCWhhc3dlbGxfY3J0Y19j b21wdXRlX2Nsb2NrOwogCQlkZXZfcHJpdi0+ZGlzcGxheS5jcnRjX2VuYWJsZSA9IGhhc3dlbGxf Y3J0Y19lbmFibGU7CkBAIC0xNDE0OCw3ICsxNDA4MSw3IEBAIHZvaWQgaW50ZWxfaW5pdF9kaXNw bGF5X2hvb2tzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAl9IGVsc2UgaWYg KEhBU19QQ0hfU1BMSVQoZGV2X3ByaXYpKSB7CiAJCWRldl9wcml2LT5kaXNwbGF5LmdldF9waXBl X2NvbmZpZyA9IGlyb25sYWtlX2dldF9waXBlX2NvbmZpZzsKIAkJZGV2X3ByaXYtPmRpc3BsYXku Z2V0X2luaXRpYWxfcGxhbmVfY29uZmlnID0KLQkJCWlyb25sYWtlX2dldF9pbml0aWFsX3BsYW5l X2NvbmZpZzsKKwkJCWk5eHhfZ2V0X2luaXRpYWxfcGxhbmVfY29uZmlnOwogCQlkZXZfcHJpdi0+ ZGlzcGxheS5jcnRjX2NvbXB1dGVfY2xvY2sgPQogCQkJaXJvbmxha2VfY3J0Y19jb21wdXRlX2Ns b2NrOwogCQlkZXZfcHJpdi0+ZGlzcGxheS5jcnRjX2VuYWJsZSA9IGlyb25sYWtlX2NydGNfZW5h YmxlOwotLSAKMi4xMy42CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK