From: ville.syrjala@linux.intel.com Subject: [PATCH 2/7] drm/i915: Pass the crtc state explicitly to intel_pipe_update_start/end() Date: Wed, 23 Aug 2017 18:22:21 +0300 Message-ID: <20170823152226.22938-2-ville.syrjala@linux.intel.com> References: <20170823152226.22938-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 31C376E5BB for ; Wed, 23 Aug 2017 15:22:37 +0000 (UTC) In-Reply-To: <20170823152226.22938-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClBh c3MgdGhlIGFwcHJvcHJpYXRlIG5ldyBjcnRjIHN0YXRlIGV4cGxpY2l0bHkgdG8KaW50ZWxfcGlw ZV91cGRhdGVfc3RhcnQvZW5kKCkgaW5zdGVhZCBvZiBvZiBtdWNraW5nIGFyb3VuZCB3aXRoCmNy dGMtPnN0YXRlLgoKdjI6IFRoZSBtbWlvIGZsaXAgc3R1ZmYgaXMgZ29uZQoKUmV2aWV3ZWQtYnk6 IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+ICN2 MQpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50 ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDE0ICsr KysrKysrKy0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAxMiAr KysrKysrKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jICB8IDI3ICsr KysrKysrKysrKystLS0tLS0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAzMiBpbnNlcnRpb25z KCspLCAyMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5k ZXggODBhMTRiMzBlNGQzLi5jZWU0ZGIwYTE2MjYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKQEAgLTEyOTE3LDEzICsxMjkxNywxMyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9iZWdp bl9jcnRjX2NvbW1pdChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJc3RydWN0IGRybV9kZXZpY2Ug KmRldiA9IGNydGMtPmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0 b19pOTE1KGRldik7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9j cnRjKGNydGMpOwotCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICppbnRlbF9jc3RhdGUgPQotCQl0 b19pbnRlbF9jcnRjX3N0YXRlKGNydGMtPnN0YXRlKTsKIAlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqb2xkX2ludGVsX2NzdGF0ZSA9CiAJCXRvX2ludGVsX2NydGNfc3RhdGUob2xkX2NydGNfc3Rh dGUpOwogCXN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKm9sZF9pbnRlbF9zdGF0ZSA9CiAJCXRv X2ludGVsX2F0b21pY19zdGF0ZShvbGRfY3J0Y19zdGF0ZS0+c3RhdGUpOwotCWJvb2wgbW9kZXNl dCA9IG5lZWRzX21vZGVzZXQoY3J0Yy0+c3RhdGUpOworCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl ICppbnRlbF9jc3RhdGUgPQorCQlpbnRlbF9hdG9taWNfZ2V0X25ld19jcnRjX3N0YXRlKG9sZF9p bnRlbF9zdGF0ZSwgaW50ZWxfY3J0Yyk7CisJYm9vbCBtb2Rlc2V0ID0gbmVlZHNfbW9kZXNldCgm aW50ZWxfY3N0YXRlLT5iYXNlKTsKIAogCWlmICghbW9kZXNldCAmJgogCSAgICAoaW50ZWxfY3N0 YXRlLT5iYXNlLmNvbG9yX21nbXRfY2hhbmdlZCB8fApAQCAtMTI5MzMsNyArMTI5MzMsNyBAQCBz dGF0aWMgdm9pZCBpbnRlbF9iZWdpbl9jcnRjX2NvbW1pdChzdHJ1Y3QgZHJtX2NydGMgKmNydGMs CiAJfQogCiAJLyogUGVyZm9ybSB2YmxhbmsgZXZhc2lvbiBhcm91bmQgY29tbWl0IG9wZXJhdGlv biAqLwotCWludGVsX3BpcGVfdXBkYXRlX3N0YXJ0KGludGVsX2NydGMpOworCWludGVsX3BpcGVf dXBkYXRlX3N0YXJ0KGludGVsX2NzdGF0ZSk7CiAKIAlpZiAobW9kZXNldCkKIAkJZ290byBvdXQ7 CkBAIC0xMjk1Myw4ICsxMjk1MywxMiBAQCBzdGF0aWMgdm9pZCBpbnRlbF9maW5pc2hfY3J0Y19j b21taXQoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkJCSAgICAgc3RydWN0IGRybV9jcnRjX3N0 YXRlICpvbGRfY3J0Y19zdGF0ZSkKIHsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9 IHRvX2ludGVsX2NydGMoY3J0Yyk7CisJc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqb2xkX2lu dGVsX3N0YXRlID0KKwkJdG9faW50ZWxfYXRvbWljX3N0YXRlKG9sZF9jcnRjX3N0YXRlLT5zdGF0 ZSk7CisJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm5ld19jcnRjX3N0YXRlID0KKwkJaW50ZWxf YXRvbWljX2dldF9uZXdfY3J0Y19zdGF0ZShvbGRfaW50ZWxfc3RhdGUsIGludGVsX2NydGMpOwog Ci0JaW50ZWxfcGlwZV91cGRhdGVfZW5kKGludGVsX2NydGMpOworCWludGVsX3BpcGVfdXBkYXRl X2VuZChuZXdfY3J0Y19zdGF0ZSk7CiB9CiAKIC8qKgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApp bmRleCBmNjA5OTVmZTQ1NWMuLjlhN2M3ZGQwZWE4NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2 LmgKQEAgLTExOTAsNiArMTE5MCwxNCBAQCBoZG1pX3RvX2RpZ19wb3J0KHN0cnVjdCBpbnRlbF9o ZG1pICppbnRlbF9oZG1pKQogCXJldHVybiBjb250YWluZXJfb2YoaW50ZWxfaGRtaSwgc3RydWN0 IGludGVsX2RpZ2l0YWxfcG9ydCwgaGRtaSk7CiB9CiAKK3N0YXRpYyBpbmxpbmUgc3RydWN0IGlu dGVsX2NydGNfc3RhdGUgKgoraW50ZWxfYXRvbWljX2dldF9uZXdfY3J0Y19zdGF0ZShzdHJ1Y3Qg aW50ZWxfYXRvbWljX3N0YXRlICpzdGF0ZSwKKwkJCQlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykK K3sKKwlyZXR1cm4gdG9faW50ZWxfY3J0Y19zdGF0ZShkcm1fYXRvbWljX2dldF9uZXdfY3J0Y19z dGF0ZSgmc3RhdGUtPmJhc2UsCisJCQkJCQkJCSAmY3J0Yy0+YmFzZSkpOworfQorCiAvKiBpbnRl bF9maWZvX3VuZGVycnVuLmMgKi8KIGJvb2wgaW50ZWxfc2V0X2NwdV9maWZvX3VuZGVycnVuX3Jl cG9ydGluZyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkJCSAgIGVudW0g cGlwZSBwaXBlLCBib29sIGVuYWJsZSk7CkBAIC0xODg4LDggKzE4OTYsOCBAQCBzdHJ1Y3QgaW50 ZWxfcGxhbmUgKmludGVsX3Nwcml0ZV9wbGFuZV9jcmVhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2LAogCQkJCQkgICAgICBlbnVtIHBpcGUgcGlwZSwgaW50IHBsYW5lKTsKIGlu dCBpbnRlbF9zcHJpdGVfc2V0X2NvbG9ya2V5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQg KmRhdGEsCiAJCQkgICAgICBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdik7Ci12b2lkIGludGVs X3BpcGVfdXBkYXRlX3N0YXJ0KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKTsKLXZvaWQgaW50ZWxf cGlwZV91cGRhdGVfZW5kKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKTsKK3ZvaWQgaW50ZWxfcGlw ZV91cGRhdGVfc3RhcnQoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm5ld19jcnRjX3N0 YXRlKTsKK3ZvaWQgaW50ZWxfcGlwZV91cGRhdGVfZW5kKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl ICpuZXdfY3J0Y19zdGF0ZSk7CiAKIC8qIGludGVsX3R2LmMgKi8KIHZvaWQgaW50ZWxfdHZfaW5p dChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9zcHJpdGUuYwppbmRleCA1MjQ5MzNiMDE0ODMuLmIwZDZlM2UyOGQwNyAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfc3ByaXRlLmMKQEAgLTcwLDggKzcwLDcgQEAgaW50IGludGVsX3VzZWNzX3Rv X3NjYW5saW5lcyhjb25zdCBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqYWRqdXN0ZWRfbW9kZSwK IAogLyoqCiAgKiBpbnRlbF9waXBlX3VwZGF0ZV9zdGFydCgpIC0gc3RhcnQgdXBkYXRlIG9mIGEg c2V0IG9mIGRpc3BsYXkgcmVnaXN0ZXJzCi0gKiBAY3J0YzogdGhlIGNydGMgb2Ygd2hpY2ggdGhl IHJlZ2lzdGVycyBhcmUgZ29pbmcgdG8gYmUgdXBkYXRlZAotICogQHN0YXJ0X3ZibF9jb3VudDog dmJsYW5rIGNvdW50ZXIgcmV0dXJuIHBvaW50ZXIgdXNlZCBmb3IgZXJyb3IgY2hlY2tpbmcKKyAq IEBuZXdfY3J0Y19zdGF0ZTogdGhlIG5ldyBjcnRjIHN0YXRlCiAgKgogICogTWFyayB0aGUgc3Rh cnQgb2YgYW4gdXBkYXRlIHRvIHBpcGUgcmVnaXN0ZXJzIHRoYXQgc2hvdWxkIGJlIHVwZGF0ZWQK ICAqIGF0b21pY2FsbHkgcmVnYXJkaW5nIHZibGFuay4gSWYgdGhlIG5leHQgdmJsYW5rIHdpbGwg aGFwcGVucyB3aXRoaW4KQEAgLTc5LDE4ICs3OCwxOCBAQCBpbnQgaW50ZWxfdXNlY3NfdG9fc2Nh bmxpbmVzKGNvbnN0IHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICphZGp1c3RlZF9tb2RlLAogICoK ICAqIEFmdGVyIGEgc3VjY2Vzc2Z1bCBjYWxsIHRvIHRoaXMgZnVuY3Rpb24sIGludGVycnVwdHMg d2lsbCBiZSBkaXNhYmxlZAogICogdW50aWwgYSBzdWJzZXF1ZW50IGNhbGwgdG8gaW50ZWxfcGlw ZV91cGRhdGVfZW5kKCkuIFRoYXQgaXMgZG9uZSB0bwotICogYXZvaWQgcmFuZG9tIGRlbGF5cy4g VGhlIHZhbHVlIHdyaXR0ZW4gdG8gQHN0YXJ0X3ZibF9jb3VudCBzaG91bGQgYmUKLSAqIHN1cHBs aWVkIHRvIGludGVsX3BpcGVfdXBkYXRlX2VuZCgpIGZvciBlcnJvciBjaGVja2luZy4KKyAqIGF2 b2lkIHJhbmRvbSBkZWxheXMuCiAgKi8KLXZvaWQgaW50ZWxfcGlwZV91cGRhdGVfc3RhcnQoc3Ry dWN0IGludGVsX2NydGMgKmNydGMpCit2b2lkIGludGVsX3BpcGVfdXBkYXRlX3N0YXJ0KGNvbnN0 IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpuZXdfY3J0Y19zdGF0ZSkKIHsKKwlzdHJ1Y3QgaW50 ZWxfY3J0YyAqY3J0YyA9IHRvX2ludGVsX2NydGMobmV3X2NydGNfc3RhdGUtPmJhc2UuY3J0Yyk7 CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShjcnRjLT5iYXNl LmRldik7Ci0JY29uc3Qgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKmFkanVzdGVkX21vZGUgPSAm Y3J0Yy0+Y29uZmlnLT5iYXNlLmFkanVzdGVkX21vZGU7CisJY29uc3Qgc3RydWN0IGRybV9kaXNw bGF5X21vZGUgKmFkanVzdGVkX21vZGUgPSAmbmV3X2NydGNfc3RhdGUtPmJhc2UuYWRqdXN0ZWRf bW9kZTsKIAlsb25nIHRpbWVvdXQgPSBtc2Vjc190b19qaWZmaWVzX3RpbWVvdXQoMSk7CiAJaW50 IHNjYW5saW5lLCBtaW4sIG1heCwgdmJsYW5rX3N0YXJ0OwogCXdhaXRfcXVldWVfaGVhZF90ICp3 cSA9IGRybV9jcnRjX3ZibGFua193YWl0cXVldWUoJmNydGMtPmJhc2UpOwogCWJvb2wgbmVlZF92 bHZfZHNpX3dhID0gKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2 X3ByaXYpKSAmJgotCQlpbnRlbF9jcnRjX2hhc190eXBlKGNydGMtPmNvbmZpZywgSU5URUxfT1VU UFVUX0RTSSk7CisJCWludGVsX2NydGNfaGFzX3R5cGUobmV3X2NydGNfc3RhdGUsIElOVEVMX09V VFBVVF9EU0kpOwogCURFRklORV9XQUlUKHdhaXQpOwogCiAJdmJsYW5rX3N0YXJ0ID0gYWRqdXN0 ZWRfbW9kZS0+Y3J0Y192Ymxhbmtfc3RhcnQ7CkBAIC0xNzAsMTUgKzE2OSwxNSBAQCB2b2lkIGlu dGVsX3BpcGVfdXBkYXRlX3N0YXJ0KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCiAvKioKICAq IGludGVsX3BpcGVfdXBkYXRlX2VuZCgpIC0gZW5kIHVwZGF0ZSBvZiBhIHNldCBvZiBkaXNwbGF5 IHJlZ2lzdGVycwotICogQGNydGM6IHRoZSBjcnRjIG9mIHdoaWNoIHRoZSByZWdpc3RlcnMgd2Vy ZSB1cGRhdGVkCi0gKiBAc3RhcnRfdmJsX2NvdW50OiBzdGFydCB2YmxhbmsgY291bnRlciAodXNl ZCBmb3IgZXJyb3IgY2hlY2tpbmcpCisgKiBAbmV3X2NydGNfc3RhdGU6IHRoZSBuZXcgY3J0YyBz dGF0ZQogICoKICAqIE1hcmsgdGhlIGVuZCBvZiBhbiB1cGRhdGUgc3RhcnRlZCB3aXRoIGludGVs X3BpcGVfdXBkYXRlX3N0YXJ0KCkuIFRoaXMKICAqIHJlLWVuYWJsZXMgaW50ZXJydXB0cyBhbmQg dmVyaWZpZXMgdGhlIHVwZGF0ZSB3YXMgYWN0dWFsbHkgY29tcGxldGVkCi0gKiBiZWZvcmUgYSB2 YmxhbmsgdXNpbmcgdGhlIHZhbHVlIG9mIEBzdGFydF92YmxfY291bnQuCisgKiBiZWZvcmUgYSB2 YmxhbmsuCiAgKi8KLXZvaWQgaW50ZWxfcGlwZV91cGRhdGVfZW5kKHN0cnVjdCBpbnRlbF9jcnRj ICpjcnRjKQordm9pZCBpbnRlbF9waXBlX3VwZGF0ZV9lbmQoc3RydWN0IGludGVsX2NydGNfc3Rh dGUgKm5ld19jcnRjX3N0YXRlKQogeworCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjID0gdG9faW50 ZWxfY3J0YyhuZXdfY3J0Y19zdGF0ZS0+YmFzZS5jcnRjKTsKIAllbnVtIHBpcGUgcGlwZSA9IGNy dGMtPnBpcGU7CiAJaW50IHNjYW5saW5lX2VuZCA9IGludGVsX2dldF9jcnRjX3NjYW5saW5lKGNy dGMpOwogCXUzMiBlbmRfdmJsX2NvdW50ID0gaW50ZWxfY3J0Y19nZXRfdmJsYW5rX2NvdW50ZXIo Y3J0Yyk7CkBAIC0xOTEsMTQgKzE5MCwxNCBAQCB2b2lkIGludGVsX3BpcGVfdXBkYXRlX2VuZChz dHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAkgKiBXb3VsZCBiZSBzbGlnaHRseSBuaWNlIHRvIGp1 c3QgZ3JhYiB0aGUgdmJsYW5rIGNvdW50IGFuZCBhcm0gdGhlCiAJICogZXZlbnQgb3V0c2lkZSBv ZiB0aGUgY3JpdGljYWwgc2VjdGlvbiAtIHRoZSBzcGlubG9jayBtaWdodCBzcGluIGZvciBhCiAJ ICogd2hpbGUgLi4uICovCi0JaWYgKGNydGMtPmJhc2Uuc3RhdGUtPmV2ZW50KSB7CisJaWYgKG5l d19jcnRjX3N0YXRlLT5iYXNlLmV2ZW50KSB7CiAJCVdBUk5fT04oZHJtX2NydGNfdmJsYW5rX2dl dCgmY3J0Yy0+YmFzZSkgIT0gMCk7CiAKIAkJc3Bpbl9sb2NrKCZjcnRjLT5iYXNlLmRldi0+ZXZl bnRfbG9jayk7Ci0JCWRybV9jcnRjX2FybV92YmxhbmtfZXZlbnQoJmNydGMtPmJhc2UsIGNydGMt PmJhc2Uuc3RhdGUtPmV2ZW50KTsKKwkJZHJtX2NydGNfYXJtX3ZibGFua19ldmVudCgmY3J0Yy0+ YmFzZSwgbmV3X2NydGNfc3RhdGUtPmJhc2UuZXZlbnQpOwogCQlzcGluX3VubG9jaygmY3J0Yy0+ YmFzZS5kZXYtPmV2ZW50X2xvY2spOwogCi0JCWNydGMtPmJhc2Uuc3RhdGUtPmV2ZW50ID0gTlVM TDsKKwkJbmV3X2NydGNfc3RhdGUtPmJhc2UuZXZlbnQgPSBOVUxMOwogCX0KIAogCWxvY2FsX2ly cV9lbmFibGUoKTsKLS0gCjIuMTMuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vaW50ZWwtZ2Z4Cg==