From: Matt Roper Subject: [PATCH] drm/i915: Only write watermark registers if a pipe is active Date: Thu, 3 Mar 2016 14:27:21 -0800 Message-ID: <1457044041-13978-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: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id DCB846E042 for ; Thu, 3 Mar 2016 22:27:31 +0000 (UTC) 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 SWYgYWxsIHBpcGVzIGFyZSBvZmYsIHRoZW4gd2UgbWF5IGhhdmUgZW50ZXJlZCBydW50aW1lIHN1 c3BlbmQgYW5kCndyaXRpbmcgdGhlc2UgcmVnaXN0ZXJzIHdpbGwgaGF2ZSBubyBlZmZlY3QgYW55 d2F5LiAgV2hlbiBhIHBpcGUgaXMKcmUtZW5hYmxlZCwgaXQncyBjcnRjX2VuYWJsZSB3aWxsIHRh a2UgY2FyZSBvZiBwcm9ncmFtbWluZyBhcHByb3ByaWF0ZQp3YXRlcm1hcmsgdmFsdWVzLgoKQ2M6 IGFydW4uc2lsdXZlcnlAbGludXguaW50ZWwuY29tCkNjOiB2aWxsZS5zeXJqYWxhQGxpbnV4Lmlu dGVsLmNvbQpCdWd6aWxsYTogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5j Z2k/aWQ9OTQzNDkKRml4ZXM6IGVkNGE2YTdjYTg1MyAoImRybS9pOTE1OiBBZGQgdHdvLXN0YWdl IElMSy1zdHlsZSB3YXRlcm1hcmsgcHJvZ3JhbW1pbmcgKHYxMSkiKQpTaWduZWQtb2ZmLWJ5OiBN YXR0IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgotLS0KSSd2ZSBzdGlsbCBiZWVu IHVuYWJsZSB0byByZXByb2R1Y2UgdGhpcyBkZWZlY3Qgb24gbXkgU05CIHN5c3RlbTsgbm9uZSBv ZiB0aGUKc3VnZ2VzdGVkIHRlc3RzIHBlb3BsZSBoYXZlIG5vdGVkIGluIEJ1Z3ppbGxhIGhhdmUg dHJpZ2dlcmVkIGl0IGZvciBtZS4gIEJ1dApiYXNlZCBvbiB0aGUgc3RhY2sgdHJhY2UgSSdtIGd1 ZXNzaW5nIHRoYXQgdGhlIHByb2JsZW0gaGFwcGVucyBiZWNhdXNlIHdlJ3ZlCmRpc2FibGVkIHRo ZSBsYXN0IHBpcGUgYW5kIGdvbmUgaW50byBydW50aW1lIHN1c3BlbmQgYmVmb3JlIHdlIGdldCBh cm91bmQgdG8Kb3B0aW1pemluZyB0aGUgd2F0ZXJtYXJrcy4KCkknbSBub3Qgc3VwZXIgZmFtaWxp YXIgd2l0aCB0aGUgZGV0YWlscyBvZiBydW50aW1lIFBNLCBzbyBpZiB0aGVyZSdzIGEgYmV0dGVy CndheSB0aGlzIHNob3VsZCBiZSBoYW5kbGVkLCBJJ20gb3BlbiB0byBzdWdnZXN0aW9ucy4KCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIHwgNyArKysrLS0tCiAxIGZpbGUgY2hhbmdl ZCwgNCBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5j CmluZGV4IGY2NWU4NDEuLjhjN2ZkZGYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtMjgw Miw4ICsyODAyLDYgQEAgc3RhdGljIHZvaWQgaWxrX3dyaXRlX3dtX3ZhbHVlcyhzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCUk5MTVfV1JJVEUoV00yX0xQX0lMSywgcmVzdWx0 cy0+d21fbHBbMV0pOwogCWlmIChkaXJ0eSAmIFdNX0RJUlRZX0xQKDMpICYmIHByZXZpb3VzLT53 bV9scFsyXSAhPSByZXN1bHRzLT53bV9scFsyXSkKIAkJSTkxNV9XUklURShXTTNfTFBfSUxLLCBy ZXN1bHRzLT53bV9scFsyXSk7Ci0KLQlkZXZfcHJpdi0+d20uaHcgPSAqcmVzdWx0czsKIH0KIAog Ym9vbCBpbGtfZGlzYWJsZV9scF93bShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQpAQCAtMzczMSw3 ICszNzI5LDEwIEBAIHN0YXRpYyB2b2lkIGlsa19wcm9ncmFtX3dhdGVybWFya3Moc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCiAJaWxrX2NvbXB1dGVfd21fcmVzdWx0cyhkZXYs IGJlc3RfbHBfd20sIHBhcnRpdGlvbmluZywgJnJlc3VsdHMpOwogCi0JaWxrX3dyaXRlX3dtX3Zh bHVlcyhkZXZfcHJpdiwgJnJlc3VsdHMpOworCWlmIChjb25maWcubnVtX3BpcGVzX2FjdGl2ZSA+ IDApCisJCWlsa193cml0ZV93bV92YWx1ZXMoZGV2X3ByaXYsICZyZXN1bHRzKTsKKworCWRldl9w cml2LT53bS5odyA9IHJlc3VsdHM7CiB9CiAKIHN0YXRpYyB2b2lkIGlsa19pbml0aWFsX3dhdGVy bWFya3Moc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSkKLS0gCjIuMS40CgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK