From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v3 04/19] drm/i915: Move scaler setup to check crtc function, v2. Date: Mon, 15 Jun 2015 12:33:41 +0200 Message-ID: <1434364436-6366-5-git-send-email-maarten.lankhorst@linux.intel.com> References: <1434364436-6366-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 ESMTP id 937696E732 for ; Mon, 15 Jun 2015 03:34:13 -0700 (PDT) In-Reply-To: <1434364436-6366-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 VGhlIHNjYWxlciBzZXR1cCBtYXkgYWRkIHBsYW5lcywgYnV0IHNpbmNlIHRoZXkncmUgdW5jaGFu Z2VkIHdlIG9ubHkKaGF2ZSB0byB3YWl0IGZvciBwcmltYXJ5IGZsaXBzLiBBbHNvIHNldCBwbGFu ZXNfY2hhbmdlZCB0byBpbmRpY2F0ZQphdCBsZWFzdCAxIHBsYW5lIGlzIG1vZGlmaWVkLgoKQ2hh bmdlcyBzaW5jZSB2MToKLSBJbnN0ZWFkIG9mIHJlbW92aW5nIHBsYW5lcywgZG8gbWluaW1hbCB2 YWxpZGF0aW9uIG5lZWRlZC4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFy dGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfYXRvbWljLmMgIHwgMTcgKysrKysrKysrLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYyB8IDE1ICsrKysrLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2Vk LCAxNCBpbnNlcnRpb25zKCspLCAxOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2F0b21pYy5jCmluZGV4IDZhYjcxZWE5MjgxOS4uZDVhZmMyYWE0YWM3IDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9hdG9taWMuYwpAQCAtMTAwLDE0ICsxMDAsNiBAQCBpbnQgaW50ZWxfYXRvbWlj X2NoZWNrKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsK IAotCS8qCi0JICogRklYTUU6IG1vdmUgdG8gY3J0YyBhdG9taWMgY2hlY2sgZnVuY3Rpb24gb25j ZSB0aGlzIGlzCi0JICogbW9yZSBhdG9taWMgZnJpZW5kbHkuCi0JICovCi0JcmV0ID0gaW50ZWxf YXRvbWljX3NldHVwX3NjYWxlcnMoZGV2LCBudWNsZWFyX2NydGMsIGNydGNfc3RhdGUpOwotCWlm IChyZXQpCi0JCXJldHVybiByZXQ7Ci0KIAlyZXR1cm4gcmV0OwogfQogCkBAIC0zNDksNiArMzQx LDE1IEBAIGludCBpbnRlbF9hdG9taWNfc2V0dXBfc2NhbGVycyhzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LAogCQkJCQkJcGxhbmUtPmJhc2UuaWQpOwogCQkJCQlyZXR1cm4gUFRSX0VSUihzdGF0ZSk7 CiAJCQkJfQorCisJCQkJLyoKKwkJCQkgKiB0aGUgcGxhbmUgaXMgYWRkZWQgYWZ0ZXIgcGxhbmUg Y2hlY2tzIGFyZSBydW4sCisJCQkJICogYnV0IHNpbmNlIHRoaXMgcGxhbmUgaXMgdW5jaGFuZ2Vk IGp1c3QgZG8gdGhlCisJCQkJICogbWluaW11bSByZXF1aXJlZCB2YWxpZGF0aW9uLgorCQkJCSAq LworCQkJCWlmIChwbGFuZS0+dHlwZSA9PSBEUk1fUExBTkVfVFlQRV9QUklNQVJZKQorCQkJCQlp bnRlbF9jcnRjLT5hdG9taWMud2FpdF9mb3JfZmxpcHMgPSB0cnVlOworCQkJCWNydGNfc3RhdGUt PmJhc2UucGxhbmVzX2NoYW5nZWQgPSB0cnVlOwogCQkJfQogCiAJCQlpbnRlbF9wbGFuZSA9IHRv X2ludGVsX3BsYW5lKHBsYW5lKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRl eCAyOWU3NjFkOWUwZWMuLmU2ODM3MTcyYWZhZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYwpAQCAtNjU3NCw3ICs2NTc0LDYgQEAgc3RhdGljIGludCBpbnRlbF9jcnRjX2NvbXB1 dGVfY29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCXN0cnVjdCBkcm1fZGV2aWNlICpk ZXYgPSBjcnRjLT5iYXNlLmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICphZGp1c3RlZF9t b2RlID0gJnBpcGVfY29uZmlnLT5iYXNlLmFkanVzdGVkX21vZGU7Ci0JaW50IHJldDsKIAogCS8q IEZJWE1FIHNob3VsZCBjaGVjayBwaXhlbCBjbG9jayBsaW1pdHMgb24gYWxsIHBsYXRmb3JtcyAq LwogCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA8IDQpIHsKQEAgLTY2MjAsMTQgKzY2MTksNyBA QCBzdGF0aWMgaW50IGludGVsX2NydGNfY29tcHV0ZV9jb25maWcoc3RydWN0IGludGVsX2NydGMg KmNydGMsCiAJaWYgKHBpcGVfY29uZmlnLT5oYXNfcGNoX2VuY29kZXIpCiAJCXJldHVybiBpcm9u bGFrZV9mZGlfY29tcHV0ZV9jb25maWcoY3J0YywgcGlwZV9jb25maWcpOwogCi0JLyogRklYTUU6 IHJlbW92ZSBiZWxvdyBjYWxsIG9uY2UgYXRvbWljIG1vZGUgc2V0IGlzIHBsYWNlIGFuZCBhbGwg Y3J0YwotCSAqIHJlbGF0ZWQgY2hlY2tzIGNhbGxlZCBmcm9tIGF0b21pY19jcnRjX2NoZWNrIGZ1 bmN0aW9uICovCi0JcmV0ID0gMDsKLQlEUk1fREVCVUdfS01TKCJpbnRlbF9jcnRjID0gJXAgZHJt X3N0YXRlIChwaXBlX2NvbmZpZy0+YmFzZS5zdGF0ZSkgPSAlcFxuIiwKLQkJY3J0YywgcGlwZV9j b25maWctPmJhc2Uuc3RhdGUpOwotCXJldCA9IGludGVsX2F0b21pY19zZXR1cF9zY2FsZXJzKGRl diwgY3J0YywgcGlwZV9jb25maWcpOwotCi0JcmV0dXJuIHJldDsKKwlyZXR1cm4gMDsKIH0KIAog c3RhdGljIGludCBza3lsYWtlX2dldF9kaXNwbGF5X2Nsb2NrX3NwZWVkKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCkBAIC0xMTcxNCw3ICsxMTcwNiwxMCBAQCBzdGF0aWMgYm9vbCBjaGVja19lbmNv ZGVyX2Nsb25pbmcoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAogc3RhdGljIGludCBp bnRlbF9jcnRjX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCQkJICAgc3Ry dWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQogeworCXN0cnVjdCBkcm1fZGV2aWNlICpk ZXYgPSBjcnRjLT5kZXY7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRl bF9jcnRjKGNydGMpOworCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZyA9CisJ CXRvX2ludGVsX2NydGNfc3RhdGUoY3J0Y19zdGF0ZSk7CiAJc3RydWN0IGRybV9hdG9taWNfc3Rh dGUgKnN0YXRlID0gY3J0Y19zdGF0ZS0+c3RhdGU7CiAJaW50IGlkeCA9IGNydGMtPmJhc2UuaWQ7 CiAJYm9vbCBtb2RlX2NoYW5nZWQgPSBuZWVkc19tb2Rlc2V0KGNydGNfc3RhdGUpOwpAQCAtMTE3 MjgsNyArMTE3MjMsNyBAQCBzdGF0aWMgaW50IGludGVsX2NydGNfYXRvbWljX2NoZWNrKHN0cnVj dCBkcm1fY3J0YyAqY3J0YywKIAkJIltDUlRDOiVpXSBtaXNtYXRjaCBiZXR3ZWVuIHN0YXRlLT5h Y3RpdmUoJWkpIGFuZCBjcnRjLT5hY3RpdmUoJWkpXG4iLAogCQlpZHgsIGNydGMtPnN0YXRlLT5h Y3RpdmUsIGludGVsX2NydGMtPmFjdGl2ZSk7CiAKLQlyZXR1cm4gMDsKKwlyZXR1cm4gaW50ZWxf YXRvbWljX3NldHVwX3NjYWxlcnMoZGV2LCBpbnRlbF9jcnRjLCBwaXBlX2NvbmZpZyk7CiB9CiAK IHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2NydGNfaGVscGVyX2Z1bmNzIGludGVsX2hlbHBlcl9m dW5jcyA9IHsKLS0gCjIuMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu dGVsLWdmeAo=