From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 07/42] drm/i915: Get rid of crtc->new_enabled, v2. Date: Mon, 11 May 2015 16:24:43 +0200 Message-ID: <1431354318-11995-8-git-send-email-maarten.lankhorst@linux.intel.com> References: <1431354318-11995-1-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTP id 18B366E295 for ; Mon, 11 May 2015 07:25:44 -0700 (PDT) In-Reply-To: <1431354318-11995-1-git-send-email-maarten.lankhorst@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 Cc: Ander Conselvan de Oliveira List-Id: intel-gfx@lists.freedesktop.org Tm8gbG9uZ2VyIGFueSBkaWZmZXJlbnQgZnJvbSBzdGF0ZS0+ZW5hYmxlLgoKdjI6IEtlZXAgdHJh Y2sgb2YgZW5hYmxlZCBjcnRjJ3MgZm9yIGNhbGxpbmcgaW50ZWxfY3J0Y19yZXN0b3JlX21vZGUu CgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGlu dXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8 IDYzICsrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgIDEgLQogMiBmaWxlcyBjaGFuZ2VkLCAxOCBpbnNlcnRp b25zKCspLCA0NiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK aW5kZXggYTljZTgyNzYwMWQ4Li44YzJmYjk1MTAyOWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKQEAgLTk3MzMsNyArOTczMyw3IEBAIGJvb2wgaW50ZWxfZ2V0X2xvYWRfZGV0 ZWN0X3BpcGUoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciwKIHJldHJ5OgogCXJldCA9 IGRybV9tb2Rlc2V0X2xvY2soJmNvbmZpZy0+Y29ubmVjdGlvbl9tdXRleCwgY3R4KTsKIAlpZiAo cmV0KQotCQlnb3RvIGZhaWxfdW5sb2NrOworCQlnb3RvIGZhaWw7CiAKIAkvKgogCSAqIEFsZ29y aXRobSBnZXRzIGEgbGl0dGxlIG1lc3N5OgpAQCAtOTc1MSwxMCArOTc1MSwxMCBAQCByZXRyeToK IAogCQlyZXQgPSBkcm1fbW9kZXNldF9sb2NrKCZjcnRjLT5tdXRleCwgY3R4KTsKIAkJaWYgKHJl dCkKLQkJCWdvdG8gZmFpbF91bmxvY2s7CisJCQlnb3RvIGZhaWw7CiAJCXJldCA9IGRybV9tb2Rl c2V0X2xvY2soJmNydGMtPnByaW1hcnktPm11dGV4LCBjdHgpOwogCQlpZiAocmV0KQotCQkJZ290 byBmYWlsX3VubG9jazsKKwkJCWdvdG8gZmFpbDsKIAogCQlvbGQtPmRwbXNfbW9kZSA9IGNvbm5l Y3Rvci0+ZHBtczsKIAkJb2xkLT5sb2FkX2RldGVjdF90ZW1wID0gZmFsc2U7CkBAIC05NzczLDkg Kzk3NzMsNiBAQCByZXRyeToKIAkJCWNvbnRpbnVlOwogCQlpZiAocG9zc2libGVfY3J0Yy0+c3Rh dGUtPmVuYWJsZSkKIAkJCWNvbnRpbnVlOwotCQkvKiBUaGlzIGNhbiBvY2N1ciB3aGVuIGFwcGx5 aW5nIHRoZSBwaXBlIEEgcXVpcmsgb24gcmVzdW1lLiAqLwotCQlpZiAodG9faW50ZWxfY3J0Yyhw b3NzaWJsZV9jcnRjKS0+bmV3X2VuYWJsZWQpCi0JCQljb250aW51ZTsKIAogCQljcnRjID0gcG9z c2libGVfY3J0YzsKIAkJYnJlYWs7CkBAIC05Nzg2LDE4ICs5NzgzLDE3IEBAIHJldHJ5OgogCSAq LwogCWlmICghY3J0YykgewogCQlEUk1fREVCVUdfS01TKCJubyBwaXBlIGF2YWlsYWJsZSBmb3Ig bG9hZC1kZXRlY3RcbiIpOwotCQlnb3RvIGZhaWxfdW5sb2NrOworCQlnb3RvIGZhaWw7CiAJfQog CiAJcmV0ID0gZHJtX21vZGVzZXRfbG9jaygmY3J0Yy0+bXV0ZXgsIGN0eCk7CiAJaWYgKHJldCkK LQkJZ290byBmYWlsX3VubG9jazsKKwkJZ290byBmYWlsOwogCXJldCA9IGRybV9tb2Rlc2V0X2xv Y2soJmNydGMtPnByaW1hcnktPm11dGV4LCBjdHgpOwogCWlmIChyZXQpCi0JCWdvdG8gZmFpbF91 bmxvY2s7CisJCWdvdG8gZmFpbDsKIAogCWludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMp OwotCWludGVsX2NydGMtPm5ld19lbmFibGVkID0gdHJ1ZTsKIAlvbGQtPmRwbXNfbW9kZSA9IGNv bm5lY3Rvci0+ZHBtczsKIAlvbGQtPmxvYWRfZGV0ZWN0X3RlbXAgPSB0cnVlOwogCW9sZC0+cmVs ZWFzZV9mYiA9IE5VTEw7CkBAIC05ODY1LDkgKzk4NjEsNyBAQCByZXRyeToKIAlpbnRlbF93YWl0 X2Zvcl92YmxhbmsoZGV2LCBpbnRlbF9jcnRjLT5waXBlKTsKIAlyZXR1cm4gdHJ1ZTsKIAotIGZh aWw6Ci0JaW50ZWxfY3J0Yy0+bmV3X2VuYWJsZWQgPSBjcnRjLT5zdGF0ZS0+ZW5hYmxlOwotZmFp bF91bmxvY2s6CitmYWlsOgogCWRybV9hdG9taWNfc3RhdGVfZnJlZShzdGF0ZSk7CiAJc3RhdGUg PSBOVUxMOwogCkBAIC05OTEzLDggKzk5MDcsNiBAQCB2b2lkIGludGVsX3JlbGVhc2VfbG9hZF9k ZXRlY3RfcGlwZShzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLAogCQlpZiAoSVNfRVJS KGNydGNfc3RhdGUpKQogCQkJZ290byBmYWlsOwogCi0JCWludGVsX2NydGMtPm5ld19lbmFibGVk ID0gZmFsc2U7Ci0KIAkJY29ubmVjdG9yX3N0YXRlLT5iZXN0X2VuY29kZXIgPSBOVUxMOwogCQlj b25uZWN0b3Jfc3RhdGUtPmNydGMgPSBOVUxMOwogCkBAIC0xMTA1MiwyMSArMTEwNDQsNiBAQCBz dGF0aWMgY29uc3Qgc3RydWN0IGRybV9jcnRjX2hlbHBlcl9mdW5jcyBpbnRlbF9oZWxwZXJfZnVu Y3MgPSB7CiAJLmF0b21pY19mbHVzaCA9IGludGVsX2ZpbmlzaF9jcnRjX2NvbW1pdCwKIH07CiAK LS8qKgotICogaW50ZWxfbW9kZXNldF91cGRhdGVfc3RhZ2VkX291dHB1dF9zdGF0ZQotICoKLSAq IFVwZGF0ZXMgdGhlIHN0YWdlZCBvdXRwdXQgY29uZmlndXJhdGlvbiBzdGF0ZSwgZS5nLiBhZnRl ciB3ZSd2ZSByZWFkIG91dCB0aGUKLSAqIGN1cnJlbnQgaHcgc3RhdGUuCi0gKi8KLXN0YXRpYyB2 b2lkIGludGVsX21vZGVzZXRfdXBkYXRlX3N0YWdlZF9vdXRwdXRfc3RhdGUoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKLXsKLQlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YzsKLQotCWZvcl9lYWNoX2lu dGVsX2NydGMoZGV2LCBjcnRjKSB7Ci0JCWNydGMtPm5ld19lbmFibGVkID0gY3J0Yy0+YmFzZS5z dGF0ZS0+ZW5hYmxlOwotCX0KLX0KLQogLyogVHJhbnNpdGlvbmFsIGhlbHBlciB0byBjb3B5IGN1 cnJlbnQgY29ubmVjdG9yL2VuY29kZXIgc3RhdGUgdG8KICAqIGNvbm5lY3Rvci0+c3RhdGUuIFRo aXMgaXMgbmVlZGVkIHNvIHRoYXQgY29kZSB0aGF0IGlzIHBhcnRpYWxseQogICogY29udmVydGVk IHRvIGF0b21pYyBkb2VzIHRoZSByaWdodCB0aGluZy4KQEAgLTExMTE5LDEwICsxMTA5Niw2IEBA IHN0YXRpYyB2b2lkIGludGVsX21vZGVzZXRfZml4dXBfc3RhdGUoc3RydWN0IGRybV9hdG9taWNf c3RhdGUgKnN0YXRlKQogCQljcnRjLT5iYXNlLmVuYWJsZWQgPSBjcnRjLT5iYXNlLnN0YXRlLT5l bmFibGU7CiAJCWNydGMtPmNvbmZpZyA9IHRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+YmFzZS5z dGF0ZSk7CiAJfQotCi0JLyogQ29weSB0aGUgbmV3IGNvbmZpZ3VyYXRpb24gdG8gdGhlIHN0YWdl ZCBzdGF0ZSwgdG8ga2VlcCB0aGUgZmV3Ci0JICogcGllY2VzIG9mIGNvZGUgdGhhdCBoYXZlbid0 IGJlZW4gY29udmVydGVkIHlldCBoYXBweSAqLwotCWludGVsX21vZGVzZXRfdXBkYXRlX3N0YWdl ZF9vdXRwdXRfc3RhdGUoc3RhdGUtPmRldik7CiB9CiAKIHN0YXRpYyB2b2lkCkBAIC0xMjQxNSw5 ICsxMjM4OCw2IEBAIHZvaWQgaW50ZWxfY3J0Y19yZXN0b3JlX21vZGUoc3RydWN0IGRybV9jcnRj ICpjcnRjKQogCX0KIAogCWZvcl9lYWNoX2ludGVsX2NydGMoZGV2LCBpbnRlbF9jcnRjKSB7Ci0J CWlmIChpbnRlbF9jcnRjLT5uZXdfZW5hYmxlZCA9PSBpbnRlbF9jcnRjLT5iYXNlLmVuYWJsZWQp Ci0JCQljb250aW51ZTsKLQogCQljcnRjX3N0YXRlID0gaW50ZWxfYXRvbWljX2dldF9jcnRjX3N0 YXRlKHN0YXRlLCBpbnRlbF9jcnRjKTsKIAkJaWYgKElTX0VSUihjcnRjX3N0YXRlKSkgewogCQkJ RFJNX0RFQlVHX0tNUygiRmFpbGVkIHRvIGFkZCBbQ1JUQzolZF0gdG8gc3RhdGU6ICVsZFxuIiwK QEAgLTEyNDI2LDkgKzEyMzk2LDYgQEAgdm9pZCBpbnRlbF9jcnRjX3Jlc3RvcmVfbW9kZShzdHJ1 Y3QgZHJtX2NydGMgKmNydGMpCiAJCQljb250aW51ZTsKIAkJfQogCi0JCWNydGNfc3RhdGUtPmJh c2UuYWN0aXZlID0gY3J0Y19zdGF0ZS0+YmFzZS5lbmFibGUgPQotCQkJaW50ZWxfY3J0Yy0+bmV3 X2VuYWJsZWQ7Ci0KIAkJaWYgKCZpbnRlbF9jcnRjLT5iYXNlID09IGNydGMpCiAJCQlkcm1fbW9k ZV9jb3B5KCZjcnRjX3N0YXRlLT5iYXNlLm1vZGUsICZjcnRjLT5tb2RlKTsKIAl9CkBAIC0xNDY3 OSw3ICsxNDY0Niw4IEBAIHN0YXRpYyBib29sIHByaW1hcnlfZ2V0X2h3X3N0YXRlKHN0cnVjdCBp bnRlbF9jcnRjICpjcnRjKQogCXJldHVybiBJOTE1X1JFQUQoRFNQQ05UUihjcnRjLT5wbGFuZSkp ICYgRElTUExBWV9QTEFORV9FTkFCTEU7CiB9CiAKLXN0YXRpYyB2b2lkIGludGVsX21vZGVzZXRf cmVhZG91dF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQorc3RhdGljIHZvaWQgaW50 ZWxfbW9kZXNldF9yZWFkb3V0X2h3X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCisJCQkJ CSAgIHVuc2lnbmVkICpjcnRjX21hc2spCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAllbnVtIHBpcGUgcGlwZTsKQEAgLTE0Njg4LDYg KzE0NjU2LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfbW9kZXNldF9yZWFkb3V0X2h3X3N0YXRlKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJc3RydWN0IGludGVsX2Nvbm5lY3RvciAqY29ubmVjdG9y OwogCWludCBpOwogCisJKmNydGNfbWFzayA9IDA7CiAJZm9yX2VhY2hfaW50ZWxfY3J0YyhkZXYs IGNydGMpIHsKIAkJc3RydWN0IGRybV9wbGFuZSAqcHJpbWFyeSA9IGNydGMtPmJhc2UucHJpbWFy eTsKIAkJc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZTsKQEAgLTE0Njk2LDYg KzE0NjY1LDkgQEAgc3RhdGljIHZvaWQgaW50ZWxfbW9kZXNldF9yZWFkb3V0X2h3X3N0YXRlKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAkJY3J0Yy0+Y29uZmlnLT5xdWlya3MgfD0gUElQRV9D T05GSUdfUVVJUktfSU5IRVJJVEVEX01PREU7CiAKKwkJaWYgKGNydGMtPmFjdGl2ZSkKKwkJCSpj cnRjX21hc2sgfD0gZHJtX2NydGNfaW5kZXgoJmNydGMtPmJhc2UpOworCiAJCWNydGMtPmFjdGl2 ZSA9IGRldl9wcml2LT5kaXNwbGF5LmdldF9waXBlX2NvbmZpZyhjcnRjLAogCQkJCQkJCQkgY3J0 Yy0+Y29uZmlnKTsKIApAQCAtMTQ3NzgsNyArMTQ3NTAsOSBAQCB2b2lkIGludGVsX21vZGVzZXRf c2V0dXBfaHdfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlzdHJ1Y3QgaW50ZWxfZW5j b2RlciAqZW5jb2RlcjsKIAlpbnQgaTsKIAotCWludGVsX21vZGVzZXRfcmVhZG91dF9od19zdGF0 ZShkZXYpOworCXVuc2lnbmVkIGNydGNfbWFzazsKKworCWludGVsX21vZGVzZXRfcmVhZG91dF9o d19zdGF0ZShkZXYsICZjcnRjX21hc2spOwogCiAJLyoKIAkgKiBOb3cgdGhhdCB3ZSBoYXZlIHRo ZSBjb25maWcsIGNvcHkgaXQgdG8gZWFjaCBDUlRDIHN0cnVjdApAQCAtMTQ4MzcsMTAgKzE0ODEx LDkgQEAgdm9pZCBpbnRlbF9tb2Rlc2V0X3NldHVwX2h3X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsCiAJCQlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPQogCQkJCWRldl9wcml2LT5waXBlX3Rv X2NydGNfbWFwcGluZ1twaXBlXTsKIAotCQkJaW50ZWxfY3J0Y19yZXN0b3JlX21vZGUoY3J0Yyk7 CisJCQlpZiAoY3J0Y19tYXNrICYgKDEgPDwgZHJtX2NydGNfaW5kZXgoY3J0YykpKQorCQkJCWlu dGVsX2NydGNfcmVzdG9yZV9tb2RlKGNydGMpOwogCQl9Ci0JfSBlbHNlIHsKLQkJaW50ZWxfbW9k ZXNldF91cGRhdGVfc3RhZ2VkX291dHB1dF9zdGF0ZShkZXYpOwogCX0KIAogCWludGVsX21vZGVz ZXRfY2hlY2tfc3RhdGUoZGV2KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggZjg1NzYx NDk0ZGQxLi4xZTg5MjA5OGVlYTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC01MTUs NyArNTE1LDYgQEAgc3RydWN0IGludGVsX2NydGMgewogCiAJc3RydWN0IGludGVsX2luaXRpYWxf cGxhbmVfY29uZmlnIHBsYW5lX2NvbmZpZzsKIAlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY29u ZmlnOwotCWJvb2wgbmV3X2VuYWJsZWQ7CiAKIAkvKiByZXNldCBjb3VudGVyIHZhbHVlIHdoZW4g dGhlIGxhc3QgZmxpcCB3YXMgc3VibWl0dGVkICovCiAJdW5zaWduZWQgaW50IHJlc2V0X2NvdW50 ZXI7Ci0tIAoyLjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n ZngK