From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH v2 13/20] drm/i915: Always reset in intel_crtc_restore_mode Date: Tue, 7 Jul 2015 12:17:44 +0200 Message-ID: <20150707101744.GG7568@phenom.ffwll.local> References: <1436252911-5703-1-git-send-email-maarten.lankhorst@linux.intel.com> <1436252911-5703-14-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-f41.google.com (mail-wg0-f41.google.com [74.125.82.41]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5F9606E4FB for ; Tue, 7 Jul 2015 03:14:59 -0700 (PDT) Received: by wgck11 with SMTP id k11so163559743wgc.0 for ; Tue, 07 Jul 2015 03:14:57 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1436252911-5703-14-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 T24gVHVlLCBKdWwgMDcsIDIwMTUgYXQgMDk6MDg6MjRBTSArMDIwMCwgTWFhcnRlbiBMYW5raG9y c3Qgd3JvdGU6Cj4gQW5kIGdldCByaWQgb2YgdGhpbmdzIHRoYXQgYXJlIG5vIGxvbmdlciB0cnVl LiBUaGlzIGZ1bmN0aW9uIGlzIG9ubHkKPiB1c2VkIGZvciBmb3JjaW5nIGEgbW9kZXNldCB3aGVu IGVuY29kZXIgcHJvcGVydGllcyBhcmUgY2hhbmdlZC4KPiAKPiBBbGwgdGhlIGV4aXN0aW5nIHN0 YXRlIGlzIGZpbmUgaW4gdGhpcyBjYXNlLCBvbmx5IHNldHRpbmcgbW9kZV9jaGFuZ2VkCj4gd2ls bCBmb3JjZSBhIGZ1bGwgcmVjYWxjdWxhdGlvbiBoZXJlLCBhbmQgdGFrZSBhbGwgdGhlIHN0YXRl IG5lZWRlZC4KPiAKPiBUaGUgcHJldmlvdXMgY29tbWl0IHdpbGwgcHJldmVudCB1bm5lZWRlZCBt b2Rlc2V0cyBhbnl3YXkuCj4gCj4gU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1h YXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KPiAtLS0KPiAgZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgNTggKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tCj4gIDEgZmlsZSBjaGFuZ2VkLCAxNiBpbnNlcnRpb25zKCspLCA0MiBkZWxldGlvbnMo LSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gaW5kZXggMTYzNzMzMDlk Y2FlLi5mN2IxZmMyODE0MmMgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j Cj4gQEAgLTEzMjYwLDYzICsxMzI2MCwzNyBAQCB2b2lkIGludGVsX2NydGNfcmVzdG9yZV9tb2Rl KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKPiAgewo+ICAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9 IGNydGMtPmRldjsKPiAgCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZTsKPiAtCXN0cnVj dCBpbnRlbF9lbmNvZGVyICplbmNvZGVyOwo+IC0Jc3RydWN0IGludGVsX2Nvbm5lY3RvciAqY29u bmVjdG9yOwo+IC0Jc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5lY3Rvcl9zdGF0ZTsK PiAtCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlOwo+ICsJc3RydWN0IGRybV9j cnRjX3N0YXRlICpjcnRjX3N0YXRlOwo+ICAJaW50IHJldDsKPiAgCj4gIAlzdGF0ZSA9IGRybV9h dG9taWNfc3RhdGVfYWxsb2MoZGV2KTsKPiAgCWlmICghc3RhdGUpIHsKPiAtCQlEUk1fREVCVUdf S01TKCJbQ1JUQzolZF0gbW9kZSByZXN0b3JlIGZhaWxlZCwgb3V0IG9mIG1lbW9yeSIsCj4gKwkJ RFJNX0RFQlVHX0tNUygiW0NSVEM6JWRdIGNydGMgcmVzdG9yZSBmYWlsZWQsIG91dCBvZiBtZW1v cnkiLAo+ICAJCQkgICAgICBjcnRjLT5iYXNlLmlkKTsKPiAgCQlyZXR1cm47Cj4gIAl9Cj4gIAo+ IC0Jc3RhdGUtPmFjcXVpcmVfY3R4ID0gZGV2LT5tb2RlX2NvbmZpZy5hY3F1aXJlX2N0eDsKPiAt Cj4gLQkvKiBUaGUgZm9yY2UgcmVzdG9yZSBwYXRoIGluIHRoZSBIVyByZWFkb3V0IGNvZGUgcmVs aWVzIG9uIHRoZSBzdGFnZWQKPiAtCSAqIGNvbmZpZyBzdGlsbCBrZWVwaW5nIHRoZSB1c2VyIHJl cXVlc3RlZCBjb25maWcgd2hpbGUgdGhlIGFjdHVhbAo+IC0JICogc3RhdGUgaGFzIGJlZW4gb3Zl cndyaXR0ZW4gYnkgdGhlIGNvbmZpZ3VyYXRpb24gcmVhZCBmcm9tIEhXLiBXZQo+IC0JICogbmVl ZCB0byBjb3B5IHRoZSBzdGFnZWQgY29uZmlnIHRvIHRoZSBhdG9taWMgc3RhdGUsIG90aGVyd2lz ZSB0aGUKPiAtCSAqIG1vZGUgc2V0IHdpbGwganVzdCByZWFwcGx5IHRoZSBzdGF0ZSB0aGUgSFcg aXMgYWxyZWFkeSBpbi4gKi8KPiAtCWZvcl9lYWNoX2ludGVsX2VuY29kZXIoZGV2LCBlbmNvZGVy KSB7Cj4gLQkJaWYgKGVuY29kZXItPmJhc2UuY3J0YyAhPSBjcnRjKQo+IC0JCQljb250aW51ZTsK PiArCXN0YXRlLT5hY3F1aXJlX2N0eCA9IGRybV9tb2Rlc2V0X2xlZ2FjeV9hY3F1aXJlX2N0eChj cnRjKTsKPiAgCj4gLQkJZm9yX2VhY2hfaW50ZWxfY29ubmVjdG9yKGRldiwgY29ubmVjdG9yKSB7 Cj4gLQkJCWlmIChjb25uZWN0b3ItPmJhc2Uuc3RhdGUtPmJlc3RfZW5jb2RlciAhPQo+IC0JCQkg ICAgJmVuY29kZXItPmJhc2UpCj4gLQkJCQljb250aW51ZTsKPiAtCj4gLQkJCWNvbm5lY3Rvcl9z dGF0ZSA9IGRybV9hdG9taWNfZ2V0X2Nvbm5lY3Rvcl9zdGF0ZShzdGF0ZSwgJmNvbm5lY3Rvci0+ YmFzZSk7Cj4gLQkJCWlmIChJU19FUlIoY29ubmVjdG9yX3N0YXRlKSkgewo+IC0JCQkJRFJNX0RF QlVHX0tNUygiRmFpbGVkIHRvIGFkZCBbQ09OTkVDVE9SOiVkOiVzXSB0byBzdGF0ZTogJWxkXG4i LAo+IC0JCQkJCSAgICAgIGNvbm5lY3Rvci0+YmFzZS5iYXNlLmlkLAo+IC0JCQkJCSAgICAgIGNv bm5lY3Rvci0+YmFzZS5uYW1lLAo+IC0JCQkJCSAgICAgIFBUUl9FUlIoY29ubmVjdG9yX3N0YXRl KSk7Cj4gLQkJCQljb250aW51ZTsKPiAtCQkJfQo+ICtyZXRyeToKPiArCWNydGNfc3RhdGUgPSBk cm1fYXRvbWljX2dldF9jcnRjX3N0YXRlKHN0YXRlLCBjcnRjKTsKPiArCXJldCA9IFBUUl9FUlJf T1JfWkVSTyhjcnRjX3N0YXRlKTsKPiArCWlmICghcmV0KSB7Cj4gKwkJaWYgKCFjcnRjX3N0YXRl LT5hY3RpdmUpCj4gKwkJCWdvdG8gb3V0Owo+ICAKPiAtCQkJY29ubmVjdG9yX3N0YXRlLT5jcnRj ID0gY3J0YzsKPiAtCQl9Cj4gKwkJY3J0Y19zdGF0ZS0+bW9kZV9jaGFuZ2VkID0gdHJ1ZTsKPiAr CQlyZXQgPSBpbnRlbF9zZXRfbW9kZShzdGF0ZSk7CgpJIHRoaW5rIGhlcmUgKGluc3RlYWQgb2Yg dGhlIGh3IHN0YXRlIHJlYWRvdXQvcmVzdG9yZSBjb2RlKSB3ZSBtdXN0IGRvIGEKZnVsbCBjb21w dXRlIGNvbmZpZyBvZiB0aGUgcGlwZSBzdGF0ZSAtIG1vc3Qgb2YgdGhlIGNvbm5lY3RvciBwcm9w ZXJ0aWVzCm5lZWQgdGhhdCB0byBnZXQgcmVmbGVjdGVkLiBTaG91bGQgYmUgZWFzeSB0byB0ZXN0 IGJ5IGNoYW5naW5nIHRoZSBwYW5lbAp1cHNjYWxpbmcgcHJvcGVydHkuIEhlbmNlIEkgdGhpbmsg d2Ugc2hvdWxkIGJlIGFibGUgdG8gcnVuIGEgZnVsbC1ibG93bgpkcm1fYXRvbWljX2NvbW1pdCBo ZXJlLgotRGFuaWVsCgo+ICAJfQo+ICAKPiAtCWNydGNfc3RhdGUgPSBpbnRlbF9hdG9taWNfZ2V0 X2NydGNfc3RhdGUoc3RhdGUsIHRvX2ludGVsX2NydGMoY3J0YykpOwo+IC0JaWYgKElTX0VSUihj cnRjX3N0YXRlKSkgewo+IC0JCURSTV9ERUJVR19LTVMoIkZhaWxlZCB0byBhZGQgW0NSVEM6JWRd IHRvIHN0YXRlOiAlbGRcbiIsCj4gLQkJCSAgICAgIGNydGMtPmJhc2UuaWQsIFBUUl9FUlIoY3J0 Y19zdGF0ZSkpOwo+IC0JCWRybV9hdG9taWNfc3RhdGVfZnJlZShzdGF0ZSk7Cj4gLQkJcmV0dXJu Owo+ICsJaWYgKHJldCA9PSAtRURFQURMSykgewo+ICsJCWRybV9hdG9taWNfc3RhdGVfY2xlYXIo c3RhdGUpOwo+ICsJCWRybV9tb2Rlc2V0X2JhY2tvZmYoc3RhdGUtPmFjcXVpcmVfY3R4KTsKPiAr CQlnb3RvIHJldHJ5Owo+ICAJfQo+ICAKPiAtCWRybV9tb2RlX2NvcHkoJmNydGNfc3RhdGUtPmJh c2UubW9kZSwgJmNydGMtPm1vZGUpOwo+IC0KPiAtCWludGVsX21vZGVzZXRfc2V0dXBfcGxhbmVf c3RhdGUoc3RhdGUsIGNydGMsICZjcnRjLT5tb2RlLAo+IC0JCQkJCWNydGMtPnByaW1hcnktPmZi LCBjcnRjLT54LCBjcnRjLT55KTsKPiAtCj4gLQlyZXQgPSBpbnRlbF9zZXRfbW9kZShzdGF0ZSk7 Cj4gIAlpZiAocmV0KQo+ICtvdXQ6Cj4gIAkJZHJtX2F0b21pY19zdGF0ZV9mcmVlKHN0YXRlKTsK PiAgfQo+ICAKPiAtLSAKPiAyLjEuMAo+IAo+IF9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCj4gSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdAo+IEludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKPiBodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4CgotLSAKRGFuaWVsIFZldHRlcgpTb2Z0d2FyZSBFbmdpbmVl ciwgSW50ZWwgQ29ycG9yYXRpb24KaHR0cDovL2Jsb2cuZmZ3bGwuY2gKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJ bnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK