From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v3.1 06/20] drm/i915: Remove plane_config from struct intel_crtc, v2. Date: Tue, 14 Jul 2015 12:33:29 +0200 Message-ID: <55A4E579.7090304@linux.intel.com> References: <1436797833-11493-1-git-send-email-maarten.lankhorst@linux.intel.com> <1436797833-11493-7-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 729506E9F2 for ; Tue, 14 Jul 2015 03:33:37 -0700 (PDT) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Stone Cc: intel-gfx List-Id: intel-gfx@lists.freedesktop.org Y29tbWl0IDRlZmI0NzdiNTZjYTlhYzZhYjc2MTM2YTI4MDFhYWVlNGQzZjQ2YzUKQXV0aG9yOiBN YWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgpEYXRl OiAgIE1vbiBKdWwgMTMgMTU6Mjk6NDcgMjAxNSArMDIwMAoKICAgIGRybS9pOTE1OiBSZW1vdmUg cGxhbmVfY29uZmlnIGZyb20gc3RydWN0IGludGVsX2NydGMsIHYyLgogICAgCiAgICBOb3RoaW5n IGRlcGVuZHMgb24gdGhpcyBvdXRzaWRlIGluaXRpYWwgaHcgcmVhZG91dCwgc28ga2VlcCB0aGlz CiAgICBzdHJ1Y3Qgb24gdGhlIHN0YWNrIGluc3RlYWQuCiAgICAKICAgIENoYW5nZXMgc2luY2Ug djE6CiAgICAtIFJlbW92ZSB1bnJlbGF0ZWQgY2hhbmdlcy4KICAgIAogICAgU2lnbmVkLW9mZi1i eTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4K ICAgIFJldmlld2VkLWJ5OiBEYW5pZWwgU3RvbmUgPGRhbmllbHNAY29sbGFib3JhLmNvbT4KCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggNjQzMmMxODA3MjVmLi4wY2EyYjFk ZjdlMDMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTE1MjA2LDYgKzE1 MjA2LDggQEAgdm9pZCBpbnRlbF9tb2Rlc2V0X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikK IAlkcm1fbW9kZXNldF91bmxvY2tfYWxsKGRldik7CiAKIAlmb3JfZWFjaF9pbnRlbF9jcnRjKGRl diwgY3J0YykgeworCQlzdHJ1Y3QgaW50ZWxfaW5pdGlhbF9wbGFuZV9jb25maWcgcGxhbmVfY29u ZmlnID0ge307CisKIAkJaWYgKCFjcnRjLT5hY3RpdmUpCiAJCQljb250aW51ZTsKIApAQCAtMTUy MTYsMTUgKzE1MjE4LDE0IEBAIHZvaWQgaW50ZWxfbW9kZXNldF9pbml0KHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCiAJCSAqIGNhbiBldmVuIGFsbG93IGZvciBzbW9vdGggYm9vdCB0cmFuc2l0aW9u cyBpZiB0aGUgQklPUwogCQkgKiBmYiBpcyBsYXJnZSBlbm91Z2ggZm9yIHRoZSBhY3RpdmUgcGlw ZSBjb25maWd1cmF0aW9uLgogCQkgKi8KLQkJaWYgKGRldl9wcml2LT5kaXNwbGF5LmdldF9pbml0 aWFsX3BsYW5lX2NvbmZpZykgewotCQkJZGV2X3ByaXYtPmRpc3BsYXkuZ2V0X2luaXRpYWxfcGxh bmVfY29uZmlnKGNydGMsCi0JCQkJCQkJICAgJmNydGMtPnBsYW5lX2NvbmZpZyk7Ci0JCQkvKgot CQkJICogSWYgdGhlIGZiIGlzIHNoYXJlZCBiZXR3ZWVuIG11bHRpcGxlIGhlYWRzLCB3ZSdsbAot CQkJICoganVzdCBnZXQgdGhlIGZpcnN0IG9uZS4KLQkJCSAqLwotCQkJaW50ZWxfZmluZF9pbml0 aWFsX3BsYW5lX29iaihjcnRjLCAmY3J0Yy0+cGxhbmVfY29uZmlnKTsKLQkJfQorCQlkZXZfcHJp di0+ZGlzcGxheS5nZXRfaW5pdGlhbF9wbGFuZV9jb25maWcoY3J0YywKKwkJCQkJCQkgICAmcGxh bmVfY29uZmlnKTsKKworCQkvKgorCQkgKiBJZiB0aGUgZmIgaXMgc2hhcmVkIGJldHdlZW4gbXVs dGlwbGUgaGVhZHMsIHdlJ2xsCisJCSAqIGp1c3QgZ2V0IHRoZSBmaXJzdCBvbmUuCisJCSAqLwor CQlpbnRlbF9maW5kX2luaXRpYWxfcGxhbmVfb2JqKGNydGMsICZwbGFuZV9jb25maWcpOwogCX0K IH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCAwOWEwYTkyMjJhM2EuLjA5ZTM1ODFj ODQ0MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTU1MCw3ICs1NTAsNiBAQCBzdHJ1 Y3QgaW50ZWxfY3J0YyB7CiAJdWludDMyX3QgY3Vyc29yX3NpemU7CiAJdWludDMyX3QgY3Vyc29y X2Jhc2U7CiAKLQlzdHJ1Y3QgaW50ZWxfaW5pdGlhbF9wbGFuZV9jb25maWcgcGxhbmVfY29uZmln OwogCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjb25maWc7CiAJYm9vbCBuZXdfZW5hYmxlZDsK IAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK