From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH v2 13/13] drm/i915: Get rid of
 intel_crtc->config in crtc_enable/disable functions, v2.
Date: Thu,  4 Oct 2018 11:46:04 +0200
Message-ID: <20181004094604.2646-14-maarten.lankhorst@linux.intel.com>
References: <20181004094604.2646-1-maarten.lankhorst@linux.intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mblankhorst.nl (mblankhorst.nl
 [IPv6:2a02:2308::216:3eff:fe92:dfa3])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 05BC16E59C
 for <intel-gfx@lists.freedesktop.org>; Thu,  4 Oct 2018 09:46:10 +0000 (UTC)
In-Reply-To: <20181004094604.2646-1-maarten.lankhorst@linux.intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

VGhlc2UgZnVuY3Rpb25zIGFscmVhZHkgaGF2ZSBhIHBvaW50ZXIgdG8gdGhlIGNvcnJlY3Qgc3Rh
dGUsCnNvIHVzZSBpdCBpbnN0ZWFkIG9mIGNydGMtPmNvbmZpZy4KCkNoYW5nZXMgc2luY2UgdjE6
Ci0gTW92ZSBwbGwgY2hhbmdlcyB0byB0aGUgcGxsIHBhdGNoLgoKU2lnbmVkLW9mZi1ieTogTWFh
cnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KUmV2aWV3
ZWQtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0t
LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgNDIgKysrKysrKysrKysr
KystLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDIxIGluc2VydGlvbnMoKyksIDIxIGRl
bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs
YXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA0ZGY0Mjkz
YTc5MTcuLjBkZTFhZTk2OWM4NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpA
QCAtNTU5NCwxNSArNTU5NCwxNSBAQCBzdGF0aWMgdm9pZCBpcm9ubGFrZV9jcnRjX2VuYWJsZShz
dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcsCiAJaWYgKHBpcGVfY29uZmlnLT5o
YXNfcGNoX2VuY29kZXIpCiAJCWludGVsX3ByZXBhcmVfc2hhcmVkX2RwbGwocGlwZV9jb25maWcp
OwogCi0JaWYgKGludGVsX2NydGNfaGFzX2RwX2VuY29kZXIoaW50ZWxfY3J0Yy0+Y29uZmlnKSkK
KwlpZiAoaW50ZWxfY3J0Y19oYXNfZHBfZW5jb2RlcihwaXBlX2NvbmZpZykpCiAJCWludGVsX2Rw
X3NldF9tX24oaW50ZWxfY3J0YywgTTFfTjEpOwogCiAJaW50ZWxfc2V0X3BpcGVfdGltaW5ncyhw
aXBlX2NvbmZpZyk7CiAJaW50ZWxfc2V0X3BpcGVfc3JjX3NpemUocGlwZV9jb25maWcpOwogCi0J
aWYgKGludGVsX2NydGMtPmNvbmZpZy0+aGFzX3BjaF9lbmNvZGVyKSB7CisJaWYgKHBpcGVfY29u
ZmlnLT5oYXNfcGNoX2VuY29kZXIpIHsKIAkJaW50ZWxfY3B1X3RyYW5zY29kZXJfc2V0X21fbihp
bnRlbF9jcnRjLAotCQkJCSAgICAgJmludGVsX2NydGMtPmNvbmZpZy0+ZmRpX21fbiwgTlVMTCk7
CisJCQkJICAgICAmcGlwZV9jb25maWctPmZkaV9tX24sIE5VTEwpOwogCX0KIAogCWlyb25sYWtl
X3NldF9waXBlY29uZihwaXBlX2NvbmZpZyk7CkBAIC01NjExLDcgKzU2MTEsNyBAQCBzdGF0aWMg
dm9pZCBpcm9ubGFrZV9jcnRjX2VuYWJsZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9j
b25maWcsCiAKIAlpbnRlbF9lbmNvZGVyc19wcmVfZW5hYmxlKGNydGMsIHBpcGVfY29uZmlnLCBv
bGRfc3RhdGUpOwogCi0JaWYgKGludGVsX2NydGMtPmNvbmZpZy0+aGFzX3BjaF9lbmNvZGVyKSB7
CisJaWYgKHBpcGVfY29uZmlnLT5oYXNfcGNoX2VuY29kZXIpIHsKIAkJLyogTm90ZTogRkRJIFBM
TCBlbmFibGluZyBfbXVzdF8gYmUgZG9uZSBiZWZvcmUgd2UgZW5hYmxlIHRoZQogCQkgKiBjcHUg
cGlwZXMsIGhlbmNlIHRoaXMgaXMgc2VwYXJhdGUgZnJvbSBhbGwgdGhlIG90aGVyIGZkaS9wY2gK
IAkJICogZW5hYmxpbmcuICovCkBAIC01NjMwLDEwICs1NjMwLDEwIEBAIHN0YXRpYyB2b2lkIGly
b25sYWtlX2NydGNfZW5hYmxlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZywK
IAlpbnRlbF9jb2xvcl9sb2FkX2x1dHMoJnBpcGVfY29uZmlnLT5iYXNlKTsKIAogCWlmIChkZXZf
cHJpdi0+ZGlzcGxheS5pbml0aWFsX3dhdGVybWFya3MgIT0gTlVMTCkKLQkJZGV2X3ByaXYtPmRp
c3BsYXkuaW5pdGlhbF93YXRlcm1hcmtzKG9sZF9pbnRlbF9zdGF0ZSwgaW50ZWxfY3J0Yy0+Y29u
ZmlnKTsKKwkJZGV2X3ByaXYtPmRpc3BsYXkuaW5pdGlhbF93YXRlcm1hcmtzKG9sZF9pbnRlbF9z
dGF0ZSwgcGlwZV9jb25maWcpOwogCWludGVsX2VuYWJsZV9waXBlKHBpcGVfY29uZmlnKTsKIAot
CWlmIChpbnRlbF9jcnRjLT5jb25maWctPmhhc19wY2hfZW5jb2RlcikKKwlpZiAocGlwZV9jb25m
aWctPmhhc19wY2hfZW5jb2RlcikKIAkJaXJvbmxha2VfcGNoX2VuYWJsZShvbGRfaW50ZWxfc3Rh
dGUsIHBpcGVfY29uZmlnKTsKIAogCWFzc2VydF92YmxhbmtfZGlzYWJsZWQoY3J0Yyk7CkBAIC01
NjUwLDcgKzU2NTAsNyBAQCBzdGF0aWMgdm9pZCBpcm9ubGFrZV9jcnRjX2VuYWJsZShzdHJ1Y3Qg
aW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcsCiAJICogc29tZSBpbnRlcmxhY2VkIEhETUkg
bW9kZXMuIExldCdzIGRvIHRoZSBkb3VibGUgd2FpdCBhbHdheXMKIAkgKiBpbiBjYXNlIHRoZXJl
IGFyZSBtb3JlIGNvcm5lciBjYXNlcyB3ZSBkb24ndCBrbm93IGFib3V0LgogCSAqLwotCWlmIChp
bnRlbF9jcnRjLT5jb25maWctPmhhc19wY2hfZW5jb2RlcikgeworCWlmIChwaXBlX2NvbmZpZy0+
aGFzX3BjaF9lbmNvZGVyKSB7CiAJCWludGVsX3dhaXRfZm9yX3ZibGFuayhkZXZfcHJpdiwgcGlw
ZSk7CiAJCWludGVsX3dhaXRfZm9yX3ZibGFuayhkZXZfcHJpdiwgcGlwZSk7CiAJfQpAQCAtNTY5
OSw3ICs1Njk5LDcgQEAgc3RhdGljIHZvaWQgaGFzd2VsbF9jcnRjX2VuYWJsZShzdHJ1Y3QgaW50
ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcsCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl
dl9wcml2ID0gdG9faTkxNShjcnRjLT5kZXYpOwogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9j
cnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKIAlpbnQgcGlwZSA9IGludGVsX2NydGMtPnBpcGUs
IGhzd193b3JrYXJvdW5kX3BpcGU7Ci0JZW51bSB0cmFuc2NvZGVyIGNwdV90cmFuc2NvZGVyID0g
aW50ZWxfY3J0Yy0+Y29uZmlnLT5jcHVfdHJhbnNjb2RlcjsKKwllbnVtIHRyYW5zY29kZXIgY3B1
X3RyYW5zY29kZXIgPSBwaXBlX2NvbmZpZy0+Y3B1X3RyYW5zY29kZXI7CiAJc3RydWN0IGludGVs
X2F0b21pY19zdGF0ZSAqb2xkX2ludGVsX3N0YXRlID0KIAkJdG9faW50ZWxfYXRvbWljX3N0YXRl
KG9sZF9zdGF0ZSk7CiAJYm9vbCBwc2xfY2xrZ2F0ZV93YTsKQEAgLTU3MTgsNyArNTcxOCw3IEBA
IHN0YXRpYyB2b2lkIGhhc3dlbGxfY3J0Y19lbmFibGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUg
KnBpcGVfY29uZmlnLAogCiAJaW50ZWxfZW5jb2RlcnNfcHJlX2VuYWJsZShjcnRjLCBwaXBlX2Nv
bmZpZywgb2xkX3N0YXRlKTsKIAotCWlmIChpbnRlbF9jcnRjX2hhc19kcF9lbmNvZGVyKGludGVs
X2NydGMtPmNvbmZpZykpCisJaWYgKGludGVsX2NydGNfaGFzX2RwX2VuY29kZXIocGlwZV9jb25m
aWcpKQogCQlpbnRlbF9kcF9zZXRfbV9uKGludGVsX2NydGMsIE0xX04xKTsKIAogCWlmICghdHJh
bnNjb2Rlcl9pc19kc2koY3B1X3RyYW5zY29kZXIpKQpAQCAtNTcyOSwxMiArNTcyOSwxMiBAQCBz
dGF0aWMgdm9pZCBoYXN3ZWxsX2NydGNfZW5hYmxlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpw
aXBlX2NvbmZpZywKIAlpZiAoY3B1X3RyYW5zY29kZXIgIT0gVFJBTlNDT0RFUl9FRFAgJiYKIAkg
ICAgIXRyYW5zY29kZXJfaXNfZHNpKGNwdV90cmFuc2NvZGVyKSkgewogCQlJOTE1X1dSSVRFKFBJ
UEVfTVVMVChjcHVfdHJhbnNjb2RlciksCi0JCQkgICBpbnRlbF9jcnRjLT5jb25maWctPnBpeGVs
X211bHRpcGxpZXIgLSAxKTsKKwkJCSAgIHBpcGVfY29uZmlnLT5waXhlbF9tdWx0aXBsaWVyIC0g
MSk7CiAJfQogCi0JaWYgKGludGVsX2NydGMtPmNvbmZpZy0+aGFzX3BjaF9lbmNvZGVyKSB7CisJ
aWYgKHBpcGVfY29uZmlnLT5oYXNfcGNoX2VuY29kZXIpIHsKIAkJaW50ZWxfY3B1X3RyYW5zY29k
ZXJfc2V0X21fbihpbnRlbF9jcnRjLAotCQkJCSAgICAgJmludGVsX2NydGMtPmNvbmZpZy0+ZmRp
X21fbiwgTlVMTCk7CisJCQkJICAgICAmcGlwZV9jb25maWctPmZkaV9tX24sIE5VTEwpOwogCX0K
IAogCWlmICghdHJhbnNjb2Rlcl9pc19kc2koY3B1X3RyYW5zY29kZXIpKQpAQCAtNTc0OCw3ICs1
NzQ4LDcgQEAgc3RhdGljIHZvaWQgaGFzd2VsbF9jcnRjX2VuYWJsZShzdHJ1Y3QgaW50ZWxfY3J0
Y19zdGF0ZSAqcGlwZV9jb25maWcsCiAKIAkvKiBEaXNwbGF5IFdBICMxMTgwOiBXYURpc2FibGVT
Y2FsYXJDbG9ja0dhdGluZzogZ2xrLCBjbmwgKi8KIAlwc2xfY2xrZ2F0ZV93YSA9IChJU19HRU1J
TklMQUtFKGRldl9wcml2KSB8fCBJU19DQU5OT05MQUtFKGRldl9wcml2KSkgJiYKLQkJCSBpbnRl
bF9jcnRjLT5jb25maWctPnBjaF9wZml0LmVuYWJsZWQ7CisJCQkgcGlwZV9jb25maWctPnBjaF9w
Zml0LmVuYWJsZWQ7CiAJaWYgKHBzbF9jbGtnYXRlX3dhKQogCQlnbGtfcGlwZV9zY2FsZXJfY2xv
Y2tfZ2F0aW5nX3dhKGRldl9wcml2LCBwaXBlLCB0cnVlKTsKIApAQCAtNTc4OCwxMCArNTc4OCwx
MCBAQCBzdGF0aWMgdm9pZCBoYXN3ZWxsX2NydGNfZW5hYmxlKHN0cnVjdCBpbnRlbF9jcnRjX3N0
YXRlICpwaXBlX2NvbmZpZywKIAlpZiAoIXRyYW5zY29kZXJfaXNfZHNpKGNwdV90cmFuc2NvZGVy
KSkKIAkJaW50ZWxfZW5hYmxlX3BpcGUocGlwZV9jb25maWcpOwogCi0JaWYgKGludGVsX2NydGMt
PmNvbmZpZy0+aGFzX3BjaF9lbmNvZGVyKQorCWlmIChwaXBlX2NvbmZpZy0+aGFzX3BjaF9lbmNv
ZGVyKQogCQlscHRfcGNoX2VuYWJsZShvbGRfaW50ZWxfc3RhdGUsIHBpcGVfY29uZmlnKTsKIAot
CWlmIChpbnRlbF9jcnRjX2hhc190eXBlKGludGVsX2NydGMtPmNvbmZpZywgSU5URUxfT1VUUFVU
X0RQX01TVCkpCisJaWYgKGludGVsX2NydGNfaGFzX3R5cGUocGlwZV9jb25maWcsIElOVEVMX09V
VFBVVF9EUF9NU1QpKQogCQlpbnRlbF9kZGlfc2V0X3ZjX3BheWxvYWRfYWxsb2MocGlwZV9jb25m
aWcsIHRydWUpOwogCiAJYXNzZXJ0X3ZibGFua19kaXNhYmxlZChjcnRjKTsKQEAgLTU4NTQsMTIg
KzU4NTQsMTIgQEAgc3RhdGljIHZvaWQgaXJvbmxha2VfY3J0Y19kaXNhYmxlKHN0cnVjdCBpbnRl
bF9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSwKIAogCWlyb25sYWtlX3BmaXRfZGlzYWJsZShv
bGRfY3J0Y19zdGF0ZSk7CiAKLQlpZiAoaW50ZWxfY3J0Yy0+Y29uZmlnLT5oYXNfcGNoX2VuY29k
ZXIpCisJaWYgKG9sZF9jcnRjX3N0YXRlLT5oYXNfcGNoX2VuY29kZXIpCiAJCWlyb25sYWtlX2Zk
aV9kaXNhYmxlKGNydGMpOwogCiAJaW50ZWxfZW5jb2RlcnNfcG9zdF9kaXNhYmxlKGNydGMsIG9s
ZF9jcnRjX3N0YXRlLCBvbGRfc3RhdGUpOwogCi0JaWYgKGludGVsX2NydGMtPmNvbmZpZy0+aGFz
X3BjaF9lbmNvZGVyKSB7CisJaWYgKG9sZF9jcnRjX3N0YXRlLT5oYXNfcGNoX2VuY29kZXIpIHsK
IAkJaXJvbmxha2VfZGlzYWJsZV9wY2hfdHJhbnNjb2RlcihkZXZfcHJpdiwgcGlwZSk7CiAKIAkJ
aWYgKEhBU19QQ0hfQ1BUKGRldl9wcml2KSkgewpAQCAtNjA2MCw3ICs2MDYwLDcgQEAgc3RhdGlj
IHZvaWQgdmFsbGV5dmlld19jcnRjX2VuYWJsZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlw
ZV9jb25maWcsCiAJaWYgKFdBUk5fT04oaW50ZWxfY3J0Yy0+YWN0aXZlKSkKIAkJcmV0dXJuOwog
Ci0JaWYgKGludGVsX2NydGNfaGFzX2RwX2VuY29kZXIoaW50ZWxfY3J0Yy0+Y29uZmlnKSkKKwlp
ZiAoaW50ZWxfY3J0Y19oYXNfZHBfZW5jb2RlcihwaXBlX2NvbmZpZykpCiAJCWludGVsX2RwX3Nl
dF9tX24oaW50ZWxfY3J0YywgTTFfTjEpOwogCiAJaW50ZWxfc2V0X3BpcGVfdGltaW5ncyhwaXBl
X2NvbmZpZyk7CkBAIC02MTMwLDcgKzYxMzAsNyBAQCBzdGF0aWMgdm9pZCBpOXh4X2NydGNfZW5h
YmxlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZywKIAogCWk5eHhfc2V0X3Bs
bF9kaXZpZGVycyhwaXBlX2NvbmZpZyk7CiAKLQlpZiAoaW50ZWxfY3J0Y19oYXNfZHBfZW5jb2Rl
cihpbnRlbF9jcnRjLT5jb25maWcpKQorCWlmIChpbnRlbF9jcnRjX2hhc19kcF9lbmNvZGVyKHBp
cGVfY29uZmlnKSkKIAkJaW50ZWxfZHBfc2V0X21fbihpbnRlbF9jcnRjLCBNMV9OMSk7CiAKIAlp
bnRlbF9zZXRfcGlwZV90aW1pbmdzKHBpcGVfY29uZmlnKTsKQEAgLTYxNTMsNyArNjE1Myw3IEBA
IHN0YXRpYyB2b2lkIGk5eHhfY3J0Y19lbmFibGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBp
cGVfY29uZmlnLAogCiAJaWYgKGRldl9wcml2LT5kaXNwbGF5LmluaXRpYWxfd2F0ZXJtYXJrcyAh
PSBOVUxMKQogCQlkZXZfcHJpdi0+ZGlzcGxheS5pbml0aWFsX3dhdGVybWFya3Mob2xkX2ludGVs
X3N0YXRlLAotCQkJCQkJICAgICBpbnRlbF9jcnRjLT5jb25maWcpOworCQkJCQkJICAgICBwaXBl
X2NvbmZpZyk7CiAJZWxzZQogCQlpbnRlbF91cGRhdGVfd2F0ZXJtYXJrcyhpbnRlbF9jcnRjKTsK
IAlpbnRlbF9lbmFibGVfcGlwZShwaXBlX2NvbmZpZyk7CkBAIC02MjA2LDcgKzYyMDYsNyBAQCBz
dGF0aWMgdm9pZCBpOXh4X2NydGNfZGlzYWJsZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xk
X2NydGNfc3RhdGUsCiAKIAlpbnRlbF9lbmNvZGVyc19wb3N0X2Rpc2FibGUoY3J0Yywgb2xkX2Ny
dGNfc3RhdGUsIG9sZF9zdGF0ZSk7CiAKLQlpZiAoIWludGVsX2NydGNfaGFzX3R5cGUoaW50ZWxf
Y3J0Yy0+Y29uZmlnLCBJTlRFTF9PVVRQVVRfRFNJKSkgeworCWlmICghaW50ZWxfY3J0Y19oYXNf
dHlwZShvbGRfY3J0Y19zdGF0ZSwgSU5URUxfT1VUUFVUX0RTSSkpIHsKIAkJaWYgKElTX0NIRVJS
WVZJRVcoZGV2X3ByaXYpKQogCQkJY2h2X2Rpc2FibGVfcGxsKGRldl9wcml2LCBwaXBlKTsKIAkJ
ZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikpCi0tIAoyLjE5LjAKCl9fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp
c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr
dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=