From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 01/12] drm/i915: Move disable_cxsr to the crtc_state. Date: Thu, 19 Nov 2015 16:07:14 +0100 Message-ID: <1447945645-32005-2-git-send-email-maarten.lankhorst@linux.intel.com> References: <1447945645-32005-1-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 mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id E14016E98D for ; Thu, 19 Nov 2015 07:07:36 -0800 (PST) In-Reply-To: <1447945645-32005-1-git-send-email-maarten.lankhorst@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 aW50ZWxfY3J0Yy0+YXRvbWljIHdpbGwgYmUgcmVtb3ZlZCBsYXRlciBvbiwgbW92ZSB0aGlzIG1l bWJlcgp0byBpbnRlbF9jcnRjX3N0YXRlLgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9y c3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9hdG9taWMuYyAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMgfCAxMiArKysrKysrLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rydi5oICAgICB8ICA0ICsrLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTAgaW5zZXJ0aW9ucygrKSwg NyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9h dG9taWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pYy5jCmluZGV4IGM0ZWFk YmM5MjhiNy4uOWYwNjM4YTM3YjZkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9hdG9taWMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYwpA QCAtOTUsNiArOTUsNyBAQCBpbnRlbF9jcnRjX2R1cGxpY2F0ZV9zdGF0ZShzdHJ1Y3QgZHJtX2Ny dGMgKmNydGMpCiAKIAljcnRjX3N0YXRlLT51cGRhdGVfcGlwZSA9IGZhbHNlOwogCWNydGNfc3Rh dGUtPmRpc2FibGVfbHBfd20gPSBmYWxzZTsKKwljcnRjX3N0YXRlLT5kaXNhYmxlX2N4c3IgPSBm YWxzZTsKIAogCXJldHVybiAmY3J0Y19zdGF0ZS0+YmFzZTsKIH0KZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYwppbmRleCBmOGMzMzJhZWUxZTAuLjVlZTY0ZTY3YWQ4YSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtNDc0OSw4ICs0NzQ5LDcgQEAgc3RhdGljIHZv aWQgaW50ZWxfcG9zdF9wbGFuZV91cGRhdGUoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAKIAlp bnRlbF9mcm9udGJ1ZmZlcl9mbGlwKGRldiwgYXRvbWljLT5mYl9iaXRzKTsKIAotCWlmIChhdG9t aWMtPmRpc2FibGVfY3hzcikKLQkJY3J0Yy0+d20uY3hzcl9hbGxvd2VkID0gdHJ1ZTsKKwljcnRj LT53bS5jeHNyX2FsbG93ZWQgPSB0cnVlOwogCiAJaWYgKGNydGMtPmF0b21pYy51cGRhdGVfd21f cG9zdCkKIAkJaW50ZWxfdXBkYXRlX3dhdGVybWFya3MoJmNydGMtPmJhc2UpOwpAQCAtNDc2OSw2 ICs0NzY4LDggQEAgc3RhdGljIHZvaWQgaW50ZWxfcHJlX3BsYW5lX3VwZGF0ZShzdHJ1Y3QgaW50 ZWxfY3J0YyAqY3J0YykKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+YmFzZS5kZXY7 CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsK IAlzdHJ1Y3QgaW50ZWxfY3J0Y19hdG9taWNfY29tbWl0ICphdG9taWMgPSAmY3J0Yy0+YXRvbWlj OworCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZyA9CisJCXRvX2ludGVsX2Ny dGNfc3RhdGUoY3J0Yy0+YmFzZS5zdGF0ZSk7CiAKIAlpZiAoYXRvbWljLT5kaXNhYmxlX2ZiYykK IAkJaW50ZWxfZmJjX2Rpc2FibGVfY3J0YyhjcnRjKTsKQEAgLTQ3NzksNyArNDc4MCw3IEBAIHN0 YXRpYyB2b2lkIGludGVsX3ByZV9wbGFuZV91cGRhdGUoc3RydWN0IGludGVsX2NydGMgKmNydGMp CiAJaWYgKGF0b21pYy0+cHJlX2Rpc2FibGVfcHJpbWFyeSkKIAkJaW50ZWxfcHJlX2Rpc2FibGVf cHJpbWFyeSgmY3J0Yy0+YmFzZSk7CiAKLQlpZiAoYXRvbWljLT5kaXNhYmxlX2N4c3IpIHsKKwlp ZiAocGlwZV9jb25maWctPmRpc2FibGVfY3hzcikgewogCQljcnRjLT53bS5jeHNyX2FsbG93ZWQg PSBmYWxzZTsKIAkJaW50ZWxfc2V0X21lbW9yeV9jeHNyKGRldl9wcml2LCBmYWxzZSk7CiAJfQpA QCAtMTE2NTgsNiArMTE2NTksNyBAQCBzdGF0aWMgYm9vbCBuZWVkc19zY2FsaW5nKHN0cnVjdCBp bnRlbF9wbGFuZV9zdGF0ZSAqc3RhdGUpCiBpbnQgaW50ZWxfcGxhbmVfYXRvbWljX2NhbGNfY2hh bmdlcyhzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJCQkJICAgIHN0cnVjdCBk cm1fcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlKQogeworCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl ICpwaXBlX2NvbmZpZyA9IHRvX2ludGVsX2NydGNfc3RhdGUoY3J0Y19zdGF0ZSk7CiAJc3RydWN0 IGRybV9jcnRjICpjcnRjID0gY3J0Y19zdGF0ZS0+Y3J0YzsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAq aW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAJc3RydWN0IGRybV9wbGFuZSAqcGxh bmUgPSBwbGFuZV9zdGF0ZS0+cGxhbmU7CkBAIC0xMTcwOCw3ICsxMTcxMCw3IEBAIGludCBpbnRl bF9wbGFuZV9hdG9taWNfY2FsY19jaGFuZ2VzKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19z dGF0ZSwKIAkJaW50ZWxfY3J0Yy0+YXRvbWljLnVwZGF0ZV93bV9wcmUgPSB0cnVlOwogCQkvKiBt dXN0IGRpc2FibGUgY3hzciBhcm91bmQgcGxhbmUgZW5hYmxlL2Rpc2FibGUgKi8KIAkJaWYgKHBs YW5lLT50eXBlICE9IERSTV9QTEFORV9UWVBFX0NVUlNPUikgewotCQkJaW50ZWxfY3J0Yy0+YXRv bWljLmRpc2FibGVfY3hzciA9IHRydWU7CisJCQlwaXBlX2NvbmZpZy0+ZGlzYWJsZV9jeHNyID0g dHJ1ZTsKIAkJCS8qIHRvIHBvdGVudGlhbGx5IHJlLWVuYWJsZSBjeHNyICovCiAJCQlpbnRlbF9j cnRjLT5hdG9taWMud2FpdF92YmxhbmsgPSB0cnVlOwogCQkJaW50ZWxfY3J0Yy0+YXRvbWljLnVw ZGF0ZV93bV9wb3N0ID0gdHJ1ZTsKQEAgLTExNzE5LDcgKzExNzIxLDcgQEAgaW50IGludGVsX3Bs YW5lX2F0b21pY19jYWxjX2NoYW5nZXMoc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRl LAogCQlpZiAocGxhbmUtPnR5cGUgIT0gRFJNX1BMQU5FX1RZUEVfQ1VSU09SKSB7CiAJCQlpZiAo aXNfY3J0Y19lbmFibGVkKQogCQkJCWludGVsX2NydGMtPmF0b21pYy53YWl0X3ZibGFuayA9IHRy dWU7Ci0JCQlpbnRlbF9jcnRjLT5hdG9taWMuZGlzYWJsZV9jeHNyID0gdHJ1ZTsKKwkJCXBpcGVf Y29uZmlnLT5kaXNhYmxlX2N4c3IgPSB0cnVlOwogCQl9CiAJfSBlbHNlIGlmIChpbnRlbF93bV9u ZWVkX3VwZGF0ZShwbGFuZSwgcGxhbmVfc3RhdGUpKSB7CiAJCWludGVsX2NydGMtPmF0b21pYy51 cGRhdGVfd21fcHJlID0gdHJ1ZTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggNzI1OTcz ZWJmNDlmLi5kZDg5MzQyODMyZTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC0zNzAs NyArMzcwLDggQEAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgewogI2RlZmluZSBQSVBFX0NPTkZJ R19RVUlSS19NT0RFX1NZTkNfRkxBR1MJKDE8PDApIC8qIHVucmVsaWFibGUgc3luYyBtb2RlLmZs YWdzICovCiAJdW5zaWduZWQgbG9uZyBxdWlya3M7CiAKLQlib29sIHVwZGF0ZV9waXBlOworCWJv b2wgdXBkYXRlX3BpcGU7IC8qIGNhbiBhIGZhc3QgbW9kZXNldCBiZSBwZXJmb3JtZWQ/ICovCisJ Ym9vbCBkaXNhYmxlX2N4c3I7CiAKIAkvKiBQaXBlIHNvdXJjZSBzaXplIChpZS4gcGFuZWwgZml0 dGVyIGlucHV0IHNpemUpCiAJICogQWxsIHBsYW5lcyB3aWxsIGJlIHBvc2l0aW9uZWQgaW5zaWRl IHRoaXMgc3BhY2UsCkBAIC01MzMsNyArNTM0LDYgQEAgc3RydWN0IGludGVsX2NydGNfYXRvbWlj X2NvbW1pdCB7CiAJLyogU2xlZXBhYmxlIG9wZXJhdGlvbnMgdG8gcGVyZm9ybSBiZWZvcmUgY29t bWl0ICovCiAJYm9vbCBkaXNhYmxlX2ZiYzsKIAlib29sIGRpc2FibGVfaXBzOwotCWJvb2wgZGlz YWJsZV9jeHNyOwogCWJvb2wgcHJlX2Rpc2FibGVfcHJpbWFyeTsKIAlib29sIHVwZGF0ZV93bV9w cmUsIHVwZGF0ZV93bV9wb3N0OwogCi0tIAoyLjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK