From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matt Roper <matthew.d.roper@intel.com>
Subject: [PATCH v2 16/16] drm/i915: Remove wm_config from
	dev_priv/intel_atomic_state
Date: Tue, 19 Apr 2016 19:26:23 -0700
Message-ID: <1461119183-14267-17-git-send-email-matthew.d.roper@intel.com>
References: <1461119183-14267-1-git-send-email-matthew.d.roper@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 mga09.intel.com (mga09.intel.com [134.134.136.24])
 by gabe.freedesktop.org (Postfix) with ESMTP id ECC7A6E8BF
 for <intel-gfx@lists.freedesktop.org>; Wed, 20 Apr 2016 02:28:17 +0000 (UTC)
In-Reply-To: <1461119183-14267-1-git-send-email-matthew.d.roper@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

V2UgY2FsY3VsYXRlIHRoZSB3YXRlcm1hcmsgY29uZmlnIGludG8gaW50ZWxfYXRvbWljX3N0YXRl
IGFuZCB0aGVuIHNhdmUKaXQgaW50byBkZXZfcHJpdiwgYnV0IG5ldmVyIGFjdHVhbGx5IHVzZSBp
dCBmcm9tIHRoZXJlLiAgVGhpcyBpcwpsZWZ0LW92ZXIgZnJvbSBzb21lIGVhcmx5IElMSy1zdHls
ZSB3YXRlcm1hcmsgcHJvZ3JhbW1pbmcgZGVzaWducyB0aGF0CmdvdCBjaGFuZ2VkIG92ZXIgdGlt
ZS4KClNpZ25lZC1vZmYtYnk6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+
ClJldmlld2VkLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXgu
aW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICB8ICAz
IC0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMzEgLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2Lmgg
ICAgIHwgIDEgLQogMyBmaWxlcyBjaGFuZ2VkLCAzNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg
YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aTkxNV9kcnYuaAppbmRleCA2YTJiYmFkLi45MGEwNGZmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2
LmgKQEAgLTE5NjEsOSArMTk2MSw2IEBAIHN0cnVjdCBkcm1faTkxNV9wcml2YXRlIHsKIAkJICov
CiAJCXVpbnQxNl90IHNrbF9sYXRlbmN5WzhdOwogCi0JCS8qIENvbW1pdHRlZCB3bSBjb25maWcg
Ki8KLQkJc3RydWN0IGludGVsX3dtX2NvbmZpZyBjb25maWc7Ci0KIAkJLyoKIAkJICogVGhlIHNr
bF93bV92YWx1ZXMgc3RydWN0dXJlIGlzIGEgYml0IHRvbyBiaWcgZm9yIHN0YWNrCiAJCSAqIGFs
bG9jYXRpb24sIHNvIHdlIGtlZXAgdGhlIHN0YWdpbmcgc3RydWN0IHdoZXJlIHdlIHN0b3JlCmRp
ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggOGJlZGYxMi4uMDVlODdiYiAxMDA2
NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTMzMTYsMzUgKzEzMzE2LDYgQEAg
c3RhdGljIGludCBjYWxjX3dhdGVybWFya19kYXRhKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpz
dGF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gc3RhdGUtPmRldjsKIAlzdHJ1Y3Qg
ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Ci0Jc3RydWN0IGludGVs
X2F0b21pY19zdGF0ZSAqaW50ZWxfc3RhdGUgPSB0b19pbnRlbF9hdG9taWNfc3RhdGUoc3RhdGUp
OwotCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKLQlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNzdGF0
ZTsKLQlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZTsKLQlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpw
c3RhdGU7Ci0KLQkvKgotCSAqIENhbGN1bGF0ZSB3YXRlcm1hcmsgY29uZmlndXJhdGlvbiBkZXRh
aWxzIG5vdyB0aGF0IGRlcml2ZWQKLQkgKiBwbGFuZS9jcnRjIHN0YXRlIGlzIGFsbCBwcm9wZXJs
eSB1cGRhdGVkLgotCSAqLwotCWRybV9mb3JfZWFjaF9jcnRjKGNydGMsIGRldikgewotCQljc3Rh
dGUgPSBkcm1fYXRvbWljX2dldF9leGlzdGluZ19jcnRjX3N0YXRlKHN0YXRlLCBjcnRjKSA/Ogot
CQkJY3J0Yy0+c3RhdGU7Ci0KLQkJaWYgKGNzdGF0ZS0+YWN0aXZlKQotCQkJaW50ZWxfc3RhdGUt
PndtX2NvbmZpZy5udW1fcGlwZXNfYWN0aXZlKys7Ci0JfQotCWRybV9mb3JfZWFjaF9sZWdhY3lf
cGxhbmUocGxhbmUsIGRldikgewotCQlwc3RhdGUgPSBkcm1fYXRvbWljX2dldF9leGlzdGluZ19w
bGFuZV9zdGF0ZShzdGF0ZSwgcGxhbmUpID86Ci0JCQlwbGFuZS0+c3RhdGU7Ci0KLQkJaWYgKCF0
b19pbnRlbF9wbGFuZV9zdGF0ZShwc3RhdGUpLT52aXNpYmxlKQotCQkJY29udGludWU7Ci0KLQkJ
aW50ZWxfc3RhdGUtPndtX2NvbmZpZy5zcHJpdGVzX2VuYWJsZWQgPSB0cnVlOwotCQlpZiAocHN0
YXRlLT5jcnRjX3cgIT0gcHN0YXRlLT5zcmNfdyA+PiAxNiB8fAotCQkgICAgcHN0YXRlLT5jcnRj
X2ggIT0gcHN0YXRlLT5zcmNfaCA+PiAxNikKLQkJCWludGVsX3N0YXRlLT53bV9jb25maWcuc3By
aXRlc19zY2FsZWQgPSB0cnVlOwotCX0KIAogCS8qIElzIHRoZXJlIHBsYXRmb3JtLXNwZWNpZmlj
IHdhdGVybWFyayBpbmZvcm1hdGlvbiB0byBjYWxjdWxhdGU/ICovCiAJaWYgKGRldl9wcml2LT5k
aXNwbGF5LmNvbXB1dGVfZ2xvYmFsX3dhdGVybWFya3MpCkBAIC0xMzU5OCw3ICsxMzU2OSw2IEBA
IHN0YXRpYyBpbnQgaW50ZWxfYXRvbWljX2NvbW1pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAog
CX0KIAogCWRybV9hdG9taWNfaGVscGVyX3N3YXBfc3RhdGUoZGV2LCBzdGF0ZSk7Ci0JZGV2X3By
aXYtPndtLmNvbmZpZyA9IGludGVsX3N0YXRlLT53bV9jb25maWc7CiAJZGV2X3ByaXYtPndtLnNr
bF9yZXN1bHRzID0gaW50ZWxfc3RhdGUtPndtX3Jlc3VsdHM7CiAJaW50ZWxfc2hhcmVkX2RwbGxf
Y29tbWl0KHN0YXRlKTsKIApAQCAtMTUzNjYsNyArMTUzMzYsNiBAQCByZXRyeToKIAl9CiAKIAkv
KiBXcml0ZSBjYWxjdWxhdGVkIHdhdGVybWFyayB2YWx1ZXMgYmFjayAqLwotCXRvX2k5MTUoZGV2
KS0+d20uY29uZmlnID0gdG9faW50ZWxfYXRvbWljX3N0YXRlKHN0YXRlKS0+d21fY29uZmlnOwog
CWZvcl9lYWNoX2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIGNzdGF0ZSwgaSkgewogCQlzdHJ1
Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3MgPSB0b19pbnRlbF9jcnRjX3N0YXRlKGNzdGF0ZSk7CiAK
ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggNjMxNjIxNS4uODA0ZTk5OSAxMDA2NDQKLS0t
IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTMwNCw3ICszMDQsNiBAQCBzdHJ1Y3QgaW50ZWxfYXRvbWlj
X3N0YXRlIHsKIAl1bnNpZ25lZCBpbnQgbWluX3BpeGNsa1tJOTE1X01BWF9QSVBFU107CiAKIAlz
dHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGxfY29uZmlnIHNoYXJlZF9kcGxsW0k5MTVfTlVNX1BMTFNd
OwotCXN0cnVjdCBpbnRlbF93bV9jb25maWcgd21fY29uZmlnOwogCiAJLyoKIAkgKiBDdXJyZW50
IHdhdGVybWFya3MgY2FuJ3QgYmUgdHJ1c3RlZCBkdXJpbmcgaGFyZHdhcmUgcmVhZG91dCwgc28K
LS0gCjIuMS40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK
aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK