From: Ander Conselvan de Oliveira Subject: [PATCH 6/8] drm/i915: Remove intel_crtc->new_config pointer Date: Thu, 11 Dec 2014 14:38:09 +0200 Message-ID: <1418301491-23020-7-git-send-email-ander.conselvan.de.oliveira@intel.com> References: <1418301491-23020-1-git-send-email-ander.conselvan.de.oliveira@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 703EF6E7DA for ; Thu, 11 Dec 2014 04:38:24 -0800 (PST) In-Reply-To: <1418301491-23020-1-git-send-email-ander.conselvan.de.oliveira@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 , shuang.he@linux.intel.com List-Id: intel-gfx@lists.freedesktop.org VGhlcmUgYXJlIG5vIG1vcmUgdXNlcnMgb2YgdGhhdCBwb2ludGVyIHNpbmNlIHRoZSBuZXcgY29u ZmlnIGlzIG5vdwpwYXNzZWQgZG93biB0aGUgY2FsbCBjaGFpbiBkdXJpbmcgbW9kZSBzZXQuIEFs c28sIHdoZW4gdGhlIHN3aXRjaCB0bwphdG9taWMgaGFwcGVucywgdGhlIHJpZ2h0IGNvbmZpZyAo c3RhdGUpIHNob3VsZCBiZSBkZXJpdmVkIGZyb20gYW4KYXRvbWljIHN0YXRlIHN0cnVjdHVyZS4K ClNpZ25lZC1vZmYtYnk6IEFuZGVyIENvbnNlbHZhbiBkZSBPbGl2ZWlyYSA8YW5kZXIuY29uc2Vs dmFuLmRlLm9saXZlaXJhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMgfCA0NiArKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICB8ICAxIC0KIDIgZmlsZXMgY2hhbmdl ZCwgMTAgaW5zZXJ0aW9ucygrKSwgMzcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jCmluZGV4IGE5ZjMwMzQuLmEwMzJhMWQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMKQEAgLTg1ODMsNyArODU4Myw2IEBAIHJldHJ5OgogCiAJaW50ZWxfY3J0 YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAJaW50ZWxfY3J0Yy0+bmV3X2VuYWJsZWQgPSB0cnVl OwotCWludGVsX2NydGMtPm5ld19jb25maWcgPSAmaW50ZWxfY3J0Yy0+Y29uZmlnOwogCW9sZC0+ ZHBtc19tb2RlID0gY29ubmVjdG9yLT5kcG1zOwogCW9sZC0+bG9hZF9kZXRlY3RfdGVtcCA9IHRy dWU7CiAJb2xkLT5yZWxlYXNlX2ZiID0gTlVMTDsKQEAgLTg2MjMsMTAgKzg2MjIsNiBAQCByZXRy eToKIAogIGZhaWw6CiAJaW50ZWxfY3J0Yy0+bmV3X2VuYWJsZWQgPSBjcnRjLT5lbmFibGVkOwot CWlmIChpbnRlbF9jcnRjLT5uZXdfZW5hYmxlZCkKLQkJaW50ZWxfY3J0Yy0+bmV3X2NvbmZpZyA9 ICZpbnRlbF9jcnRjLT5jb25maWc7Ci0JZWxzZQotCQlpbnRlbF9jcnRjLT5uZXdfY29uZmlnID0g TlVMTDsKIGZhaWxfdW5sb2NrOgogCWlmIChyZXQgPT0gLUVERUFETEspIHsKIAkJZHJtX21vZGVz ZXRfYmFja29mZihjdHgpOwpAQCAtODY1Myw3ICs4NjQ4LDYgQEAgdm9pZCBpbnRlbF9yZWxlYXNl X2xvYWRfZGV0ZWN0X3BpcGUoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciwKIAkJdG9f aW50ZWxfY29ubmVjdG9yKGNvbm5lY3RvciktPm5ld19lbmNvZGVyID0gTlVMTDsKIAkJaW50ZWxf ZW5jb2Rlci0+bmV3X2NydGMgPSBOVUxMOwogCQlpbnRlbF9jcnRjLT5uZXdfZW5hYmxlZCA9IGZh bHNlOwotCQlpbnRlbF9jcnRjLT5uZXdfY29uZmlnID0gTlVMTDsKIAkJaW50ZWxfc2V0X21vZGUo Y3J0YywgTlVMTCwgMCwgMCwgTlVMTCk7CiAKIAkJaWYgKG9sZC0+cmVsZWFzZV9mYikgewpAQCAt OTgzOSwxNCArOTgzMyw4IEBAIHN0YXRpYyB2b2lkIGludGVsX21vZGVzZXRfdXBkYXRlX3N0YWdl ZF9vdXRwdXRfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJCXRvX2ludGVsX2NydGMo ZW5jb2Rlci0+YmFzZS5jcnRjKTsKIAl9CiAKLQlmb3JfZWFjaF9pbnRlbF9jcnRjKGRldiwgY3J0 YykgeworCWZvcl9lYWNoX2ludGVsX2NydGMoZGV2LCBjcnRjKQogCQljcnRjLT5uZXdfZW5hYmxl ZCA9IGNydGMtPmJhc2UuZW5hYmxlZDsKLQotCQlpZiAoY3J0Yy0+bmV3X2VuYWJsZWQpCi0JCQlj cnRjLT5uZXdfY29uZmlnID0gJmNydGMtPmNvbmZpZzsKLQkJZWxzZQotCQkJY3J0Yy0+bmV3X2Nv bmZpZyA9IE5VTEw7Ci0JfQogfQogCiAvKioKQEAgLTEwMzU1LDEyICsxMDM0Myw4IEBAIGludGVs X21vZGVzZXRfdXBkYXRlX3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIHBy ZXBhcmVfcGlwZXMpCiAJaW50ZWxfbW9kZXNldF9jb21taXRfb3V0cHV0X3N0YXRlKGRldik7CiAK IAkvKiBEb3VibGUgY2hlY2sgc3RhdGUuICovCi0JZm9yX2VhY2hfaW50ZWxfY3J0YyhkZXYsIGlu dGVsX2NydGMpIHsKKwlmb3JfZWFjaF9pbnRlbF9jcnRjKGRldiwgaW50ZWxfY3J0YykKIAkJV0FS Tl9PTihpbnRlbF9jcnRjLT5iYXNlLmVuYWJsZWQgIT0gaW50ZWxfY3J0Y19pbl91c2UoJmludGVs X2NydGMtPmJhc2UpKTsKLQkJV0FSTl9PTihpbnRlbF9jcnRjLT5uZXdfY29uZmlnICYmCi0JCQlp bnRlbF9jcnRjLT5uZXdfY29uZmlnICE9ICZpbnRlbF9jcnRjLT5jb25maWcpOwotCQlXQVJOX09O KGludGVsX2NydGMtPmJhc2UuZW5hYmxlZCAhPSAhIWludGVsX2NydGMtPm5ld19jb25maWcpOwot CX0KIAogCWxpc3RfZm9yX2VhY2hfZW50cnkoY29ubmVjdG9yLCAmZGV2LT5tb2RlX2NvbmZpZy5j b25uZWN0b3JfbGlzdCwgaGVhZCkgewogCQlpZiAoIWNvbm5lY3Rvci0+ZW5jb2RlciB8fCAhY29u bmVjdG9yLT5lbmNvZGVyLT5jcnRjKQpAQCAtMTA5NTcsOSArMTA5NDEsNiBAQCBzdGF0aWMgaW50 IF9faW50ZWxfc2V0X21vZGUoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCiAJKnNhdmVkX21vZGUg PSBjcnRjLT5tb2RlOwogCi0JaWYgKG1vZGVzZXRfcGlwZXMpCi0JCXRvX2ludGVsX2NydGMoY3J0 YyktPm5ld19jb25maWcgPSBwaXBlX2NvbmZpZzsKLQogCS8qCiAJICogU2VlIGlmIHRoZSBjb25m aWcgcmVxdWlyZXMgYW55IGFkZGl0aW9uYWwgcHJlcGFyYXRpb24sIGUuZy4KIAkgKiB0byBhZGp1 c3QgZ2xvYmFsIHN0YXRlIHdpdGggcGlwZXMgb2ZmLiAgV2UgbmVlZCB0byBkbyB0aGlzCkBAIC0x MDk4NCw3ICsxMDk2NSwxMyBAQCBzdGF0aWMgaW50IF9faW50ZWxfc2V0X21vZGUoc3RydWN0IGRy bV9jcnRjICpjcnRjLAogCQkJZ290byBkb25lOwogCiAJCWZvcl9lYWNoX2ludGVsX2NydGNfbWFz a2VkKGRldiwgbW9kZXNldF9waXBlcywgaW50ZWxfY3J0YykgewotCQkJc3RydWN0IGludGVsX2Ny dGNfc3RhdGUgKnN0YXRlID0gaW50ZWxfY3J0Yy0+bmV3X2NvbmZpZzsKKwkJCXN0cnVjdCBpbnRl bF9jcnRjX3N0YXRlICpzdGF0ZTsKKworCQkJaWYgKCZpbnRlbF9jcnRjLT5iYXNlID09IGNydGMp CisJCQkJc3RhdGUgPSBwaXBlX2NvbmZpZzsKKwkJCWVsc2UKKwkJCQlzdGF0ZSA9IGludGVsX2Ny dGMtPmNvbmZpZzsKKwogCQkJcmV0ID0gZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19jb21wdXRlX2Ns b2NrKGludGVsX2NydGMsCiAJCQkJCQkJCSAgIHN0YXRlKTsKIAkJCWlmIChyZXQpIHsKQEAgLTEx MDE0LDcgKzExMDAxLDYgQEAgc3RhdGljIGludCBfX2ludGVsX3NldF9tb2RlKHN0cnVjdCBkcm1f Y3J0YyAqY3J0YywKIAkJLyogbW9kZV9zZXQvZW5hYmxlL2Rpc2FibGUgZnVuY3Rpb25zIHJlbHkg b24gYSBjb3JyZWN0IHBpcGUKIAkJICogY29uZmlnLiAqLwogCQl0b19pbnRlbF9jcnRjKGNydGMp LT5jb25maWcgPSAqcGlwZV9jb25maWc7Ci0JCXRvX2ludGVsX2NydGMoY3J0YyktPm5ld19jb25m aWcgPSAmdG9faW50ZWxfY3J0YyhjcnRjKS0+Y29uZmlnOwogCiAJCS8qCiAJCSAqIENhbGN1bGF0 ZSBhbmQgc3RvcmUgdmFyaW91cyBjb25zdGFudHMgd2hpY2gKQEAgLTExMTc3LDE1ICsxMTE2Myw5 IEBAIHN0YXRpYyB2b2lkIGludGVsX3NldF9jb25maWdfcmVzdG9yZV9zdGF0ZShzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LAogCWludCBjb3VudDsKIAogCWNvdW50ID0gMDsKLQlmb3JfZWFjaF9pbnRl bF9jcnRjKGRldiwgY3J0YykgeworCWZvcl9lYWNoX2ludGVsX2NydGMoZGV2LCBjcnRjKQogCQlj cnRjLT5uZXdfZW5hYmxlZCA9IGNvbmZpZy0+c2F2ZV9jcnRjX2VuYWJsZWRbY291bnQrK107CiAK LQkJaWYgKGNydGMtPm5ld19lbmFibGVkKQotCQkJY3J0Yy0+bmV3X2NvbmZpZyA9ICZjcnRjLT5j b25maWc7Ci0JCWVsc2UKLQkJCWNydGMtPm5ld19jb25maWcgPSBOVUxMOwotCX0KLQogCWNvdW50 ID0gMDsKIAlmb3JfZWFjaF9pbnRlbF9lbmNvZGVyKGRldiwgZW5jb2RlcikgewogCQllbmNvZGVy LT5uZXdfY3J0YyA9CkBAIC0xMTM5MSwxMSArMTEzNzEsNiBAQCBpbnRlbF9tb2Rlc2V0X3N0YWdl X291dHB1dF9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJCSAgICAgIGNydGMtPm5l d19lbmFibGVkID8gImVuIiA6ICJkaXMiKTsKIAkJCWNvbmZpZy0+bW9kZV9jaGFuZ2VkID0gdHJ1 ZTsKIAkJfQotCi0JCWlmIChjcnRjLT5uZXdfZW5hYmxlZCkKLQkJCWNydGMtPm5ld19jb25maWcg PSAmY3J0Yy0+Y29uZmlnOwotCQllbHNlCi0JCQljcnRjLT5uZXdfY29uZmlnID0gTlVMTDsKIAl9 CiAKIAlyZXR1cm4gMDsKQEAgLTExNDIyLDcgKzExMzk3LDYgQEAgc3RhdGljIHZvaWQgZGlzYWJs ZV9jcnRjX25vZmIoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJfQogCiAJY3J0Yy0+bmV3X2Vu YWJsZWQgPSBmYWxzZTsKLQljcnRjLT5uZXdfY29uZmlnID0gTlVMTDsKIH0KIAogc3RhdGljIGlu dCBpbnRlbF9jcnRjX3NldF9jb25maWcoc3RydWN0IGRybV9tb2RlX3NldCAqc2V0KQpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcnYuaAppbmRleCAwYTg0NjY3Li4xNzViODUzIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcnYuaApAQCAtNDQwLDcgKzQ0MCw2IEBAIHN0cnVjdCBpbnRlbF9jcnRjIHsKIAogCXN0 cnVjdCBpbnRlbF9wbGFuZV9jb25maWcgcGxhbmVfY29uZmlnOwogCXN0cnVjdCBpbnRlbF9jcnRj X3N0YXRlIGNvbmZpZzsKLQlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqbmV3X2NvbmZpZzsKIAli b29sIG5ld19lbmFibGVkOwogCiAJLyogcmVzZXQgY291bnRlciB2YWx1ZSB3aGVuIHRoZSBsYXN0 IGZsaXAgd2FzIHN1Ym1pdHRlZCAqLwotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==