From: Lyude Subject: [PATCH v2 04/10] drm/i915/gen9: Cleanup skl_pipe_wm_active_state Date: Fri, 14 Oct 2016 17:31:52 -0400 Message-ID: <1476480722-13015-5-git-send-email-cpaul@redhat.com> References: <1476480722-13015-1-git-send-email-cpaul@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1476480722-13015-1-git-send-email-cpaul@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: intel-gfx@lists.freedesktop.org Cc: Paulo Zanoni , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter , Lyude List-Id: dri-devel@lists.freedesktop.org VGhpcyBmdW5jdGlvbiBpcyBhIHdyZWNrLCBsZXQncyBoZWxwIGl0IGdldCBpdHMgbGlmZSBiYWNr IHRvZ2V0aGVyIGFuZApjbGVhbnVwIGFsbCBvZiB0aGUgY29weSBwYXN0YSBoZXJlLgoKU2lnbmVk LW9mZi1ieTogTHl1ZGUgPGNwYXVsQHJlZGhhdC5jb20+ClJldmlld2VkLWJ5OiBNYWFydGVuIExh bmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgpSZXZpZXdlZC1ieTog UGF1bG8gWmFub25pIDxwYXVsby5yLnphbm9uaUBpbnRlbC5jb20+CkNjOiBWaWxsZSBTeXJqw6Rs w6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgpDYzogTWF0dCBSb3BlciA8bWF0dGhl dy5kLnJvcGVyQGludGVsLmNvbQpDYzogUGF1bG8gWmFub25pIDxwYXVsby5yLnphbm9uaUBpbnRl bC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyB8IDUyICsrKysrKysr KysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTQgaW5z ZXJ0aW9ucygrKSwgMzggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXgg MWJkY2NjOS4uMmQ2M2EzNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC00MjcxLDQ2ICs0 MjcxLDIyIEBAIHN0YXRpYyB2b2lkIGlsa19vcHRpbWl6ZV93YXRlcm1hcmtzKHN0cnVjdCBpbnRl bF9jcnRjX3N0YXRlICpjc3RhdGUpCiBzdGF0aWMgdm9pZCBza2xfcGlwZV93bV9hY3RpdmVfc3Rh dGUodWludDMyX3QgdmFsLAogCQkJCSAgICAgc3RydWN0IHNrbF9waXBlX3dtICphY3RpdmUsCiAJ CQkJICAgICBib29sIGlzX3RyYW5zd20sCi0JCQkJICAgICBib29sIGlzX2N1cnNvciwKIAkJCQkg ICAgIGludCBpLAogCQkJCSAgICAgaW50IGxldmVsKQogeworCXN0cnVjdCBza2xfcGxhbmVfd20g KnBsYW5lX3dtID0gJmFjdGl2ZS0+cGxhbmVzW2ldOwogCWJvb2wgaXNfZW5hYmxlZCA9ICh2YWwg JiBQTEFORV9XTV9FTikgIT0gMDsKIAogCWlmICghaXNfdHJhbnN3bSkgewotCQlpZiAoIWlzX2N1 cnNvcikgewotCQkJYWN0aXZlLT5wbGFuZXNbaV0ud21bbGV2ZWxdLnBsYW5lX2VuID0gaXNfZW5h YmxlZDsKLQkJCWFjdGl2ZS0+cGxhbmVzW2ldLndtW2xldmVsXS5wbGFuZV9yZXNfYiA9Ci0JCQkJ dmFsICYgUExBTkVfV01fQkxPQ0tTX01BU0s7Ci0JCQlhY3RpdmUtPnBsYW5lc1tpXS53bVtsZXZl bF0ucGxhbmVfcmVzX2wgPQotCQkJCSh2YWwgPj4gUExBTkVfV01fTElORVNfU0hJRlQpICYKLQkJ CQlQTEFORV9XTV9MSU5FU19NQVNLOwotCQl9IGVsc2UgewotCQkJYWN0aXZlLT5wbGFuZXNbUExB TkVfQ1VSU09SXS53bVtsZXZlbF0ucGxhbmVfZW4gPQotCQkJCWlzX2VuYWJsZWQ7Ci0JCQlhY3Rp dmUtPnBsYW5lc1tQTEFORV9DVVJTT1JdLndtW2xldmVsXS5wbGFuZV9yZXNfYiA9Ci0JCQkJdmFs ICYgUExBTkVfV01fQkxPQ0tTX01BU0s7Ci0JCQlhY3RpdmUtPnBsYW5lc1tQTEFORV9DVVJTT1Jd LndtW2xldmVsXS5wbGFuZV9yZXNfbCA9Ci0JCQkJKHZhbCA+PiBQTEFORV9XTV9MSU5FU19TSElG VCkgJgotCQkJCVBMQU5FX1dNX0xJTkVTX01BU0s7Ci0JCX0KKwkJcGxhbmVfd20tPndtW2xldmVs XS5wbGFuZV9lbiA9IGlzX2VuYWJsZWQ7CisJCXBsYW5lX3dtLT53bVtsZXZlbF0ucGxhbmVfcmVz X2IgPSB2YWwgJiBQTEFORV9XTV9CTE9DS1NfTUFTSzsKKwkJcGxhbmVfd20tPndtW2xldmVsXS5w bGFuZV9yZXNfbCA9CisJCQkodmFsID4+IFBMQU5FX1dNX0xJTkVTX1NISUZUKSAmIFBMQU5FX1dN X0xJTkVTX01BU0s7CiAJfSBlbHNlIHsKLQkJaWYgKCFpc19jdXJzb3IpIHsKLQkJCWFjdGl2ZS0+ cGxhbmVzW2ldLnRyYW5zX3dtLnBsYW5lX2VuID0gaXNfZW5hYmxlZDsKLQkJCWFjdGl2ZS0+cGxh bmVzW2ldLnRyYW5zX3dtLnBsYW5lX3Jlc19iID0KLQkJCQl2YWwgJiBQTEFORV9XTV9CTE9DS1Nf TUFTSzsKLQkJCWFjdGl2ZS0+cGxhbmVzW2ldLnRyYW5zX3dtLnBsYW5lX3Jlc19sID0KLQkJCQko dmFsID4+IFBMQU5FX1dNX0xJTkVTX1NISUZUKSAmCi0JCQkJUExBTkVfV01fTElORVNfTUFTSzsK LQkJfSBlbHNlIHsKLQkJCWFjdGl2ZS0+cGxhbmVzW1BMQU5FX0NVUlNPUl0udHJhbnNfd20ucGxh bmVfZW4gPQotCQkJCWlzX2VuYWJsZWQ7Ci0JCQlhY3RpdmUtPnBsYW5lc1tQTEFORV9DVVJTT1Jd LnRyYW5zX3dtLnBsYW5lX3Jlc19iID0KLQkJCQl2YWwgJiBQTEFORV9XTV9CTE9DS1NfTUFTSzsK LQkJCWFjdGl2ZS0+cGxhbmVzW1BMQU5FX0NVUlNPUl0udHJhbnNfd20ucGxhbmVfcmVzX2wgPQot CQkJCSh2YWwgPj4gUExBTkVfV01fTElORVNfU0hJRlQpICYKLQkJCQlQTEFORV9XTV9MSU5FU19N QVNLOwotCQl9CisJCXBsYW5lX3dtLT50cmFuc193bS5wbGFuZV9lbiA9IGlzX2VuYWJsZWQ7CisJ CXBsYW5lX3dtLT50cmFuc193bS5wbGFuZV9yZXNfYiA9IHZhbCAmIFBMQU5FX1dNX0JMT0NLU19N QVNLOworCQlwbGFuZV93bS0+dHJhbnNfd20ucGxhbmVfcmVzX2wgPQorCQkJKHZhbCA+PiBQTEFO RV9XTV9MSU5FU19TSElGVCkgJiBQTEFORV9XTV9MSU5FU19NQVNLOwogCX0KIH0KIApAQCAtNDM0 OSwyMCArNDMyNSwyMCBAQCBzdGF0aWMgdm9pZCBza2xfcGlwZV93bV9nZXRfaHdfc3RhdGUoc3Ry dWN0IGRybV9jcnRjICpjcnRjKQogCWZvciAobGV2ZWwgPSAwOyBsZXZlbCA8PSBtYXhfbGV2ZWw7 IGxldmVsKyspIHsKIAkJZm9yIChpID0gMDsgaSA8IGludGVsX251bV9wbGFuZXMoaW50ZWxfY3J0 Yyk7IGkrKykgewogCQkJdGVtcCA9IGh3LT5wbGFuZVtwaXBlXVtpXVtsZXZlbF07Ci0JCQlza2xf cGlwZV93bV9hY3RpdmVfc3RhdGUodGVtcCwgYWN0aXZlLCBmYWxzZSwKLQkJCQkJCWZhbHNlLCBp LCBsZXZlbCk7CisJCQlza2xfcGlwZV93bV9hY3RpdmVfc3RhdGUodGVtcCwgYWN0aXZlLCBmYWxz ZSwgaSwgbGV2ZWwpOwogCQl9CiAJCXRlbXAgPSBody0+cGxhbmVbcGlwZV1bUExBTkVfQ1VSU09S XVtsZXZlbF07Ci0JCXNrbF9waXBlX3dtX2FjdGl2ZV9zdGF0ZSh0ZW1wLCBhY3RpdmUsIGZhbHNl LCB0cnVlLCBpLCBsZXZlbCk7CisJCXNrbF9waXBlX3dtX2FjdGl2ZV9zdGF0ZSh0ZW1wLCBhY3Rp dmUsIGZhbHNlLCBQTEFORV9DVVJTT1IsCisJCQkJCSBsZXZlbCk7CiAJfQogCiAJZm9yIChpID0g MDsgaSA8IGludGVsX251bV9wbGFuZXMoaW50ZWxfY3J0Yyk7IGkrKykgewogCQl0ZW1wID0gaHct PnBsYW5lX3RyYW5zW3BpcGVdW2ldOwotCQlza2xfcGlwZV93bV9hY3RpdmVfc3RhdGUodGVtcCwg YWN0aXZlLCB0cnVlLCBmYWxzZSwgaSwgMCk7CisJCXNrbF9waXBlX3dtX2FjdGl2ZV9zdGF0ZSh0 ZW1wLCBhY3RpdmUsIHRydWUsIGksIDApOwogCX0KIAogCXRlbXAgPSBody0+cGxhbmVfdHJhbnNb cGlwZV1bUExBTkVfQ1VSU09SXTsKLQlza2xfcGlwZV93bV9hY3RpdmVfc3RhdGUodGVtcCwgYWN0 aXZlLCB0cnVlLCB0cnVlLCBpLCAwKTsKKwlza2xfcGlwZV93bV9hY3RpdmVfc3RhdGUodGVtcCwg YWN0aXZlLCB0cnVlLCBQTEFORV9DVVJTT1IsIDApOwogCiAJaW50ZWxfY3J0Yy0+d20uYWN0aXZl LnNrbCA9ICphY3RpdmU7CiB9Ci0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vZHJpLWRldmVsCg==