From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH 1/3] drm/i915: Make ips_enabled a property
	depending on whether IPS is enabled.
Date: Fri, 17 Nov 2017 16:37:54 +0100
Message-ID: <20171117153756.33558-2-maarten.lankhorst@linux.intel.com>
References: <20171117153756.33558-1-maarten.lankhorst@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 mblankhorst.nl (mblankhorst.nl [141.105.120.124])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 013326EA52
 for <intel-gfx@lists.freedesktop.org>; Fri, 17 Nov 2017 15:38:01 +0000 (UTC)
In-Reply-To: <20171117153756.33558-1-maarten.lankhorst@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

aXBzX2VuYWJsZWQgd2FzIHVzZWQgYXMgYSB2YXJpYWJsZSBvZiB3aGV0aGVyIElQUyBjYW4gYmUg
ZW5hYmxlZCBvciBub3QsCmJ1dCBzaG91bGQgYmUgdXNlZCB0byB0ZXN0IHdoZXRoZXIgSVBTIGlz
IGFjdHVhbGx5IGVuYWJsZWQuCgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFh
cnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX2Rpc3BsYXkuYyAgfCA3NSArKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0t
LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcGlwZV9jcmMuYyB8ICAyIC0KIDIgZmlsZXMg
Y2hhbmdlZCwgMzUgaW5zZXJ0aW9ucygrKSwgNDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDNiM2RlYzFlNjY0MC4uODI4M2U4MDU5N2JkIDEwMDY0
NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC00ODcwLDcgKzQ4NzAsNyBAQCB2b2lk
IGhzd19lbmFibGVfaXBzKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRl
KQogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5iYXNlLmRldjsKIAlzdHJ1Y3QgZHJt
X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAKLQlpZiAoIWNydGMtPmNv
bmZpZy0+aXBzX2VuYWJsZWQpCisJaWYgKCFjcnRjX3N0YXRlLT5pcHNfZW5hYmxlZCkKIAkJcmV0
dXJuOwogCiAJLyoKQEAgLTQ5NjYsMTQgKzQ5NjYsNiBAQCBpbnRlbF9wb3N0X2VuYWJsZV9wcmlt
YXJ5KHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0
YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAJaW50IHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOwog
Ci0JLyoKLQkgKiBGSVhNRSBJUFMgc2hvdWxkIGJlIGZpbmUgYXMgbG9uZyBhcyBvbmUgcGxhbmUg
aXMKLQkgKiBlbmFibGVkLCBidXQgaW4gcHJhY3RpY2UgaXQgc2VlbXMgdG8gaGF2ZSBwcm9ibGVt
cwotCSAqIHdoZW4gZ29pbmcgZnJvbSBwcmltYXJ5IG9ubHkgdG8gc3ByaXRlIG9ubHkgYW5kIHZp
Y2UKLQkgKiB2ZXJzYS4KLQkgKi8KLQloc3dfZW5hYmxlX2lwcyhuZXdfY3J0Y19zdGF0ZSk7Ci0K
IAkvKgogCSAqIEdlbjIgcmVwb3J0cyBwaXBlIHVuZGVycnVucyB3aGVuZXZlciBhbGwgcGxhbmVz
IGFyZSBkaXNhYmxlZC4KIAkgKiBTbyBkb24ndCBlbmFibGUgdW5kZXJydW4gcmVwb3J0aW5nIGJl
Zm9yZSBhdCBsZWFzdCBzb21lIHBsYW5lcwpAQCAtNDk4OSwxMCArNDk4MSw5IEBAIGludGVsX3Bv
c3RfZW5hYmxlX3ByaW1hcnkoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCWludGVsX2NoZWNrX3Bj
aF9maWZvX3VuZGVycnVucyhkZXZfcHJpdik7CiB9CiAKLS8qIEZJWE1FIG1vdmUgYWxsIHRoaXMg
dG8gcHJlX3BsYW5lX3VwZGF0ZSgpIHdpdGggcHJvcGVyIHN0YXRlIHRyYWNraW5nICovCisvKiBG
SVhNRSBnZXQgcmlkIG9mIHRoaXMgYW5kIHVzZSBwcmVfcGxhbmVfdXBkYXRlICovCiBzdGF0aWMg
dm9pZAotaW50ZWxfcHJlX2Rpc2FibGVfcHJpbWFyeShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCi0J
CQkgIGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSkKK2ludGVs
X3ByZV9kaXNhYmxlX3ByaW1hcnlfbm9hdG9taWMoc3RydWN0IGRybV9jcnRjICpjcnRjKQogewog
CXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3By
aXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwpAQCAtNTAwMSwzMiArNDk5MiwxMiBAQCBp
bnRlbF9wcmVfZGlzYWJsZV9wcmltYXJ5KHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAogCS8qCiAJ
ICogR2VuMiByZXBvcnRzIHBpcGUgdW5kZXJydW5zIHdoZW5ldmVyIGFsbCBwbGFuZXMgYXJlIGRp
c2FibGVkLgotCSAqIFNvIGRpYXNibGUgdW5kZXJydW4gcmVwb3J0aW5nIGJlZm9yZSBhbGwgdGhl
IHBsYW5lcyBnZXQgZGlzYWJsZWQuCi0JICogRklYTUU6IE5lZWQgdG8gZml4IHRoZSBsb2dpYyB0
byB3b3JrIHdoZW4gd2UgdHVybiBvZmYgYWxsIHBsYW5lcwotCSAqIGJ1dCBsZWF2ZSB0aGUgcGlw
ZSBydW5uaW5nLgorCSAqIFNvIGRpc2FibGUgdW5kZXJydW4gcmVwb3J0aW5nIGJlZm9yZSBhbGwg
dGhlIHBsYW5lcyBnZXQgZGlzYWJsZWQuCiAJICovCiAJaWYgKElTX0dFTjIoZGV2X3ByaXYpKQog
CQlpbnRlbF9zZXRfY3B1X2ZpZm9fdW5kZXJydW5fcmVwb3J0aW5nKGRldl9wcml2LCBwaXBlLCBm
YWxzZSk7CiAKLQkvKgotCSAqIEZJWE1FIElQUyBzaG91bGQgYmUgZmluZSBhcyBsb25nIGFzIG9u
ZSBwbGFuZSBpcwotCSAqIGVuYWJsZWQsIGJ1dCBpbiBwcmFjdGljZSBpdCBzZWVtcyB0byBoYXZl
IHByb2JsZW1zCi0JICogd2hlbiBnb2luZyBmcm9tIHByaW1hcnkgb25seSB0byBzcHJpdGUgb25s
eSBhbmQgdmljZQotCSAqIHZlcnNhLgotCSAqLwotCWhzd19kaXNhYmxlX2lwcyhvbGRfY3J0Y19z
dGF0ZSk7Ci19Ci0KLS8qIEZJWE1FIGdldCByaWQgb2YgdGhpcyBhbmQgdXNlIHByZV9wbGFuZV91
cGRhdGUgKi8KLXN0YXRpYyB2b2lkCi1pbnRlbF9wcmVfZGlzYWJsZV9wcmltYXJ5X25vYXRvbWlj
KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKLXsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0
Yy0+ZGV2OwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2
KTsKLQlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7
Ci0JaW50IHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOwotCi0JaW50ZWxfcHJlX2Rpc2FibGVfcHJp
bWFyeShjcnRjLCB0b19pbnRlbF9jcnRjX3N0YXRlKGNydGMtPnN0YXRlKSk7CisJaHN3X2Rpc2Fi
bGVfaXBzKHRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+c3RhdGUpKTsKIAogCS8qCiAJICogVmJs
YW5rIHRpbWUgdXBkYXRlcyBmcm9tIHRoZSBzaGFkb3cgdG8gbGl2ZSBwbGFuZSBjb250cm9sIHJl
Z2lzdGVyCkBAIC01MDU4LDYgKzUwMjksMTEgQEAgc3RhdGljIHZvaWQgaW50ZWxfcG9zdF9wbGFu
ZV91cGRhdGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlKQogCWlmIChw
aXBlX2NvbmZpZy0+dXBkYXRlX3dtX3Bvc3QgJiYgcGlwZV9jb25maWctPmJhc2UuYWN0aXZlKQog
CQlpbnRlbF91cGRhdGVfd2F0ZXJtYXJrcyhjcnRjKTsKIAorCWlmICghb2xkX2NydGNfc3RhdGUt
Pmlwc19lbmFibGVkIHx8CisJICAgIG5lZWRzX21vZGVzZXQoJm9sZF9jcnRjX3N0YXRlLT5iYXNl
KSB8fAorCSAgICBwaXBlX2NvbmZpZy0+dXBkYXRlX3BpcGUpCisJCWhzd19lbmFibGVfaXBzKHBp
cGVfY29uZmlnKTsKKwogCWlmIChvbGRfcHJpX3N0YXRlKSB7CiAJCXN0cnVjdCBpbnRlbF9wbGFu
ZV9zdGF0ZSAqcHJpbWFyeV9zdGF0ZSA9CiAJCQlpbnRlbF9hdG9taWNfZ2V0X25ld19wbGFuZV9z
dGF0ZSh0b19pbnRlbF9hdG9taWNfc3RhdGUob2xkX3N0YXRlKSwKQEAgLTUwODgsNiArNTA2NCw5
IEBAIHN0YXRpYyB2b2lkIGludGVsX3ByZV9wbGFuZV91cGRhdGUoc3RydWN0IGludGVsX2NydGNf
c3RhdGUgKm9sZF9jcnRjX3N0YXRlLAogCXN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKm9sZF9p
bnRlbF9zdGF0ZSA9CiAJCXRvX2ludGVsX2F0b21pY19zdGF0ZShvbGRfc3RhdGUpOwogCisJaWYg
KG5lZWRzX21vZGVzZXQoJnBpcGVfY29uZmlnLT5iYXNlKSB8fCAhcGlwZV9jb25maWctPmlwc19l
bmFibGVkKQorCQloc3dfZGlzYWJsZV9pcHMob2xkX2NydGNfc3RhdGUpOworCiAJaWYgKG9sZF9w
cmlfc3RhdGUpIHsKIAkJc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwcmltYXJ5X3N0YXRlID0K
IAkJCWludGVsX2F0b21pY19nZXRfbmV3X3BsYW5lX3N0YXRlKG9sZF9pbnRlbF9zdGF0ZSwKQEAg
LTUwOTYsMTAgKzUwNzUsMTMgQEAgc3RhdGljIHZvaWQgaW50ZWxfcHJlX3BsYW5lX3VwZGF0ZShz
dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUsCiAJCQl0b19pbnRlbF9wbGFu
ZV9zdGF0ZShvbGRfcHJpX3N0YXRlKTsKIAogCQlpbnRlbF9mYmNfcHJlX3VwZGF0ZShjcnRjLCBw
aXBlX2NvbmZpZywgcHJpbWFyeV9zdGF0ZSk7Ci0KLQkJaWYgKG9sZF9wcmltYXJ5X3N0YXRlLT5i
YXNlLnZpc2libGUgJiYKKwkJLyoKKwkJICogR2VuMiByZXBvcnRzIHBpcGUgdW5kZXJydW5zIHdo
ZW5ldmVyIGFsbCBwbGFuZXMgYXJlIGRpc2FibGVkLgorCQkgKiBTbyBkaXNhYmxlIHVuZGVycnVu
IHJlcG9ydGluZyBiZWZvcmUgYWxsIHRoZSBwbGFuZXMgZ2V0IGRpc2FibGVkLgorCQkgKi8KKwkJ
aWYgKElTX0dFTjIoZGV2X3ByaXYpICYmIG9sZF9wcmltYXJ5X3N0YXRlLT5iYXNlLnZpc2libGUg
JiYKIAkJICAgIChtb2Rlc2V0IHx8ICFwcmltYXJ5X3N0YXRlLT5iYXNlLnZpc2libGUpKQotCQkJ
aW50ZWxfcHJlX2Rpc2FibGVfcHJpbWFyeSgmY3J0Yy0+YmFzZSwgb2xkX2NydGNfc3RhdGUpOwor
CQkJaW50ZWxfc2V0X2NwdV9maWZvX3VuZGVycnVuX3JlcG9ydGluZyhkZXZfcHJpdiwgY3J0Yy0+
cGlwZSwgZmFsc2UpOwogCX0KIAogCS8qCkBAIC02MjMxLDEyICs2MjEzLDI1IEBAIHN0YXRpYyBp
bnQgaXJvbmxha2VfZmRpX2NvbXB1dGVfY29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9j
cnRjLAogc3RhdGljIGJvb2wgcGlwZV9jb25maWdfc3VwcG9ydHNfaXBzKHN0cnVjdCBkcm1faTkx
NV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQkgICAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpw
aXBlX2NvbmZpZykKIHsKKwl1OCB2aXNpYmxlX3BsYW5lczsKKwogCWlmIChwaXBlX2NvbmZpZy0+
aXBzX2ZvcmNlX2Rpc2FibGUpCiAJCXJldHVybiBmYWxzZTsKIAogCWlmIChwaXBlX2NvbmZpZy0+
cGlwZV9icHAgPiAyNCkKIAkJcmV0dXJuIGZhbHNlOwogCisJdmlzaWJsZV9wbGFuZXMgPSBwaXBl
X2NvbmZpZy0+YWN0aXZlX3BsYW5lcyAmIH5CSVQoUExBTkVfQ1VSU09SKTsKKworCS8qCisJICog
RklYTUUgSVBTIHNob3VsZCBiZSBmaW5lIGFzIGxvbmcgYXMgb25lIHBsYW5lIGlzCisJICogZW5h
YmxlZCwgYnV0IGluIHByYWN0aWNlIGl0IHNlZW1zIHRvIGhhdmUgcHJvYmxlbXMKKwkgKiB3aGVu
IGdvaW5nIGZyb20gcHJpbWFyeSBvbmx5IHRvIHNwcml0ZSBvbmx5IGFuZCB2aWNlCisJICogdmVy
c2EuCisJICovCisJaWYgKHZpc2libGVfcGxhbmVzICE9IEJJVChQTEFORV9QUklNQVJZKSkKKwkJ
cmV0dXJuIGZhbHNlOworCiAJLyogSFNXIGNhbiBoYW5kbGUgcGl4ZWwgcmF0ZSB1cCB0byBjZGNs
az8gKi8KIAlpZiAoSVNfSEFTV0VMTChkZXZfcHJpdikpCiAJCXJldHVybiB0cnVlOwpAQCAtNjM3
OCw5ICs2MzczLDYgQEAgc3RhdGljIGludCBpbnRlbF9jcnRjX2NvbXB1dGVfY29uZmlnKHN0cnVj
dCBpbnRlbF9jcnRjICpjcnRjLAogCiAJaW50ZWxfY3J0Y19jb21wdXRlX3BpeGVsX3JhdGUocGlw
ZV9jb25maWcpOwogCi0JaWYgKEhBU19JUFMoZGV2X3ByaXYpKQotCQloc3dfY29tcHV0ZV9pcHNf
Y29uZmlnKGNydGMsIHBpcGVfY29uZmlnKTsKLQogCWlmIChwaXBlX2NvbmZpZy0+aGFzX3BjaF9l
bmNvZGVyKQogCQlyZXR1cm4gaXJvbmxha2VfZmRpX2NvbXB1dGVfY29uZmlnKGNydGMsIHBpcGVf
Y29uZmlnKTsKIApAQCAtMTA0ODgsNiArMTA0ODAsOSBAQCBzdGF0aWMgaW50IGludGVsX2NydGNf
YXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJCQkJCQkgcGlwZV9jb25maWcp
OwogCX0KIAorCWlmIChIQVNfSVBTKGRldl9wcml2KSkKKwkJaHN3X2NvbXB1dGVfaXBzX2NvbmZp
ZyhpbnRlbF9jcnRjLCBwaXBlX2NvbmZpZyk7CisKIAlyZXR1cm4gcmV0OwogfQogCmRpZmYgLS1n
aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9waXBlX2NyYy5jIGIvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaW50ZWxfcGlwZV9jcmMuYwppbmRleCA2MTY0MWQ0NzliOTMuLjFmNWNkNTcyYTdm
ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcGlwZV9jcmMuYworKysg
Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9waXBlX2NyYy5jCkBAIC01NDEsOCArNTQxLDYg
QEAgc3RhdGljIHZvaWQgaHN3X3BpcGVfQV9jcmNfd2Eoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg
KmRldl9wcml2LAogCQkgKiBjb21wbGV0ZWx5IGRpc2FibGUgaXQuCiAJCSAqLwogCQlwaXBlX2Nv
bmZpZy0+aXBzX2ZvcmNlX2Rpc2FibGUgPSBlbmFibGU7Ci0JCWlmIChwaXBlX2NvbmZpZy0+aXBz
X2VuYWJsZWQgPT0gZW5hYmxlKQotCQkJcGlwZV9jb25maWctPmJhc2UuY29ubmVjdG9yc19jaGFu
Z2VkID0gdHJ1ZTsKIAl9CiAKIAlpZiAoSVNfSEFTV0VMTChkZXZfcHJpdikpIHsKLS0gCjIuMTUu
MAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt
Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v
bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==