From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH 2/3] drm/i915: Make EDP PSR flags not depend on enum values Date: Mon, 19 Nov 2018 16:41:08 +0200 Message-ID: <20181119144109.12994-2-imre.deak@intel.com> References: <20181119144109.12994-1-imre.deak@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 ESMTPS id A852C6E032 for ; Mon, 19 Nov 2018 14:41:13 +0000 (UTC) In-Reply-To: <20181119144109.12994-1-imre.deak@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 Cc: Lucas De Marchi List-Id: intel-gfx@lists.freedesktop.org RGVwZW5kaW5nIG9uIHRoZSB0cmFuc2NvZGVyIGVudW0gdmFsdWVzIHRvIHRyYW5zbGF0ZSBmcm9t IHRyYW5zY29kZXIKdG8gRURQIFBTUiBmbGFncyBjYW4gZWFzaWx5IGJyZWFrIGlmIHdlIGFkZCBh IG5ldyB0cmFuc2NvZGVyLiBTbyByZW1vdmUKdGhlIGRlcGVuZGVuY3kgYnkgdXNpbmcgYW4gZXhw bGljaXQgbWFwcGluZy4KCldoaWxlIGF0IGl0IGFsc28gYWRkIGEgV0FSTiBmb3IgdW5leHBlY3Rl ZCB0cmFuY29kZXJzLgoKQ2M6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5p bnRlbC5jb20+CkNjOiBMdWNhcyBEZSBNYXJjaGkgPGx1Y2FzLmRlbWFyY2hpQGludGVsLmNvbT4K Q2M6IE1pa2EgS2Fob2xhIDxtaWthLmthaG9sYUBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IElt cmUgRGVhayA8aW1yZS5kZWFrQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X3JlZy5oICB8IDEwICsrKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMg fCA3MCArKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tCiAyIGZpbGVzIGNo YW5nZWQsIDU5IGluc2VydGlvbnMoKyksIDIxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X3JlZy5oCmluZGV4IGVkYjU4YWYxZTkwMy4uMjViMDY5MTc1YzJhIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfcmVnLmgKQEAgLTQxNTAsOSArNDE1MCwxMyBAQCBlbnVtIHsKIC8qIEJzcGVjIGNsYWltcyB0 aG9zZSBhcmVuJ3Qgc2hpZnRlZCBidXQgc3RheSBhdCAweDY0ODAwICovCiAjZGVmaW5lIEVEUF9Q U1JfSU1SCQkJCV9NTUlPKDB4NjQ4MzQpCiAjZGVmaW5lIEVEUF9QU1JfSUlSCQkJCV9NTUlPKDB4 NjQ4MzgpCi0jZGVmaW5lICAgRURQX1BTUl9FUlJPUih0cmFucykJCQkoMSA8PCAoKCh0cmFucykg KiA4ICsgMTApICYgMzEpKQotI2RlZmluZSAgIEVEUF9QU1JfUE9TVF9FWElUKHRyYW5zKQkJKDEg PDwgKCgodHJhbnMpICogOCArIDkpICYgMzEpKQotI2RlZmluZSAgIEVEUF9QU1JfUFJFX0VOVFJZ KHRyYW5zKQkJKDEgPDwgKCgodHJhbnMpICogOCArIDgpICYgMzEpKQorI2RlZmluZSAgIF9FRFBf UFNSX0VSUk9SKGlkeCkJCQkoMSA8PCAoKGlkeCkgKiA4ICsgMikpCisjZGVmaW5lICAgX0VEUF9Q U1JfUE9TVF9FWElUKGlkeCkJCSgxIDw8ICgoaWR4KSAqIDggKyAxKSkKKyNkZWZpbmUgICBfRURQ X1BTUl9QUkVfRU5UUlkoaWR4KQkJKDEgPDwgKChpZHgpICogOCkpCisjZGVmaW5lICAgX0VEUF9Q U1JfVFJBTlNDT0RFUl9BX0lEWAkJMQorI2RlZmluZSAgIF9FRFBfUFNSX1RSQU5TQ09ERVJfQl9J RFgJCTIKKyNkZWZpbmUgICBfRURQX1BTUl9UUkFOU0NPREVSX0NfSURYCQkzCisjZGVmaW5lICAg X0VEUF9QU1JfVFJBTlNDT0RFUl9FRFBfSURYCQkwCiAKICNkZWZpbmUgRURQX1BTUl9BVVhfQ1RM CQkJCV9NTUlPKGRldl9wcml2LT5wc3JfbW1pb19iYXNlICsgMHgxMCkKICNkZWZpbmUgICBFRFBf UFNSX0FVWF9DVExfVElNRV9PVVRfTUFTSwkJKDMgPDwgMjYpCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9wc3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bz ci5jCmluZGV4IDQ4ZGYxNmEwMmZhYy4uNWZkYzJmMTk2MDQ1IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9wc3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9wc3IuYwpAQCAtODMsMjUgKzgzLDU5IEBAIHN0YXRpYyBib29sIGludGVsX3BzcjJfZW5hYmxl ZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJfQogfQogCitzdGF0aWMgaW50 IGVkcF9wc3JfdHJhbnNjb2Rlcl9pZHgoZW51bSB0cmFuc2NvZGVyIHRyYW5zKQoreworCWludCB0 cmFuc190b19pZHhbXSA9IHsKKwkJW1RSQU5TQ09ERVJfQV0gPSBfRURQX1BTUl9UUkFOU0NPREVS X0FfSURYLAorCQlbVFJBTlNDT0RFUl9CXSA9IF9FRFBfUFNSX1RSQU5TQ09ERVJfQl9JRFgsCisJ CVtUUkFOU0NPREVSX0NdID0gX0VEUF9QU1JfVFJBTlNDT0RFUl9DX0lEWCwKKwkJW1RSQU5TQ09E RVJfRURQXSA9IF9FRFBfUFNSX1RSQU5TQ09ERVJfRURQX0lEWCwKKwl9OworCisJc3dpdGNoICh0 cmFucykgeworCWNhc2UgVFJBTlNDT0RFUl9BOgorCWNhc2UgVFJBTlNDT0RFUl9COgorCWNhc2Ug VFJBTlNDT0RFUl9DOgorCWNhc2UgVFJBTlNDT0RFUl9FRFA6CisJCXJldHVybiB0cmFuc190b19p ZHhbdHJhbnNdOworCWRlZmF1bHQ6CisJCU1JU1NJTkdfQ0FTRSh0cmFucyk7CisJCXJldHVybiB0 cmFuc190b19pZHhbVFJBTlNDT0RFUl9FRFBdOworCX0KK30KKworc3RhdGljIHUzMiBlZHBfcHNy X2Vycm9yKGVudW0gdHJhbnNjb2RlciB0cmFucykKK3sKKwlyZXR1cm4gX0VEUF9QU1JfRVJST1Io ZWRwX3Bzcl90cmFuc2NvZGVyX2lkeCh0cmFucykpOworfQorCitzdGF0aWMgdTMyIGVkcF9wc3Jf cG9zdF9leGl0KGVudW0gdHJhbnNjb2RlciB0cmFucykKK3sKKwlyZXR1cm4gX0VEUF9QU1JfUE9T VF9FWElUKGVkcF9wc3JfdHJhbnNjb2Rlcl9pZHgodHJhbnMpKTsKK30KKworc3RhdGljIHUzMiBl ZHBfcHNyX3ByZV9lbnRyeShlbnVtIHRyYW5zY29kZXIgdHJhbnMpCit7CisJcmV0dXJuIF9FRFBf UFNSX1BSRV9FTlRSWShlZHBfcHNyX3RyYW5zY29kZXJfaWR4KHRyYW5zKSk7Cit9CisKIHZvaWQg aW50ZWxfcHNyX2lycV9jb250cm9sKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwg dTMyIGRlYnVnKQogewogCXUzMiBkZWJ1Z19tYXNrLCBtYXNrOworCWVudW0gdHJhbnNjb2RlciBj cHVfdHJhbnNjb2RlcjsKKwl1MzIgdHJhbnNjb2RlcnMgPSBCSVQoVFJBTlNDT0RFUl9FRFApOwog Ci0JbWFzayA9IEVEUF9QU1JfRVJST1IoVFJBTlNDT0RFUl9FRFApOwotCWRlYnVnX21hc2sgPSBF RFBfUFNSX1BPU1RfRVhJVChUUkFOU0NPREVSX0VEUCkgfAotCQkgICAgIEVEUF9QU1JfUFJFX0VO VFJZKFRSQU5TQ09ERVJfRURQKTsKLQotCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDgpIHsK LQkJbWFzayB8PSBFRFBfUFNSX0VSUk9SKFRSQU5TQ09ERVJfQSkgfAotCQkJRURQX1BTUl9FUlJP UihUUkFOU0NPREVSX0IpIHwKLQkJCUVEUF9QU1JfRVJST1IoVFJBTlNDT0RFUl9DKTsKLQotCQlk ZWJ1Z19tYXNrIHw9IEVEUF9QU1JfUE9TVF9FWElUKFRSQU5TQ09ERVJfQSkgfAotCQkJICAgICAg RURQX1BTUl9QUkVfRU5UUlkoVFJBTlNDT0RFUl9BKSB8Ci0JCQkgICAgICBFRFBfUFNSX1BPU1Rf RVhJVChUUkFOU0NPREVSX0IpIHwKLQkJCSAgICAgIEVEUF9QU1JfUFJFX0VOVFJZKFRSQU5TQ09E RVJfQikgfAotCQkJICAgICAgRURQX1BTUl9QT1NUX0VYSVQoVFJBTlNDT0RFUl9DKSB8Ci0JCQkg ICAgICBFRFBfUFNSX1BSRV9FTlRSWShUUkFOU0NPREVSX0MpOworCWlmIChJTlRFTF9HRU4oZGV2 X3ByaXYpID49IDgpCisJCXRyYW5zY29kZXJzIHw9IEJJVChUUkFOU0NPREVSX0EpIHwKKwkJCSAg ICAgICBCSVQoVFJBTlNDT0RFUl9CKSB8CisJCQkgICAgICAgQklUKFRSQU5TQ09ERVJfQyk7CisK KwlkZWJ1Z19tYXNrID0gMDsKKwltYXNrID0gMDsKKwlmb3JfZWFjaF9jcHVfdHJhbnNjb2Rlcl9t YXNrZWQoZGV2X3ByaXYsIGNwdV90cmFuc2NvZGVyLCB0cmFuc2NvZGVycykgeworCQltYXNrIHw9 IGVkcF9wc3JfZXJyb3IoY3B1X3RyYW5zY29kZXIpOworCQlkZWJ1Z19tYXNrIHw9IGVkcF9wc3Jf cG9zdF9leGl0KGNwdV90cmFuc2NvZGVyKSB8CisJCQkgICAgICBlZHBfcHNyX3ByZV9lbnRyeShj cHVfdHJhbnNjb2Rlcik7CiAJfQogCiAJaWYgKGRlYnVnICYgSTkxNV9QU1JfREVCVUdfSVJRKQpA QCAtMTYwLDE3ICsxOTQsMTcgQEAgdm9pZCBpbnRlbF9wc3JfaXJxX2hhbmRsZXIoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCB1MzIgcHNyX2lpcikKIAogCWZvcl9lYWNoX2NwdV90 cmFuc2NvZGVyX21hc2tlZChkZXZfcHJpdiwgY3B1X3RyYW5zY29kZXIsIHRyYW5zY29kZXJzKSB7 CiAJCS8qIEZJWE1FOiBFeGl0IFBTUiBhbmQgbGluayB0cmFpbiBtYW51YWxseSB3aGVuIHRoaXMg aGFwcGVucy4gKi8KLQkJaWYgKHBzcl9paXIgJiBFRFBfUFNSX0VSUk9SKGNwdV90cmFuc2NvZGVy KSkKKwkJaWYgKHBzcl9paXIgJiBlZHBfcHNyX2Vycm9yKGNwdV90cmFuc2NvZGVyKSkKIAkJCURS TV9ERUJVR19LTVMoIlt0cmFuc2NvZGVyICVzXSBQU1IgYXV4IGVycm9yXG4iLAogCQkJCSAgICAg IHRyYW5zY29kZXJfbmFtZShjcHVfdHJhbnNjb2RlcikpOwogCi0JCWlmIChwc3JfaWlyICYgRURQ X1BTUl9QUkVfRU5UUlkoY3B1X3RyYW5zY29kZXIpKSB7CisJCWlmIChwc3JfaWlyICYgZWRwX3Bz cl9wcmVfZW50cnkoY3B1X3RyYW5zY29kZXIpKSB7CiAJCQlkZXZfcHJpdi0+cHNyLmxhc3RfZW50 cnlfYXR0ZW1wdCA9IHRpbWVfbnM7CiAJCQlEUk1fREVCVUdfS01TKCJbdHJhbnNjb2RlciAlc10g UFNSIGVudHJ5IGF0dGVtcHQgaW4gMiB2YmxhbmtzXG4iLAogCQkJCSAgICAgIHRyYW5zY29kZXJf bmFtZShjcHVfdHJhbnNjb2RlcikpOwogCQl9CiAKLQkJaWYgKHBzcl9paXIgJiBFRFBfUFNSX1BP U1RfRVhJVChjcHVfdHJhbnNjb2RlcikpIHsKKwkJaWYgKHBzcl9paXIgJiBlZHBfcHNyX3Bvc3Rf ZXhpdChjcHVfdHJhbnNjb2RlcikpIHsKIAkJCWRldl9wcml2LT5wc3IubGFzdF9leGl0ID0gdGlt ZV9uczsKIAkJCURSTV9ERUJVR19LTVMoIlt0cmFuc2NvZGVyICVzXSBQU1IgZXhpdCBjb21wbGV0 ZWRcbiIsCiAJCQkJICAgICAgdHJhbnNjb2Rlcl9uYW1lKGNwdV90cmFuc2NvZGVyKSk7Ci0tIAoy LjEzLjIKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=