From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v2 09/20] drm/i915: Fill in more crtc state, v2. Date: Tue, 7 Jul 2015 09:08:20 +0200 Message-ID: <1436252911-5703-10-git-send-email-maarten.lankhorst@linux.intel.com> References: <1436252911-5703-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 3631E6E448 for ; Tue, 7 Jul 2015 00:08:50 -0700 (PDT) In-Reply-To: <1436252911-5703-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 UGVyZm9ybSBhIGZ1bGwgcmVhZG91dCBvZiB0aGUgc3RhdGUgYnkgbWFraW5nIHN1cmUgdGhlIG1v ZGUgaXMgc2V0CnVwIGNvcnJlY3RseSBhdG9taWNhbGx5LgoKQWxzbyB0aGVyZSB3YXMgYSBzbWFs bCBtZW1vcnkgbGVhayBieSBkb2luZyB0aGUgbWVtc2V0LCBmaXggdGhpcwpieSBjYWxsaW5nIF9f ZHJtX2F0b21pY19oZWxwZXJfY3J0Y19kZXN0cm95X3N0YXRlIGZpcnN0LgoKQ2hhbmdlcyBzaW5j ZSB2MToKLSBNb3ZlZCBhZnRlciByZXdvcmtpbmcgcHJpbWFyeSBwbGFuZSBhbmQgdXBkYXRpbmcg bW9kZSBtZW1iZXJzLgotIEZvcmNlIGEgbW9kZXNldCBjYWxjdWxhdGlvbiBieSBjaGFuZ2luZyBt b2RlLT50eXBlIGZyb20gd2hhdCB0aGUKICBmaW5hbCBtb2RlIHdpbGwgYmUuCgpTaWduZWQtb2Zm LWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDM1ICsrKysrKysr KysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9m YmRldi5jICAgfCAgOSArKy0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMTggaW5zZXJ0aW9ucygr KSwgMjYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4 IGVlNTQzZTE1MTVmMS4uZGM0YmRiOTFhZDRkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCkBAIC0xNTE5MSw2ICsxNTE5MSw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3Nhbml0aXpl X2NydGMoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRl diA9IGNydGMtPmJhc2UuZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IGRldi0+ZGV2X3ByaXZhdGU7CisJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmln ID0gdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5iYXNlLnN0YXRlKTsKIAlzdHJ1Y3QgaW50ZWxf ZW5jb2RlciAqZW5jb2RlcjsKIAl1MzIgcmVnOwogCWJvb2wgZW5hYmxlOwpAQCAtMTUyMDIsNiAr MTUyMDMsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9zYW5pdGl6ZV9jcnRjKHN0cnVjdCBpbnRlbF9j cnRjICpjcnRjKQogCS8qIHJlc3RvcmUgdmJsYW5rIGludGVycnVwdHMgdG8gY29ycmVjdCBzdGF0 ZSAqLwogCWRybV9jcnRjX3ZibGFua19yZXNldCgmY3J0Yy0+YmFzZSk7CiAJaWYgKGNydGMtPmFj dGl2ZSkgeworCQlkcm1fY2FsY190aW1lc3RhbXBpbmdfY29uc3RhbnRzKCZjcnRjLT5iYXNlLCAm Y3J0Yy0+YmFzZS5od21vZGUpOwogCQl1cGRhdGVfc2NhbmxpbmVfb2Zmc2V0KGNydGMpOwogCQlk cm1fY3J0Y192Ymxhbmtfb24oJmNydGMtPmJhc2UpOwogCX0KQEAgLTE1MjU0LDkgKzE1MjU2LDgg QEAgc3RhdGljIHZvaWQgaW50ZWxfc2FuaXRpemVfY3J0YyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0 YykKIAkJCSAgICAgIGNydGMtPmJhc2Uuc3RhdGUtPmVuYWJsZSA/ICJlbmFibGVkIiA6ICJkaXNh YmxlZCIsCiAJCQkgICAgICBjcnRjLT5hY3RpdmUgPyAiZW5hYmxlZCIgOiAiZGlzYWJsZWQiKTsK IAotCQljcnRjLT5iYXNlLnN0YXRlLT5lbmFibGUgPSBjcnRjLT5hY3RpdmU7Ci0JCWNydGMtPmJh c2Uuc3RhdGUtPmFjdGl2ZSA9IGNydGMtPmFjdGl2ZTsKLQkJY3J0Yy0+YmFzZS5lbmFibGVkID0g Y3J0Yy0+YWN0aXZlOworCQljcnRjLT5iYXNlLmVuYWJsZWQgPSBjcnRjLT5iYXNlLnN0YXRlLT5h Y3RpdmUgPSBjcnRjLT5hY3RpdmU7CisJCVdBUk5fT04oZHJtX2F0b21pY19zZXRfbW9kZV9mb3Jf Y3J0YygmcGlwZV9jb25maWctPmJhc2UsIE5VTEwpIDwgMCk7CiAKIAkJLyogQmVjYXVzZSB3ZSBv bmx5IGVzdGFibGlzaCB0aGUgY29ubmVjdG9yIC0+IGVuY29kZXIgLT4KIAkJICogY3J0YyBsaW5r cyBpZiBzb21ldGhpbmcgaXMgYWN0aXZlLCB0aGlzIG1lYW5zIHRoZQpAQCAtMTU0MTIsNiArMTU0 MTMsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9tb2Rlc2V0X3JlYWRvdXRfaHdfc3RhdGUoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKIAlpbnQgaTsKIAogCWZvcl9lYWNoX2ludGVsX2NydGMoZGV2LCBj cnRjKSB7CisJCV9fZHJtX2F0b21pY19oZWxwZXJfY3J0Y19kZXN0cm95X3N0YXRlKCZjcnRjLT5i YXNlLCBjcnRjLT5iYXNlLnN0YXRlKTsKIAkJbWVtc2V0KGNydGMtPmNvbmZpZywgMCwgc2l6ZW9m KCpjcnRjLT5jb25maWcpKTsKIAkJY3J0Yy0+Y29uZmlnLT5iYXNlLmNydGMgPSAmY3J0Yy0+YmFz ZTsKIApAQCAtMTU0MjAsMTEgKzE1NDIyLDIxIEBAIHN0YXRpYyB2b2lkIGludGVsX21vZGVzZXRf cmVhZG91dF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQljcnRjLT5hY3RpdmUg PSBkZXZfcHJpdi0+ZGlzcGxheS5nZXRfcGlwZV9jb25maWcoY3J0YywKIAkJCQkJCQkJIGNydGMt PmNvbmZpZyk7CiAKLQkJY3J0Yy0+YmFzZS5zdGF0ZS0+ZW5hYmxlID0gY3J0Yy0+YWN0aXZlOwog CQljcnRjLT5iYXNlLnN0YXRlLT5hY3RpdmUgPSBjcnRjLT5hY3RpdmU7CiAJCWNydGMtPmJhc2Uu ZW5hYmxlZCA9IGNydGMtPmFjdGl2ZTsKIAkJY3J0Yy0+YmFzZS5od21vZGUgPSBjcnRjLT5jb25m aWctPmJhc2UuYWRqdXN0ZWRfbW9kZTsKIAorCQlpZiAoY3J0Yy0+YmFzZS5lbmFibGVkKSB7CisJ CQltZW1zZXQoJmNydGMtPmJhc2UubW9kZSwgMCwgc2l6ZW9mKGNydGMtPmJhc2UubW9kZSkpOwor CQkJaW50ZWxfbW9kZV9mcm9tX3BpcGVfY29uZmlnKCZjcnRjLT5iYXNlLm1vZGUsIGNydGMtPmNv bmZpZyk7CisJCQlXQVJOX09OKGRybV9hdG9taWNfc2V0X21vZGVfZm9yX2NydGMoY3J0Yy0+YmFz ZS5zdGF0ZSwgJmNydGMtPmJhc2UubW9kZSkgPCAwKTsKKworCQkJLyogbWFrZSBzdXJlIGEgaW5p dGlhbCBtb2Rlc2V0IGhhcHBlbnMgYnkgbWFraW5nIHN1cmUKKwkJCSAqIG1vZGUtPnR5cGUgd2ls bCBiZSBkaWZmZXJlbnQgZnJvbSB0aGUgZmluYWwgbW9kZQorCQkJICovCisJCQljcnRjLT5iYXNl LnN0YXRlLT5tb2RlLnR5cGUgPSAwOworCQl9CisKIAkJcmVhZG91dF9wbGFuZV9zdGF0ZShjcnRj LCB0b19pbnRlbF9jcnRjX3N0YXRlKGNydGMtPmJhc2Uuc3RhdGUpKTsKIAogCQlEUk1fREVCVUdf S01TKCJbQ1JUQzolZF0gaHcgc3RhdGUgcmVhZG91dDogJXNcbiIsCkBAIC0xNTUwMSwyMSArMTU1 MTMsNiBAQCB2b2lkIGludGVsX21vZGVzZXRfc2V0dXBfaHdfc3RhdGUoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwKIAogCWludGVsX21vZGVzZXRfcmVhZG91dF9od19zdGF0ZShkZXYpOwogCi0JLyoK LQkgKiBOb3cgdGhhdCB3ZSBoYXZlIHRoZSBjb25maWcsIGNvcHkgaXQgdG8gZWFjaCBDUlRDIHN0 cnVjdAotCSAqIE5vdGUgdGhhdCB0aGlzIGNvdWxkIGdvIGF3YXkgaWYgd2UgbW92ZSB0byB1c2lu ZyBjcnRjX2NvbmZpZwotCSAqIGNoZWNraW5nIGV2ZXJ5d2hlcmUuCi0JICovCi0JZm9yX2VhY2hf aW50ZWxfY3J0YyhkZXYsIGNydGMpIHsKLQkJaWYgKGNydGMtPmFjdGl2ZSAmJiBpOTE1LmZhc3Ri b290KSB7Ci0JCQlpbnRlbF9tb2RlX2Zyb21fcGlwZV9jb25maWcoJmNydGMtPmJhc2UubW9kZSwK LQkJCQkJCSAgICBjcnRjLT5jb25maWcpOwotCQkJRFJNX0RFQlVHX0tNUygiW0NSVEM6JWRdIGZv dW5kIGFjdGl2ZSBtb2RlOiAiLAotCQkJCSAgICAgIGNydGMtPmJhc2UuYmFzZS5pZCk7Ci0JCQlk cm1fbW9kZV9kZWJ1Z19wcmludG1vZGVsaW5lKCZjcnRjLT5iYXNlLm1vZGUpOwotCQl9Ci0JfQot CiAJLyogSFcgc3RhdGUgaXMgcmVhZCBvdXQsIG5vdyB3ZSBuZWVkIHRvIHNhbml0aXplIHRoaXMg bWVzcy4gKi8KIAlmb3JfZWFjaF9pbnRlbF9lbmNvZGVyKGRldiwgZW5jb2RlcikgewogCQlpbnRl bF9zYW5pdGl6ZV9lbmNvZGVyKGVuY29kZXIpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZmJkZXYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMK aW5kZXggM2Q1YmI1NjQ3N2FiLi41MmQyMGNlYTE4MmMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZmJkZXYuYwpAQCAtNDg2LDE2ICs0ODYsMTEgQEAgcmV0cnk6CiAJCQkgKiBjb25maWcsIG5vdCB0 aGUgaW5wdXQgbW9kZSwgd2hpY2ggaXMgd2hhdCBjcnRjLT5tb2RlCiAJCQkgKiB1c3VhbGx5IGNv bnRhaW5zLiBCdXQgc2luY2Ugb3VyIGN1cnJlbnQgZmFzdGJvb3QKIAkJCSAqIGNvZGUgcHV0cyBh IG1vZGUgZGVyaXZlZCBmcm9tIHRoZSBwb3N0LXBmaXQgdGltaW5ncwotCQkJICogaW50byBjcnRj LT5tb2RlIHRoaXMgd29ya3Mgb3V0IGNvcnJlY3RseS4gV2UgZG9uJ3QKLQkJCSAqIHVzZSBod21v ZGUgYW55d2hlcmUgcmlnaHQgbm93LCBzbyB1c2UgaXQgZm9yIHRoaXMKLQkJCSAqIHNpbmNlIHRo ZSBmYiBoZWxwZXIgbGF5ZXIgd2FudHMgYSBwb2ludGVyIHRvCi0JCQkgKiBzb21ldGhpbmcgd2Ug b3duLgorCQkJICogaW50byBjcnRjLT5tb2RlIHRoaXMgd29ya3Mgb3V0IGNvcnJlY3RseS4KIAkJ CSAqLwogCQkJRFJNX0RFQlVHX0tNUygibG9va2luZyBmb3IgY3VycmVudCBtb2RlIG9uIGNvbm5l Y3RvciAlc1xuIiwKIAkJCQkgICAgICBjb25uZWN0b3ItPm5hbWUpOwotCQkJaW50ZWxfbW9kZV9m cm9tX3BpcGVfY29uZmlnKCZlbmNvZGVyLT5jcnRjLT5od21vZGUsCi0JCQkJCQkgICAgdG9faW50 ZWxfY3J0YyhlbmNvZGVyLT5jcnRjKS0+Y29uZmlnKTsKLQkJCW1vZGVzW2ldID0gJmVuY29kZXIt PmNydGMtPmh3bW9kZTsKKwkJCW1vZGVzW2ldID0gJmVuY29kZXItPmNydGMtPm1vZGU7CiAJCX0K IAkJY3J0Y3NbaV0gPSBuZXdfY3J0YzsKIAotLSAKMi4xLjAKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==