From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v4 1/8] drm/i915: Pass crtc state to modeset_get_crtc_power_domains. Date: Wed, 10 Feb 2016 13:49:36 +0100 Message-ID: <1455108583-29227-2-git-send-email-maarten.lankhorst@linux.intel.com> References: <1455108583-29227-1-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 68E5B6E6C4 for ; Wed, 10 Feb 2016 04:49:48 -0800 (PST) In-Reply-To: <1455108583-29227-1-git-send-email-maarten.lankhorst@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 List-Id: intel-gfx@lists.freedesktop.org VXNlIG91ciBuZXdseSBjcmVhdGVkIGVuY29kZXJfbWFzayB0byBpdGVyYXRlIG92ZXIgdGhlIGVu Y29kZXJzLgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hv cnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMgfCAzMyArKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFu Z2VkLCAyMSBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMKaW5kZXggMzBkNGRiMGQ3NzZmLi5iNDc5YmE2MjM4ZDcgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTUzMDEsMzEgKzUzMDEsMzcgQEAgaW50ZWxf ZGlzcGxheV9wb3J0X2F1eF9wb3dlcl9kb21haW4oc3RydWN0IGludGVsX2VuY29kZXIgKmludGVs X2VuY29kZXIpCiAJfQogfQogCi1zdGF0aWMgdW5zaWduZWQgbG9uZyBnZXRfY3J0Y19wb3dlcl9k b21haW5zKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKK3N0YXRpYyB1bnNpZ25lZCBsb25nIGdldF9j cnRjX3Bvd2VyX2RvbWFpbnMoc3RydWN0IGRybV9jcnRjICpjcnRjLAorCQkJCQkgICAgc3RydWN0 IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRl diA9IGNydGMtPmRldjsKLQlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2RlcjsKKwlz dHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXI7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2Ny dGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwogCWVudW0gcGlwZSBwaXBlID0gaW50ZWxfY3J0Yy0+ cGlwZTsKIAl1bnNpZ25lZCBsb25nIG1hc2s7Ci0JZW51bSB0cmFuc2NvZGVyIHRyYW5zY29kZXIg PSBpbnRlbF9jcnRjLT5jb25maWctPmNwdV90cmFuc2NvZGVyOworCWVudW0gdHJhbnNjb2RlciB0 cmFuc2NvZGVyID0gY3J0Y19zdGF0ZS0+Y3B1X3RyYW5zY29kZXI7CiAKLQlpZiAoIWNydGMtPnN0 YXRlLT5hY3RpdmUpCisJaWYgKCFjcnRjX3N0YXRlLT5iYXNlLmFjdGl2ZSkKIAkJcmV0dXJuIDA7 CiAKIAltYXNrID0gQklUKFBPV0VSX0RPTUFJTl9QSVBFKHBpcGUpKTsKIAltYXNrIHw9IEJJVChQ T1dFUl9ET01BSU5fVFJBTlNDT0RFUih0cmFuc2NvZGVyKSk7Ci0JaWYgKGludGVsX2NydGMtPmNv bmZpZy0+cGNoX3BmaXQuZW5hYmxlZCB8fAotCSAgICBpbnRlbF9jcnRjLT5jb25maWctPnBjaF9w Zml0LmZvcmNlX3RocnUpCisJaWYgKGNydGNfc3RhdGUtPnBjaF9wZml0LmVuYWJsZWQgfHwKKwkg ICAgY3J0Y19zdGF0ZS0+cGNoX3BmaXQuZm9yY2VfdGhydSkKIAkJbWFzayB8PSBCSVQoUE9XRVJf RE9NQUlOX1BJUEVfUEFORUxfRklUVEVSKHBpcGUpKTsKIAotCWZvcl9lYWNoX2VuY29kZXJfb25f Y3J0YyhkZXYsIGNydGMsIGludGVsX2VuY29kZXIpCisJZHJtX2Zvcl9lYWNoX2VuY29kZXJfbWFz ayhlbmNvZGVyLCBkZXYsIGNydGNfc3RhdGUtPmJhc2UuZW5jb2Rlcl9tYXNrKSB7CisJCXN0cnVj dCBpbnRlbF9lbmNvZGVyICppbnRlbF9lbmNvZGVyID0gdG9faW50ZWxfZW5jb2RlcihlbmNvZGVy KTsKKwogCQltYXNrIHw9IEJJVChpbnRlbF9kaXNwbGF5X3BvcnRfcG93ZXJfZG9tYWluKGludGVs X2VuY29kZXIpKTsKKwl9CiAKIAlyZXR1cm4gbWFzazsKIH0KIAotc3RhdGljIHVuc2lnbmVkIGxv bmcgbW9kZXNldF9nZXRfY3J0Y19wb3dlcl9kb21haW5zKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykK K3N0YXRpYyB1bnNpZ25lZCBsb25nCittb2Rlc2V0X2dldF9jcnRjX3Bvd2VyX2RvbWFpbnMoc3Ry dWN0IGRybV9jcnRjICpjcnRjLAorCQkJICAgICAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpj cnRjX3N0YXRlKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGNydGMt PmRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19p bnRlbF9jcnRjKGNydGMpOwpAQCAtNTMzMyw3ICs1MzM5LDggQEAgc3RhdGljIHVuc2lnbmVkIGxv bmcgbW9kZXNldF9nZXRfY3J0Y19wb3dlcl9kb21haW5zKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykK IAl1bnNpZ25lZCBsb25nIGRvbWFpbnMsIG5ld19kb21haW5zLCBvbGRfZG9tYWluczsKIAogCW9s ZF9kb21haW5zID0gaW50ZWxfY3J0Yy0+ZW5hYmxlZF9wb3dlcl9kb21haW5zOwotCWludGVsX2Ny dGMtPmVuYWJsZWRfcG93ZXJfZG9tYWlucyA9IG5ld19kb21haW5zID0gZ2V0X2NydGNfcG93ZXJf ZG9tYWlucyhjcnRjKTsKKwlpbnRlbF9jcnRjLT5lbmFibGVkX3Bvd2VyX2RvbWFpbnMgPSBuZXdf ZG9tYWlucyA9CisJCWdldF9jcnRjX3Bvd2VyX2RvbWFpbnMoY3J0YywgY3J0Y19zdGF0ZSk7CiAK IAlkb21haW5zID0gbmV3X2RvbWFpbnMgJiB+b2xkX2RvbWFpbnM7CiAKQEAgLTUzNjUsNyArNTM3 Miw4IEBAIHN0YXRpYyB2b2lkIG1vZGVzZXRfdXBkYXRlX2NydGNfcG93ZXJfZG9tYWlucyhzdHJ1 Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiAJZm9yX2VhY2hfY3J0Y19pbl9zdGF0ZShzdGF0 ZSwgY3J0YywgY3J0Y19zdGF0ZSwgaSkgewogCQlpZiAobmVlZHNfbW9kZXNldChjcnRjLT5zdGF0 ZSkpCiAJCQlwdXRfZG9tYWluc1t0b19pbnRlbF9jcnRjKGNydGMpLT5waXBlXSA9Ci0JCQkJbW9k ZXNldF9nZXRfY3J0Y19wb3dlcl9kb21haW5zKGNydGMpOworCQkJCW1vZGVzZXRfZ2V0X2NydGNf cG93ZXJfZG9tYWlucyhjcnRjLAorCQkJCQl0b19pbnRlbF9jcnRjX3N0YXRlKGNydGMtPnN0YXRl KSk7CiAJfQogCiAJaWYgKGRldl9wcml2LT5kaXNwbGF5Lm1vZGVzZXRfY29tbWl0X2NkY2xrICYm CkBAIC0xMzQ4Niw3ICsxMzQ5NCw4IEBAIHN0YXRpYyBpbnQgaW50ZWxfYXRvbWljX2NvbW1pdChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQl9CiAKIAkJaWYgKHVwZGF0ZV9waXBlKSB7Ci0JCQlw dXRfZG9tYWlucyA9IG1vZGVzZXRfZ2V0X2NydGNfcG93ZXJfZG9tYWlucyhjcnRjKTsKKwkJCXB1 dF9kb21haW5zID0gbW9kZXNldF9nZXRfY3J0Y19wb3dlcl9kb21haW5zKGNydGMsCisJCQkJCSAg ICAgIHRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+c3RhdGUpKTsKIAogCQkJLyogbWFrZSBzdXJl IGludGVsX21vZGVzZXRfY2hlY2tfc3RhdGUgcnVucyAqLwogCQkJaHdfY2hlY2sgPSB0cnVlOwpA QCAtMTU4MzAsNyArMTU4MzksNyBAQCBpbnRlbF9tb2Rlc2V0X3NldHVwX2h3X3N0YXRlKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCiAJZm9yX2VhY2hfaW50ZWxfY3J0YyhkZXYsIGNydGMpIHsKIAkJ dW5zaWduZWQgbG9uZyBwdXRfZG9tYWluczsKIAotCQlwdXRfZG9tYWlucyA9IG1vZGVzZXRfZ2V0 X2NydGNfcG93ZXJfZG9tYWlucygmY3J0Yy0+YmFzZSk7CisJCXB1dF9kb21haW5zID0gbW9kZXNl dF9nZXRfY3J0Y19wb3dlcl9kb21haW5zKCZjcnRjLT5iYXNlLCBjcnRjLT5jb25maWcpOwogCQlp ZiAoV0FSTl9PTihwdXRfZG9tYWlucykpCiAJCQltb2Rlc2V0X3B1dF9wb3dlcl9kb21haW5zKGRl dl9wcml2LCBwdXRfZG9tYWlucyk7CiAJfQotLSAKMi4xLjAKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=