From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rodrigo Vivi Subject: [PATCH 11/31] drm/i915: Use intel_crtc instead of intel_dp on PSR enable/disable functions. Date: Thu, 5 Nov 2015 10:50:03 -0800 Message-ID: <1446749423-4789-12-git-send-email-rodrigo.vivi@intel.com> References: <1446749423-4789-1-git-send-email-rodrigo.vivi@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 02A036E479 for ; Thu, 5 Nov 2015 10:49:49 -0800 (PST) In-Reply-To: <1446749423-4789-1-git-send-email-rodrigo.vivi@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: Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org VGhpcyB3aWxsIGdpdmUgdXMgdGhlIGZsZXhpYmlsaXR5IHRvIG1vdmUgdGhlbSB0bwpwb3N0IGF0 b21pYyBtb2Rlc2V0IGZ1bmN0aW9ucy4KClNpZ25lZC1vZmYtYnk6IFJvZHJpZ28gVml2aSA8cm9k cmlnby52aXZpQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGku YyB8ICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgIHwgIDUgKysrLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIHwgIDQgKystLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcHNyLmMgfCAzOCArKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0t LS0tLS0tLQogNCBmaWxlcyBjaGFuZ2VkLCAzMSBpbnNlcnRpb25zKCspLCAyMCBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jCmluZGV4IDA2ZDMwMDIuLmI4ZjhkZWUgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2RkaS5jCkBAIC0yNDA0LDcgKzI0MDQsNyBAQCBzdGF0aWMgdm9pZCBp bnRlbF9lbmFibGVfZGRpKHN0cnVjdCBpbnRlbF9lbmNvZGVyICppbnRlbF9lbmNvZGVyKQogCQkJ aW50ZWxfZHBfc3RvcF9saW5rX3RyYWluKGludGVsX2RwKTsKIAogCQlpbnRlbF9lZHBfYmFja2xp Z2h0X29uKGludGVsX2RwKTsKLQkJaW50ZWxfcHNyX2VuYWJsZShpbnRlbF9kcCk7CisJCWludGVs X3Bzcl9lbmFibGUoaW50ZWxfY3J0Yyk7CiAJCWludGVsX2VkcF9kcnJzX2VuYWJsZShpbnRlbF9k cCk7CiAJfQogCkBAIC0yNDMyLDcgKzI0MzIsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kaXNhYmxl X2RkaShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2RlcikKIAkJc3RydWN0IGludGVs X2RwICppbnRlbF9kcCA9IGVuY190b19pbnRlbF9kcChlbmNvZGVyKTsKIAogCQlpbnRlbF9lZHBf ZHJyc19kaXNhYmxlKGludGVsX2RwKTsKLQkJaW50ZWxfcHNyX2Rpc2FibGUoaW50ZWxfZHApOwor CQlpbnRlbF9wc3JfZGlzYWJsZShpbnRlbF9jcnRjKTsKIAkJaW50ZWxfZWRwX2JhY2tsaWdodF9v ZmYoaW50ZWxfZHApOwogCX0KIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2RwLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCmluZGV4IGUxNTRhMmUu LjkyZjU5Y2MgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwpAQCAtMjM3NCw3ICsyMzc0LDcgQEAg c3RhdGljIHZvaWQgaW50ZWxfZGlzYWJsZV9kcChzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2Rl cikKIAkJaW50ZWxfYXVkaW9fY29kZWNfZGlzYWJsZShlbmNvZGVyKTsKIAogCWlmIChIQVNfUFNS KGRldikgJiYgIUhBU19EREkoZGV2KSkKLQkJaW50ZWxfcHNyX2Rpc2FibGUoaW50ZWxfZHApOwor CQlpbnRlbF9wc3JfZGlzYWJsZShjcnRjKTsKIAogCS8qIE1ha2Ugc3VyZSB0aGUgcGFuZWwgaXMg b2ZmIGJlZm9yZSB0cnlpbmcgdG8gY2hhbmdlIHRoZSBtb2RlLiBCdXQgYWxzbwogCSAqIGVuc3Vy ZSB0aGF0IHdlIGhhdmUgdmRkIHdoaWxlIHdlIHN3aXRjaCBvZmYgdGhlIHBhbmVsLiAqLwpAQCAt MjYyOSw5ICsyNjI5LDEwIEBAIHN0YXRpYyB2b2lkIGc0eF9lbmFibGVfZHAoc3RydWN0IGludGVs X2VuY29kZXIgKmVuY29kZXIpCiBzdGF0aWMgdm9pZCB2bHZfZW5hYmxlX2RwKHN0cnVjdCBpbnRl bF9lbmNvZGVyICplbmNvZGVyKQogewogCXN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAgPSBlbmNf dG9faW50ZWxfZHAoJmVuY29kZXItPmJhc2UpOworCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjID0g dG9faW50ZWxfY3J0YyhlbmNvZGVyLT5iYXNlLmNydGMpOwogCiAJaW50ZWxfZWRwX2JhY2tsaWdo dF9vbihpbnRlbF9kcCk7Ci0JaW50ZWxfcHNyX2VuYWJsZShpbnRlbF9kcCk7CisJaW50ZWxfcHNy X2VuYWJsZShjcnRjKTsKIH0KIAogc3RhdGljIHZvaWQgZzR4X3ByZV9lbmFibGVfZHAoc3RydWN0 IGludGVsX2VuY29kZXIgKmVuY29kZXIpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDA2 NTExZDIuLmNhZmU0YzEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Ry di5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC0xMzk5LDggKzEz OTksOCBAQCB2b2lkIGludGVsX2JhY2tsaWdodF91bnJlZ2lzdGVyKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpOwogLyogaW50ZWxfcHNyLmMgKi8KIGJvb2wgaW50ZWxfcHNyX3JlYWR5KHN0cnVjdCBp bnRlbF9kcCAqaW50ZWxfZHAsCiAJCSAgICAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVf Y29uZmlnKTsKLXZvaWQgaW50ZWxfcHNyX2VuYWJsZShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2Rw KTsKLXZvaWQgaW50ZWxfcHNyX2Rpc2FibGUoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCk7Cit2 b2lkIGludGVsX3Bzcl9lbmFibGUoc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMpOwordm9p ZCBpbnRlbF9wc3JfZGlzYWJsZShzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0Yyk7CiB2b2lk IGludGVsX3Bzcl9pbnZhbGlkYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkgIHVuc2ln bmVkIGZyb250YnVmZmVyX2JpdHMpOwogdm9pZCBpbnRlbF9wc3JfZmx1c2goc3RydWN0IGRybV9k ZXZpY2UgKmRldiwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMKaW5kZXggZTY5MGRiMy4uYmNmMmQ5 ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMKQEAgLTM3MSwxOCArMzcxLDE5IEBAIHN0YXRp YyB2b2lkIGludGVsX3Bzcl9hY3RpdmF0ZShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogCiAv KioKICAqIGludGVsX3Bzcl9lbmFibGUgLSBFbmFibGUgUFNSCi0gKiBAaW50ZWxfZHA6IEludGVs IERQCisgKiBAaW50ZWxfY3J0YzogSW50ZWwgQ1JUQwogICoKICAqIFRoaXMgZnVuY3Rpb24gY2Fu IG9ubHkgYmUgY2FsbGVkIGFmdGVyIHRoZSBwaXBlIGlzIGZ1bGx5IHRyYWluZWQgYW5kIGVuYWJs ZWQuCiAgKi8KLXZvaWQgaW50ZWxfcHNyX2VuYWJsZShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2Rw KQordm9pZCBpbnRlbF9wc3JfZW5hYmxlKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjKQog ewotCXN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmludGVsX2RpZ19wb3J0ID0gZHBfdG9fZGln X3BvcnQoaW50ZWxfZHApOwotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBpbnRlbF9kaWdfcG9y dC0+YmFzZS5iYXNlLmRldjsKKwlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSAmaW50ZWxfY3J0Yy0+ YmFzZTsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwogCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Ci0Jc3RydWN0IGludGVs X2NydGMgKmNydGMgPSB0b19pbnRlbF9jcnRjKGludGVsX2RpZ19wb3J0LT5iYXNlLmJhc2UuY3J0 Yyk7CisJc3RydWN0IGludGVsX2VuY29kZXIgKmludGVsX2VuY29kZXI7CisJc3RydWN0IGludGVs X2RwICppbnRlbF9kcCA9IE5VTEw7CiAKLQlpZiAoIWNydGMtPmNvbmZpZy0+cHNyX3JlYWR5KQor CWlmICghaW50ZWxfY3J0Yy0+Y29uZmlnLT5wc3JfcmVhZHkpCiAJCXJldHVybjsKIAogCW11dGV4 X2xvY2soJmRldl9wcml2LT5wc3IubG9jayk7CkBAIC0zOTEsNiArMzkyLDE2IEBAIHZvaWQgaW50 ZWxfcHNyX2VuYWJsZShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogCQlnb3RvIHVubG9jazsK IAl9CiAKKwlmb3JfZWFjaF9lbmNvZGVyX29uX2NydGMoZGV2LCBjcnRjLCBpbnRlbF9lbmNvZGVy KSB7CisJCWlmIChpbnRlbF9lbmNvZGVyLT50eXBlID09IElOVEVMX09VVFBVVF9FRFApCisJCQlp bnRlbF9kcCA9IGVuY190b19pbnRlbF9kcCgmaW50ZWxfZW5jb2Rlci0+YmFzZSk7CisJfQorCisJ aWYgKCFpbnRlbF9kcCkgeworCQlEUk1fREVCVUdfS01TKCJObyBlRFAgZm91bmRcbiIpOworCQln b3RvIHVubG9jazsKKwl9CisKIAlkZXZfcHJpdi0+cHNyLmJ1c3lfZnJvbnRidWZmZXJfYml0cyA9 IDA7CiAKIAlpZiAoSEFTX0RESShkZXYpKSB7CkBAIC0zOTgsOCArNDA5LDggQEAgdm9pZCBpbnRl bF9wc3JfZW5hYmxlKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAKIAkJaWYgKGRldl9wcml2 LT5wc3IucHNyMl9zdXBwb3J0KSB7CiAJCQkvKiBQU1IyIGlzIHJlc3RyaWN0ZWQgdG8gd29yayB3 aXRoIHBhbmVsIHJlc29sdXRpb25zIHVwdG8gMzIwMHgyMDAwICovCi0JCQlpZiAoY3J0Yy0+Y29u ZmlnLT5waXBlX3NyY193ID4gMzIwMCB8fAotCQkJCWNydGMtPmNvbmZpZy0+cGlwZV9zcmNfaCA+ IDIwMDApCisJCQlpZiAoaW50ZWxfY3J0Yy0+Y29uZmlnLT5waXBlX3NyY193ID4gMzIwMCB8fAor CQkJCWludGVsX2NydGMtPmNvbmZpZy0+cGlwZV9zcmNfaCA+IDIwMDApCiAJCQkJZGV2X3ByaXYt PnBzci5wc3IyX3N1cHBvcnQgPSBmYWxzZTsKIAkJCWVsc2UKIAkJCQlza2xfcHNyX3NldHVwX3N1 X3ZzYyhpbnRlbF9kcCk7CkBAIC00ODQsMTQgKzQ5NSwxMyBAQCBzdGF0aWMgdm9pZCBoc3dfcHNy X2Rpc2FibGUoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIAogLyoqCiAgKiBpbnRlbF9wc3Jf ZGlzYWJsZSAtIERpc2FibGUgUFNSCi0gKiBAaW50ZWxfZHA6IEludGVsIERQCisgKiBAaW50ZWxf Y3J0YzogSW50ZWwgQ1JUQwogICoKICAqIFRoaXMgZnVuY3Rpb24gbmVlZHMgdG8gYmUgY2FsbGVk IGJlZm9yZSBkaXNhYmxpbmcgcGlwZS4KICAqLwotdm9pZCBpbnRlbF9wc3JfZGlzYWJsZShzdHJ1 Y3QgaW50ZWxfZHAgKmludGVsX2RwKQordm9pZCBpbnRlbF9wc3JfZGlzYWJsZShzdHJ1Y3QgaW50 ZWxfY3J0YyAqaW50ZWxfY3J0YykKIHsKLQlzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRl bF9kaWdfcG9ydCA9IGRwX3RvX2RpZ19wb3J0KGludGVsX2RwKTsKLQlzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2ID0gaW50ZWxfZGlnX3BvcnQtPmJhc2UuYmFzZS5kZXY7CisJc3RydWN0IGRybV9kZXZp Y2UgKmRldiA9IGludGVsX2NydGMtPmJhc2UuZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAKIAltdXRleF9sb2NrKCZkZXZfcHJpdi0+ cHNyLmxvY2spOwpAQCAtNTAxLDkgKzUxMSw5IEBAIHZvaWQgaW50ZWxfcHNyX2Rpc2FibGUoc3Ry dWN0IGludGVsX2RwICppbnRlbF9kcCkKIAl9CiAKIAlpZiAoSEFTX0RESShkZXYpKQotCQloc3df cHNyX2Rpc2FibGUoaW50ZWxfZHApOworCQloc3dfcHNyX2Rpc2FibGUoZGV2X3ByaXYtPnBzci5l bmFibGVkKTsKIAllbHNlCi0JCXZsdl9wc3JfZGlzYWJsZShpbnRlbF9kcCk7CisJCXZsdl9wc3Jf ZGlzYWJsZShkZXZfcHJpdi0+cHNyLmVuYWJsZWQpOwogCiAJZGV2X3ByaXYtPnBzci5lbmFibGVk ID0gTlVMTDsKIAltdXRleF91bmxvY2soJmRldl9wcml2LT5wc3IubG9jayk7Ci0tIAoyLjQuMwoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK