From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [RFC PATCH 6/7] drm/i915: Always reset in intel_crtc_restore_mode Date: Mon, 22 Jun 2015 17:25:11 +0200 Message-ID: <20150622152511.GS25769@phenom.ffwll.local> References: <1434700950-16242-1-git-send-email-maarten.lankhorst@linux.intel.com> <1434700950-16242-7-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-f54.google.com (mail-wg0-f54.google.com [74.125.82.54]) by gabe.freedesktop.org (Postfix) with ESMTP id 3B8EA6E7F2 for ; Mon, 22 Jun 2015 08:22:24 -0700 (PDT) Received: by wgck11 with SMTP id k11so17251654wgc.0 for ; Mon, 22 Jun 2015 08:22:23 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1434700950-16242-7-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 T24gRnJpLCBKdW4gMTksIDIwMTUgYXQgMTA6MDI6MjlBTSArMDIwMCwgTWFhcnRlbiBMYW5raG9y c3Qgd3JvdGU6Cj4gQW5kIGdldCByaWQgb2YgdGhpbmdzIHRoYXQgYXJlIG5vIGxvbmdlciB0cnVl LiBUaGlzIGZ1bmN0aW9uIGlzIG9ubHkKPiB1c2VkIGZvciBmb3JjaW5nIGEgbW9kZXNldCB3aGVu IGVuY29kZXIgcHJvcGVydGllcyBhcmUgY2hhbmdlZC4KPiAKPiBBbGwgdGhlIGV4aXN0aW5nIHN0 YXRlIGlzIGZpbmUgaW4gdGhpcyBjYXNlLCBvbmx5IHNldHRpbmcgbW9kZV9jaGFuZ2VkCj4gd2ls bCBmb3JjZSBhIGZ1bGwgcmVjYWxjdWxhdGlvbiBoZXJlLCBhbmQgdGFrZSBhbGwgdGhlIHN0YXRl IG5lZWRlZC4KPiAKPiBTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5s YW5raG9yc3RAbGludXguaW50ZWwuY29tPgoKSnVzdCB0byBtYWtlIHN1cmUgd2UncmUgYWxpZ25l ZCBoZXJlIG9uIGZ1dHVyZSB3b3JrOiBXaGVuIHdlIHN0YXJ0CmNvbnZlcnRpbmcgb3ZlciBjb25u ZWN0b3IgcHJvcHMgd2Ugc2ltcGx5IG5lZWQgdG8gcHVzaCB0aGUgLT5tb2RlX2NoYW5nZWQKKG9y IHdlbGwgcGVyaGFwcyBiZXR0ZXIgY3J0Y19zdGF0ZS0+Y29ubmVjdG9yX2NoYW5nZWQpIHVwZGF0 ZSBpZiB0aGVyZSdzCmFueXRoaW5nIHRvIGRvIGludG8gdGhlIGNvbm5lY3RvcidzIGF0b21pY19z ZXRfcHJvcCBjYWxsYmFjay4KCkJ1dCBJIGd1ZXNzIGZvciBhIGxvdCBvZiBzdGF0ZSBpdCdzIGFj dHVhbGx5IGJldHRlciB0byBub3QgZG8gdGhhdCwgYW5kCnJlbHkgdXBvbiBpbnRlbF9waXBlX2Nv bmZpZ19jb21wYXJlIHRvIGZpZ3VyZSB0aGluZ3Mgb3V0IGZvciB1cy4gVGhhdAptZWFucyB3ZSBt dXN0IHJ1biBwcmV0dHkgbXVjaCBhbGwgdGhlIG1vZGVzZXQgY29tcHV0ZV9jb25maWcgY29kZQp1 bmNvbmRpdGlvbmFsbHksIGJ1dCBJIHRoaW5rIHRoYXQgaGFzIGEgY2xlYXIgYWR2YW50YWdlIG9m IHJlZHVjaW5nCmR1cGxpY2F0ZWQgc3RhdGUgY29tcGFyaXNvbnMuCgpJIGRvbid0IGV4cGVjdCB3 ZSdsbCBldmVyIGdldCByaWQgb2YgdGhpcyBvbmUgc2luY2Ugb2YgT2xkIENyYXAKZW5jb2RlcnMv Y29ubmVjdG9yZXMgKGR2bywgc2R2bywgdHYsIC4uLikgd2UnbGwgbGlrZWx5IG5ldmVyIGNvbnZl cnQgdGhlCnByb3BzIHRvIGF0b21pYyBwcm9wZXJseS4KLURhbmllbAoKPiAtLS0KPiAgZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgNjIgKysrKysrKysrKystLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tCj4gIDEgZmlsZSBjaGFuZ2VkLCAxOCBpbnNlcnRpb25zKCspLCA0NCBk ZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gaW5kZXgg OTQyZDI1ZTc0OTBhLi43OTZkMDhjNDYwNmUgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jCj4gQEAgLTEzMTc0LDY2ICsxMzE3NCw0MCBAQCB2b2lkIGludGVsX2NydGNfcmVz dG9yZV9tb2RlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKPiAgewo+ICAJc3RydWN0IGRybV9kZXZp Y2UgKmRldiA9IGNydGMtPmRldjsKPiAgCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZTsK PiAtCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjOwo+IC0Jc3RydWN0IGludGVsX2VuY29k ZXIgKmVuY29kZXI7Cj4gLQlzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICpjb25uZWN0b3I7Cj4gLQlz dHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubmVjdG9yX3N0YXRlOwo+IC0Jc3RydWN0IGlu dGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7Cj4gKwlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNy dGNfc3RhdGU7Cj4gIAlpbnQgcmV0Owo+ICAKPiAgCXN0YXRlID0gZHJtX2F0b21pY19zdGF0ZV9h bGxvYyhkZXYpOwo+ICAJaWYgKCFzdGF0ZSkgewo+IC0JCURSTV9ERUJVR19LTVMoIltDUlRDOiVk XSBtb2RlIHJlc3RvcmUgZmFpbGVkLCBvdXQgb2YgbWVtb3J5IiwKPiArCQlEUk1fREVCVUdfS01T KCJbQ1JUQzolZF0gY3J0YyByZXN0b3JlIGZhaWxlZCwgb3V0IG9mIG1lbW9yeSIsCj4gIAkJCSAg ICAgIGNydGMtPmJhc2UuaWQpOwo+ICAJCXJldHVybjsKPiAgCX0KPiAgCj4gLQlzdGF0ZS0+YWNx dWlyZV9jdHggPSBkZXYtPm1vZGVfY29uZmlnLmFjcXVpcmVfY3R4Owo+IC0KPiAtCS8qIFRoZSBm b3JjZSByZXN0b3JlIHBhdGggaW4gdGhlIEhXIHJlYWRvdXQgY29kZSByZWxpZXMgb24gdGhlIHN0 YWdlZAo+IC0JICogY29uZmlnIHN0aWxsIGtlZXBpbmcgdGhlIHVzZXIgcmVxdWVzdGVkIGNvbmZp ZyB3aGlsZSB0aGUgYWN0dWFsCj4gLQkgKiBzdGF0ZSBoYXMgYmVlbiBvdmVyd3JpdHRlbiBieSB0 aGUgY29uZmlndXJhdGlvbiByZWFkIGZyb20gSFcuIFdlCj4gLQkgKiBuZWVkIHRvIGNvcHkgdGhl IHN0YWdlZCBjb25maWcgdG8gdGhlIGF0b21pYyBzdGF0ZSwgb3RoZXJ3aXNlIHRoZQo+IC0JICog bW9kZSBzZXQgd2lsbCBqdXN0IHJlYXBwbHkgdGhlIHN0YXRlIHRoZSBIVyBpcyBhbHJlYWR5IGlu LiAqLwo+IC0JZm9yX2VhY2hfaW50ZWxfZW5jb2RlcihkZXYsIGVuY29kZXIpIHsKPiAtCQlpZiAo ZW5jb2Rlci0+YmFzZS5jcnRjICE9IGNydGMpCj4gLQkJCWNvbnRpbnVlOwo+ICsJc3RhdGUtPmFj cXVpcmVfY3R4ID0gZHJtX21vZGVzZXRfbGVnYWN5X2FjcXVpcmVfY3R4KGNydGMpOwo+ICAKPiAt CQlmb3JfZWFjaF9pbnRlbF9jb25uZWN0b3IoZGV2LCBjb25uZWN0b3IpIHsKPiAtCQkJaWYgKGNv bm5lY3Rvci0+YmFzZS5zdGF0ZS0+YmVzdF9lbmNvZGVyICE9ICZlbmNvZGVyLT5iYXNlKQo+IC0J CQkJY29udGludWU7Cj4gLQo+IC0JCQljb25uZWN0b3Jfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9j b25uZWN0b3Jfc3RhdGUoc3RhdGUsICZjb25uZWN0b3ItPmJhc2UpOwo+IC0JCQlpZiAoSVNfRVJS KGNvbm5lY3Rvcl9zdGF0ZSkpIHsKPiAtCQkJCURSTV9ERUJVR19LTVMoIkZhaWxlZCB0byBhZGQg W0NPTk5FQ1RPUjolZDolc10gdG8gc3RhdGU6ICVsZFxuIiwKPiAtCQkJCQkgICAgICBjb25uZWN0 b3ItPmJhc2UuYmFzZS5pZCwKPiAtCQkJCQkgICAgICBjb25uZWN0b3ItPmJhc2UubmFtZSwKPiAt CQkJCQkgICAgICBQVFJfRVJSKGNvbm5lY3Rvcl9zdGF0ZSkpOwo+IC0JCQkJY29udGludWU7Cj4g LQkJCX0KPiArcmV0cnk6Cj4gKwljcnRjX3N0YXRlID0gZHJtX2F0b21pY19nZXRfY3J0Y19zdGF0 ZShzdGF0ZSwgY3J0Yyk7Cj4gKwlyZXQgPSBQVFJfRVJSX09SX1pFUk8oY3J0Y19zdGF0ZSk7Cj4g KwlpZiAoIXJldCkgewo+ICsJCWlmICghY3J0Y19zdGF0ZS0+YWN0aXZlKQo+ICsJCQlnb3RvIG91 dDsKPiAgCj4gLQkJCWNvbm5lY3Rvcl9zdGF0ZS0+Y3J0YyA9IGNydGM7Cj4gLQkJfQo+ICsJCWNy dGNfc3RhdGUtPm1vZGVfY2hhbmdlZCA9IHRydWU7Cj4gKwkJcmV0ID0gaW50ZWxfbW9kZXNldF9j b21wdXRlX2NvbmZpZyhzdGF0ZSk7Cj4gIAl9Cj4gIAo+IC0JZm9yX2VhY2hfaW50ZWxfY3J0Yyhk ZXYsIGludGVsX2NydGMpIHsKPiAtCQljcnRjX3N0YXRlID0gaW50ZWxfYXRvbWljX2dldF9jcnRj X3N0YXRlKHN0YXRlLCBpbnRlbF9jcnRjKTsKPiAtCQlpZiAoSVNfRVJSKGNydGNfc3RhdGUpKSB7 Cj4gLQkJCURSTV9ERUJVR19LTVMoIkZhaWxlZCB0byBhZGQgW0NSVEM6JWRdIHRvIHN0YXRlOiAl bGRcbiIsCj4gLQkJCQkgICAgICBpbnRlbF9jcnRjLT5iYXNlLmJhc2UuaWQsCj4gLQkJCQkgICAg ICBQVFJfRVJSKGNydGNfc3RhdGUpKTsKPiAtCQkJY29udGludWU7Cj4gLQkJfQo+ICsJaWYgKCFy ZXQpCj4gKwkJcmV0ID0gaW50ZWxfc2V0X21vZGVfY2hlY2tlZChzdGF0ZSk7Cj4gIAo+IC0JCWlm ICgmaW50ZWxfY3J0Yy0+YmFzZSA9PSBjcnRjKQo+IC0JCQlkcm1fbW9kZV9jb3B5KCZjcnRjX3N0 YXRlLT5iYXNlLm1vZGUsICZjcnRjLT5tb2RlKTsKPiArCWlmIChyZXQgPT0gLUVERUFETEspIHsK PiArCQlkcm1fYXRvbWljX3N0YXRlX2NsZWFyKHN0YXRlKTsKPiArCQlkcm1fbW9kZXNldF9iYWNr b2ZmKHN0YXRlLT5hY3F1aXJlX2N0eCk7Cj4gKwkJZ290byByZXRyeTsKPiAgCX0KPiAgCj4gLQlp bnRlbF9tb2Rlc2V0X3NldHVwX3BsYW5lX3N0YXRlKHN0YXRlLCBjcnRjLCAmY3J0Yy0+bW9kZSwK PiAtCQkJCQljcnRjLT5wcmltYXJ5LT5mYiwgY3J0Yy0+eCwgY3J0Yy0+eSk7Cj4gLQo+IC0JcmV0 ID0gaW50ZWxfc2V0X21vZGUoc3RhdGUpOwo+ICAJaWYgKHJldCkKPiArb3V0Ogo+ICAJCWRybV9h dG9taWNfc3RhdGVfZnJlZShzdGF0ZSk7Cj4gIH0KPiAgCj4gLS0gCj4gMi4xLjAKPiAKPiBfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwo+IEludGVsLWdmeCBt YWlsaW5nIGxpc3QKPiBJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4gaHR0cDovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAoKLS0gCkRhbmll bCBWZXR0ZXIKU29mdHdhcmUgRW5naW5lZXIsIEludGVsIENvcnBvcmF0aW9uCmh0dHA6Ly9ibG9n LmZmd2xsLmNoCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==