From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 06/18] drm/i915: Fill in more crtc state. Date: Thu, 2 Jul 2015 16:36:50 +0200 Message-ID: <1435847822-5318-7-git-send-email-maarten.lankhorst@linux.intel.com> References: <1435847822-5318-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 C1C9A6ECA0 for ; Thu, 2 Jul 2015 07:37:25 -0700 (PDT) In-Reply-To: <1435847822-5318-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 ZHJtX2F0b21pY19oZWxwZXJfY3J0Y19kZXN0cm95X3N0YXRlIGZpcnN0LgoKU2lnbmVkLW9mZi1i eTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4K LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAzOSArKysrKysrKysr KysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Zi ZGV2LmMgICB8ICA5ICsrLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAxOSBpbnNlcnRpb25zKCsp LCAyOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXgg YTNmOTA4MDgyOGJkLi4zNGQ3NTYyNTBjNzYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMKQEAgLTE1MjI5LDYgKzE1MjI5LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfc2FuaXRpemVf Y3J0YyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 ID0gY3J0Yy0+YmFzZS5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g ZGV2LT5kZXZfcHJpdmF0ZTsKKwlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcg PSB0b19pbnRlbF9jcnRjX3N0YXRlKGNydGMtPmJhc2Uuc3RhdGUpOwogCXN0cnVjdCBpbnRlbF9l bmNvZGVyICplbmNvZGVyOwogCXUzMiByZWc7CiAJYm9vbCBlbmFibGU7CkBAIC0xNTIzNyw5ICsx NTIzOCwyMCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9zYW5pdGl6ZV9jcnRjKHN0cnVjdCBpbnRlbF9j cnRjICpjcnRjKQogCXJlZyA9IFBJUEVDT05GKGNydGMtPmNvbmZpZy0+Y3B1X3RyYW5zY29kZXIp OwogCUk5MTVfV1JJVEUocmVnLCBJOTE1X1JFQUQocmVnKSAmIH5QSVBFQ09ORl9GUkFNRV9TVEFS VF9ERUxBWV9NQVNLKTsKIAorCW1lbXNldCgmY3J0Yy0+YmFzZS5tb2RlLCAwLCBzaXplb2YoY3J0 Yy0+YmFzZS5tb2RlKSk7CisJaWYgKHBpcGVfY29uZmlnLT5iYXNlLmFjdGl2ZSkgeworCQlpbnRl bF9tb2RlX2Zyb21fcGlwZV9jb25maWcoJmNydGMtPmJhc2UubW9kZSwgcGlwZV9jb25maWcpOwor CQlpbnRlbF9tb2RlX2Zyb21fcGlwZV9jb25maWcoJnBpcGVfY29uZmlnLT5iYXNlLmFkanVzdGVk X21vZGUsIHBpcGVfY29uZmlnKTsKKwkJY3J0Yy0+YmFzZS5od21vZGUgPSBwaXBlX2NvbmZpZy0+ YmFzZS5hZGp1c3RlZF9tb2RlOworCisJCVdBUk5fT04oZHJtX2F0b21pY19zZXRfbW9kZV9mb3Jf Y3J0YygmcGlwZV9jb25maWctPmJhc2UsICZjcnRjLT5iYXNlLm1vZGUpIDwgMCk7CisJfSBlbHNl CisJCVdBUk5fT04oZHJtX2F0b21pY19zZXRfbW9kZV9mb3JfY3J0YygmcGlwZV9jb25maWctPmJh c2UsIE5VTEwpIDwgMCk7CisKIAkvKiByZXN0b3JlIHZibGFuayBpbnRlcnJ1cHRzIHRvIGNvcnJl Y3Qgc3RhdGUgKi8KIAlkcm1fY3J0Y192YmxhbmtfcmVzZXQoJmNydGMtPmJhc2UpOwogCWlmIChj cnRjLT5hY3RpdmUpIHsKKwkJZHJtX2NhbGNfdGltZXN0YW1waW5nX2NvbnN0YW50cygmY3J0Yy0+ YmFzZSwgJmNydGMtPmJhc2UuaHdtb2RlKTsKIAkJdXBkYXRlX3NjYW5saW5lX29mZnNldChjcnRj KTsKIAkJZHJtX2NydGNfdmJsYW5rX29uKCZjcnRjLT5iYXNlKTsKIAl9CkBAIC0xNTI5Miw5ICsx NTMwNCw4IEBAIHN0YXRpYyB2b2lkIGludGVsX3Nhbml0aXplX2NydGMoc3RydWN0IGludGVsX2Ny dGMgKmNydGMpCiAJCQkgICAgICBjcnRjLT5iYXNlLnN0YXRlLT5lbmFibGUgPyAiZW5hYmxlZCIg OiAiZGlzYWJsZWQiLAogCQkJICAgICAgY3J0Yy0+YWN0aXZlID8gImVuYWJsZWQiIDogImRpc2Fi bGVkIik7CiAKLQkJY3J0Yy0+YmFzZS5zdGF0ZS0+ZW5hYmxlID0gY3J0Yy0+YWN0aXZlOwotCQlj cnRjLT5iYXNlLnN0YXRlLT5hY3RpdmUgPSBjcnRjLT5hY3RpdmU7Ci0JCWNydGMtPmJhc2UuZW5h YmxlZCA9IGNydGMtPmFjdGl2ZTsKKwkJY3J0Yy0+YmFzZS5lbmFibGVkID0gY3J0Yy0+YmFzZS5z dGF0ZS0+YWN0aXZlID0gY3J0Yy0+YWN0aXZlOworCQlXQVJOX09OKGRybV9hdG9taWNfc2V0X21v ZGVfZm9yX2NydGMoJnBpcGVfY29uZmlnLT5iYXNlLCBOVUxMKSA8IDApOwogCiAJCS8qIEJlY2F1 c2Ugd2Ugb25seSBlc3RhYmxpc2ggdGhlIGNvbm5lY3RvciAtPiBlbmNvZGVyIC0+CiAJCSAqIGNy dGMgbGlua3MgaWYgc29tZXRoaW5nIGlzIGFjdGl2ZSwgdGhpcyBtZWFucyB0aGUKQEAgLTE1NDY3 LDYgKzE1NDc4LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfbW9kZXNldF9yZWFkb3V0X2h3X3N0YXRl KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaW50IGk7CiAKIAlmb3JfZWFjaF9pbnRlbF9jcnRj KGRldiwgY3J0YykgeworCQlfX2RybV9hdG9taWNfaGVscGVyX2NydGNfZGVzdHJveV9zdGF0ZSgm Y3J0Yy0+YmFzZSwgY3J0Yy0+YmFzZS5zdGF0ZSk7CiAJCW1lbXNldChjcnRjLT5jb25maWcsIDAs IHNpemVvZigqY3J0Yy0+Y29uZmlnKSk7CiAJCWNydGMtPmNvbmZpZy0+YmFzZS5jcnRjID0gJmNy dGMtPmJhc2U7CiAKQEAgLTE1NDc1LDEwICsxNTQ4Nyw4IEBAIHN0YXRpYyB2b2lkIGludGVsX21v ZGVzZXRfcmVhZG91dF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQljcnRjLT5h Y3RpdmUgPSBkZXZfcHJpdi0+ZGlzcGxheS5nZXRfcGlwZV9jb25maWcoY3J0YywKIAkJCQkJCQkJ IGNydGMtPmNvbmZpZyk7CiAKLQkJY3J0Yy0+YmFzZS5zdGF0ZS0+ZW5hYmxlID0gY3J0Yy0+YWN0 aXZlOwotCQljcnRjLT5iYXNlLnN0YXRlLT5hY3RpdmUgPSBjcnRjLT5hY3RpdmU7Ci0JCWNydGMt PmJhc2UuZW5hYmxlZCA9IGNydGMtPmFjdGl2ZTsKLQkJY3J0Yy0+YmFzZS5od21vZGUgPSBjcnRj LT5jb25maWctPmJhc2UuYWRqdXN0ZWRfbW9kZTsKKwkJY3J0Yy0+YmFzZS5lbmFibGVkID0gY3J0 Yy0+YmFzZS5zdGF0ZS0+YWN0aXZlID0gY3J0Yy0+YWN0aXZlOworCQlXQVJOX09OKGRybV9hdG9t aWNfc2V0X21vZGVfZm9yX2NydGMoY3J0Yy0+YmFzZS5zdGF0ZSwgTlVMTCkgPCAwKTsKIAogCQly ZWFkb3V0X3BsYW5lX3N0YXRlKGNydGMsIHRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+YmFzZS5z dGF0ZSkpOwogCkBAIC0xNTU1NiwyMSArMTU1NjYsNiBAQCB2b2lkIGludGVsX21vZGVzZXRfc2V0 dXBfaHdfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAogCWludGVsX21vZGVzZXRfcmVh ZG91dF9od19zdGF0ZShkZXYpOwogCi0JLyoKLQkgKiBOb3cgdGhhdCB3ZSBoYXZlIHRoZSBjb25m aWcsIGNvcHkgaXQgdG8gZWFjaCBDUlRDIHN0cnVjdAotCSAqIE5vdGUgdGhhdCB0aGlzIGNvdWxk IGdvIGF3YXkgaWYgd2UgbW92ZSB0byB1c2luZyBjcnRjX2NvbmZpZwotCSAqIGNoZWNraW5nIGV2 ZXJ5d2hlcmUuCi0JICovCi0JZm9yX2VhY2hfaW50ZWxfY3J0YyhkZXYsIGNydGMpIHsKLQkJaWYg KGNydGMtPmFjdGl2ZSAmJiBpOTE1LmZhc3Rib290KSB7Ci0JCQlpbnRlbF9tb2RlX2Zyb21fcGlw ZV9jb25maWcoJmNydGMtPmJhc2UubW9kZSwKLQkJCQkJCSAgICBjcnRjLT5jb25maWcpOwotCQkJ RFJNX0RFQlVHX0tNUygiW0NSVEM6JWRdIGZvdW5kIGFjdGl2ZSBtb2RlOiAiLAotCQkJCSAgICAg IGNydGMtPmJhc2UuYmFzZS5pZCk7Ci0JCQlkcm1fbW9kZV9kZWJ1Z19wcmludG1vZGVsaW5lKCZj cnRjLT5iYXNlLm1vZGUpOwotCQl9Ci0JfQotCiAJLyogSFcgc3RhdGUgaXMgcmVhZCBvdXQsIG5v dyB3ZSBuZWVkIHRvIHNhbml0aXplIHRoaXMgbWVzcy4gKi8KIAlmb3JfZWFjaF9pbnRlbF9lbmNv ZGVyKGRldiwgZW5jb2RlcikgewogCQlpbnRlbF9zYW5pdGl6ZV9lbmNvZGVyKGVuY29kZXIpOwpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMKaW5kZXggM2Q1YmI1NjQ3N2FiLi41MmQyMGNlYTE4 MmMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYuYwpAQCAtNDg2LDE2ICs0ODYsMTEgQEAg cmV0cnk6CiAJCQkgKiBjb25maWcsIG5vdCB0aGUgaW5wdXQgbW9kZSwgd2hpY2ggaXMgd2hhdCBj cnRjLT5tb2RlCiAJCQkgKiB1c3VhbGx5IGNvbnRhaW5zLiBCdXQgc2luY2Ugb3VyIGN1cnJlbnQg ZmFzdGJvb3QKIAkJCSAqIGNvZGUgcHV0cyBhIG1vZGUgZGVyaXZlZCBmcm9tIHRoZSBwb3N0LXBm aXQgdGltaW5ncwotCQkJICogaW50byBjcnRjLT5tb2RlIHRoaXMgd29ya3Mgb3V0IGNvcnJlY3Rs eS4gV2UgZG9uJ3QKLQkJCSAqIHVzZSBod21vZGUgYW55d2hlcmUgcmlnaHQgbm93LCBzbyB1c2Ug aXQgZm9yIHRoaXMKLQkJCSAqIHNpbmNlIHRoZSBmYiBoZWxwZXIgbGF5ZXIgd2FudHMgYSBwb2lu dGVyIHRvCi0JCQkgKiBzb21ldGhpbmcgd2Ugb3duLgorCQkJICogaW50byBjcnRjLT5tb2RlIHRo aXMgd29ya3Mgb3V0IGNvcnJlY3RseS4KIAkJCSAqLwogCQkJRFJNX0RFQlVHX0tNUygibG9va2lu ZyBmb3IgY3VycmVudCBtb2RlIG9uIGNvbm5lY3RvciAlc1xuIiwKIAkJCQkgICAgICBjb25uZWN0 b3ItPm5hbWUpOwotCQkJaW50ZWxfbW9kZV9mcm9tX3BpcGVfY29uZmlnKCZlbmNvZGVyLT5jcnRj LT5od21vZGUsCi0JCQkJCQkgICAgdG9faW50ZWxfY3J0YyhlbmNvZGVyLT5jcnRjKS0+Y29uZmln KTsKLQkJCW1vZGVzW2ldID0gJmVuY29kZXItPmNydGMtPmh3bW9kZTsKKwkJCW1vZGVzW2ldID0g JmVuY29kZXItPmNydGMtPm1vZGU7CiAJCX0KIAkJY3J0Y3NbaV0gPSBuZXdfY3J0YzsKIAotLSAK Mi4xLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==