From: Jim Bride Subject: [PATCH v2 2/4] drm/i915/psr: Clean-up intel_enable_source_psr1() Date: Fri, 30 Jun 2017 12:08:11 -0700 Message-ID: <1498849693-26240-3-git-send-email-jim.bride@linux.intel.com> References: <1498849693-26240-1-git-send-email-jim.bride@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3B3E46E85A for ; Fri, 30 Jun 2017 19:10:43 +0000 (UTC) In-Reply-To: <1498849693-26240-1-git-send-email-jim.bride@linux.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: Jani Nikula , Wayne Boyer , Paulo Zanoni , Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org T24gU0tMKyB0aGVyZSBpcyBhIGJpdCBpbiBTUkRfQ1RMIHRoYXQgc29mdHdhcmUgaXMgbm90IHN1 cHBvc2VkIHRvCm1vZGlmeSwgYnV0IHdlIGN1cnJlbnRseSBjbG9iYmVyIHRoYXQgYml0IHdoZW4g d2UgZW5hYmxlIFBTUi4gIEluCm9yZGVyIHRvIHByZXNlcnZlIHRoZSB2YWx1ZSBvZiB0aGF0IGJp dCwgZ28gYWhlYWQgYW5kIHJlYWQgU1JEX0NUTCBhbmQKZG8gYSBmaWVsZC13aXNlIHNldHRpbmcg b2YgdGhlIHZhcmlvdXMgYml0cyB0aGF0IHdlIG5lZWQgdG8gaW5pdGlhbGl6ZQpiZWZvcmUgd3Jp dGluZyB0aGUgcmVnaXN0ZXIgYmFjayBvdXQuICBBZGRpdGlvbmFsbHksIGdvIGFoZWFkIGFuZApl eHBsaWNpdGx5IGRpc2FibGUgc2luZ2xlLWZyYW1lIHVwZGF0ZSBzaW5jZSB3ZSBhcmVuJ3QgY3Vy cmVudGx5CnN1cHBvcnRpbmcgaXQuCgp2MjogKiBEbyBhIGZpZWxkLXdpc2UgaW5pdCBvbiBFRFBf UFNSX01BWF9TTEVFUF9USU1FIGV2ZW4gdGhvdWdoIHdlCiAgICAgIGFsd2F5cyBzZXQgaXQgdG8g dGhlIG1heCB2YWx1ZS4gKFJvZHJpZ28pCiAgICAqIFJlYmFzZQoKQ2M6IFJvZHJpZ28gVml2aSA8 cm9kcmlnby52aXZpQGludGVsLmNvbT4KQ2M6IFBhdWxvIFphbm9uaSA8cGF1bG8uci56YW5vbmlA aW50ZWwuY29tPgpDYzogV2F5bmUgQm95ZXIgPHdheW5lLmJveWVyQGludGVsLmNvbT4KQ2M6IEph bmkgTmlrdWxhIDxqYW5pLm5pa3VsYUBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IEppbSBCcmlk ZSA8amltLmJyaWRlQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X3JlZy5oICB8ICA0ICsrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5jIHwg MjEgKysrKysrKysrKysrKysrKysrKy0tCiAyIGZpbGVzIGNoYW5nZWQsIDIzIGluc2VydGlvbnMo KyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9yZWcuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKaW5kZXggNjRjYzY3NC4u ZGY1ODgxOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaAorKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCkBAIC0zNzg5LDE4ICszNzg5LDIyIEBA IGVudW0gewogI2RlZmluZSAgIEVEUF9QU1JfTUlOX0xJTktfRU5UUllfVElNRV80X0xJTkVTCSgx PDwyNSkKICNkZWZpbmUgICBFRFBfUFNSX01JTl9MSU5LX0VOVFJZX1RJTUVfMl9MSU5FUwkoMjw8 MjUpCiAjZGVmaW5lICAgRURQX1BTUl9NSU5fTElOS19FTlRSWV9USU1FXzBfTElORVMJKDM8PDI1 KQorI2RlZmluZSAgIEVEUF9QU1JfTUFYX1NMRUVQX1RJTUVfTUFTSyAgICAgICAgICAgKDB4MWY8 PDIwKQogI2RlZmluZSAgIEVEUF9QU1JfTUFYX1NMRUVQX1RJTUVfU0hJRlQJCTIwCiAjZGVmaW5l ICAgRURQX1BTUl9TS0lQX0FVWF9FWElUCQkJKDE8PDEyKQogI2RlZmluZSAgIEVEUF9QU1JfVFAx X1RQMl9TRUwJCQkoMDw8MTEpCiAjZGVmaW5lICAgRURQX1BTUl9UUDFfVFAzX1NFTAkJCSgxPDwx MSkKKyNkZWZpbmUgICBFRFBfUFNSX1RQMl9UUDNfVElNRV9NQVNLICAgICAgICAgICAgICgzPDw4 KQogI2RlZmluZSAgIEVEUF9QU1JfVFAyX1RQM19USU1FXzUwMHVzCQkoMDw8OCkKICNkZWZpbmUg ICBFRFBfUFNSX1RQMl9UUDNfVElNRV8xMDB1cwkJKDE8PDgpCiAjZGVmaW5lICAgRURQX1BTUl9U UDJfVFAzX1RJTUVfMjUwMHVzCQkoMjw8OCkKICNkZWZpbmUgICBFRFBfUFNSX1RQMl9UUDNfVElN RV8wdXMJCSgzPDw4KQorI2RlZmluZSAgIEVEUF9QU1JfVFAxX1RJTUVfTUFTSyAgICAgICAgICAg ICAgICAgKDB4Mzw8NCkKICNkZWZpbmUgICBFRFBfUFNSX1RQMV9USU1FXzUwMHVzCQkoMDw8NCkK ICNkZWZpbmUgICBFRFBfUFNSX1RQMV9USU1FXzEwMHVzCQkoMTw8NCkKICNkZWZpbmUgICBFRFBf UFNSX1RQMV9USU1FXzI1MDB1cwkJKDI8PDQpCiAjZGVmaW5lICAgRURQX1BTUl9UUDFfVElNRV8w dXMJCQkoMzw8NCkKKyNkZWZpbmUgICBFRFBfUFNSX0lETEVfRlJBTUVfTUFTSyAgICAgICAgICAg ICAgICgweGY8PDApCiAjZGVmaW5lICAgRURQX1BTUl9JRExFX0ZSQU1FX1NISUZUCQkwCiAKICNk ZWZpbmUgRURQX1BTUl9BVVhfQ1RMCQkJCV9NTUlPKGRldl9wcml2LT5wc3JfbW1pb19iYXNlICsg MHgxMCkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMKaW5kZXggNTU5ZjFhYi4uMTMyOTg3YiAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMKQEAgLTI4MCwxNyArMjgwLDMyIEBAIHN0YXRpYyB2b2lk IGludGVsX2VuYWJsZV9zb3VyY2VfcHNyMShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogCSAq IHdpdGggdGhlIDUgb3IgNiBpZGxlIHBhdHRlcm5zLgogCSAqLwogCXVpbnQzMl90IGlkbGVfZnJh bWVzID0gbWF4KDYsIGRldl9wcml2LT52YnQucHNyLmlkbGVfZnJhbWVzKTsKLQl1aW50MzJfdCB2 YWwgPSBFRFBfUFNSX0VOQUJMRTsKKwl1aW50MzJfdCB2YWwgPSBJOTE1X1JFQUQoRURQX1BTUl9D VEwpOwogCisJdmFsIHw9IEVEUF9QU1JfRU5BQkxFOworCisJdmFsICY9IH5FRFBfUFNSX01BWF9T TEVFUF9USU1FX01BU0s7CiAJdmFsIHw9IG1heF9zbGVlcF90aW1lIDw8IEVEUF9QU1JfTUFYX1NM RUVQX1RJTUVfU0hJRlQ7CisKKwl2YWwgJj0gfkVEUF9QU1JfSURMRV9GUkFNRV9NQVNLOwogCXZh bCB8PSBpZGxlX2ZyYW1lcyA8PCBFRFBfUFNSX0lETEVfRlJBTUVfU0hJRlQ7CiAKKwl2YWwgJj0g fkVEUF9QU1JfTUlOX0xJTktfRU5UUllfVElNRV9NQVNLOwogCWlmIChJU19IQVNXRUxMKGRldl9w cml2KSkKIAkJdmFsIHw9IEVEUF9QU1JfTUlOX0xJTktfRU5UUllfVElNRV84X0xJTkVTOwogCi0J aWYgKGRldl9wcml2LT5wc3IubGlua19zdGFuZGJ5KQorCWlmIChkZXZfcHJpdi0+cHNyLmxpbmtf c3RhbmRieSkgewogCQl2YWwgfD0gRURQX1BTUl9MSU5LX1NUQU5EQlk7CiAKKwkJLyogU0ZVIHNo b3VsZCBvbmx5IGJlIGVuYWJsZWQgd2l0aCBsaW5rIHN0YW5kYnksIGJ1dCBmb3IKKwkJICogbm93 IHdlIGRvIG5vdCBzdXBwb3J0IGl0LiAqLworCQl2YWwgJj0gfkJEV19QU1JfU0lOR0xFX0ZSQU1F OworCX0gZWxzZSB7CisJCXZhbCAmPSB+RURQX1BTUl9MSU5LX1NUQU5EQlk7CisJCXZhbCAmPSB+ QkRXX1BTUl9TSU5HTEVfRlJBTUU7CisJfQorCisJdmFsICY9IH5FRFBfUFNSX1RQMV9USU1FX01B U0s7CiAJaWYgKGRldl9wcml2LT52YnQucHNyLnRwMV93YWtldXBfdGltZSA+IDUpCiAJCXZhbCB8 PSBFRFBfUFNSX1RQMV9USU1FXzI1MDB1czsKIAllbHNlIGlmIChkZXZfcHJpdi0+dmJ0LnBzci50 cDFfd2FrZXVwX3RpbWUgPiAxKQpAQCAtMzAwLDYgKzMxNSw3IEBAIHN0YXRpYyB2b2lkIGludGVs X2VuYWJsZV9zb3VyY2VfcHNyMShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogCWVsc2UKIAkJ dmFsIHw9IEVEUF9QU1JfVFAxX1RJTUVfMHVzOwogCisJdmFsICY9IH5FRFBfUFNSX1RQMl9UUDNf VElNRV9NQVNLOwogCWlmIChkZXZfcHJpdi0+dmJ0LnBzci50cDJfdHAzX3dha2V1cF90aW1lID4g NSkKIAkJdmFsIHw9IEVEUF9QU1JfVFAyX1RQM19USU1FXzI1MDB1czsKIAllbHNlIGlmIChkZXZf cHJpdi0+dmJ0LnBzci50cDJfdHAzX3dha2V1cF90aW1lID4gMSkKQEAgLTMwOSw2ICszMjUsNyBA QCBzdGF0aWMgdm9pZCBpbnRlbF9lbmFibGVfc291cmNlX3BzcjEoc3RydWN0IGludGVsX2RwICpp bnRlbF9kcCkKIAllbHNlCiAJCXZhbCB8PSBFRFBfUFNSX1RQMl9UUDNfVElNRV8wdXM7CiAKKwl2 YWwgJj0gfkVEUF9QU1JfVFAxX1RQM19TRUw7CiAJaWYgKGludGVsX2RwX3NvdXJjZV9zdXBwb3J0 c19oYnIyKGludGVsX2RwKSAmJgogCSAgICBkcm1fZHBfdHBzM19zdXBwb3J0ZWQoaW50ZWxfZHAt PmRwY2QpKQogCQl2YWwgfD0gRURQX1BTUl9UUDFfVFAzX1NFTDsKLS0gCjIuNy40CgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK