From mboxrd@z Thu Jan  1 00:00:00 1970
From: ville.syrjala@linux.intel.com
Subject: [PATCH 10/18] drm/i915: Nuke crtc->wm.cxsr_allowed
Date: Thu,  2 Mar 2017 19:15:00 +0200
Message-ID: <20170302171508.1666-11-ville.syrjala@linux.intel.com>
References: <20170302171508.1666-1-ville.syrjala@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 mga05.intel.com (mga05.intel.com [192.55.52.43])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 3A0E76EC01
 for <intel-gfx@lists.freedesktop.org>; Thu,  2 Mar 2017 17:15:41 +0000 (UTC)
In-Reply-To: <20170302171508.1666-1-ville.syrjala@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

RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClJl
bW92ZSBjcnRjLT53bS5jeHNyX2FsbG93ZWQgYW5kIGp1c3QgcmVseSBvbiBjcnRjX3N0YXRlLT5k
aXNhYmxlX2N4c3IKaW5zdGVhZC4gVGhpcyB3YXMgdXNlZCBvbmx5IGJ5IHZsdi9jaHYgdG8gaW5k
aWNhdGUgd2hldGhlciB0byBlbmFibGUKY3hzciBpbiB0aGUgd20gY29tcHV0YXRpb24uIFRoYXQg
ZG9lc24ndCByZWFsbHkgd29yayBhbnltb3JlLCBhbmQgYXMgZmFyCmFzIHRoZSBvcHRpbWFsIHdh
dGVybWFya3MgZ28gd2UnbGwganVzdCBjb25zaWRlciB0aGUgbnVtYmVyIG9mIHBsYW5lcwphbmQg
dGhlIGN1cnJlbnQgcGlwZSwgYW5kIGZvciB0aGUgaW50ZXJtZWRpYXRlIHdhdGVybWFya3Mgd2Un
bGwgYWxzbwpzdGFydCB0byBjb25zaWRlciBkaXNhYmxlX2N4c3Igd2hpY2ggaXMgc2V0IGFwcHJv
cHJpYXRlbHkgd2hlbiBwbGFuZXMKYXJlIGJlaW5nIGVuYWJsZWQvZGlzYWJsZWQuCgpXZSdsbCBh
bHNvIGZsaXAgb3ZlciB0aGUgY3J0Y19zdGF0ZS0+d20ubmVlZF9wb3N0dmJsX3VwZGF0ZSBzZXR1
cCBzbwp0aGF0IGl0J3MgdGhlIHdtIGNvZGUgdGhhdCB3aWxsIHNldCBpdC4gUHJldmlvdXNseSB0
aGUgZ2VuZXJpYyBjb2RlIHNldAppdCB1cCwgYW5kIHRoZW4gdGhlIHdtIGNvZGUgY2xlYXJlZCBp
dCBhZ2FpbiBpZiBpdCB0aG91Z2h0IGl0J3Mgbm90Cm5lZWRlZCBhZnRlciBhbGwuCgpTaWduZWQt
b2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgpS
ZXZpZXdlZC1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4Lmlu
dGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA0NCAr
KysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX2Rydi5oICAgICB8ICAzIC0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0u
YyAgICAgIHwgMTQgKysrKysrLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDIwIGluc2VydGlvbnMo
KyksIDQxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu
dGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRl
eCA3Y2E3ZDNlNWQxOGUuLjQ4NzQzOTUwYTdjOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp
c3BsYXkuYwpAQCAtNTAwMCw4ICs1MDAwLDYgQEAgc3RhdGljIHZvaWQgaW50ZWxfcG9zdF9wbGFu
ZV91cGRhdGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlKQogCiAJaW50
ZWxfZnJvbnRidWZmZXJfZmxpcCh0b19pOTE1KGNydGMtPmJhc2UuZGV2KSwgcGlwZV9jb25maWct
PmZiX2JpdHMpOwogCi0JY3J0Yy0+d20uY3hzcl9hbGxvd2VkID0gdHJ1ZTsKLQogCWlmIChwaXBl
X2NvbmZpZy0+dXBkYXRlX3dtX3Bvc3QgJiYgcGlwZV9jb25maWctPmJhc2UuYWN0aXZlKQogCQlp
bnRlbF91cGRhdGVfd2F0ZXJtYXJrcyhjcnRjKTsKIApAQCAtNTA0OCwyMiArNTA0NiwxOCBAQCBz
dGF0aWMgdm9pZCBpbnRlbF9wcmVfcGxhbmVfdXBkYXRlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl
ICpvbGRfY3J0Y19zdGF0ZSkKIAkJCWludGVsX3ByZV9kaXNhYmxlX3ByaW1hcnkoJmNydGMtPmJh
c2UpOwogCX0KIAotCWlmIChwaXBlX2NvbmZpZy0+ZGlzYWJsZV9jeHNyICYmIEhBU19HTUNIX0RJ
U1BMQVkoZGV2X3ByaXYpKSB7Ci0JCWNydGMtPndtLmN4c3JfYWxsb3dlZCA9IGZhbHNlOwotCi0J
CS8qCi0JCSAqIFZibGFuayB0aW1lIHVwZGF0ZXMgZnJvbSB0aGUgc2hhZG93IHRvIGxpdmUgcGxh
bmUgY29udHJvbCByZWdpc3RlcgotCQkgKiBhcmUgYmxvY2tlZCBpZiB0aGUgbWVtb3J5IHNlbGYt
cmVmcmVzaCBtb2RlIGlzIGFjdGl2ZSBhdCB0aGF0Ci0JCSAqIG1vbWVudC4gU28gdG8gbWFrZSBz
dXJlIHRoZSBwbGFuZSBnZXRzIHRydWx5IGRpc2FibGVkLCBkaXNhYmxlCi0JCSAqIGZpcnN0IHRo
ZSBzZWxmLXJlZnJlc2ggbW9kZS4gVGhlIHNlbGYtcmVmcmVzaCBlbmFibGUgYml0IGluIHR1cm4K
LQkJICogd2lsbCBiZSBjaGVja2VkL2FwcGxpZWQgYnkgdGhlIEhXIG9ubHkgYXQgdGhlIG5leHQg
ZnJhbWUgc3RhcnQKLQkJICogZXZlbnQgd2hpY2ggaXMgYWZ0ZXIgdGhlIHZibGFuayBzdGFydCBl
dmVudCwgc28gd2UgbmVlZCB0byBoYXZlIGEKLQkJICogd2FpdC1mb3ItdmJsYW5rIGJldHdlZW4g
ZGlzYWJsaW5nIHRoZSBwbGFuZSBhbmQgdGhlIHBpcGUuCi0JCSAqLwotCQlpZiAob2xkX2NydGNf
c3RhdGUtPmJhc2UuYWN0aXZlICYmCi0JCSAgICBpbnRlbF9zZXRfbWVtb3J5X2N4c3IoZGV2X3By
aXYsIGZhbHNlKSkKLQkJCWludGVsX3dhaXRfZm9yX3ZibGFuayhkZXZfcHJpdiwgY3J0Yy0+cGlw
ZSk7Ci0JfQorCS8qCisJICogVmJsYW5rIHRpbWUgdXBkYXRlcyBmcm9tIHRoZSBzaGFkb3cgdG8g
bGl2ZSBwbGFuZSBjb250cm9sIHJlZ2lzdGVyCisJICogYXJlIGJsb2NrZWQgaWYgdGhlIG1lbW9y
eSBzZWxmLXJlZnJlc2ggbW9kZSBpcyBhY3RpdmUgYXQgdGhhdAorCSAqIG1vbWVudC4gU28gdG8g
bWFrZSBzdXJlIHRoZSBwbGFuZSBnZXRzIHRydWx5IGRpc2FibGVkLCBkaXNhYmxlCisJICogZmly
c3QgdGhlIHNlbGYtcmVmcmVzaCBtb2RlLiBUaGUgc2VsZi1yZWZyZXNoIGVuYWJsZSBiaXQgaW4g
dHVybgorCSAqIHdpbGwgYmUgY2hlY2tlZC9hcHBsaWVkIGJ5IHRoZSBIVyBvbmx5IGF0IHRoZSBu
ZXh0IGZyYW1lIHN0YXJ0CisJICogZXZlbnQgd2hpY2ggaXMgYWZ0ZXIgdGhlIHZibGFuayBzdGFy
dCBldmVudCwgc28gd2UgbmVlZCB0byBoYXZlIGEKKwkgKiB3YWl0LWZvci12YmxhbmsgYmV0d2Vl
biBkaXNhYmxpbmcgdGhlIHBsYW5lIGFuZCB0aGUgcGlwZS4KKwkgKi8KKwlpZiAoSEFTX0dNQ0hf
RElTUExBWShkZXZfcHJpdikgJiYgb2xkX2NydGNfc3RhdGUtPmJhc2UuYWN0aXZlICYmCisJICAg
IHBpcGVfY29uZmlnLT5kaXNhYmxlX2N4c3IgJiYgaW50ZWxfc2V0X21lbW9yeV9jeHNyKGRldl9w
cml2LCBmYWxzZSkpCisJCWludGVsX3dhaXRfZm9yX3ZibGFuayhkZXZfcHJpdiwgY3J0Yy0+cGlw
ZSk7CiAKIAkvKgogCSAqIElWQiB3b3JrYXJvdW5kOiBtdXN0IGRpc2FibGUgbG93IHBvd2VyIHdh
dGVybWFya3MgZm9yIGF0IGxlYXN0CkBAIC0xMDg3MSwxMSArMTA4NjUsNiBAQCBpbnQgaW50ZWxf
cGxhbmVfYXRvbWljX2NhbGNfY2hhbmdlcyhzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3Rh
dGUsCiAJCXBpcGVfY29uZmlnLT51cGRhdGVfd21fcG9zdCA9IHRydWU7CiAJfQogCi0JLyogUHJl
LWdlbjkgcGxhdGZvcm1zIG5lZWQgdHdvLXN0ZXAgd2F0ZXJtYXJrIHVwZGF0ZXMgKi8KLQlpZiAo
KHBpcGVfY29uZmlnLT51cGRhdGVfd21fcHJlIHx8IHBpcGVfY29uZmlnLT51cGRhdGVfd21fcG9z
dCkgJiYKLQkgICAgSU5URUxfR0VOKGRldl9wcml2KSA8IDkgJiYgZGV2X3ByaXYtPmRpc3BsYXku
b3B0aW1pemVfd2F0ZXJtYXJrcykKLQkJdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjX3N0YXRlKS0+
d20ubmVlZF9wb3N0dmJsX3VwZGF0ZSA9IHRydWU7Ci0KIAlpZiAodmlzaWJsZSB8fCB3YXNfdmlz
aWJsZSkKIAkJcGlwZV9jb25maWctPmZiX2JpdHMgfD0gcGxhbmUtPmZyb250YnVmZmVyX2JpdDsK
IApAQCAtMTI2MTksMTIgKzEyNjA4LDcgQEAgc3RhdGljIGJvb2wgbmVlZHNfdmJsYW5rX3dhaXQo
c3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiAJaWYgKGNydGNfc3RhdGUtPnVw
ZGF0ZV93bV9wb3N0KQogCQlyZXR1cm4gdHJ1ZTsKIAotCS8qCi0JICogY3hzciBpcyByZS1lbmFi
bGVkIGFmdGVyIHZibGFuay4KLQkgKiBUaGlzIGlzIGFscmVhZHkgaGFuZGxlZCBieSBjcnRjX3N0
YXRlLT51cGRhdGVfd21fcG9zdCwKLQkgKiBidXQgYWRkZWQgZm9yIGNsYXJpdHkuCi0JICovCi0J
aWYgKGNydGNfc3RhdGUtPmRpc2FibGVfY3hzcikKKwlpZiAoY3J0Y19zdGF0ZS0+d20ubmVlZF9w
b3N0dmJsX3VwZGF0ZSkKIAkJcmV0dXJuIHRydWU7CiAKIAlyZXR1cm4gZmFsc2U7CkBAIC0xMzg5
Myw4ICsxMzg3Nyw2IEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0Y19pbml0KHN0cnVjdCBkcm1faTkx
NV9wcml2YXRlICpkZXZfcHJpdiwgZW51bSBwaXBlIHBpcGUpCiAJaW50ZWxfY3J0Yy0+Y3Vyc29y
X2NudGwgPSB+MDsKIAlpbnRlbF9jcnRjLT5jdXJzb3Jfc2l6ZSA9IH4wOwogCi0JaW50ZWxfY3J0
Yy0+d20uY3hzcl9hbGxvd2VkID0gdHJ1ZTsKLQogCS8qIGluaXRpYWxpemUgc2hhcmVkIHNjYWxl
cnMgKi8KIAlpbnRlbF9jcnRjX2luaXRfc2NhbGVycyhpbnRlbF9jcnRjLCBjcnRjX3N0YXRlKTsK
IApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCBhNzJiNjk5ZjQ1ZmUuLjJhODA5ZDAzZTc0
NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTc3Nyw5ICs3NzcsNiBAQCBzdHJ1Y3Qg
aW50ZWxfY3J0YyB7CiAJCQlzdHJ1Y3QgaW50ZWxfcGlwZV93bSBpbGs7CiAJCQlzdHJ1Y3Qgdmx2
X3dtX3N0YXRlIHZsdjsKIAkJfSBhY3RpdmU7Ci0KLQkJLyogYWxsb3cgQ3hTUiBvbiB0aGlzIHBp
cGUgKi8KLQkJYm9vbCBjeHNyX2FsbG93ZWQ7CiAJfSB3bTsKIAogCWludCBzY2FubGluZV9vZmZz
ZXQ7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCAwN2U1YzliNjdjYTUuLjdhODZkMjc3Y2E5
ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC0xMjc0LDggKzEyNzQsNyBAQCBzdGF0aWMg
aW50IHZsdl9jb21wdXRlX3BpcGVfd20oc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3Rh
dGUpCiAJICogZW5hYmxlZCBjYW4gd2VkZ2UgdGhlIHBpcGUuIEhlbmNlIHdlIG9ubHkgYWxsb3cg
Y3hzcgogCSAqIHdpdGggZXhhY3RseSBvbmUgZW5hYmxlZCBwcmltYXJ5L3Nwcml0ZSBwbGFuZS4K
IAkgKi8KLQl3bV9zdGF0ZS0+Y3hzciA9IGNydGMtPnBpcGUgIT0gUElQRV9DICYmCi0JCWNydGMt
PndtLmN4c3JfYWxsb3dlZCAmJiBudW1fYWN0aXZlX3BsYW5lcyA9PSAxOworCXdtX3N0YXRlLT5j
eHNyID0gY3J0Yy0+cGlwZSAhPSBQSVBFX0MgJiYgbnVtX2FjdGl2ZV9wbGFuZXMgPT0gMTsKIAog
CWZvciAobGV2ZWwgPSAwOyBsZXZlbCA8IHdtX3N0YXRlLT5udW1fbGV2ZWxzOyBsZXZlbCsrKSB7
CiAJCWNvbnN0IHN0cnVjdCB2bHZfcGlwZV93bSAqcmF3ID0gJmNydGNfc3RhdGUtPndtLnZsdi5y
YXdbbGV2ZWxdOwpAQCAtMTQxMSw3ICsxNDEwLDggQEAgc3RhdGljIGludCB2bHZfY29tcHV0ZV9p
bnRlcm1lZGlhdGVfd20oc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlpbnQgbGV2ZWw7CiAKIAlp
bnRlcm1lZGlhdGUtPm51bV9sZXZlbHMgPSBtaW4ob3B0aW1hbC0+bnVtX2xldmVscywgYWN0aXZl
LT5udW1fbGV2ZWxzKTsKLQlpbnRlcm1lZGlhdGUtPmN4c3IgPSBvcHRpbWFsLT5jeHNyICYgYWN0
aXZlLT5jeHNyOworCWludGVybWVkaWF0ZS0+Y3hzciA9IG9wdGltYWwtPmN4c3IgJiYgYWN0aXZl
LT5jeHNyICYmCisJCSFjcnRjX3N0YXRlLT5kaXNhYmxlX2N4c3I7CiAKIAlmb3IgKGxldmVsID0g
MDsgbGV2ZWwgPCBpbnRlcm1lZGlhdGUtPm51bV9sZXZlbHM7IGxldmVsKyspIHsKIAkJZW51bSBw
bGFuZV9pZCBwbGFuZV9pZDsKQEAgLTE0MzQsOCArMTQzNCw4IEBAIHN0YXRpYyBpbnQgdmx2X2Nv
bXB1dGVfaW50ZXJtZWRpYXRlX3dtKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJICogSWYgb3Vy
IGludGVybWVkaWF0ZSBXTSBhcmUgaWRlbnRpY2FsIHRvIHRoZSBmaW5hbCBXTSwgdGhlbiB3ZSBj
YW4KIAkgKiBvbWl0IHRoZSBwb3N0LXZibGFuayBwcm9ncmFtbWluZzsgb25seSB1cGRhdGUgaWYg
aXQncyBkaWZmZXJlbnQuCiAJICovCi0JaWYgKG1lbWNtcChpbnRlcm1lZGlhdGUsIG9wdGltYWws
IHNpemVvZigqaW50ZXJtZWRpYXRlKSkgPT0gMCkKLQkJY3J0Y19zdGF0ZS0+d20ubmVlZF9wb3N0
dmJsX3VwZGF0ZSA9IGZhbHNlOworCWlmIChtZW1jbXAoaW50ZXJtZWRpYXRlLCBvcHRpbWFsLCBz
aXplb2YoKmludGVybWVkaWF0ZSkpICE9IDApCisJCWNydGNfc3RhdGUtPndtLm5lZWRfcG9zdHZi
bF91cGRhdGUgPSB0cnVlOwogCiAJcmV0dXJuIDA7CiB9CkBAIC0yNjI4LDggKzI2MjgsOCBAQCBz
dGF0aWMgaW50IGlsa19jb21wdXRlX2ludGVybWVkaWF0ZV93bShzdHJ1Y3QgZHJtX2RldmljZSAq
ZGV2LAogCSAqIElmIG91ciBpbnRlcm1lZGlhdGUgV00gYXJlIGlkZW50aWNhbCB0byB0aGUgZmlu
YWwgV00sIHRoZW4gd2UgY2FuCiAJICogb21pdCB0aGUgcG9zdC12YmxhbmsgcHJvZ3JhbW1pbmc7
IG9ubHkgdXBkYXRlIGlmIGl0J3MgZGlmZmVyZW50LgogCSAqLwotCWlmIChtZW1jbXAoYSwgJm5l
d3N0YXRlLT53bS5pbGsub3B0aW1hbCwgc2l6ZW9mKCphKSkgPT0gMCkKLQkJbmV3c3RhdGUtPndt
Lm5lZWRfcG9zdHZibF91cGRhdGUgPSBmYWxzZTsKKwlpZiAobWVtY21wKGEsICZuZXdzdGF0ZS0+
d20uaWxrLm9wdGltYWwsIHNpemVvZigqYSkpICE9IDApCisJCW5ld3N0YXRlLT53bS5uZWVkX3Bv
c3R2YmxfdXBkYXRlID0gdHJ1ZTsKIAogCXJldHVybiAwOwogfQotLSAKMi4xMC4yCgpfX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu
ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl
ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK