From: Ander Conselvan de Oliveira Subject: [PATCH 3/6] drm/i915: Remove intel_crtc->new_config Date: Thu, 2 Apr 2015 14:47:58 +0300 Message-ID: <1427975281-7688-4-git-send-email-ander.conselvan.de.oliveira@intel.com> References: <1427975281-7688-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 7AC356E9E9 for ; Thu, 2 Apr 2015 04:48:07 -0700 (PDT) In-Reply-To: <1427975281-7688-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 List-Id: intel-gfx@lists.freedesktop.org SXQncyBub3QgbmVlZGVkIGFueW1vcmUsIG5vdyB0aGF0IGFsbCB0aGUgdXNlcnMgd2VyZSBjb252 ZXJ0ZWQgdG8gdXNpbmcKYW4gYXRvbWljIHN0YXRlLgoKU2lnbmVkLW9mZi1ieTogQW5kZXIgQ29u c2VsdmFuIGRlIE9saXZlaXJhIDxhbmRlci5jb25zZWx2YW4uZGUub2xpdmVpcmFAaW50ZWwuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDMxIC0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5o ICAgICB8ICAxIC0KIDIgZmlsZXMgY2hhbmdlZCwgMzIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDBiN2RkZWUuLjIwN2M3MTMgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTkxNzEsNyArOTE3MSw2IEBAIHJldHJ5OgogCiAJ aW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAJaW50ZWxfY3J0Yy0+bmV3X2VuYWJs ZWQgPSB0cnVlOwotCWludGVsX2NydGMtPm5ld19jb25maWcgPSBpbnRlbF9jcnRjLT5jb25maWc7 CiAJb2xkLT5kcG1zX21vZGUgPSBjb25uZWN0b3ItPmRwbXM7CiAJb2xkLT5sb2FkX2RldGVjdF90 ZW1wID0gdHJ1ZTsKIAlvbGQtPnJlbGVhc2VfZmIgPSBOVUxMOwpAQCAtOTIyNywxMCArOTIyNiw2 IEBAIHJldHJ5OgogCiAgZmFpbDoKIAlpbnRlbF9jcnRjLT5uZXdfZW5hYmxlZCA9IGNydGMtPnN0 YXRlLT5lbmFibGU7Ci0JaWYgKGludGVsX2NydGMtPm5ld19lbmFibGVkKQotCQlpbnRlbF9jcnRj LT5uZXdfY29uZmlnID0gaW50ZWxfY3J0Yy0+Y29uZmlnOwotCWVsc2UKLQkJaW50ZWxfY3J0Yy0+ bmV3X2NvbmZpZyA9IE5VTEw7CiBmYWlsX3VubG9jazoKIAlpZiAoc3RhdGUpIHsKIAkJZHJtX2F0 b21pY19zdGF0ZV9mcmVlKHN0YXRlKTsKQEAgLTkyNzYsNyArOTI3MSw2IEBAIHZvaWQgaW50ZWxf cmVsZWFzZV9sb2FkX2RldGVjdF9waXBlKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3Is CiAJCXRvX2ludGVsX2Nvbm5lY3Rvcihjb25uZWN0b3IpLT5uZXdfZW5jb2RlciA9IE5VTEw7CiAJ CWludGVsX2VuY29kZXItPm5ld19jcnRjID0gTlVMTDsKIAkJaW50ZWxfY3J0Yy0+bmV3X2VuYWJs ZWQgPSBmYWxzZTsKLQkJaW50ZWxfY3J0Yy0+bmV3X2NvbmZpZyA9IE5VTEw7CiAKIAkJY29ubmVj dG9yX3N0YXRlLT5iZXN0X2VuY29kZXIgPSBOVUxMOwogCQljb25uZWN0b3Jfc3RhdGUtPmNydGMg PSBOVUxMOwpAQCAtMTA0MTYsMTEgKzEwNDEwLDYgQEAgc3RhdGljIHZvaWQgaW50ZWxfbW9kZXNl dF91cGRhdGVfc3RhZ2VkX291dHB1dF9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJ Zm9yX2VhY2hfaW50ZWxfY3J0YyhkZXYsIGNydGMpIHsKIAkJY3J0Yy0+bmV3X2VuYWJsZWQgPSBj cnRjLT5iYXNlLnN0YXRlLT5lbmFibGU7Ci0KLQkJaWYgKGNydGMtPm5ld19lbmFibGVkKQotCQkJ Y3J0Yy0+bmV3X2NvbmZpZyA9IGNydGMtPmNvbmZpZzsKLQkJZWxzZQotCQkJY3J0Yy0+bmV3X2Nv bmZpZyA9IE5VTEw7CiAJfQogfQogCkBAIC0xMDk4MSw5ICsxMDk3MCw2IEBAIGludGVsX21vZGVz ZXRfdXBkYXRlX3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIHByZXBhcmVf cGlwZXMpCiAJLyogRG91YmxlIGNoZWNrIHN0YXRlLiAqLwogCWZvcl9lYWNoX2ludGVsX2NydGMo ZGV2LCBpbnRlbF9jcnRjKSB7CiAJCVdBUk5fT04oaW50ZWxfY3J0Yy0+YmFzZS5zdGF0ZS0+ZW5h YmxlICE9IGludGVsX2NydGNfaW5fdXNlKCZpbnRlbF9jcnRjLT5iYXNlKSk7Ci0JCVdBUk5fT04o aW50ZWxfY3J0Yy0+bmV3X2NvbmZpZyAmJgotCQkJaW50ZWxfY3J0Yy0+bmV3X2NvbmZpZyAhPSBp bnRlbF9jcnRjLT5jb25maWcpOwotCQlXQVJOX09OKGludGVsX2NydGMtPmJhc2Uuc3RhdGUtPmVu YWJsZSAhPSAhIWludGVsX2NydGMtPm5ld19jb25maWcpOwogCX0KIAogCWxpc3RfZm9yX2VhY2hf ZW50cnkoY29ubmVjdG9yLCAmZGV2LT5tb2RlX2NvbmZpZy5jb25uZWN0b3JfbGlzdCwgaGVhZCkg ewpAQCAtMTE2NDYsOSArMTE2MzIsNiBAQCBzdGF0aWMgaW50IF9faW50ZWxfc2V0X21vZGUoc3Ry dWN0IGRybV9jcnRjICpjcnRjLAogCiAJKnNhdmVkX21vZGUgPSBjcnRjLT5tb2RlOwogCi0JaWYg KG1vZGVzZXRfcGlwZXMpCi0JCXRvX2ludGVsX2NydGMoY3J0YyktPm5ld19jb25maWcgPSBwaXBl X2NvbmZpZzsKLQogCS8qCiAJICogU2VlIGlmIHRoZSBjb25maWcgcmVxdWlyZXMgYW55IGFkZGl0 aW9uYWwgcHJlcGFyYXRpb24sIGUuZy4KIAkgKiB0byBhZGp1c3QgZ2xvYmFsIHN0YXRlIHdpdGgg cGlwZXMgb2ZmLiAgV2UgbmVlZCB0byBkbyB0aGlzCkBAIC0xMTc0MSw5ICsxMTcyNCw2IEBAIGRv bmU6CiAJCSAgICAgICBzaXplb2YgKmNydGNfc3RhdGVfY29weSk7CiAJCWludGVsX2NydGMtPmNv bmZpZyA9IGNydGNfc3RhdGVfY29weTsKIAkJaW50ZWxfY3J0Yy0+YmFzZS5zdGF0ZSA9ICZjcnRj X3N0YXRlX2NvcHktPmJhc2U7Ci0KLQkJaWYgKG1vZGVzZXRfcGlwZXMpCi0JCQlpbnRlbF9jcnRj LT5uZXdfY29uZmlnID0gaW50ZWxfY3J0Yy0+Y29uZmlnOwogCX0gZWxzZSB7CiAJCWtmcmVlKGNy dGNfc3RhdGVfY29weSk7CiAJfQpAQCAtMTE5MjIsMTEgKzExOTAyLDYgQEAgc3RhdGljIHZvaWQg aW50ZWxfc2V0X2NvbmZpZ19yZXN0b3JlX3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJ Y291bnQgPSAwOwogCWZvcl9lYWNoX2ludGVsX2NydGMoZGV2LCBjcnRjKSB7CiAJCWNydGMtPm5l d19lbmFibGVkID0gY29uZmlnLT5zYXZlX2NydGNfZW5hYmxlZFtjb3VudCsrXTsKLQotCQlpZiAo Y3J0Yy0+bmV3X2VuYWJsZWQpCi0JCQljcnRjLT5uZXdfY29uZmlnID0gY3J0Yy0+Y29uZmlnOwot CQllbHNlCi0JCQljcnRjLT5uZXdfY29uZmlnID0gTlVMTDsKIAl9CiAKIAljb3VudCA9IDA7CkBA IC0xMjE1MywxMSArMTIxMjgsNiBAQCBpbnRlbF9tb2Rlc2V0X3N0YWdlX291dHB1dF9zdGF0ZShz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJCSAgICAgIGNydGMtPm5ld19lbmFibGVkID8gImVu IiA6ICJkaXMiKTsKIAkJCWNvbmZpZy0+bW9kZV9jaGFuZ2VkID0gdHJ1ZTsKIAkJfQotCi0JCWlm IChjcnRjLT5uZXdfZW5hYmxlZCkKLQkJCWNydGMtPm5ld19jb25maWcgPSBjcnRjLT5jb25maWc7 Ci0JCWVsc2UKLQkJCWNydGMtPm5ld19jb25maWcgPSBOVUxMOwogCX0KIAogCXJldHVybiAwOwpA QCAtMTIxODQsNyArMTIxNTQsNiBAQCBzdGF0aWMgdm9pZCBkaXNhYmxlX2NydGNfbm9mYihzdHJ1 Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAl9CiAKIAljcnRjLT5uZXdfZW5hYmxlZCA9IGZhbHNlOwot CWNydGMtPm5ld19jb25maWcgPSBOVUxMOwogfQogCiBzdGF0aWMgaW50IGludGVsX2NydGNfc2V0 X2NvbmZpZyhzdHJ1Y3QgZHJtX21vZGVfc2V0ICpzZXQpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5o CmluZGV4IDQ3OTliMTEuLjY4NjAxNGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC00 NzEsNyArNDcxLDYgQEAgc3RydWN0IGludGVsX2NydGMgewogCiAJc3RydWN0IGludGVsX2luaXRp YWxfcGxhbmVfY29uZmlnIHBsYW5lX2NvbmZpZzsKIAlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAq Y29uZmlnOwotCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpuZXdfY29uZmlnOwogCWJvb2wgbmV3 X2VuYWJsZWQ7CiAKIAkvKiByZXNldCBjb3VudGVyIHZhbHVlIHdoZW4gdGhlIGxhc3QgZmxpcCB3 YXMgc3VibWl0dGVkICovCi0tIAoyLjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK