From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915: Keep crtc_state->active in sync with enable. Date: Mon, 11 May 2015 11:58:23 +0200 Message-ID: <20150511095823.GU15256@phenom.ffwll.local> References: <20150507212842.GB22531@intel.com> <1431034288-3160-1-git-send-email-matthew.d.roper@intel.com> <1431071763.2457.8.camel@gmail.com> <55506C1B.1030408@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 7764E6E055 for ; Mon, 11 May 2015 02:56:03 -0700 (PDT) Received: by widdi4 with SMTP id di4so89797291wid.0 for ; Mon, 11 May 2015 02:56:02 -0700 (PDT) Content-Disposition: inline In-Reply-To: <55506C1B.1030408@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 T24gTW9uLCBNYXkgMTEsIDIwMTUgYXQgMTA6NDU6MTVBTSArMDIwMCwgTWFhcnRlbiBMYW5raG9y c3Qgd3JvdGU6Cj4gV2l0aCB0aGUgcmVjZW50IG1vZGVzZXQgaW50ZXJuYWwgcmV3b3JrLCB3ZSB3 aW5kIHVwIHNldHRpbmcgY3J0Y19zdGF0ZS0+ZW5hYmxlCj4gdG8gZmFsc2UsIGJ1dCBsZWF2ZSBj cnRjX3N0YXRlLT5hY3RpdmUgYXMgdHJ1ZSBmb2xsb3dpbmcgYQo+IGRybU1vZGVTZXRDcnRjKGZi PTApLCB3aGljaCBpcyBpbmNvcnJlY3QuICBUaGlzIG1pc21hdGNoIGdldHMgY2F1Z2h0IGJ5Cj4g ZHJtX2F0b21pY19jcnRjX2NoZWNrKCkgYW5kIGNhdXNlcyBzdWJzZXF1ZW50IGF0b21pYyBvcGVy YXRpb25zIChzdWNoIGFzIHBsYW5lCj4gdXBkYXRlcyB3aGlsZSB0aGUgQ1JUQyBpcyBkaXNhYmxl ZCkgdG8gZmFpbC4KPiAKPiBCaXNlY3QgcG9pbnRzIHRvCj4gCj4gICAgICAgICBjb21taXQgZGFk OWE3ZDZkOTY2MzAxODJmYjUyYWFlN2MzODU2ZTllNzI4NWUxMwo+ICAgICAgICAgQXV0aG9yOiBB bmRlciBDb25zZWx2YW4gZGUgT2xpdmVpcmEgPGFuZGVyLmNvbnNlbHZhbi5kZS5vbGl2ZWlyYUBp bnRlbC5jb20+Cj4gICAgICAgICBEYXRlOiAgIFR1ZSBBcHIgMjEgMTc6MTM6MTkgMjAxNSArMDMw MAo+IAo+ICAgICAgICAgICAgIGRybS9pOTE1OiBVc2UgYXRvbWljIGhlbHBlcnMgZm9yIGNvbXB1 dGluZyBjaGFuZ2VkIGZsYWdzCj4gCj4gYXMgdGhlIGNvbW1pdCB0aGF0IGFjdHVhbGx5IHRyaWdn ZXJzIHRoZSByZWdyZXNzaW9uLgo+IAo+IENjOiBNYXR0IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJA aW50ZWwuY29tPgo+IENjOiBBbmRlciBDb25zZWx2YW4gZGUgT2xpdmVpcmEgPGFuZGVyLmNvbnNl bHZhbi5kZS5vbGl2ZWlyYUBpbnRlbC5jb20+Cj4gUmVwb3J0ZWQtYW5kLVRlc3RlZC1ieTogS2Vu bmV0aCBHcmF1bmtlIDxrZW5uZXRoQHdoaXRlY2FwZS5vcmc+Cj4gU2lnbmVkLW9mZi1ieTogTWFh cnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KClllYWgg dGhpcyBtYWtlcyBtb3JlIHNlbnNlLCBpbiB0aGUgbGVnYWN5IGNvZGVwYXRocyB3ZSBhbHdheXMg aW1wbGljaXRseQpzbWFzaCB0aGUgZHBtcyBzdGF0ZSAoaS5lLiBzdGF0ZS0+YWN0aXZlKSB0byB0 aGUgbG9naWNhbCBwaXBlIHN0YXRlIChpLmUuCnN0YXRlLT5lbmFibGUpLiBRdWV1ZWQgZm9yIC1u ZXh0LCB0aGFua3MgZm9yIHRoZSBwYXRjaC4KPiAtLS0KPiBUaGUgb3JpZ2luYWwgcGF0Y2ggZm9y IHRoaXMgaXMgd3JvbmcsIHdlIHNob3VsZCBrZWVwIGVuYWJsZSBhbmQgYWN0aXZlIGluIHN5bmMg d2hlbiBjaGFuZ2VkLgo+IFBsZWFzZSByZXZlcnQgImRybS9pOTE1OiBTZXQgY3J0Y19zdGF0ZS0+ YWN0aXZlIHRvIGZhbHNlIHdoZW4gQ1JUQyBpcyBkaXNhYmxlZCAodjIpIi4KCkkndmUgc3F1YXNo ZWQgdGhlIHJldmVydCByaWdodCBpbnRvIHRoaXMgb25lLCBpbW8gZGlkbid0IG1ha2Ugc2Vuc2UK c2VwYXJldGVseS4KLURhbmllbAoKPiAKPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jIHwgMTcgKysrKysrKysrKysrKy0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDEzIGluc2Vy dGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYwo+IGluZGV4IDIyZTY2NDRmNzU1ZS4uZTIyMzIwOWUyZDgxIDEwMDY0NAo+IC0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+IEBAIC05ODY4LDcgKzk4NjgsNyBAQCByZXRyeToKPiAg CQlnb3RvIGZhaWw7Cj4gIAl9Cj4gIAo+IC0JY3J0Y19zdGF0ZS0+YmFzZS5lbmFibGUgPSB0cnVl Owo+ICsJY3J0Y19zdGF0ZS0+YmFzZS5hY3RpdmUgPSBjcnRjX3N0YXRlLT5iYXNlLmVuYWJsZSA9 IHRydWU7Cj4gIAo+ICAJaWYgKCFtb2RlKQo+ICAJCW1vZGUgPSAmbG9hZF9kZXRlY3RfbW9kZTsK PiBAQCAtOTk2NSw3ICs5OTY1LDcgQEAgdm9pZCBpbnRlbF9yZWxlYXNlX2xvYWRfZGV0ZWN0X3Bp cGUoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciwKPiAgCQljb25uZWN0b3Jfc3RhdGUt PmJlc3RfZW5jb2RlciA9IE5VTEw7Cj4gIAkJY29ubmVjdG9yX3N0YXRlLT5jcnRjID0gTlVMTDsK PiAgCj4gLQkJY3J0Y19zdGF0ZS0+YmFzZS5lbmFibGUgPSBmYWxzZTsKPiArCQljcnRjX3N0YXRl LT5iYXNlLmVuYWJsZSA9IGNydGNfc3RhdGUtPmJhc2UuYWN0aXZlID0gZmFsc2U7Cj4gIAo+ICAJ CXJldCA9IGludGVsX21vZGVzZXRfc2V0dXBfcGxhbmVfc3RhdGUoc3RhdGUsIGNydGMsIE5VTEws IE5VTEwsCj4gIAkJCQkJCSAgICAgIDAsIDApOwo+IEBAIC0xMjQ5Miw3ICsxMjQ5Miw4IEBAIHZv aWQgaW50ZWxfY3J0Y19yZXN0b3JlX21vZGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQo+ICAJCQlj b250aW51ZTsKPiAgCQl9Cj4gIAo+IC0JCWNydGNfc3RhdGUtPmJhc2UuZW5hYmxlID0gaW50ZWxf Y3J0Yy0+bmV3X2VuYWJsZWQ7Cj4gKwkJY3J0Y19zdGF0ZS0+YmFzZS5hY3RpdmUgPSBjcnRjX3N0 YXRlLT5iYXNlLmVuYWJsZSA9Cj4gKwkJCWludGVsX2NydGMtPm5ld19lbmFibGVkOwo+ICAKPiAg CQlpZiAoJmludGVsX2NydGMtPmJhc2UgPT0gY3J0YykKPiAgCQkJZHJtX21vZGVfY29weSgmY3J0 Y19zdGF0ZS0+YmFzZS5tb2RlLCAmY3J0Yy0+bW9kZSk7Cj4gQEAgLTEyNjE3LDExICsxMjYxOCwx NiBAQCBpbnRlbF9tb2Rlc2V0X3N0YWdlX291dHB1dF9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LAo+ICAJfQo+ICAKPiAgCWZvcl9lYWNoX2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIGNy dGNfc3RhdGUsIGkpIHsKPiArCQlib29sIGhhc19jb25uZWN0b3JzOwo+ICsKPiAgCQlyZXQgPSBk cm1fYXRvbWljX2FkZF9hZmZlY3RlZF9jb25uZWN0b3JzKHN0YXRlLCBjcnRjKTsKPiAgCQlpZiAo cmV0KQo+ICAJCQlyZXR1cm4gcmV0Owo+ICAKPiAtCQljcnRjX3N0YXRlLT5lbmFibGUgPSBkcm1f YXRvbWljX2Nvbm5lY3RvcnNfZm9yX2NydGMoc3RhdGUsIGNydGMpOwo+ICsJCWhhc19jb25uZWN0 b3JzID0gISFkcm1fYXRvbWljX2Nvbm5lY3RvcnNfZm9yX2NydGMoc3RhdGUsIGNydGMpOwo+ICsJ CWlmIChoYXNfY29ubmVjdG9ycyAhPSBjcnRjX3N0YXRlLT5lbmFibGUpCj4gKwkJCWNydGNfc3Rh dGUtPmVuYWJsZSA9Cj4gKwkJCWNydGNfc3RhdGUtPmFjdGl2ZSA9IGhhc19jb25uZWN0b3JzOwo+ ICAJfQo+ICAKPiAgCXJldCA9IGludGVsX21vZGVzZXRfc2V0dXBfcGxhbmVfc3RhdGUoc3RhdGUs IHNldC0+Y3J0Yywgc2V0LT5tb2RlLAo+IEBAIC0xNDU5OCw2ICsxNDYwNCw3IEBAIHN0YXRpYyB2 b2lkIGludGVsX3Nhbml0aXplX2NydGMoc3RydWN0IGludGVsX2NydGMgKmNydGMpCj4gIAo+ICAJ CVdBUk5fT04oY3J0Yy0+YWN0aXZlKTsKPiAgCQljcnRjLT5iYXNlLnN0YXRlLT5lbmFibGUgPSBm YWxzZTsKPiArCQljcnRjLT5iYXNlLnN0YXRlLT5hY3RpdmUgPSBmYWxzZTsKPiAgCQljcnRjLT5i YXNlLmVuYWJsZWQgPSBmYWxzZTsKPiAgCX0KPiAgCj4gQEAgLTE0NjI2LDYgKzE0NjMzLDcgQEAg c3RhdGljIHZvaWQgaW50ZWxfc2FuaXRpemVfY3J0YyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykK PiAgCQkJICAgICAgY3J0Yy0+YWN0aXZlID8gImVuYWJsZWQiIDogImRpc2FibGVkIik7Cj4gIAo+ ICAJCWNydGMtPmJhc2Uuc3RhdGUtPmVuYWJsZSA9IGNydGMtPmFjdGl2ZTsKPiArCQljcnRjLT5i YXNlLnN0YXRlLT5hY3RpdmUgPSBjcnRjLT5hY3RpdmU7Cj4gIAkJY3J0Yy0+YmFzZS5lbmFibGVk ID0gY3J0Yy0+YWN0aXZlOwo+ICAKPiAgCQkvKiBCZWNhdXNlIHdlIG9ubHkgZXN0YWJsaXNoIHRo ZSBjb25uZWN0b3IgLT4gZW5jb2RlciAtPgo+IEBAIC0xNDc2NCw2ICsxNDc3Miw3IEBAIHN0YXRp YyB2b2lkIGludGVsX21vZGVzZXRfcmVhZG91dF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KQo+ICAJCQkJCQkJCSBjcnRjLT5jb25maWcpOwo+ICAKPiAgCQljcnRjLT5iYXNlLnN0YXRl LT5lbmFibGUgPSBjcnRjLT5hY3RpdmU7Cj4gKwkJY3J0Yy0+YmFzZS5zdGF0ZS0+YWN0aXZlID0g Y3J0Yy0+YWN0aXZlOwo+ICAJCWNydGMtPmJhc2UuZW5hYmxlZCA9IGNydGMtPmFjdGl2ZTsKPiAg Cj4gIAkJcGxhbmVfc3RhdGUgPSB0b19pbnRlbF9wbGFuZV9zdGF0ZShwcmltYXJ5LT5zdGF0ZSk7 Cj4gLS0gCj4gMi4xLjAKPiAKPiBfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwo+IEludGVsLWdmeCBtYWlsaW5nIGxpc3QKPiBJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCj4gaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2ludGVsLWdmeAoKLS0gCkRhbmllbCBWZXR0ZXIKU29mdHdhcmUgRW5naW5lZXIsIEludGVs IENvcnBvcmF0aW9uCmh0dHA6Ly9ibG9nLmZmd2xsLmNoCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==