From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH v3 2/3] drm/i915: Make EDP PSR flags not depend on enum values Date: Tue, 20 Nov 2018 11:23:24 +0200 Message-ID: <20181120092325.21249-2-imre.deak@intel.com> References: <20181120092325.21249-1-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id AE4F66E366 for ; Tue, 20 Nov 2018 09:23:28 +0000 (UTC) In-Reply-To: <20181120092325.21249-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 ZCB0cmFuY29kZXJzLgoKdjI6Ci0gU2ltcGxpZnkgdGhpbmdzIGJ5IGRlZmluaW5nIGZsYWcgc2hp ZnQgdmFsdWVzIGluc3RlYWQgb2YgaW5kaWNlcy4KLSBzL3RyYW5zL2NwdV90cmFuc2NvZGVyLyAo VmlsbGUpCnYzOgotIERlZmluZSBmbGFncyB0byBsb29rIGxpa2Ugc2VwZXJhdGUgYml0cyBpbnN0 ZWFkIG9mIHRoZSB2YWx1ZXMgb2YKICB0aGUgc2FtZSBiaXRmaWVsZC4gKFZpbGxlKQoKQ2M6IFZp bGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+CkNjOiBMdWNhcyBE ZSBNYXJjaGkgPGx1Y2FzLmRlbWFyY2hpQGludGVsLmNvbT4KQ2M6IE1pa2EgS2Fob2xhIDxtaWth LmthaG9sYUBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IEltcmUgRGVhayA8aW1yZS5kZWFrQGlu dGVsLmNvbT4KUmV2aWV3ZWQtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51 eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaCAgfCAxMCAr KysrKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMgfCA1NSArKysrKysrKysr KysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDQ0IGluc2Vy dGlvbnMoKyksIDIxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfcmVnLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCmluZGV4IGVk YjU4YWYxZTkwMy4uZTZiMzcxZTk4NmVlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X3JlZy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKQEAgLTQx NTAsOSArNDE1MCwxMyBAQCBlbnVtIHsKIC8qIEJzcGVjIGNsYWltcyB0aG9zZSBhcmVuJ3Qgc2hp ZnRlZCBidXQgc3RheSBhdCAweDY0ODAwICovCiAjZGVmaW5lIEVEUF9QU1JfSU1SCQkJCV9NTUlP KDB4NjQ4MzQpCiAjZGVmaW5lIEVEUF9QU1JfSUlSCQkJCV9NTUlPKDB4NjQ4MzgpCi0jZGVmaW5l ICAgRURQX1BTUl9FUlJPUih0cmFucykJCQkoMSA8PCAoKCh0cmFucykgKiA4ICsgMTApICYgMzEp KQotI2RlZmluZSAgIEVEUF9QU1JfUE9TVF9FWElUKHRyYW5zKQkJKDEgPDwgKCgodHJhbnMpICog OCArIDkpICYgMzEpKQotI2RlZmluZSAgIEVEUF9QU1JfUFJFX0VOVFJZKHRyYW5zKQkJKDEgPDwg KCgodHJhbnMpICogOCArIDgpICYgMzEpKQorI2RlZmluZSAgIEVEUF9QU1JfRVJST1Ioc2hpZnQp CQkJKDEgPDwgKChzaGlmdCkgKyAyKSkKKyNkZWZpbmUgICBFRFBfUFNSX1BPU1RfRVhJVChzaGlm dCkJCSgxIDw8ICgoc2hpZnQpICsgMSkpCisjZGVmaW5lICAgRURQX1BTUl9QUkVfRU5UUlkoc2hp ZnQpCQkoMSA8PCAoc2hpZnQpKQorI2RlZmluZSAgIEVEUF9QU1JfVFJBTlNDT0RFUl9DX1NISUZU CQkyNAorI2RlZmluZSAgIEVEUF9QU1JfVFJBTlNDT0RFUl9CX1NISUZUCQkxNgorI2RlZmluZSAg IEVEUF9QU1JfVFJBTlNDT0RFUl9BX1NISUZUCQk4CisjZGVmaW5lICAgRURQX1BTUl9UUkFOU0NP REVSX0VEUF9TSElGVAkJMAogCiAjZGVmaW5lIEVEUF9QU1JfQVVYX0NUTAkJCQlfTU1JTyhkZXZf cHJpdi0+cHNyX21taW9fYmFzZSArIDB4MTApCiAjZGVmaW5lICAgRURQX1BTUl9BVVhfQ1RMX1RJ TUVfT1VUX01BU0sJCSgzIDw8IDI2KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcHNyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wc3IuYwppbmRleCA0OGRm MTZhMDJmYWMuLjI2MjkyOTYxZDY5MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcHNyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMKQEAgLTgz LDI1ICs4Myw0MiBAQCBzdGF0aWMgYm9vbCBpbnRlbF9wc3IyX2VuYWJsZWQoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2LAogCX0KIH0KIAorc3RhdGljIGludCBlZHBfcHNyX3NoaWZ0 KGVudW0gdHJhbnNjb2RlciBjcHVfdHJhbnNjb2RlcikKK3sKKwlzd2l0Y2ggKGNwdV90cmFuc2Nv ZGVyKSB7CisJY2FzZSBUUkFOU0NPREVSX0E6CisJCXJldHVybiBFRFBfUFNSX1RSQU5TQ09ERVJf QV9TSElGVDsKKwljYXNlIFRSQU5TQ09ERVJfQjoKKwkJcmV0dXJuIEVEUF9QU1JfVFJBTlNDT0RF Ul9CX1NISUZUOworCWNhc2UgVFJBTlNDT0RFUl9DOgorCQlyZXR1cm4gRURQX1BTUl9UUkFOU0NP REVSX0NfU0hJRlQ7CisJZGVmYXVsdDoKKwkJTUlTU0lOR19DQVNFKGNwdV90cmFuc2NvZGVyKTsK KwkJLyogZmFsbHRocm91Z2ggKi8KKwljYXNlIFRSQU5TQ09ERVJfRURQOgorCQlyZXR1cm4gRURQ X1BTUl9UUkFOU0NPREVSX0VEUF9TSElGVDsKKwl9Cit9CisKIHZvaWQgaW50ZWxfcHNyX2lycV9j b250cm9sKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdTMyIGRlYnVnKQogewog CXUzMiBkZWJ1Z19tYXNrLCBtYXNrOworCWVudW0gdHJhbnNjb2RlciBjcHVfdHJhbnNjb2RlcjsK Kwl1MzIgdHJhbnNjb2RlcnMgPSBCSVQoVFJBTlNDT0RFUl9FRFApOwogCi0JbWFzayA9IEVEUF9Q U1JfRVJST1IoVFJBTlNDT0RFUl9FRFApOwotCWRlYnVnX21hc2sgPSBFRFBfUFNSX1BPU1RfRVhJ VChUUkFOU0NPREVSX0VEUCkgfAotCQkgICAgIEVEUF9QU1JfUFJFX0VOVFJZKFRSQU5TQ09ERVJf RURQKTsKLQotCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDgpIHsKLQkJbWFzayB8PSBFRFBf UFNSX0VSUk9SKFRSQU5TQ09ERVJfQSkgfAotCQkJRURQX1BTUl9FUlJPUihUUkFOU0NPREVSX0Ip IHwKLQkJCUVEUF9QU1JfRVJST1IoVFJBTlNDT0RFUl9DKTsKLQotCQlkZWJ1Z19tYXNrIHw9IEVE UF9QU1JfUE9TVF9FWElUKFRSQU5TQ09ERVJfQSkgfAotCQkJICAgICAgRURQX1BTUl9QUkVfRU5U UlkoVFJBTlNDT0RFUl9BKSB8Ci0JCQkgICAgICBFRFBfUFNSX1BPU1RfRVhJVChUUkFOU0NPREVS X0IpIHwKLQkJCSAgICAgIEVEUF9QU1JfUFJFX0VOVFJZKFRSQU5TQ09ERVJfQikgfAotCQkJICAg ICAgRURQX1BTUl9QT1NUX0VYSVQoVFJBTlNDT0RFUl9DKSB8Ci0JCQkgICAgICBFRFBfUFNSX1BS RV9FTlRSWShUUkFOU0NPREVSX0MpOworCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDgpCisJ CXRyYW5zY29kZXJzIHw9IEJJVChUUkFOU0NPREVSX0EpIHwKKwkJCSAgICAgICBCSVQoVFJBTlND T0RFUl9CKSB8CisJCQkgICAgICAgQklUKFRSQU5TQ09ERVJfQyk7CisKKwlkZWJ1Z19tYXNrID0g MDsKKwltYXNrID0gMDsKKwlmb3JfZWFjaF9jcHVfdHJhbnNjb2Rlcl9tYXNrZWQoZGV2X3ByaXYs IGNwdV90cmFuc2NvZGVyLCB0cmFuc2NvZGVycykgeworCQlpbnQgc2hpZnQgPSBlZHBfcHNyX3No aWZ0KGNwdV90cmFuc2NvZGVyKTsKKworCQltYXNrIHw9IEVEUF9QU1JfRVJST1Ioc2hpZnQpOwor CQlkZWJ1Z19tYXNrIHw9IEVEUF9QU1JfUE9TVF9FWElUKHNoaWZ0KSB8CisJCQkgICAgICBFRFBf UFNSX1BSRV9FTlRSWShzaGlmdCk7CiAJfQogCiAJaWYgKGRlYnVnICYgSTkxNV9QU1JfREVCVUdf SVJRKQpAQCAtMTU5LDE4ICsxNzYsMjAgQEAgdm9pZCBpbnRlbF9wc3JfaXJxX2hhbmRsZXIoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCB1MzIgcHNyX2lpcikKIAkJCSAgICAgICBC SVQoVFJBTlNDT0RFUl9DKTsKIAogCWZvcl9lYWNoX2NwdV90cmFuc2NvZGVyX21hc2tlZChkZXZf cHJpdiwgY3B1X3RyYW5zY29kZXIsIHRyYW5zY29kZXJzKSB7CisJCWludCBzaGlmdCA9IGVkcF9w c3Jfc2hpZnQoY3B1X3RyYW5zY29kZXIpOworCiAJCS8qIEZJWE1FOiBFeGl0IFBTUiBhbmQgbGlu ayB0cmFpbiBtYW51YWxseSB3aGVuIHRoaXMgaGFwcGVucy4gKi8KLQkJaWYgKHBzcl9paXIgJiBF RFBfUFNSX0VSUk9SKGNwdV90cmFuc2NvZGVyKSkKKwkJaWYgKHBzcl9paXIgJiBFRFBfUFNSX0VS Uk9SKHNoaWZ0KSkKIAkJCURSTV9ERUJVR19LTVMoIlt0cmFuc2NvZGVyICVzXSBQU1IgYXV4IGVy cm9yXG4iLAogCQkJCSAgICAgIHRyYW5zY29kZXJfbmFtZShjcHVfdHJhbnNjb2RlcikpOwogCi0J CWlmIChwc3JfaWlyICYgRURQX1BTUl9QUkVfRU5UUlkoY3B1X3RyYW5zY29kZXIpKSB7CisJCWlm IChwc3JfaWlyICYgRURQX1BTUl9QUkVfRU5UUlkoc2hpZnQpKSB7CiAJCQlkZXZfcHJpdi0+cHNy Lmxhc3RfZW50cnlfYXR0ZW1wdCA9IHRpbWVfbnM7CiAJCQlEUk1fREVCVUdfS01TKCJbdHJhbnNj b2RlciAlc10gUFNSIGVudHJ5IGF0dGVtcHQgaW4gMiB2YmxhbmtzXG4iLAogCQkJCSAgICAgIHRy YW5zY29kZXJfbmFtZShjcHVfdHJhbnNjb2RlcikpOwogCQl9CiAKLQkJaWYgKHBzcl9paXIgJiBF RFBfUFNSX1BPU1RfRVhJVChjcHVfdHJhbnNjb2RlcikpIHsKKwkJaWYgKHBzcl9paXIgJiBFRFBf UFNSX1BPU1RfRVhJVChzaGlmdCkpIHsKIAkJCWRldl9wcml2LT5wc3IubGFzdF9leGl0ID0gdGlt ZV9uczsKIAkJCURSTV9ERUJVR19LTVMoIlt0cmFuc2NvZGVyICVzXSBQU1IgZXhpdCBjb21wbGV0 ZWRcbiIsCiAJCQkJICAgICAgdHJhbnNjb2Rlcl9uYW1lKGNwdV90cmFuc2NvZGVyKSk7Ci0tIAoy LjEzLjIKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=