From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH v2 09/20] drm/i915: Fill in more crtc state, v2. Date: Tue, 7 Jul 2015 12:28:25 +0200 Message-ID: <20150707102825.GI7568@phenom.ffwll.local> References: <1436252911-5703-1-git-send-email-maarten.lankhorst@linux.intel.com> <1436252911-5703-10-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 mail-wg0-f48.google.com (mail-wg0-f48.google.com [74.125.82.48]) by gabe.freedesktop.org (Postfix) with ESMTPS id B60D66E9B7 for ; Tue, 7 Jul 2015 03:25:40 -0700 (PDT) Received: by wgbgr6 with SMTP id gr6so9730038wgb.3 for ; Tue, 07 Jul 2015 03:25:39 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1436252911-5703-10-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: Maarten Lankhorst Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gVHVlLCBKdWwgMDcsIDIwMTUgYXQgMDk6MDg6MjBBTSArMDIwMCwgTWFhcnRlbiBMYW5raG9y c3Qgd3JvdGU6Cj4gUGVyZm9ybSBhIGZ1bGwgcmVhZG91dCBvZiB0aGUgc3RhdGUgYnkgbWFraW5n IHN1cmUgdGhlIG1vZGUgaXMgc2V0Cj4gdXAgY29ycmVjdGx5IGF0b21pY2FsbHkuCj4gCj4gQWxz byB0aGVyZSB3YXMgYSBzbWFsbCBtZW1vcnkgbGVhayBieSBkb2luZyB0aGUgbWVtc2V0LCBmaXgg dGhpcwo+IGJ5IGNhbGxpbmcgX19kcm1fYXRvbWljX2hlbHBlcl9jcnRjX2Rlc3Ryb3lfc3RhdGUg Zmlyc3QuCj4gCj4gQ2hhbmdlcyBzaW5jZSB2MToKPiAtIE1vdmVkIGFmdGVyIHJld29ya2luZyBw cmltYXJ5IHBsYW5lIGFuZCB1cGRhdGluZyBtb2RlIG1lbWJlcnMuCj4gLSBGb3JjZSBhIG1vZGVz ZXQgY2FsY3VsYXRpb24gYnkgY2hhbmdpbmcgbW9kZS0+dHlwZSBmcm9tIHdoYXQgdGhlCj4gICBm aW5hbCBtb2RlIHdpbGwgYmUuCj4gCj4gU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3Qg PG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KCnRiaCBJIGRvbid0IHJlYWxseSBs aWtlIG1vZGVfZnJvbV9waXBlX2NvbmZpZyBzaW5jZSBpdCBnb2VzIGluIHJldmVyc2UuCldpdGgg dGhlIGFkanVzdCBtb2RlIG9mIGNvbmZpZ19jb21wYXJlIHdlIGNhbiBjb21wYXJlIGRpZmZlcmVu dCBmaW5hbCBodwpzdGF0ZXMgYW5kIG1ha2UgYSBjYWxsIHdoZXRoZXIgdGhleSBtYXRjaCBlbm91 Z2ggZm9yIG1vZGVzZXQgYXZvaWRhbmNlIG9yCm5vdC4gbW9kZV9mcm9tX3BpcGVfY29uZmlnIG90 b2ggaXMgYSBsaWUgb24gcGFuZWxzIHdoZXJlIHdlIGNhbiBkbwp1cHNjYWxpbmcsIGhlbmNlIEkn ZCBsaWtlIHRvIHJlbW92ZSBpdCB0byBhdm9pZCBjb25mdXNpb24uCi1EYW5pZWwKCj4gLS0tCj4g IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDM1ICsrKysrKysrKysrKysr KystLS0tLS0tLS0tLS0tLS0tLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2 LmMgICB8ICA5ICsrLS0tLS0tLQo+ICAyIGZpbGVzIGNoYW5nZWQsIDE4IGluc2VydGlvbnMoKyks IDI2IGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiBp bmRleCBlZTU0M2UxNTE1ZjEuLmRjNGJkYjkxYWQ0ZCAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMKPiBAQCAtMTUxOTEsNiArMTUxOTEsNyBAQCBzdGF0aWMgdm9pZCBpbnRl bF9zYW5pdGl6ZV9jcnRjKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQo+ICB7Cj4gIAlzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+YmFzZS5kZXY7Cj4gIAlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwo+ICsJc3RydWN0IGludGVsX2NydGNf c3RhdGUgKnBpcGVfY29uZmlnID0gdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5iYXNlLnN0YXRl KTsKPiAgCXN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyOwo+ICAJdTMyIHJlZzsKPiAgCWJv b2wgZW5hYmxlOwo+IEBAIC0xNTIwMiw2ICsxNTIwMyw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3Nh bml0aXplX2NydGMoc3RydWN0IGludGVsX2NydGMgKmNydGMpCj4gIAkvKiByZXN0b3JlIHZibGFu ayBpbnRlcnJ1cHRzIHRvIGNvcnJlY3Qgc3RhdGUgKi8KPiAgCWRybV9jcnRjX3ZibGFua19yZXNl dCgmY3J0Yy0+YmFzZSk7Cj4gIAlpZiAoY3J0Yy0+YWN0aXZlKSB7Cj4gKwkJZHJtX2NhbGNfdGlt ZXN0YW1waW5nX2NvbnN0YW50cygmY3J0Yy0+YmFzZSwgJmNydGMtPmJhc2UuaHdtb2RlKTsKPiAg CQl1cGRhdGVfc2NhbmxpbmVfb2Zmc2V0KGNydGMpOwo+ICAJCWRybV9jcnRjX3ZibGFua19vbigm Y3J0Yy0+YmFzZSk7Cj4gIAl9Cj4gQEAgLTE1MjU0LDkgKzE1MjU2LDggQEAgc3RhdGljIHZvaWQg aW50ZWxfc2FuaXRpemVfY3J0YyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKPiAgCQkJICAgICAg Y3J0Yy0+YmFzZS5zdGF0ZS0+ZW5hYmxlID8gImVuYWJsZWQiIDogImRpc2FibGVkIiwKPiAgCQkJ ICAgICAgY3J0Yy0+YWN0aXZlID8gImVuYWJsZWQiIDogImRpc2FibGVkIik7Cj4gIAo+IC0JCWNy dGMtPmJhc2Uuc3RhdGUtPmVuYWJsZSA9IGNydGMtPmFjdGl2ZTsKPiAtCQljcnRjLT5iYXNlLnN0 YXRlLT5hY3RpdmUgPSBjcnRjLT5hY3RpdmU7Cj4gLQkJY3J0Yy0+YmFzZS5lbmFibGVkID0gY3J0 Yy0+YWN0aXZlOwo+ICsJCWNydGMtPmJhc2UuZW5hYmxlZCA9IGNydGMtPmJhc2Uuc3RhdGUtPmFj dGl2ZSA9IGNydGMtPmFjdGl2ZTsKPiArCQlXQVJOX09OKGRybV9hdG9taWNfc2V0X21vZGVfZm9y X2NydGMoJnBpcGVfY29uZmlnLT5iYXNlLCBOVUxMKSA8IDApOwo+ICAKPiAgCQkvKiBCZWNhdXNl IHdlIG9ubHkgZXN0YWJsaXNoIHRoZSBjb25uZWN0b3IgLT4gZW5jb2RlciAtPgo+ICAJCSAqIGNy dGMgbGlua3MgaWYgc29tZXRoaW5nIGlzIGFjdGl2ZSwgdGhpcyBtZWFucyB0aGUKPiBAQCAtMTU0 MTIsNiArMTU0MTMsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9tb2Rlc2V0X3JlYWRvdXRfaHdfc3Rh dGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKPiAgCWludCBpOwo+ICAKPiAgCWZvcl9lYWNoX2lu dGVsX2NydGMoZGV2LCBjcnRjKSB7Cj4gKwkJX19kcm1fYXRvbWljX2hlbHBlcl9jcnRjX2Rlc3Ry b3lfc3RhdGUoJmNydGMtPmJhc2UsIGNydGMtPmJhc2Uuc3RhdGUpOwo+ICAJCW1lbXNldChjcnRj LT5jb25maWcsIDAsIHNpemVvZigqY3J0Yy0+Y29uZmlnKSk7Cj4gIAkJY3J0Yy0+Y29uZmlnLT5i YXNlLmNydGMgPSAmY3J0Yy0+YmFzZTsKPiAgCj4gQEAgLTE1NDIwLDExICsxNTQyMiwyMSBAQCBz dGF0aWMgdm9pZCBpbnRlbF9tb2Rlc2V0X3JlYWRvdXRfaHdfc3RhdGUoc3RydWN0IGRybV9kZXZp Y2UgKmRldikKPiAgCQljcnRjLT5hY3RpdmUgPSBkZXZfcHJpdi0+ZGlzcGxheS5nZXRfcGlwZV9j b25maWcoY3J0YywKPiAgCQkJCQkJCQkgY3J0Yy0+Y29uZmlnKTsKPiAgCj4gLQkJY3J0Yy0+YmFz ZS5zdGF0ZS0+ZW5hYmxlID0gY3J0Yy0+YWN0aXZlOwo+ICAJCWNydGMtPmJhc2Uuc3RhdGUtPmFj dGl2ZSA9IGNydGMtPmFjdGl2ZTsKPiAgCQljcnRjLT5iYXNlLmVuYWJsZWQgPSBjcnRjLT5hY3Rp dmU7Cj4gIAkJY3J0Yy0+YmFzZS5od21vZGUgPSBjcnRjLT5jb25maWctPmJhc2UuYWRqdXN0ZWRf bW9kZTsKPiAgCj4gKwkJaWYgKGNydGMtPmJhc2UuZW5hYmxlZCkgewo+ICsJCQltZW1zZXQoJmNy dGMtPmJhc2UubW9kZSwgMCwgc2l6ZW9mKGNydGMtPmJhc2UubW9kZSkpOwo+ICsJCQlpbnRlbF9t b2RlX2Zyb21fcGlwZV9jb25maWcoJmNydGMtPmJhc2UubW9kZSwgY3J0Yy0+Y29uZmlnKTsKPiAr CQkJV0FSTl9PTihkcm1fYXRvbWljX3NldF9tb2RlX2Zvcl9jcnRjKGNydGMtPmJhc2Uuc3RhdGUs ICZjcnRjLT5iYXNlLm1vZGUpIDwgMCk7Cj4gKwo+ICsJCQkvKiBtYWtlIHN1cmUgYSBpbml0aWFs IG1vZGVzZXQgaGFwcGVucyBieSBtYWtpbmcgc3VyZQo+ICsJCQkgKiBtb2RlLT50eXBlIHdpbGwg YmUgZGlmZmVyZW50IGZyb20gdGhlIGZpbmFsIG1vZGUKPiArCQkJICovCj4gKwkJCWNydGMtPmJh c2Uuc3RhdGUtPm1vZGUudHlwZSA9IDA7Cj4gKwkJfQo+ICsKPiAgCQlyZWFkb3V0X3BsYW5lX3N0 YXRlKGNydGMsIHRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+YmFzZS5zdGF0ZSkpOwo+ICAKPiAg CQlEUk1fREVCVUdfS01TKCJbQ1JUQzolZF0gaHcgc3RhdGUgcmVhZG91dDogJXNcbiIsCj4gQEAg LTE1NTAxLDIxICsxNTUxMyw2IEBAIHZvaWQgaW50ZWxfbW9kZXNldF9zZXR1cF9od19zdGF0ZShz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LAo+ICAKPiAgCWludGVsX21vZGVzZXRfcmVhZG91dF9od19z dGF0ZShkZXYpOwo+ICAKPiAtCS8qCj4gLQkgKiBOb3cgdGhhdCB3ZSBoYXZlIHRoZSBjb25maWcs IGNvcHkgaXQgdG8gZWFjaCBDUlRDIHN0cnVjdAo+IC0JICogTm90ZSB0aGF0IHRoaXMgY291bGQg Z28gYXdheSBpZiB3ZSBtb3ZlIHRvIHVzaW5nIGNydGNfY29uZmlnCj4gLQkgKiBjaGVja2luZyBl dmVyeXdoZXJlLgo+IC0JICovCj4gLQlmb3JfZWFjaF9pbnRlbF9jcnRjKGRldiwgY3J0Yykgewo+ IC0JCWlmIChjcnRjLT5hY3RpdmUgJiYgaTkxNS5mYXN0Ym9vdCkgewo+IC0JCQlpbnRlbF9tb2Rl X2Zyb21fcGlwZV9jb25maWcoJmNydGMtPmJhc2UubW9kZSwKPiAtCQkJCQkJICAgIGNydGMtPmNv bmZpZyk7Cj4gLQkJCURSTV9ERUJVR19LTVMoIltDUlRDOiVkXSBmb3VuZCBhY3RpdmUgbW9kZTog IiwKPiAtCQkJCSAgICAgIGNydGMtPmJhc2UuYmFzZS5pZCk7Cj4gLQkJCWRybV9tb2RlX2RlYnVn X3ByaW50bW9kZWxpbmUoJmNydGMtPmJhc2UubW9kZSk7Cj4gLQkJfQo+IC0JfQo+IC0KPiAgCS8q IEhXIHN0YXRlIGlzIHJlYWQgb3V0LCBub3cgd2UgbmVlZCB0byBzYW5pdGl6ZSB0aGlzIG1lc3Mu ICovCj4gIAlmb3JfZWFjaF9pbnRlbF9lbmNvZGVyKGRldiwgZW5jb2Rlcikgewo+ICAJCWludGVs X3Nhbml0aXplX2VuY29kZXIoZW5jb2Rlcik7Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2ZiZGV2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5j Cj4gaW5kZXggM2Q1YmI1NjQ3N2FiLi41MmQyMGNlYTE4MmMgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2ZiZGV2LmMKPiBAQCAtNDg2LDE2ICs0ODYsMTEgQEAgcmV0cnk6Cj4gIAkJCSAqIGNv bmZpZywgbm90IHRoZSBpbnB1dCBtb2RlLCB3aGljaCBpcyB3aGF0IGNydGMtPm1vZGUKPiAgCQkJ ICogdXN1YWxseSBjb250YWlucy4gQnV0IHNpbmNlIG91ciBjdXJyZW50IGZhc3Rib290Cj4gIAkJ CSAqIGNvZGUgcHV0cyBhIG1vZGUgZGVyaXZlZCBmcm9tIHRoZSBwb3N0LXBmaXQgdGltaW5ncwo+ IC0JCQkgKiBpbnRvIGNydGMtPm1vZGUgdGhpcyB3b3JrcyBvdXQgY29ycmVjdGx5LiBXZSBkb24n dAo+IC0JCQkgKiB1c2UgaHdtb2RlIGFueXdoZXJlIHJpZ2h0IG5vdywgc28gdXNlIGl0IGZvciB0 aGlzCj4gLQkJCSAqIHNpbmNlIHRoZSBmYiBoZWxwZXIgbGF5ZXIgd2FudHMgYSBwb2ludGVyIHRv Cj4gLQkJCSAqIHNvbWV0aGluZyB3ZSBvd24uCj4gKwkJCSAqIGludG8gY3J0Yy0+bW9kZSB0aGlz IHdvcmtzIG91dCBjb3JyZWN0bHkuCj4gIAkJCSAqLwo+ICAJCQlEUk1fREVCVUdfS01TKCJsb29r aW5nIGZvciBjdXJyZW50IG1vZGUgb24gY29ubmVjdG9yICVzXG4iLAo+ICAJCQkJICAgICAgY29u bmVjdG9yLT5uYW1lKTsKPiAtCQkJaW50ZWxfbW9kZV9mcm9tX3BpcGVfY29uZmlnKCZlbmNvZGVy LT5jcnRjLT5od21vZGUsCj4gLQkJCQkJCSAgICB0b19pbnRlbF9jcnRjKGVuY29kZXItPmNydGMp LT5jb25maWcpOwo+IC0JCQltb2Rlc1tpXSA9ICZlbmNvZGVyLT5jcnRjLT5od21vZGU7Cj4gKwkJ CW1vZGVzW2ldID0gJmVuY29kZXItPmNydGMtPm1vZGU7Cj4gIAkJfQo+ICAJCWNydGNzW2ldID0g bmV3X2NydGM7Cj4gIAo+IC0tIAo+IDIuMS4wCj4gCj4gX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KPiBJbnRlbC1nZnggbWFpbGluZyBsaXN0Cj4gSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwo+IGh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngKCi0tIApEYW5pZWwgVmV0dGVyClNvZnR3YXJlIEVu Z2luZWVyLCBJbnRlbCBDb3Jwb3JhdGlvbgpodHRwOi8vYmxvZy5mZndsbC5jaApfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=