From: Ville Syrjala Subject: [PATCH 5/9] drm/i915: Cleanup enum pipe/enum plane_id/enum old_plane_id in initial fb readout Date: Wed, 11 Oct 2017 19:04:51 +0300 Message-ID: <20171011160455.1874-6-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7A1BC6E6DC for ; Wed, 11 Oct 2017 16:05:13 +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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClVz ZSBlbnVtIHBpcGUsIGVudW0gcGxhbmVfaWQsIGFuZCBlbnVtIG9sZF9wbGFuZV9pZCBjb25zaXN0 ZW50bHkgaW4gdGhlCmluaXRpYWwgZnJhbWVidWZmZSByZWFkb3V0LgoKdjI6IFVzZSBvbGRfcGxh bmVfaWQgaW4gdGhlIGlsayBjb2RlCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZp bGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYyB8IDU4ICsrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLQog MSBmaWxlIGNoYW5nZWQsIDMyIGluc2VydGlvbnMoKyksIDI2IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA5ZDM3Yzc1OGY3YjUuLjIxMTYwYTA2YWIz NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtNzQ1NiwxNCArNzQ1Niwx NiBAQCBpOXh4X2dldF9pbml0aWFsX3BsYW5lX2NvbmZpZyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0 YywKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+YmFzZS5kZXY7CiAJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOworCXN0cnVjdCBpbnRl bF9wbGFuZSAqcGxhbmUgPSB0b19pbnRlbF9wbGFuZShjcnRjLT5iYXNlLnByaW1hcnkpOworCWVu dW0gb2xkX3BsYW5lX2lkIHBsYW5lX2lkID0gcGxhbmUtPnBsYW5lOworCWVudW0gcGlwZSBwaXBl ID0gY3J0Yy0+cGlwZTsKIAl1MzIgdmFsLCBiYXNlLCBvZmZzZXQ7Ci0JaW50IHBpcGUgPSBjcnRj LT5waXBlLCBwbGFuZSA9IGNydGMtPnBsYW5lOwogCWludCBmb3VyY2MsIHBpeGVsX2Zvcm1hdDsK IAl1bnNpZ25lZCBpbnQgYWxpZ25lZF9oZWlnaHQ7CiAJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAq ZmI7CiAJc3RydWN0IGludGVsX2ZyYW1lYnVmZmVyICppbnRlbF9mYjsKIAotCXZhbCA9IEk5MTVf UkVBRChEU1BDTlRSKHBsYW5lKSk7CisJdmFsID0gSTkxNV9SRUFEKERTUENOVFIocGxhbmVfaWQp KTsKIAlpZiAoISh2YWwgJiBESVNQTEFZX1BMQU5FX0VOQUJMRSkpCiAJCXJldHVybjsKIApAQCAt NzQ5MCwxMiArNzQ5MiwxMiBAQCBpOXh4X2dldF9pbml0aWFsX3BsYW5lX2NvbmZpZyhzdHJ1Y3Qg aW50ZWxfY3J0YyAqY3J0YywKIAogCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDQpIHsKIAkJ aWYgKHBsYW5lX2NvbmZpZy0+dGlsaW5nKQotCQkJb2Zmc2V0ID0gSTkxNV9SRUFEKERTUFRJTEVP RkYocGxhbmUpKTsKKwkJCW9mZnNldCA9IEk5MTVfUkVBRChEU1BUSUxFT0ZGKHBsYW5lX2lkKSk7 CiAJCWVsc2UKLQkJCW9mZnNldCA9IEk5MTVfUkVBRChEU1BMSU5PRkYocGxhbmUpKTsKLQkJYmFz ZSA9IEk5MTVfUkVBRChEU1BTVVJGKHBsYW5lKSkgJiAweGZmZmZmMDAwOworCQkJb2Zmc2V0ID0g STkxNV9SRUFEKERTUExJTk9GRihwbGFuZV9pZCkpOworCQliYXNlID0gSTkxNV9SRUFEKERTUFNV UkYocGxhbmVfaWQpKSAmIDB4ZmZmZmYwMDA7CiAJfSBlbHNlIHsKLQkJYmFzZSA9IEk5MTVfUkVB RChEU1BBRERSKHBsYW5lKSk7CisJCWJhc2UgPSBJOTE1X1JFQUQoRFNQQUREUihwbGFuZV9pZCkp OwogCX0KIAlwbGFuZV9jb25maWctPmJhc2UgPSBiYXNlOwogCkBAIC03NTAzLDE1ICs3NTA1LDE1 IEBAIGk5eHhfZ2V0X2luaXRpYWxfcGxhbmVfY29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRj LAogCWZiLT53aWR0aCA9ICgodmFsID4+IDE2KSAmIDB4ZmZmKSArIDE7CiAJZmItPmhlaWdodCA9 ICgodmFsID4+IDApICYgMHhmZmYpICsgMTsKIAotCXZhbCA9IEk5MTVfUkVBRChEU1BTVFJJREUo cGlwZSkpOworCXZhbCA9IEk5MTVfUkVBRChEU1BTVFJJREUocGxhbmVfaWQpKTsKIAlmYi0+cGl0 Y2hlc1swXSA9IHZhbCAmIDB4ZmZmZmZmYzA7CiAKIAlhbGlnbmVkX2hlaWdodCA9IGludGVsX2Zi X2FsaWduX2hlaWdodChmYiwgMCwgZmItPmhlaWdodCk7CiAKIAlwbGFuZV9jb25maWctPnNpemUg PSBmYi0+cGl0Y2hlc1swXSAqIGFsaWduZWRfaGVpZ2h0OwogCi0JRFJNX0RFQlVHX0tNUygicGlw ZS9wbGFuZSAlYy8lZCB3aXRoIGZiOiBzaXplPSVkeCVkQCVkLCBvZmZzZXQ9JXgsIHBpdGNoICVk LCBzaXplIDB4JXhcbiIsCi0JCSAgICAgIHBpcGVfbmFtZShwaXBlKSwgcGxhbmUsIGZiLT53aWR0 aCwgZmItPmhlaWdodCwKKwlEUk1fREVCVUdfS01TKCIlcy8lcyB3aXRoIGZiOiBzaXplPSVkeCVk QCVkLCBvZmZzZXQ9JXgsIHBpdGNoICVkLCBzaXplIDB4JXhcbiIsCisJCSAgICAgIGNydGMtPmJh c2UubmFtZSwgcGxhbmUtPmJhc2UubmFtZSwgZmItPndpZHRoLCBmYi0+aGVpZ2h0LAogCQkgICAg ICBmYi0+Zm9ybWF0LT5jcHBbMF0gKiA4LCBiYXNlLCBmYi0+cGl0Y2hlc1swXSwKIAkJICAgICAg cGxhbmVfY29uZmlnLT5zaXplKTsKIApAQCAtODQ4Miw4ICs4NDg0LDEwIEBAIHNreWxha2VfZ2V0 X2luaXRpYWxfcGxhbmVfY29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogewogCXN0cnVj dCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5iYXNlLmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CisJc3RydWN0IGludGVsX3BsYW5lICpwbGFu ZSA9IHRvX2ludGVsX3BsYW5lKGNydGMtPmJhc2UucHJpbWFyeSk7CisJZW51bSBwbGFuZV9pZCBw bGFuZV9pZCA9IHBsYW5lLT5pZDsKKwllbnVtIHBpcGUgcGlwZSA9IGNydGMtPnBpcGU7CiAJdTMy IHZhbCwgYmFzZSwgb2Zmc2V0LCBzdHJpZGVfbXVsdCwgdGlsaW5nOwotCWludCBwaXBlID0gY3J0 Yy0+cGlwZTsKIAlpbnQgZm91cmNjLCBwaXhlbF9mb3JtYXQ7CiAJdW5zaWduZWQgaW50IGFsaWdu ZWRfaGVpZ2h0OwogCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiOwpAQCAtODQ5OSw3ICs4NTAz LDcgQEAgc2t5bGFrZV9nZXRfaW5pdGlhbF9wbGFuZV9jb25maWcoc3RydWN0IGludGVsX2NydGMg KmNydGMsCiAKIAlmYi0+ZGV2ID0gZGV2OwogCi0JdmFsID0gSTkxNV9SRUFEKFBMQU5FX0NUTChw aXBlLCAwKSk7CisJdmFsID0gSTkxNV9SRUFEKFBMQU5FX0NUTChwaXBlLCBwbGFuZV9pZCkpOwog CWlmICghKHZhbCAmIFBMQU5FX0NUTF9FTkFCTEUpKQogCQlnb3RvIGVycm9yOwogCkBAIC04NTM1 LDE2ICs4NTM5LDE2IEBAIHNreWxha2VfZ2V0X2luaXRpYWxfcGxhbmVfY29uZmlnKHN0cnVjdCBp bnRlbF9jcnRjICpjcnRjLAogCQlnb3RvIGVycm9yOwogCX0KIAotCWJhc2UgPSBJOTE1X1JFQUQo UExBTkVfU1VSRihwaXBlLCAwKSkgJiAweGZmZmZmMDAwOworCWJhc2UgPSBJOTE1X1JFQUQoUExB TkVfU1VSRihwaXBlLCBwbGFuZV9pZCkpICYgMHhmZmZmZjAwMDsKIAlwbGFuZV9jb25maWctPmJh c2UgPSBiYXNlOwogCi0Jb2Zmc2V0ID0gSTkxNV9SRUFEKFBMQU5FX09GRlNFVChwaXBlLCAwKSk7 CisJb2Zmc2V0ID0gSTkxNV9SRUFEKFBMQU5FX09GRlNFVChwaXBlLCBwbGFuZV9pZCkpOwogCi0J dmFsID0gSTkxNV9SRUFEKFBMQU5FX1NJWkUocGlwZSwgMCkpOworCXZhbCA9IEk5MTVfUkVBRChQ TEFORV9TSVpFKHBpcGUsIHBsYW5lX2lkKSk7CiAJZmItPmhlaWdodCA9ICgodmFsID4+IDE2KSAm IDB4ZmZmKSArIDE7CiAJZmItPndpZHRoID0gKCh2YWwgPj4gMCkgJiAweDFmZmYpICsgMTsKIAot CXZhbCA9IEk5MTVfUkVBRChQTEFORV9TVFJJREUocGlwZSwgMCkpOworCXZhbCA9IEk5MTVfUkVB RChQTEFORV9TVFJJREUocGlwZSwgcGxhbmVfaWQpKTsKIAlzdHJpZGVfbXVsdCA9IGludGVsX2Zi X3N0cmlkZV9hbGlnbm1lbnQoZmIsIDApOwogCWZiLT5waXRjaGVzWzBdID0gKHZhbCAmIDB4M2Zm KSAqIHN0cmlkZV9tdWx0OwogCkBAIC04NTUyLDggKzg1NTYsOCBAQCBza3lsYWtlX2dldF9pbml0 aWFsX3BsYW5lX2NvbmZpZyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAogCXBsYW5lX2NvbmZp Zy0+c2l6ZSA9IGZiLT5waXRjaGVzWzBdICogYWxpZ25lZF9oZWlnaHQ7CiAKLQlEUk1fREVCVUdf S01TKCJwaXBlICVjIHdpdGggZmI6IHNpemU9JWR4JWRAJWQsIG9mZnNldD0leCwgcGl0Y2ggJWQs IHNpemUgMHgleFxuIiwKLQkJICAgICAgcGlwZV9uYW1lKHBpcGUpLCBmYi0+d2lkdGgsIGZiLT5o ZWlnaHQsCisJRFJNX0RFQlVHX0tNUygiJXMvJXMgd2l0aCBmYjogc2l6ZT0lZHglZEAlZCwgb2Zm c2V0PSV4LCBwaXRjaCAlZCwgc2l6ZSAweCV4XG4iLAorCQkgICAgICBjcnRjLT5iYXNlLm5hbWUs IHBsYW5lLT5iYXNlLm5hbWUsIGZiLT53aWR0aCwgZmItPmhlaWdodCwKIAkJICAgICAgZmItPmZv cm1hdC0+Y3BwWzBdICogOCwgYmFzZSwgZmItPnBpdGNoZXNbMF0sCiAJCSAgICAgIHBsYW5lX2Nv bmZpZy0+c2l6ZSk7CiAKQEAgLTg1OTQsMTQgKzg1OTgsMTYgQEAgaXJvbmxha2VfZ2V0X2luaXRp YWxfcGxhbmVfY29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogewogCXN0cnVjdCBkcm1f ZGV2aWNlICpkZXYgPSBjcnRjLT5iYXNlLmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CisJc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSA9IHRv X2ludGVsX3BsYW5lKGNydGMtPmJhc2UucHJpbWFyeSk7CisJZW51bSBvbGRfcGxhbmVfaWQgcGxh bmVfaWQgPSBwbGFuZS0+cGxhbmU7CisJZW51bSBwaXBlIHBpcGUgPSBjcnRjLT5waXBlOwogCXUz MiB2YWwsIGJhc2UsIG9mZnNldDsKLQlpbnQgcGlwZSA9IGNydGMtPnBpcGU7CiAJaW50IGZvdXJj YywgcGl4ZWxfZm9ybWF0OwogCXVuc2lnbmVkIGludCBhbGlnbmVkX2hlaWdodDsKIAlzdHJ1Y3Qg ZHJtX2ZyYW1lYnVmZmVyICpmYjsKIAlzdHJ1Y3QgaW50ZWxfZnJhbWVidWZmZXIgKmludGVsX2Zi OwogCi0JdmFsID0gSTkxNV9SRUFEKERTUENOVFIocGlwZSkpOworCXZhbCA9IEk5MTVfUkVBRChE U1BDTlRSKHBsYW5lX2lkKSk7CiAJaWYgKCEodmFsICYgRElTUExBWV9QTEFORV9FTkFCTEUpKQog CQlyZXR1cm47CiAKQEAgLTg2MjYsMTQgKzg2MzIsMTQgQEAgaXJvbmxha2VfZ2V0X2luaXRpYWxf cGxhbmVfY29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCWZvdXJjYyA9IGk5eHhfZm9y bWF0X3RvX2ZvdXJjYyhwaXhlbF9mb3JtYXQpOwogCWZiLT5mb3JtYXQgPSBkcm1fZm9ybWF0X2lu Zm8oZm91cmNjKTsKIAotCWJhc2UgPSBJOTE1X1JFQUQoRFNQU1VSRihwaXBlKSkgJiAweGZmZmZm MDAwOworCWJhc2UgPSBJOTE1X1JFQUQoRFNQU1VSRihwbGFuZV9pZCkpICYgMHhmZmZmZjAwMDsK IAlpZiAoSVNfSEFTV0VMTChkZXZfcHJpdikgfHwgSVNfQlJPQURXRUxMKGRldl9wcml2KSkgewot CQlvZmZzZXQgPSBJOTE1X1JFQUQoRFNQT0ZGU0VUKHBpcGUpKTsKKwkJb2Zmc2V0ID0gSTkxNV9S RUFEKERTUE9GRlNFVChwbGFuZV9pZCkpOwogCX0gZWxzZSB7CiAJCWlmIChwbGFuZV9jb25maWct PnRpbGluZykKLQkJCW9mZnNldCA9IEk5MTVfUkVBRChEU1BUSUxFT0ZGKHBpcGUpKTsKKwkJCW9m ZnNldCA9IEk5MTVfUkVBRChEU1BUSUxFT0ZGKHBsYW5lX2lkKSk7CiAJCWVsc2UKLQkJCW9mZnNl dCA9IEk5MTVfUkVBRChEU1BMSU5PRkYocGlwZSkpOworCQkJb2Zmc2V0ID0gSTkxNV9SRUFEKERT UExJTk9GRihwbGFuZV9pZCkpOwogCX0KIAlwbGFuZV9jb25maWctPmJhc2UgPSBiYXNlOwogCkBA IC04NjQxLDE1ICs4NjQ3LDE1IEBAIGlyb25sYWtlX2dldF9pbml0aWFsX3BsYW5lX2NvbmZpZyhz dHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAlmYi0+d2lkdGggPSAoKHZhbCA+PiAxNikgJiAweGZm ZikgKyAxOwogCWZiLT5oZWlnaHQgPSAoKHZhbCA+PiAwKSAmIDB4ZmZmKSArIDE7CiAKLQl2YWwg PSBJOTE1X1JFQUQoRFNQU1RSSURFKHBpcGUpKTsKKwl2YWwgPSBJOTE1X1JFQUQoRFNQU1RSSURF KHBsYW5lX2lkKSk7CiAJZmItPnBpdGNoZXNbMF0gPSB2YWwgJiAweGZmZmZmZmMwOwogCiAJYWxp Z25lZF9oZWlnaHQgPSBpbnRlbF9mYl9hbGlnbl9oZWlnaHQoZmIsIDAsIGZiLT5oZWlnaHQpOwog CiAJcGxhbmVfY29uZmlnLT5zaXplID0gZmItPnBpdGNoZXNbMF0gKiBhbGlnbmVkX2hlaWdodDsK IAotCURSTV9ERUJVR19LTVMoInBpcGUgJWMgd2l0aCBmYjogc2l6ZT0lZHglZEAlZCwgb2Zmc2V0 PSV4LCBwaXRjaCAlZCwgc2l6ZSAweCV4XG4iLAotCQkgICAgICBwaXBlX25hbWUocGlwZSksIGZi LT53aWR0aCwgZmItPmhlaWdodCwKKwlEUk1fREVCVUdfS01TKCIlcy8lcyB3aXRoIGZiOiBzaXpl PSVkeCVkQCVkLCBvZmZzZXQ9JXgsIHBpdGNoICVkLCBzaXplIDB4JXhcbiIsCisJCSAgICAgIGNy dGMtPmJhc2UubmFtZSwgcGxhbmUtPmJhc2UubmFtZSwgZmItPndpZHRoLCBmYi0+aGVpZ2h0LAog CQkgICAgICBmYi0+Zm9ybWF0LT5jcHBbMF0gKiA4LCBiYXNlLCBmYi0+cGl0Y2hlc1swXSwKIAkJ ICAgICAgcGxhbmVfY29uZmlnLT5zaXplKTsKIAotLSAKMi4xMy42CgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK