From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH] drm/i915: Keep crtc_state->active in sync with
	enable.
Date: Mon, 11 May 2015 10:45:15 +0200
Message-ID: <55506C1B.1030408@linux.intel.com>
References: <20150507212842.GB22531@intel.com>	
 <1431034288-3160-1-git-send-email-matthew.d.roper@intel.com>
 <1431071763.2457.8.camel@gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga11.intel.com (mga11.intel.com [192.55.52.93])
 by gabe.freedesktop.org (Postfix) with ESMTP id 262756E308
 for <intel-gfx@lists.freedesktop.org>; Mon, 11 May 2015 01:45:18 -0700 (PDT)
In-Reply-To: <1431071763.2457.8.camel@gmail.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: Ander Conselvan De Oliveira <conselvan2@gmail.com>, Matt Roper <matthew.d.roper@intel.com>
Cc: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

V2l0aCB0aGUgcmVjZW50IG1vZGVzZXQgaW50ZXJuYWwgcmV3b3JrLCB3ZSB3aW5kIHVwIHNldHRp
bmcgY3J0Y19zdGF0ZS0+ZW5hYmxlCnRvIGZhbHNlLCBidXQgbGVhdmUgY3J0Y19zdGF0ZS0+YWN0
aXZlIGFzIHRydWUgZm9sbG93aW5nIGEKZHJtTW9kZVNldENydGMoZmI9MCksIHdoaWNoIGlzIGlu
Y29ycmVjdC4gIFRoaXMgbWlzbWF0Y2ggZ2V0cyBjYXVnaHQgYnkKZHJtX2F0b21pY19jcnRjX2No
ZWNrKCkgYW5kIGNhdXNlcyBzdWJzZXF1ZW50IGF0b21pYyBvcGVyYXRpb25zIChzdWNoIGFzIHBs
YW5lCnVwZGF0ZXMgd2hpbGUgdGhlIENSVEMgaXMgZGlzYWJsZWQpIHRvIGZhaWwuCgpCaXNlY3Qg
cG9pbnRzIHRvCgogICAgICAgIGNvbW1pdCBkYWQ5YTdkNmQ5NjYzMDE4MmZiNTJhYWU3YzM4NTZl
OWU3Mjg1ZTEzCiAgICAgICAgQXV0aG9yOiBBbmRlciBDb25zZWx2YW4gZGUgT2xpdmVpcmEgPGFu
ZGVyLmNvbnNlbHZhbi5kZS5vbGl2ZWlyYUBpbnRlbC5jb20+CiAgICAgICAgRGF0ZTogICBUdWUg
QXByIDIxIDE3OjEzOjE5IDIwMTUgKzAzMDAKCiAgICAgICAgICAgIGRybS9pOTE1OiBVc2UgYXRv
bWljIGhlbHBlcnMgZm9yIGNvbXB1dGluZyBjaGFuZ2VkIGZsYWdzCgphcyB0aGUgY29tbWl0IHRo
YXQgYWN0dWFsbHkgdHJpZ2dlcnMgdGhlIHJlZ3Jlc3Npb24uCgpDYzogTWF0dCBSb3BlciA8bWF0
dGhldy5kLnJvcGVyQGludGVsLmNvbT4KQ2M6IEFuZGVyIENvbnNlbHZhbiBkZSBPbGl2ZWlyYSA8
YW5kZXIuY29uc2VsdmFuLmRlLm9saXZlaXJhQGludGVsLmNvbT4KUmVwb3J0ZWQtYW5kLVRlc3Rl
ZC1ieTogS2VubmV0aCBHcmF1bmtlIDxrZW5uZXRoQHdoaXRlY2FwZS5vcmc+ClNpZ25lZC1vZmYt
Ynk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+
Ci0tLQpUaGUgb3JpZ2luYWwgcGF0Y2ggZm9yIHRoaXMgaXMgd3JvbmcsIHdlIHNob3VsZCBrZWVw
IGVuYWJsZSBhbmQgYWN0aXZlIGluIHN5bmMgd2hlbiBjaGFuZ2VkLgpQbGVhc2UgcmV2ZXJ0ICJk
cm0vaTkxNTogU2V0IGNydGNfc3RhdGUtPmFjdGl2ZSB0byBmYWxzZSB3aGVuIENSVEMgaXMgZGlz
YWJsZWQgKHYyKSIuCgogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMTcg
KysrKysrKysrKysrKy0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMyBpbnNlcnRpb25zKCspLCA0IGRl
bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs
YXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCAyMmU2NjQ0
Zjc1NWUuLmUyMjMyMDllMmQ4MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpA
QCAtOTg2OCw3ICs5ODY4LDcgQEAgcmV0cnk6CiAJCWdvdG8gZmFpbDsKIAl9CiAKLQljcnRjX3N0
YXRlLT5iYXNlLmVuYWJsZSA9IHRydWU7CisJY3J0Y19zdGF0ZS0+YmFzZS5hY3RpdmUgPSBjcnRj
X3N0YXRlLT5iYXNlLmVuYWJsZSA9IHRydWU7CiAKIAlpZiAoIW1vZGUpCiAJCW1vZGUgPSAmbG9h
ZF9kZXRlY3RfbW9kZTsKQEAgLTk5NjUsNyArOTk2NSw3IEBAIHZvaWQgaW50ZWxfcmVsZWFzZV9s
b2FkX2RldGVjdF9waXBlKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsCiAJCWNvbm5l
Y3Rvcl9zdGF0ZS0+YmVzdF9lbmNvZGVyID0gTlVMTDsKIAkJY29ubmVjdG9yX3N0YXRlLT5jcnRj
ID0gTlVMTDsKIAotCQljcnRjX3N0YXRlLT5iYXNlLmVuYWJsZSA9IGZhbHNlOworCQljcnRjX3N0
YXRlLT5iYXNlLmVuYWJsZSA9IGNydGNfc3RhdGUtPmJhc2UuYWN0aXZlID0gZmFsc2U7CiAKIAkJ
cmV0ID0gaW50ZWxfbW9kZXNldF9zZXR1cF9wbGFuZV9zdGF0ZShzdGF0ZSwgY3J0YywgTlVMTCwg
TlVMTCwKIAkJCQkJCSAgICAgIDAsIDApOwpAQCAtMTI0OTIsNyArMTI0OTIsOCBAQCB2b2lkIGlu
dGVsX2NydGNfcmVzdG9yZV9tb2RlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAkJCWNvbnRpbnVl
OwogCQl9CiAKLQkJY3J0Y19zdGF0ZS0+YmFzZS5lbmFibGUgPSBpbnRlbF9jcnRjLT5uZXdfZW5h
YmxlZDsKKwkJY3J0Y19zdGF0ZS0+YmFzZS5hY3RpdmUgPSBjcnRjX3N0YXRlLT5iYXNlLmVuYWJs
ZSA9CisJCQlpbnRlbF9jcnRjLT5uZXdfZW5hYmxlZDsKIAogCQlpZiAoJmludGVsX2NydGMtPmJh
c2UgPT0gY3J0YykKIAkJCWRybV9tb2RlX2NvcHkoJmNydGNfc3RhdGUtPmJhc2UubW9kZSwgJmNy
dGMtPm1vZGUpOwpAQCAtMTI2MTcsMTEgKzEyNjE4LDE2IEBAIGludGVsX21vZGVzZXRfc3RhZ2Vf
b3V0cHV0X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJfQogCiAJZm9yX2VhY2hfY3J0
Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgY3J0Y19zdGF0ZSwgaSkgeworCQlib29sIGhhc19jb25u
ZWN0b3JzOworCiAJCXJldCA9IGRybV9hdG9taWNfYWRkX2FmZmVjdGVkX2Nvbm5lY3RvcnMoc3Rh
dGUsIGNydGMpOwogCQlpZiAocmV0KQogCQkJcmV0dXJuIHJldDsKIAotCQljcnRjX3N0YXRlLT5l
bmFibGUgPSBkcm1fYXRvbWljX2Nvbm5lY3RvcnNfZm9yX2NydGMoc3RhdGUsIGNydGMpOworCQlo
YXNfY29ubmVjdG9ycyA9ICEhZHJtX2F0b21pY19jb25uZWN0b3JzX2Zvcl9jcnRjKHN0YXRlLCBj
cnRjKTsKKwkJaWYgKGhhc19jb25uZWN0b3JzICE9IGNydGNfc3RhdGUtPmVuYWJsZSkKKwkJCWNy
dGNfc3RhdGUtPmVuYWJsZSA9CisJCQljcnRjX3N0YXRlLT5hY3RpdmUgPSBoYXNfY29ubmVjdG9y
czsKIAl9CiAKIAlyZXQgPSBpbnRlbF9tb2Rlc2V0X3NldHVwX3BsYW5lX3N0YXRlKHN0YXRlLCBz
ZXQtPmNydGMsIHNldC0+bW9kZSwKQEAgLTE0NTk4LDYgKzE0NjA0LDcgQEAgc3RhdGljIHZvaWQg
aW50ZWxfc2FuaXRpemVfY3J0YyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAogCQlXQVJOX09O
KGNydGMtPmFjdGl2ZSk7CiAJCWNydGMtPmJhc2Uuc3RhdGUtPmVuYWJsZSA9IGZhbHNlOworCQlj
cnRjLT5iYXNlLnN0YXRlLT5hY3RpdmUgPSBmYWxzZTsKIAkJY3J0Yy0+YmFzZS5lbmFibGVkID0g
ZmFsc2U7CiAJfQogCkBAIC0xNDYyNiw2ICsxNDYzMyw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3Nh
bml0aXplX2NydGMoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJCQkgICAgICBjcnRjLT5hY3Rp
dmUgPyAiZW5hYmxlZCIgOiAiZGlzYWJsZWQiKTsKIAogCQljcnRjLT5iYXNlLnN0YXRlLT5lbmFi
bGUgPSBjcnRjLT5hY3RpdmU7CisJCWNydGMtPmJhc2Uuc3RhdGUtPmFjdGl2ZSA9IGNydGMtPmFj
dGl2ZTsKIAkJY3J0Yy0+YmFzZS5lbmFibGVkID0gY3J0Yy0+YWN0aXZlOwogCiAJCS8qIEJlY2F1
c2Ugd2Ugb25seSBlc3RhYmxpc2ggdGhlIGNvbm5lY3RvciAtPiBlbmNvZGVyIC0+CkBAIC0xNDc2
NCw2ICsxNDc3Miw3IEBAIHN0YXRpYyB2b2lkIGludGVsX21vZGVzZXRfcmVhZG91dF9od19zdGF0
ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJCQkJCQkgY3J0Yy0+Y29uZmlnKTsKIAogCQlj
cnRjLT5iYXNlLnN0YXRlLT5lbmFibGUgPSBjcnRjLT5hY3RpdmU7CisJCWNydGMtPmJhc2Uuc3Rh
dGUtPmFjdGl2ZSA9IGNydGMtPmFjdGl2ZTsKIAkJY3J0Yy0+YmFzZS5lbmFibGVkID0gY3J0Yy0+
YWN0aXZlOwogCiAJCXBsYW5lX3N0YXRlID0gdG9faW50ZWxfcGxhbmVfc3RhdGUocHJpbWFyeS0+
c3RhdGUpOwotLSAKMi4xLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr
dG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50
ZWwtZ2Z4Cg==