From: ville.syrjala@linux.intel.com Subject: [PATCH 10/18] drm/i915: Nuke crtc->wm.cxsr_allowed Date: Thu, 16 Feb 2017 20:07:43 +0200 Message-ID: <20170216180751.3097-11-ville.syrjala@linux.intel.com> References: <20170216180751.3097-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 24D496EC09 for ; Thu, 16 Feb 2017 18:08:24 +0000 (UTC) In-Reply-To: <20170216180751.3097-1-ville.syrjala@linux.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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClJl bW92ZSBjcnRjLT53bS5jeHNyX2FsbG93ZWQgYW5kIGp1c3QgcmVseSBvbiBjcnRjX3N0YXRlLT5k aXNhYmxlX2N4c3IKaW5zdGVhZC4gVGhpcyB3YXMgdXNlZCBvbmx5IGJ5IHZsdi9jaHYgdG8gaW5k aWNhdGUgd2hldGhlciB0byBlbmFibGUKY3hzciBpbiB0aGUgd20gY29tcHV0YXRpb24uIFRoYXQg ZG9lc24ndCByZWFsbHkgd29yayBhbnltb3JlLCBhbmQgYXMgZmFyCmFzIHRoZSBvcHRpbWFsIHdh dGVybWFya3MgZ28gd2UnbGwganVzdCBjb25zaWRlciB0aGUgbnVtYmVyIG9mIHBsYW5lcwphbmQg dGhlIGN1cnJlbnQgcGlwZSwgYW5kIGZvciB0aGUgaW50ZXJtZWRpYXRlIHdhdGVybWFya3Mgd2Un bGwgYWxzbwpzdGFydCB0byBjb25zaWRlciBkaXNhYmxlX2N4c3Igd2hpY2ggaXMgc2V0IGFwcHJv cHJpYXRlbHkgd2hlbiBwbGFuZXMKYXJlIGJlaW5nIGVuYWJsZWQvZGlzYWJsZWQuCgpXZSdsbCBh bHNvIGZsaXAgb3ZlciB0aGUgY3J0Y19zdGF0ZS0+d20ubmVlZF9wb3N0dmJsX3VwZGF0ZSBzZXR1 cCBzbwp0aGF0IGl0J3MgdGhlIHdtIGNvZGUgdGhhdCB3aWxsIHNldCBpdC4gUHJldmlvdXNseSB0 aGUgZ2VuZXJpYyBjb2RlIHNldAppdCB1cCwgYW5kIHRoZW4gdGhlIHdtIGNvZGUgY2xlYXJlZCBp dCBhZ2FpbiBpZiBpdCB0aG91Z2h0IGl0J3Mgbm90Cm5lZWRlZCBhZnRlciBhbGwuCgpTaWduZWQt b2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgot LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDQ0ICsrKysrKysrKysr LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2 LmggICAgIHwgIDMgLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgICAgfCAx NCArKysrKystLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMjAgaW5zZXJ0aW9ucygrKSwgNDEgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDc3MTYwZWFh MjI5NC4uODIxMzUxMDFmYWFlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBA IC01MDAyLDggKzUwMDIsNiBAQCBzdGF0aWMgdm9pZCBpbnRlbF9wb3N0X3BsYW5lX3VwZGF0ZShz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUpCiAKIAlpbnRlbF9mcm9udGJ1 ZmZlcl9mbGlwKHRvX2k5MTUoY3J0Yy0+YmFzZS5kZXYpLCBwaXBlX2NvbmZpZy0+ZmJfYml0cyk7 CiAKLQljcnRjLT53bS5jeHNyX2FsbG93ZWQgPSB0cnVlOwotCiAJaWYgKHBpcGVfY29uZmlnLT51 cGRhdGVfd21fcG9zdCAmJiBwaXBlX2NvbmZpZy0+YmFzZS5hY3RpdmUpCiAJCWludGVsX3VwZGF0 ZV93YXRlcm1hcmtzKGNydGMpOwogCkBAIC01MDUwLDIyICs1MDQ4LDE4IEBAIHN0YXRpYyB2b2lk IGludGVsX3ByZV9wbGFuZV91cGRhdGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRj X3N0YXRlKQogCQkJaW50ZWxfcHJlX2Rpc2FibGVfcHJpbWFyeSgmY3J0Yy0+YmFzZSk7CiAJfQog Ci0JaWYgKHBpcGVfY29uZmlnLT5kaXNhYmxlX2N4c3IgJiYgSEFTX0dNQ0hfRElTUExBWShkZXZf cHJpdikpIHsKLQkJY3J0Yy0+d20uY3hzcl9hbGxvd2VkID0gZmFsc2U7Ci0KLQkJLyoKLQkJICog VmJsYW5rIHRpbWUgdXBkYXRlcyBmcm9tIHRoZSBzaGFkb3cgdG8gbGl2ZSBwbGFuZSBjb250cm9s IHJlZ2lzdGVyCi0JCSAqIGFyZSBibG9ja2VkIGlmIHRoZSBtZW1vcnkgc2VsZi1yZWZyZXNoIG1v ZGUgaXMgYWN0aXZlIGF0IHRoYXQKLQkJICogbW9tZW50LiBTbyB0byBtYWtlIHN1cmUgdGhlIHBs YW5lIGdldHMgdHJ1bHkgZGlzYWJsZWQsIGRpc2FibGUKLQkJICogZmlyc3QgdGhlIHNlbGYtcmVm cmVzaCBtb2RlLiBUaGUgc2VsZi1yZWZyZXNoIGVuYWJsZSBiaXQgaW4gdHVybgotCQkgKiB3aWxs IGJlIGNoZWNrZWQvYXBwbGllZCBieSB0aGUgSFcgb25seSBhdCB0aGUgbmV4dCBmcmFtZSBzdGFy dAotCQkgKiBldmVudCB3aGljaCBpcyBhZnRlciB0aGUgdmJsYW5rIHN0YXJ0IGV2ZW50LCBzbyB3 ZSBuZWVkIHRvIGhhdmUgYQotCQkgKiB3YWl0LWZvci12YmxhbmsgYmV0d2VlbiBkaXNhYmxpbmcg dGhlIHBsYW5lIGFuZCB0aGUgcGlwZS4KLQkJICovCi0JCWlmIChvbGRfY3J0Y19zdGF0ZS0+YmFz ZS5hY3RpdmUgJiYKLQkJICAgIGludGVsX3NldF9tZW1vcnlfY3hzcihkZXZfcHJpdiwgZmFsc2Up KQotCQkJaW50ZWxfd2FpdF9mb3JfdmJsYW5rKGRldl9wcml2LCBjcnRjLT5waXBlKTsKLQl9CisJ LyoKKwkgKiBWYmxhbmsgdGltZSB1cGRhdGVzIGZyb20gdGhlIHNoYWRvdyB0byBsaXZlIHBsYW5l IGNvbnRyb2wgcmVnaXN0ZXIKKwkgKiBhcmUgYmxvY2tlZCBpZiB0aGUgbWVtb3J5IHNlbGYtcmVm cmVzaCBtb2RlIGlzIGFjdGl2ZSBhdCB0aGF0CisJICogbW9tZW50LiBTbyB0byBtYWtlIHN1cmUg dGhlIHBsYW5lIGdldHMgdHJ1bHkgZGlzYWJsZWQsIGRpc2FibGUKKwkgKiBmaXJzdCB0aGUgc2Vs Zi1yZWZyZXNoIG1vZGUuIFRoZSBzZWxmLXJlZnJlc2ggZW5hYmxlIGJpdCBpbiB0dXJuCisJICog d2lsbCBiZSBjaGVja2VkL2FwcGxpZWQgYnkgdGhlIEhXIG9ubHkgYXQgdGhlIG5leHQgZnJhbWUg c3RhcnQKKwkgKiBldmVudCB3aGljaCBpcyBhZnRlciB0aGUgdmJsYW5rIHN0YXJ0IGV2ZW50LCBz byB3ZSBuZWVkIHRvIGhhdmUgYQorCSAqIHdhaXQtZm9yLXZibGFuayBiZXR3ZWVuIGRpc2FibGlu ZyB0aGUgcGxhbmUgYW5kIHRoZSBwaXBlLgorCSAqLworCWlmIChIQVNfR01DSF9ESVNQTEFZKGRl dl9wcml2KSAmJiBvbGRfY3J0Y19zdGF0ZS0+YmFzZS5hY3RpdmUgJiYKKwkgICAgcGlwZV9jb25m aWctPmRpc2FibGVfY3hzciAmJiBpbnRlbF9zZXRfbWVtb3J5X2N4c3IoZGV2X3ByaXYsIGZhbHNl KSkKKwkJaW50ZWxfd2FpdF9mb3JfdmJsYW5rKGRldl9wcml2LCBjcnRjLT5waXBlKTsKIAogCS8q CiAJICogSVZCIHdvcmthcm91bmQ6IG11c3QgZGlzYWJsZSBsb3cgcG93ZXIgd2F0ZXJtYXJrcyBm b3IgYXQgbGVhc3QKQEAgLTEwOTY1LDExICsxMDk1OSw2IEBAIGludCBpbnRlbF9wbGFuZV9hdG9t aWNfY2FsY19jaGFuZ2VzKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJcGlw ZV9jb25maWctPnVwZGF0ZV93bV9wb3N0ID0gdHJ1ZTsKIAl9CiAKLQkvKiBQcmUtZ2VuOSBwbGF0 Zm9ybXMgbmVlZCB0d28tc3RlcCB3YXRlcm1hcmsgdXBkYXRlcyAqLwotCWlmICgocGlwZV9jb25m aWctPnVwZGF0ZV93bV9wcmUgfHwgcGlwZV9jb25maWctPnVwZGF0ZV93bV9wb3N0KSAmJgotCSAg ICBJTlRFTF9HRU4oZGV2X3ByaXYpIDwgOSAmJiBkZXZfcHJpdi0+ZGlzcGxheS5vcHRpbWl6ZV93 YXRlcm1hcmtzKQotCQl0b19pbnRlbF9jcnRjX3N0YXRlKGNydGNfc3RhdGUpLT53bS5uZWVkX3Bv c3R2YmxfdXBkYXRlID0gdHJ1ZTsKLQogCWlmICh2aXNpYmxlIHx8IHdhc192aXNpYmxlKQogCQlw aXBlX2NvbmZpZy0+ZmJfYml0cyB8PSBwbGFuZS0+ZnJvbnRidWZmZXJfYml0OwogCkBAIC0xMjcx MywxMiArMTI3MDIsNyBAQCBzdGF0aWMgYm9vbCBuZWVkc192Ymxhbmtfd2FpdChzdHJ1Y3QgaW50 ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIAlpZiAoY3J0Y19zdGF0ZS0+dXBkYXRlX3dtX3Bv c3QpCiAJCXJldHVybiB0cnVlOwogCi0JLyoKLQkgKiBjeHNyIGlzIHJlLWVuYWJsZWQgYWZ0ZXIg dmJsYW5rLgotCSAqIFRoaXMgaXMgYWxyZWFkeSBoYW5kbGVkIGJ5IGNydGNfc3RhdGUtPnVwZGF0 ZV93bV9wb3N0LAotCSAqIGJ1dCBhZGRlZCBmb3IgY2xhcml0eS4KLQkgKi8KLQlpZiAoY3J0Y19z dGF0ZS0+ZGlzYWJsZV9jeHNyKQorCWlmIChjcnRjX3N0YXRlLT53bS5uZWVkX3Bvc3R2YmxfdXBk YXRlKQogCQlyZXR1cm4gdHJ1ZTsKIAogCXJldHVybiBmYWxzZTsKQEAgLTEzOTcwLDggKzEzOTU0 LDYgQEAgc3RhdGljIGludCBpbnRlbF9jcnRjX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2LCBlbnVtIHBpcGUgcGlwZSkKIAlpbnRlbF9jcnRjLT5jdXJzb3JfY250bCA9IH4w OwogCWludGVsX2NydGMtPmN1cnNvcl9zaXplID0gfjA7CiAKLQlpbnRlbF9jcnRjLT53bS5jeHNy X2FsbG93ZWQgPSB0cnVlOwotCiAJLyogaW5pdGlhbGl6ZSBzaGFyZWQgc2NhbGVycyAqLwogCWlu dGVsX2NydGNfaW5pdF9zY2FsZXJzKGludGVsX2NydGMsIGNydGNfc3RhdGUpOwogCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rydi5oCmluZGV4IDFjMzExMDA0ODJlZi4uZDE5NzYxN2U3ZWViIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtNzcxLDkgKzc3MSw2IEBAIHN0cnVjdCBpbnRlbF9jcnRj IHsKIAkJCXN0cnVjdCBpbnRlbF9waXBlX3dtIGlsazsKIAkJCXN0cnVjdCB2bHZfd21fc3RhdGUg dmx2OwogCQl9IGFjdGl2ZTsKLQotCQkvKiBhbGxvdyBDeFNSIG9uIHRoaXMgcGlwZSAqLwotCQli b29sIGN4c3JfYWxsb3dlZDsKIAl9IHdtOwogCiAJaW50IHNjYW5saW5lX29mZnNldDsKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9wbS5jCmluZGV4IGVjMzg0ZDU1OWFhZS4uNWJlYjJkMmRiNzAxIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3BtLmMKQEAgLTEyNjMsOCArMTI2Myw3IEBAIHN0YXRpYyBpbnQgdmx2X2Nv bXB1dGVfcGlwZV93bShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIAkgKiBl bmFibGVkIGNhbiB3ZWRnZSB0aGUgcGlwZS4gSGVuY2Ugd2Ugb25seSBhbGxvdyBjeHNyCiAJICog d2l0aCBleGFjdGx5IG9uZSBlbmFibGVkIHByaW1hcnkvc3ByaXRlIHBsYW5lLgogCSAqLwotCXdt X3N0YXRlLT5jeHNyID0gY3J0Yy0+cGlwZSAhPSBQSVBFX0MgJiYKLQkJY3J0Yy0+d20uY3hzcl9h bGxvd2VkICYmIG51bV9hY3RpdmVfcGxhbmVzID09IDE7CisJd21fc3RhdGUtPmN4c3IgPSBjcnRj LT5waXBlICE9IFBJUEVfQyAmJiBudW1fYWN0aXZlX3BsYW5lcyA9PSAxOwogCiAJZm9yIChsZXZl bCA9IDA7IGxldmVsIDwgd21fc3RhdGUtPm51bV9sZXZlbHM7IGxldmVsKyspIHsKIAkJY29uc3Qg c3RydWN0IHZsdl9waXBlX3dtICpub25pbnZlcnRlZCA9CkBAIC0xNDAxLDcgKzE0MDAsOCBAQCBz dGF0aWMgaW50IHZsdl9jb21wdXRlX2ludGVybWVkaWF0ZV93bShzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LAogCWludCBsZXZlbDsKIAogCWludGVybWVkaWF0ZS0+bnVtX2xldmVscyA9IG1pbihvcHRp bWFsLT5udW1fbGV2ZWxzLCBhY3RpdmUtPm51bV9sZXZlbHMpOwotCWludGVybWVkaWF0ZS0+Y3hz ciA9IG9wdGltYWwtPmN4c3IgJiBhY3RpdmUtPmN4c3I7CisJaW50ZXJtZWRpYXRlLT5jeHNyID0g b3B0aW1hbC0+Y3hzciAmJiBhY3RpdmUtPmN4c3IgJiYKKwkJIWNydGNfc3RhdGUtPmRpc2FibGVf Y3hzcjsKIAogCWZvciAobGV2ZWwgPSAwOyBsZXZlbCA8IGludGVybWVkaWF0ZS0+bnVtX2xldmVs czsgbGV2ZWwrKykgewogCQllbnVtIHBsYW5lX2lkIHBsYW5lX2lkOwpAQCAtMTQyNCw4ICsxNDI0 LDggQEAgc3RhdGljIGludCB2bHZfY29tcHV0ZV9pbnRlcm1lZGlhdGVfd20oc3RydWN0IGRybV9k ZXZpY2UgKmRldiwKIAkgKiBJZiBvdXIgaW50ZXJtZWRpYXRlIFdNIGFyZSBpZGVudGljYWwgdG8g dGhlIGZpbmFsIFdNLCB0aGVuIHdlIGNhbgogCSAqIG9taXQgdGhlIHBvc3QtdmJsYW5rIHByb2dy YW1taW5nOyBvbmx5IHVwZGF0ZSBpZiBpdCdzIGRpZmZlcmVudC4KIAkgKi8KLQlpZiAobWVtY21w KGludGVybWVkaWF0ZSwgb3B0aW1hbCwgc2l6ZW9mKCppbnRlcm1lZGlhdGUpKSA9PSAwKQotCQlj cnRjX3N0YXRlLT53bS5uZWVkX3Bvc3R2YmxfdXBkYXRlID0gZmFsc2U7CisJaWYgKG1lbWNtcChp bnRlcm1lZGlhdGUsIG9wdGltYWwsIHNpemVvZigqaW50ZXJtZWRpYXRlKSkgIT0gMCkKKwkJY3J0 Y19zdGF0ZS0+d20ubmVlZF9wb3N0dmJsX3VwZGF0ZSA9IHRydWU7CiAKIAlyZXR1cm4gMDsKIH0K QEAgLTI2MTQsOCArMjYxNCw4IEBAIHN0YXRpYyBpbnQgaWxrX2NvbXB1dGVfaW50ZXJtZWRpYXRl X3dtKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJICogSWYgb3VyIGludGVybWVkaWF0ZSBXTSBh cmUgaWRlbnRpY2FsIHRvIHRoZSBmaW5hbCBXTSwgdGhlbiB3ZSBjYW4KIAkgKiBvbWl0IHRoZSBw b3N0LXZibGFuayBwcm9ncmFtbWluZzsgb25seSB1cGRhdGUgaWYgaXQncyBkaWZmZXJlbnQuCiAJ ICovCi0JaWYgKG1lbWNtcChhLCAmbmV3c3RhdGUtPndtLmlsay5vcHRpbWFsLCBzaXplb2YoKmEp KSA9PSAwKQotCQluZXdzdGF0ZS0+d20ubmVlZF9wb3N0dmJsX3VwZGF0ZSA9IGZhbHNlOworCWlm IChtZW1jbXAoYSwgJm5ld3N0YXRlLT53bS5pbGsub3B0aW1hbCwgc2l6ZW9mKCphKSkgIT0gMCkK KwkJbmV3c3RhdGUtPndtLm5lZWRfcG9zdHZibF91cGRhdGUgPSB0cnVlOwogCiAJcmV0dXJuIDA7 CiB9Ci0tIAoyLjEwLjIKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=