From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v2 0.999/9] drm/i915: Pass crtc state to modeset_get_crtc_power_domains. Date: Mon, 11 Jan 2016 14:31:19 +0100 Message-ID: <5693AEA7.2030009@linux.intel.com> References: <1452515269-6221-1-git-send-email-maarten.lankhorst@linux.intel.com> <1452515269-6221-2-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 mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id 45D156E4CB for ; Mon, 11 Jan 2016 05:31:21 -0800 (PST) In-Reply-To: <1452515269-6221-2-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 cnN0QGxpbnV4LmludGVsLmNvbT4KLS0tClRoaXMgZGVwZW5kcyBvbiB0aGUgYXRvbWljIGVuY29k ZXJfbWFzayBwYXRjaGVzIGFuZCBpcyByZXF1aXJlZCBmb3IgdW5pZnlpbmcgcG93ZXIgZG9tYWlu IGhhbmRsaW5nLgoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCAzZmQ2ZjFj MTU3YjguLjFhYzg2OGQwM2QyYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpA QCAtNTM0MiwzMSArNTM0MiwzNyBAQCBpbnRlbF9kaXNwbGF5X3BvcnRfYXV4X3Bvd2VyX2RvbWFp bihzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2RlcikKIAl9CiB9CiAKLXN0YXRpYyB1 bnNpZ25lZCBsb25nIGdldF9jcnRjX3Bvd2VyX2RvbWFpbnMoc3RydWN0IGRybV9jcnRjICpjcnRj KQorc3RhdGljIHVuc2lnbmVkIGxvbmcgZ2V0X2NydGNfcG93ZXJfZG9tYWlucyhzdHJ1Y3QgZHJt X2NydGMgKmNydGMsCisJCQkJCSAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0 ZSkKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwotCXN0cnVjdCBpbnRl bF9lbmNvZGVyICppbnRlbF9lbmNvZGVyOworCXN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlcjsK IAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAJ ZW51bSBwaXBlIHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOwogCXVuc2lnbmVkIGxvbmcgbWFzazsK LQllbnVtIHRyYW5zY29kZXIgdHJhbnNjb2RlciA9IGludGVsX2NydGMtPmNvbmZpZy0+Y3B1X3Ry YW5zY29kZXI7CisJZW51bSB0cmFuc2NvZGVyIHRyYW5zY29kZXIgPSBjcnRjX3N0YXRlLT5jcHVf dHJhbnNjb2RlcjsKIAotCWlmICghY3J0Yy0+c3RhdGUtPmFjdGl2ZSkKKwlpZiAoIWNydGNfc3Rh dGUtPmJhc2UuYWN0aXZlKQogCQlyZXR1cm4gMDsKIAogCW1hc2sgPSBCSVQoUE9XRVJfRE9NQUlO X1BJUEUocGlwZSkpOwogCW1hc2sgfD0gQklUKFBPV0VSX0RPTUFJTl9UUkFOU0NPREVSKHRyYW5z Y29kZXIpKTsKLQlpZiAoaW50ZWxfY3J0Yy0+Y29uZmlnLT5wY2hfcGZpdC5lbmFibGVkIHx8Ci0J ICAgIGludGVsX2NydGMtPmNvbmZpZy0+cGNoX3BmaXQuZm9yY2VfdGhydSkKKwlpZiAoY3J0Y19z dGF0ZS0+cGNoX3BmaXQuZW5hYmxlZCB8fAorCSAgICBjcnRjX3N0YXRlLT5wY2hfcGZpdC5mb3Jj ZV90aHJ1KQogCQltYXNrIHw9IEJJVChQT1dFUl9ET01BSU5fUElQRV9QQU5FTF9GSVRURVIocGlw ZSkpOwogCi0JZm9yX2VhY2hfZW5jb2Rlcl9vbl9jcnRjKGRldiwgY3J0YywgaW50ZWxfZW5jb2Rl cikKKwlkcm1fZm9yX2VhY2hfZW5jb2Rlcl9tYXNrKGVuY29kZXIsIGRldiwgY3J0Y19zdGF0ZS0+ YmFzZS5lbmNvZGVyX21hc2spIHsKKwkJc3RydWN0IGludGVsX2VuY29kZXIgKmludGVsX2VuY29k ZXIgPSB0b19pbnRlbF9lbmNvZGVyKGVuY29kZXIpOworCiAJCW1hc2sgfD0gQklUKGludGVsX2Rp c3BsYXlfcG9ydF9wb3dlcl9kb21haW4oaW50ZWxfZW5jb2RlcikpOworCX0KIAogCXJldHVybiBt YXNrOwogfQogCi1zdGF0aWMgdW5zaWduZWQgbG9uZyBtb2Rlc2V0X2dldF9jcnRjX3Bvd2VyX2Rv bWFpbnMoc3RydWN0IGRybV9jcnRjICpjcnRjKQorc3RhdGljIHVuc2lnbmVkIGxvbmcKK21vZGVz ZXRfZ2V0X2NydGNfcG93ZXJfZG9tYWlucyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCisJCQkgICAg ICAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiB7CiAJc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gY3J0Yy0+ZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3Qg aW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CkBAIC01Mzc0LDcg KzUzODAsOCBAQCBzdGF0aWMgdW5zaWduZWQgbG9uZyBtb2Rlc2V0X2dldF9jcnRjX3Bvd2VyX2Rv bWFpbnMoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCXVuc2lnbmVkIGxvbmcgZG9tYWlucywgbmV3 X2RvbWFpbnMsIG9sZF9kb21haW5zOwogCiAJb2xkX2RvbWFpbnMgPSBpbnRlbF9jcnRjLT5lbmFi bGVkX3Bvd2VyX2RvbWFpbnM7Ci0JaW50ZWxfY3J0Yy0+ZW5hYmxlZF9wb3dlcl9kb21haW5zID0g bmV3X2RvbWFpbnMgPSBnZXRfY3J0Y19wb3dlcl9kb21haW5zKGNydGMpOworCWludGVsX2NydGMt PmVuYWJsZWRfcG93ZXJfZG9tYWlucyA9IG5ld19kb21haW5zID0KKwkJZ2V0X2NydGNfcG93ZXJf ZG9tYWlucyhjcnRjLCBjcnRjX3N0YXRlKTsKIAogCWRvbWFpbnMgPSBuZXdfZG9tYWlucyAmIH5v bGRfZG9tYWluczsKIApAQCAtNTQwNiw3ICs1NDEzLDggQEAgc3RhdGljIHZvaWQgbW9kZXNldF91 cGRhdGVfY3J0Y19wb3dlcl9kb21haW5zKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkK IAlmb3JfZWFjaF9jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBjcnRjX3N0YXRlLCBpKSB7CiAJ CWlmIChuZWVkc19tb2Rlc2V0KGNydGMtPnN0YXRlKSkKIAkJCXB1dF9kb21haW5zW3RvX2ludGVs X2NydGMoY3J0YyktPnBpcGVdID0KLQkJCQltb2Rlc2V0X2dldF9jcnRjX3Bvd2VyX2RvbWFpbnMo Y3J0Yyk7CisJCQkJbW9kZXNldF9nZXRfY3J0Y19wb3dlcl9kb21haW5zKGNydGMsCisJCQkJCXRv X2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+c3RhdGUpKTsKIAl9CiAKIAlpZiAoZGV2X3ByaXYtPmRp c3BsYXkubW9kZXNldF9jb21taXRfY2RjbGsgJiYKQEAgLTEzNjMyLDcgKzEzNjQwLDggQEAgc3Rh dGljIGludCBpbnRlbF9hdG9taWNfY29tbWl0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCX0K IAogCQlpZiAodXBkYXRlX3BpcGUpIHsKLQkJCXB1dF9kb21haW5zID0gbW9kZXNldF9nZXRfY3J0 Y19wb3dlcl9kb21haW5zKGNydGMpOworCQkJcHV0X2RvbWFpbnMgPSBtb2Rlc2V0X2dldF9jcnRj X3Bvd2VyX2RvbWFpbnMoY3J0YywKKwkJCQkJICAgICAgdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRj LT5zdGF0ZSkpOwogCiAJCQkvKiBtYWtlIHN1cmUgaW50ZWxfbW9kZXNldF9jaGVja19zdGF0ZSBy dW5zICovCiAJCQlod19jaGVjayA9IHRydWU7CkBAIC0xNTk4OSw3ICsxNTk5OCw3IEBAIGludGVs X21vZGVzZXRfc2V0dXBfaHdfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlmb3JfZWFj aF9pbnRlbF9jcnRjKGRldiwgY3J0YykgewogCQl1bnNpZ25lZCBsb25nIHB1dF9kb21haW5zOwog Ci0JCXB1dF9kb21haW5zID0gbW9kZXNldF9nZXRfY3J0Y19wb3dlcl9kb21haW5zKCZjcnRjLT5i YXNlKTsKKwkJcHV0X2RvbWFpbnMgPSBtb2Rlc2V0X2dldF9jcnRjX3Bvd2VyX2RvbWFpbnMoJmNy dGMtPmJhc2UsIGNydGMtPmNvbmZpZyk7CiAJCWlmIChXQVJOX09OKHB1dF9kb21haW5zKSkKIAkJ CW1vZGVzZXRfcHV0X3Bvd2VyX2RvbWFpbnMoZGV2X3ByaXYsIHB1dF9kb21haW5zKTsKIAl9Cgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=