From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lyude Subject: [PATCH 09/10] drm/i915/gen9: Actually verify WM levels in verify_wm_state() Date: Fri, 7 Oct 2016 20:11:33 -0400 Message-ID: <1475885497-6094-10-git-send-email-cpaul@redhat.com> References: <1475885497-6094-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: <1475885497-6094-1-git-send-email-cpaul@redhat.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 Cc: Paulo Zanoni , David Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter List-Id: dri-devel@lists.freedesktop.org VGhhbmtzIHRvIFBhdWxvIFphbm9uaSBmb3IgaW5kaXJlY3RseSBwb2ludGluZyB0aGlzIG91dC4K Ckxvb2tzIGxpa2Ugd2UgbmV2ZXIgYWN0dWFsbHkgYWRkZWQgYW55IGNvZGUgZm9yIGNoZWNraW5n IHdoZXRoZXIgb3Igbm90CndlIGFjdHVhbGx5IHdyb3RlIHdhdGVybWFyayBsZXZlbHMgcHJvcGVy bHkuIExldCdzIGZpeCB0aGF0LgoKU2lnbmVkLW9mZi1ieTogTHl1ZGUgPGNwYXVsQHJlZGhhdC5j b20+CkNjOiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwu Y29tPgpDYzogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4K Q2M6IFBhdWxvIFphbm9uaSA8cGF1bG8uci56YW5vbmlAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDEwMCArKysrKysrKysrKysrKysrKysrKysr KysrKysrKy0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDg0IGluc2VydGlvbnMoKyksIDE2IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCAzOTQwMGEwLi4y YzY4MmJjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xMzQ0NCwzMCAr MTM0NDQsNjYgQEAgc3RhdGljIHZvaWQgdmVyaWZ5X3dtX3N0YXRlKHN0cnVjdCBkcm1fY3J0YyAq Y3J0YywKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwogCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIAlzdHJ1Y3Qgc2tsX2RkYl9h bGxvY2F0aW9uIGh3X2RkYiwgKnN3X2RkYjsKLQlzdHJ1Y3Qgc2tsX2RkYl9lbnRyeSAqaHdfZW50 cnksICpzd19lbnRyeTsKKwlzdHJ1Y3Qgc2tsX3BpcGVfd20gaHdfd20sICpzd193bTsKKwlzdHJ1 Y3Qgc2tsX3BsYW5lX3dtICpod19wbGFuZV93bSwgKnN3X3BsYW5lX3dtOworCXN0cnVjdCBza2xf ZGRiX2VudHJ5ICpod19kZGJfZW50cnksICpzd19kZGJfZW50cnk7CiAJc3RydWN0IGludGVsX2Ny dGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwogCWNvbnN0IGVudW0gcGlwZSBw aXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsKLQlpbnQgcGxhbmU7CisJaW50IHBsYW5lLCBsZXZlbCwg bWF4X2xldmVsID0gaWxrX3dtX21heF9sZXZlbChkZXYpOwogCiAJaWYgKElOVEVMX0lORk8oZGV2 KS0+Z2VuIDwgOSB8fCAhbmV3X3N0YXRlLT5hY3RpdmUpCiAJCXJldHVybjsKIAorCXNrbF9waXBl X3dtX2dldF9od19zdGF0ZShjcnRjLCAmaHdfd20pOworCXN3X3dtID0gJmludGVsX2NydGMtPndt LmFjdGl2ZS5za2w7CisKIAlza2xfZGRiX2dldF9od19zdGF0ZShkZXZfcHJpdiwgJmh3X2RkYik7 CiAJc3dfZGRiID0gJmRldl9wcml2LT53bS5za2xfaHcuZGRiOwogCiAJLyogcGxhbmVzICovCiAJ Zm9yX2VhY2hfcGxhbmUoZGV2X3ByaXYsIHBpcGUsIHBsYW5lKSB7Ci0JCWh3X2VudHJ5ID0gJmh3 X2RkYi5wbGFuZVtwaXBlXVtwbGFuZV07Ci0JCXN3X2VudHJ5ID0gJnN3X2RkYi0+cGxhbmVbcGlw ZV1bcGxhbmVdOworCQlod19wbGFuZV93bSA9ICZod193bS5wbGFuZXNbcGxhbmVdOworCQlzd19w bGFuZV93bSA9ICZzd193bS0+cGxhbmVzW3BsYW5lXTsKIAotCQlpZiAoc2tsX2RkYl9lbnRyeV9l cXVhbChod19lbnRyeSwgc3dfZW50cnkpKQotCQkJY29udGludWU7CisJCS8qIFdhdGVybWFya3Mg Ki8KKwkJZm9yIChsZXZlbCA9IDA7IGxldmVsIDw9IG1heF9sZXZlbDsgbGV2ZWwrKykgeworCQkJ aWYgKHNrbF93bV9sZXZlbF9lcXVhbHMoJmh3X3BsYW5lX3dtLT53bVtsZXZlbF0sCisJCQkJCQkm c3dfcGxhbmVfd20tPndtW2xldmVsXSkpCisJCQkJY29udGludWU7CisKKwkJCURSTV9FUlJPUigi bWlzbWF0Y2ggaW4gV00gcGlwZSAlYyBwbGFuZSAlZCBsZXZlbCAlZCAoZXhwZWN0ZWQgZT0lZCBi PSVkIGw9JWQsIGdvdCBlPSVkIGI9JWQgbD0lZClcbiIsCisJCQkJICBwaXBlX25hbWUocGlwZSks IHBsYW5lICsgMSwgbGV2ZWwsCisJCQkJICBzd19wbGFuZV93bS0+d21bbGV2ZWxdLnBsYW5lX2Vu LAorCQkJCSAgc3dfcGxhbmVfd20tPndtW2xldmVsXS5wbGFuZV9yZXNfYiwKKwkJCQkgIHN3X3Bs YW5lX3dtLT53bVtsZXZlbF0ucGxhbmVfcmVzX2wsCisJCQkJICBod19wbGFuZV93bS0+d21bbGV2 ZWxdLnBsYW5lX2VuLAorCQkJCSAgaHdfcGxhbmVfd20tPndtW2xldmVsXS5wbGFuZV9yZXNfYiwK KwkJCQkgIGh3X3BsYW5lX3dtLT53bVtsZXZlbF0ucGxhbmVfcmVzX2wpOworCQl9CiAKLQkJRFJN X0VSUk9SKCJtaXNtYXRjaCBpbiBEREIgc3RhdGUgcGlwZSAlYyBwbGFuZSAlZCAiCi0JCQkgICIo ZXhwZWN0ZWQgKCV1LCV1KSwgZm91bmQgKCV1LCV1KSlcbiIsCi0JCQkgIHBpcGVfbmFtZShwaXBl KSwgcGxhbmUgKyAxLAotCQkJICBzd19lbnRyeS0+c3RhcnQsIHN3X2VudHJ5LT5lbmQsCi0JCQkg IGh3X2VudHJ5LT5zdGFydCwgaHdfZW50cnktPmVuZCk7CisJCWlmICghc2tsX3dtX2xldmVsX2Vx dWFscygmaHdfcGxhbmVfd20tPnRyYW5zX3dtLAorCQkJCQkgJnN3X3BsYW5lX3dtLT50cmFuc193 bSkpIHsKKwkJCURSTV9FUlJPUigibWlzbWF0Y2ggaW4gdHJhbnMgV00gcGlwZSAlYyBwbGFuZSAl ZCAoZXhwZWN0ZWQgZT0lZCBiPSVkIGw9JWQsIGdvdCBlPSVkIGI9JWQgbD0lZClcbiIsCisJCQkJ ICBwaXBlX25hbWUocGlwZSksIHBsYW5lICsgMSwKKwkJCQkgIHN3X3BsYW5lX3dtLT50cmFuc193 bS5wbGFuZV9lbiwKKwkJCQkgIHN3X3BsYW5lX3dtLT50cmFuc193bS5wbGFuZV9yZXNfYiwKKwkJ CQkgIHN3X3BsYW5lX3dtLT50cmFuc193bS5wbGFuZV9yZXNfbCwKKwkJCQkgIGh3X3BsYW5lX3dt LT50cmFuc193bS5wbGFuZV9lbiwKKwkJCQkgIGh3X3BsYW5lX3dtLT50cmFuc193bS5wbGFuZV9y ZXNfYiwKKwkJCQkgIGh3X3BsYW5lX3dtLT50cmFuc193bS5wbGFuZV9yZXNfbCk7CisJCX0KKwor CQkvKiBEREIgKi8KKwkJaHdfZGRiX2VudHJ5ID0gJmh3X2RkYi5wbGFuZVtwaXBlXVtwbGFuZV07 CisJCXN3X2RkYl9lbnRyeSA9ICZzd19kZGItPnBsYW5lW3BpcGVdW3BsYW5lXTsKKworCQlpZiAo IXNrbF9kZGJfZW50cnlfZXF1YWwoaHdfZGRiX2VudHJ5LCBzd19kZGJfZW50cnkpKSB7CisJCQlE Uk1fRVJST1IoIm1pc21hdGNoIGluIEREQiBzdGF0ZSBwaXBlICVjIHBsYW5lICVkICIKKwkJCQkg ICIoZXhwZWN0ZWQgKCV1LCV1KSwgZm91bmQgKCV1LCV1KSlcbiIsCisJCQkJICBwaXBlX25hbWUo cGlwZSksIHBsYW5lICsgMSwKKwkJCQkgIHN3X2RkYl9lbnRyeS0+c3RhcnQsIHN3X2RkYl9lbnRy eS0+ZW5kLAorCQkJCSAgaHdfZGRiX2VudHJ5LT5zdGFydCwgaHdfZGRiX2VudHJ5LT5lbmQpOwor CQl9CiAJfQogCiAJLyoKQEAgLTEzNDc3LDE1ICsxMzUxMyw0NyBAQCBzdGF0aWMgdm9pZCB2ZXJp Znlfd21fc3RhdGUoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCSAqIG9uY2UgdGhlIHBsYW5lIGJl Y29tZXMgdmlzaWJsZSwgd2UgY2FuIHNraXAgdGhpcyBjaGVjawogCSAqLwogCWlmIChpbnRlbF9j cnRjLT5jdXJzb3JfYWRkcikgewotCQlod19lbnRyeSA9ICZod19kZGIucGxhbmVbcGlwZV1bUExB TkVfQ1VSU09SXTsKLQkJc3dfZW50cnkgPSAmc3dfZGRiLT5wbGFuZVtwaXBlXVtQTEFORV9DVVJT T1JdOworCQlod19wbGFuZV93bSA9ICZod193bS5wbGFuZXNbUExBTkVfQ1VSU09SXTsKKwkJc3df cGxhbmVfd20gPSAmc3dfd20tPnBsYW5lc1tQTEFORV9DVVJTT1JdOworCisJCS8qIFdhdGVybWFy a3MgKi8KKwkJZm9yIChsZXZlbCA9IDA7IGxldmVsIDw9IG1heF9sZXZlbDsgbGV2ZWwrKykgewor CQkJaWYgKHNrbF93bV9sZXZlbF9lcXVhbHMoJmh3X3BsYW5lX3dtLT53bVtsZXZlbF0sCisJCQkJ CQkmc3dfcGxhbmVfd20tPndtW2xldmVsXSkpCisJCQkJY29udGludWU7CisKKwkJCURSTV9FUlJP UigibWlzbWF0Y2ggaW4gV00gcGlwZSAlYyBjdXJzb3IgbGV2ZWwgJWQgKGV4cGVjdGVkIGU9JWQg Yj0lZCBsPSVkLCBnb3QgZT0lZCBiPSVkIGw9JWQpXG4iLAorCQkJCSAgcGlwZV9uYW1lKHBpcGUp LCBsZXZlbCwKKwkJCQkgIHN3X3BsYW5lX3dtLT53bVtsZXZlbF0ucGxhbmVfZW4sCisJCQkJICBz d19wbGFuZV93bS0+d21bbGV2ZWxdLnBsYW5lX3Jlc19iLAorCQkJCSAgc3dfcGxhbmVfd20tPndt W2xldmVsXS5wbGFuZV9yZXNfbCwKKwkJCQkgIGh3X3BsYW5lX3dtLT53bVtsZXZlbF0ucGxhbmVf ZW4sCisJCQkJICBod19wbGFuZV93bS0+d21bbGV2ZWxdLnBsYW5lX3Jlc19iLAorCQkJCSAgaHdf cGxhbmVfd20tPndtW2xldmVsXS5wbGFuZV9yZXNfbCk7CisJCX0KKworCQlpZiAoIXNrbF93bV9s ZXZlbF9lcXVhbHMoJmh3X3BsYW5lX3dtLT50cmFuc193bSwKKwkJCQkJICZzd19wbGFuZV93bS0+ dHJhbnNfd20pKSB7CisJCQlEUk1fRVJST1IoIm1pc21hdGNoIGluIHRyYW5zIFdNIHBpcGUgJWMg Y3Vyc29yIChleHBlY3RlZCBlPSVkIGI9JWQgbD0lZCwgZ290IGU9JWQgYj0lZCBsPSVkKVxuIiwK KwkJCQkgIHBpcGVfbmFtZShwaXBlKSwKKwkJCQkgIHN3X3BsYW5lX3dtLT50cmFuc193bS5wbGFu ZV9lbiwKKwkJCQkgIHN3X3BsYW5lX3dtLT50cmFuc193bS5wbGFuZV9yZXNfYiwKKwkJCQkgIHN3 X3BsYW5lX3dtLT50cmFuc193bS5wbGFuZV9yZXNfbCwKKwkJCQkgIGh3X3BsYW5lX3dtLT50cmFu c193bS5wbGFuZV9lbiwKKwkJCQkgIGh3X3BsYW5lX3dtLT50cmFuc193bS5wbGFuZV9yZXNfYiwK KwkJCQkgIGh3X3BsYW5lX3dtLT50cmFuc193bS5wbGFuZV9yZXNfbCk7CisJCX0KKworCQkvKiBE REIgKi8KKwkJaHdfZGRiX2VudHJ5ID0gJmh3X2RkYi5wbGFuZVtwaXBlXVtQTEFORV9DVVJTT1Jd OworCQlzd19kZGJfZW50cnkgPSAmc3dfZGRiLT5wbGFuZVtwaXBlXVtQTEFORV9DVVJTT1JdOwog Ci0JCWlmICghc2tsX2RkYl9lbnRyeV9lcXVhbChod19lbnRyeSwgc3dfZW50cnkpKSB7CisJCWlm ICghc2tsX2RkYl9lbnRyeV9lcXVhbChod19kZGJfZW50cnksIHN3X2RkYl9lbnRyeSkpIHsKIAkJ CURSTV9FUlJPUigibWlzbWF0Y2ggaW4gRERCIHN0YXRlIHBpcGUgJWMgY3Vyc29yICIKIAkJCQkg ICIoZXhwZWN0ZWQgKCV1LCV1KSwgZm91bmQgKCV1LCV1KSlcbiIsCiAJCQkJICBwaXBlX25hbWUo cGlwZSksCi0JCQkJICBzd19lbnRyeS0+c3RhcnQsIHN3X2VudHJ5LT5lbmQsCi0JCQkJICBod19l bnRyeS0+c3RhcnQsIGh3X2VudHJ5LT5lbmQpOworCQkJCSAgc3dfZGRiX2VudHJ5LT5zdGFydCwg c3dfZGRiX2VudHJ5LT5lbmQsCisJCQkJICBod19kZGJfZW50cnktPnN0YXJ0LCBod19kZGJfZW50 cnktPmVuZCk7CiAJCX0KIAl9CiB9Ci0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==