From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH v2 2/3] drm/i915: Make EDP PSR flags not depend on enum values Date: Mon, 19 Nov 2018 22:46:37 +0200 Message-ID: <20181119204637.6748-1-imre.deak@intel.com> References: <20181119144109.12994-2-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 09F95880C4 for ; Mon, 19 Nov 2018 20:46:40 +0000 (UTC) In-Reply-To: <20181119144109.12994-2-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 VmlsbGUpCgpDYzogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNv bT4KQ2M6IEx1Y2FzIERlIE1hcmNoaSA8bHVjYXMuZGVtYXJjaGlAaW50ZWwuY29tPgpDYzogTWlr YSBLYWhvbGEgPG1pa2Eua2Fob2xhQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogSW1yZSBEZWFr IDxpbXJlLmRlYWtAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVn LmggIHwgMTAgKysrKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5jIHwgNTUg KysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2Vk LCA0NCBpbnNlcnRpb25zKCspLCAyMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcu aAppbmRleCBlZGI1OGFmMWU5MDMuLmY4MGIxNmUzZmYzMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9yZWcuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3Jl Zy5oCkBAIC00MTUwLDkgKzQxNTAsMTMgQEAgZW51bSB7CiAvKiBCc3BlYyBjbGFpbXMgdGhvc2Ug YXJlbid0IHNoaWZ0ZWQgYnV0IHN0YXkgYXQgMHg2NDgwMCAqLwogI2RlZmluZSBFRFBfUFNSX0lN UgkJCQlfTU1JTygweDY0ODM0KQogI2RlZmluZSBFRFBfUFNSX0lJUgkJCQlfTU1JTygweDY0ODM4 KQotI2RlZmluZSAgIEVEUF9QU1JfRVJST1IodHJhbnMpCQkJKDEgPDwgKCgodHJhbnMpICogOCAr IDEwKSAmIDMxKSkKLSNkZWZpbmUgICBFRFBfUFNSX1BPU1RfRVhJVCh0cmFucykJCSgxIDw8ICgo KHRyYW5zKSAqIDggKyA5KSAmIDMxKSkKLSNkZWZpbmUgICBFRFBfUFNSX1BSRV9FTlRSWSh0cmFu cykJCSgxIDw8ICgoKHRyYW5zKSAqIDggKyA4KSAmIDMxKSkKKyNkZWZpbmUgICBFRFBfUFNSX0VS Uk9SKHNoaWZ0KQkJCSg0IDw8IChzaGlmdCkpCisjZGVmaW5lICAgRURQX1BTUl9QT1NUX0VYSVQo c2hpZnQpCQkoMiA8PCAoc2hpZnQpKQorI2RlZmluZSAgIEVEUF9QU1JfUFJFX0VOVFJZKHNoaWZ0 KQkJKDEgPDwgKHNoaWZ0KSkKKyNkZWZpbmUgICBFRFBfUFNSX1RSQU5TQ09ERVJfQ19TSElGVAkJ MjQKKyNkZWZpbmUgICBFRFBfUFNSX1RSQU5TQ09ERVJfQl9TSElGVAkJMTYKKyNkZWZpbmUgICBF RFBfUFNSX1RSQU5TQ09ERVJfQV9TSElGVAkJOAorI2RlZmluZSAgIEVEUF9QU1JfVFJBTlNDT0RF Ul9FRFBfU0hJRlQJCTAKIAogI2RlZmluZSBFRFBfUFNSX0FVWF9DVEwJCQkJX01NSU8oZGV2X3By aXYtPnBzcl9tbWlvX2Jhc2UgKyAweDEwKQogI2RlZmluZSAgIEVEUF9QU1JfQVVYX0NUTF9USU1F X09VVF9NQVNLCQkoMyA8PCAyNikKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3Bzci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMKaW5kZXggNDhkZjE2 YTAyZmFjLi4yNjI5Mjk2MWQ2OTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3Bzci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5jCkBAIC04Mywy NSArODMsNDIgQEAgc3RhdGljIGJvb2wgaW50ZWxfcHNyMl9lbmFibGVkKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwKIAl9CiB9CiAKK3N0YXRpYyBpbnQgZWRwX3Bzcl9zaGlmdChl bnVtIHRyYW5zY29kZXIgY3B1X3RyYW5zY29kZXIpCit7CisJc3dpdGNoIChjcHVfdHJhbnNjb2Rl cikgeworCWNhc2UgVFJBTlNDT0RFUl9BOgorCQlyZXR1cm4gRURQX1BTUl9UUkFOU0NPREVSX0Ff U0hJRlQ7CisJY2FzZSBUUkFOU0NPREVSX0I6CisJCXJldHVybiBFRFBfUFNSX1RSQU5TQ09ERVJf Ql9TSElGVDsKKwljYXNlIFRSQU5TQ09ERVJfQzoKKwkJcmV0dXJuIEVEUF9QU1JfVFJBTlNDT0RF Ul9DX1NISUZUOworCWRlZmF1bHQ6CisJCU1JU1NJTkdfQ0FTRShjcHVfdHJhbnNjb2Rlcik7CisJ CS8qIGZhbGx0aHJvdWdoICovCisJY2FzZSBUUkFOU0NPREVSX0VEUDoKKwkJcmV0dXJuIEVEUF9Q U1JfVFJBTlNDT0RFUl9FRFBfU0hJRlQ7CisJfQorfQorCiB2b2lkIGludGVsX3Bzcl9pcnFfY29u dHJvbChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIHUzMiBkZWJ1ZykKIHsKIAl1 MzIgZGVidWdfbWFzaywgbWFzazsKKwllbnVtIHRyYW5zY29kZXIgY3B1X3RyYW5zY29kZXI7CisJ dTMyIHRyYW5zY29kZXJzID0gQklUKFRSQU5TQ09ERVJfRURQKTsKIAotCW1hc2sgPSBFRFBfUFNS X0VSUk9SKFRSQU5TQ09ERVJfRURQKTsKLQlkZWJ1Z19tYXNrID0gRURQX1BTUl9QT1NUX0VYSVQo VFJBTlNDT0RFUl9FRFApIHwKLQkJICAgICBFRFBfUFNSX1BSRV9FTlRSWShUUkFOU0NPREVSX0VE UCk7Ci0KLQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA4KSB7Ci0JCW1hc2sgfD0gRURQX1BT Ul9FUlJPUihUUkFOU0NPREVSX0EpIHwKLQkJCUVEUF9QU1JfRVJST1IoVFJBTlNDT0RFUl9CKSB8 Ci0JCQlFRFBfUFNSX0VSUk9SKFRSQU5TQ09ERVJfQyk7Ci0KLQkJZGVidWdfbWFzayB8PSBFRFBf UFNSX1BPU1RfRVhJVChUUkFOU0NPREVSX0EpIHwKLQkJCSAgICAgIEVEUF9QU1JfUFJFX0VOVFJZ KFRSQU5TQ09ERVJfQSkgfAotCQkJICAgICAgRURQX1BTUl9QT1NUX0VYSVQoVFJBTlNDT0RFUl9C KSB8Ci0JCQkgICAgICBFRFBfUFNSX1BSRV9FTlRSWShUUkFOU0NPREVSX0IpIHwKLQkJCSAgICAg IEVEUF9QU1JfUE9TVF9FWElUKFRSQU5TQ09ERVJfQykgfAotCQkJICAgICAgRURQX1BTUl9QUkVf RU5UUlkoVFJBTlNDT0RFUl9DKTsKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA4KQorCQl0 cmFuc2NvZGVycyB8PSBCSVQoVFJBTlNDT0RFUl9BKSB8CisJCQkgICAgICAgQklUKFRSQU5TQ09E RVJfQikgfAorCQkJICAgICAgIEJJVChUUkFOU0NPREVSX0MpOworCisJZGVidWdfbWFzayA9IDA7 CisJbWFzayA9IDA7CisJZm9yX2VhY2hfY3B1X3RyYW5zY29kZXJfbWFza2VkKGRldl9wcml2LCBj cHVfdHJhbnNjb2RlciwgdHJhbnNjb2RlcnMpIHsKKwkJaW50IHNoaWZ0ID0gZWRwX3Bzcl9zaGlm dChjcHVfdHJhbnNjb2Rlcik7CisKKwkJbWFzayB8PSBFRFBfUFNSX0VSUk9SKHNoaWZ0KTsKKwkJ ZGVidWdfbWFzayB8PSBFRFBfUFNSX1BPU1RfRVhJVChzaGlmdCkgfAorCQkJICAgICAgRURQX1BT Ul9QUkVfRU5UUlkoc2hpZnQpOwogCX0KIAogCWlmIChkZWJ1ZyAmIEk5MTVfUFNSX0RFQlVHX0lS USkKQEAgLTE1OSwxOCArMTc2LDIwIEBAIHZvaWQgaW50ZWxfcHNyX2lycV9oYW5kbGVyKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdTMyIHBzcl9paXIpCiAJCQkgICAgICAgQklU KFRSQU5TQ09ERVJfQyk7CiAKIAlmb3JfZWFjaF9jcHVfdHJhbnNjb2Rlcl9tYXNrZWQoZGV2X3By aXYsIGNwdV90cmFuc2NvZGVyLCB0cmFuc2NvZGVycykgeworCQlpbnQgc2hpZnQgPSBlZHBfcHNy X3NoaWZ0KGNwdV90cmFuc2NvZGVyKTsKKwogCQkvKiBGSVhNRTogRXhpdCBQU1IgYW5kIGxpbmsg dHJhaW4gbWFudWFsbHkgd2hlbiB0aGlzIGhhcHBlbnMuICovCi0JCWlmIChwc3JfaWlyICYgRURQ X1BTUl9FUlJPUihjcHVfdHJhbnNjb2RlcikpCisJCWlmIChwc3JfaWlyICYgRURQX1BTUl9FUlJP UihzaGlmdCkpCiAJCQlEUk1fREVCVUdfS01TKCJbdHJhbnNjb2RlciAlc10gUFNSIGF1eCBlcnJv clxuIiwKIAkJCQkgICAgICB0cmFuc2NvZGVyX25hbWUoY3B1X3RyYW5zY29kZXIpKTsKIAotCQlp ZiAocHNyX2lpciAmIEVEUF9QU1JfUFJFX0VOVFJZKGNwdV90cmFuc2NvZGVyKSkgeworCQlpZiAo cHNyX2lpciAmIEVEUF9QU1JfUFJFX0VOVFJZKHNoaWZ0KSkgewogCQkJZGV2X3ByaXYtPnBzci5s YXN0X2VudHJ5X2F0dGVtcHQgPSB0aW1lX25zOwogCQkJRFJNX0RFQlVHX0tNUygiW3RyYW5zY29k ZXIgJXNdIFBTUiBlbnRyeSBhdHRlbXB0IGluIDIgdmJsYW5rc1xuIiwKIAkJCQkgICAgICB0cmFu c2NvZGVyX25hbWUoY3B1X3RyYW5zY29kZXIpKTsKIAkJfQogCi0JCWlmIChwc3JfaWlyICYgRURQ X1BTUl9QT1NUX0VYSVQoY3B1X3RyYW5zY29kZXIpKSB7CisJCWlmIChwc3JfaWlyICYgRURQX1BT Ul9QT1NUX0VYSVQoc2hpZnQpKSB7CiAJCQlkZXZfcHJpdi0+cHNyLmxhc3RfZXhpdCA9IHRpbWVf bnM7CiAJCQlEUk1fREVCVUdfS01TKCJbdHJhbnNjb2RlciAlc10gUFNSIGV4aXQgY29tcGxldGVk XG4iLAogCQkJCSAgICAgIHRyYW5zY29kZXJfbmFtZShjcHVfdHJhbnNjb2RlcikpOwotLSAKMi4x My4yCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK