From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: drm/i915: Postpone plane readout until after encoder
	readout, v2.
Date: Wed, 5 Aug 2015 12:45:48 +0200
Message-ID: <55C1E95C.6030101@linux.intel.com>
References: <1438347848-11293-1-git-send-email-patrik.jakobsson@linux.intel.com>
 <55BF7C5D.6030405@linux.intel.com>
 <CAMeQTsbQXmQ03mP6SqTg4fBXpcaKA0-YB8rVqYtm268_ca6anA@mail.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 1C5AF895C4
 for <intel-gfx@lists.freedesktop.org>; Wed,  5 Aug 2015 03:46:07 -0700 (PDT)
In-Reply-To: <CAMeQTsbQXmQ03mP6SqTg4fBXpcaKA0-YB8rVqYtm268_ca6anA@mail.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: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Cc: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogUGF0cmlrIEpha29ic3NvbiA8cGF0cmlrLmpha29ic3NvbkBsaW51eC5pbnRlbC5jb20+
CgpXaGVuIHJlYWRpbmcgb3V0IGh3IHN0YXRlIGZvciBwbGFuZXMgd2UgZGlzYWJsZSBpbmFjdGl2
ZSBwbGFuZXMgd2hpY2ggaW4KdHVybiB0cmlnZ2VycyBhbiB1cGRhdGUgb2YgdGhlIHdhdGVybWFy
a3MuIFRoZSB1cGRhdGUgZGVwZW5kcyBvbiB0aGUKY3J0Y19jbG9jayBiZWluZyBzZXQgd2hpY2gg
aXMgZG9uZSB3aGVuIHJlYWRpbmcgb3V0IGVuY29kZXJzLiBUaHVzCnBvc3Rwb25lIHRoZSBwbGFu
ZSByZWFkb3V0IHVudGlsIGFmdGVyIGVuY29kZXIgcmVhZG91dC4KClRoaXMgcHJldmVudHMgYSB3
YXJuaW5nIGluIHNrbF9jb21wdXRlX2xpbmV0aW1lX3dtKCkgd2hlcmUgcGl4ZWxfcmF0ZQpiZWNv
bWVzIDAgd2hlbiBjcnRjX2Nsb2NrIGlzIDAuCgpDaGFuZ2VzIHNpbmNlIHYxOgotIFNldCBhbGwg
bW9kZXMgYWZ0ZXIgYWxsIHN0YXRlIGlzIHJlYWQgb3V0LiAoTWFhcnRlbikKClJlZmVyZW5jZXM6
IGh0dHBzOi8vYnVncy5mcmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTkxNDI4ClNpZ25l
ZC1vZmYtYnk6IFBhdHJpayBKYWtvYnNzb24gPHBhdHJpay5qYWtvYnNzb25AbGludXguaW50ZWwu
Y29tPgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RA
bGludXguaW50ZWwuY29tPgotLS0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu
dGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRl
eCBkZjIzN2FkNGE3ODAuLjg1ZDUyMTU4ZDQ3NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp
c3BsYXkuYwpAQCAtMTUwNDIsMjcgKzE1MDQyLDI1IEBAIHN0YXRpYyBib29sIHByaW1hcnlfZ2V0
X2h3X3N0YXRlKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCXJldHVybiAhIShJOTE1X1JFQUQo
RFNQQ05UUihjcnRjLT5wbGFuZSkpICYgRElTUExBWV9QTEFORV9FTkFCTEUpOwogfQogCi1zdGF0
aWMgdm9pZCByZWFkb3V0X3BsYW5lX3N0YXRlKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAotCQkJ
CXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQorc3RhdGljIHZvaWQgaW50ZWxf
c2FuaXRpemVfcGxhbmUoc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSkKIHsKLQlzdHJ1Y3QgaW50
ZWxfcGxhbmUgKnA7CiAJc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZTsKLQli
b29sIGFjdGl2ZSA9IGNydGNfc3RhdGUtPmJhc2UuYWN0aXZlOworCXN0cnVjdCBpbnRlbF9jcnRj
ICpjcnRjOwogCi0JZm9yX2VhY2hfaW50ZWxfcGxhbmUoY3J0Yy0+YmFzZS5kZXYsIHApIHsKLQkJ
aWYgKGNydGMtPnBpcGUgIT0gcC0+cGlwZSkKLQkJCWNvbnRpbnVlOworCXBsYW5lX3N0YXRlID0g
dG9faW50ZWxfcGxhbmVfc3RhdGUocGxhbmUtPmJhc2Uuc3RhdGUpOwogCi0JCXBsYW5lX3N0YXRl
ID0gdG9faW50ZWxfcGxhbmVfc3RhdGUocC0+YmFzZS5zdGF0ZSk7CisJaWYgKCFwbGFuZV9zdGF0
ZS0+YmFzZS5jcnRjKQorCQlyZXR1cm47CiAKLQkJaWYgKHAtPmJhc2UudHlwZSA9PSBEUk1fUExB
TkVfVFlQRV9QUklNQVJZKQotCQkJcGxhbmVfc3RhdGUtPnZpc2libGUgPSBwcmltYXJ5X2dldF9o
d19zdGF0ZShjcnRjKTsKLQkJZWxzZSB7Ci0JCQlpZiAoYWN0aXZlKQotCQkJCXAtPmRpc2FibGVf
cGxhbmUoJnAtPmJhc2UsICZjcnRjLT5iYXNlKTsKKwljcnRjID0gdG9faW50ZWxfY3J0YyhwbGFu
ZV9zdGF0ZS0+YmFzZS5jcnRjKTsKIAotCQkJcGxhbmVfc3RhdGUtPnZpc2libGUgPSBmYWxzZTsK
LQkJfQorCWlmIChwbGFuZS0+YmFzZS50eXBlID09IERSTV9QTEFORV9UWVBFX1BSSU1BUlkpIHsK
KwkJcGxhbmVfc3RhdGUtPnZpc2libGUgPSBwcmltYXJ5X2dldF9od19zdGF0ZShjcnRjKTsKKwl9
IGVsc2UgeworCQlpZiAoY3J0Yy0+YmFzZS5zdGF0ZS0+YWN0aXZlKQorCQkJcGxhbmUtPmRpc2Fi
bGVfcGxhbmUoJnBsYW5lLT5iYXNlLCAmY3J0Yy0+YmFzZSk7CisKKwkJcGxhbmVfc3RhdGUtPnZp
c2libGUgPSBmYWxzZTsKIAl9CiB9CiAKQEAgLTE1MDg2LDM1ICsxNTA4NCw2IEBAIHN0YXRpYyB2
b2lkIGludGVsX21vZGVzZXRfcmVhZG91dF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2
KQogCQljcnRjLT5iYXNlLnN0YXRlLT5hY3RpdmUgPSBjcnRjLT5hY3RpdmU7CiAJCWNydGMtPmJh
c2UuZW5hYmxlZCA9IGNydGMtPmFjdGl2ZTsKIAotCQltZW1zZXQoJmNydGMtPmJhc2UubW9kZSwg
MCwgc2l6ZW9mKGNydGMtPmJhc2UubW9kZSkpOwotCQlpZiAoY3J0Yy0+YmFzZS5zdGF0ZS0+YWN0
aXZlKSB7Ci0JCQlpbnRlbF9tb2RlX2Zyb21fcGlwZV9jb25maWcoJmNydGMtPmJhc2UubW9kZSwg
Y3J0Yy0+Y29uZmlnKTsKLQkJCWludGVsX21vZGVfZnJvbV9waXBlX2NvbmZpZygmY3J0Yy0+YmFz
ZS5zdGF0ZS0+YWRqdXN0ZWRfbW9kZSwgY3J0Yy0+Y29uZmlnKTsKLQkJCVdBUk5fT04oZHJtX2F0
b21pY19zZXRfbW9kZV9mb3JfY3J0YyhjcnRjLT5iYXNlLnN0YXRlLCAmY3J0Yy0+YmFzZS5tb2Rl
KSk7Ci0KLQkJCS8qCi0JCQkgKiBUaGUgaW5pdGlhbCBtb2RlIG5lZWRzIHRvIGJlIHNldCBpbiBv
cmRlciB0byBrZWVwCi0JCQkgKiB0aGUgYXRvbWljIGNvcmUgaGFwcHkuIEl0IHdhbnRzIGEgdmFs
aWQgbW9kZSBpZiB0aGUKLQkJCSAqIGNydGMncyBlbmFibGVkLCBzbyB3ZSBkbyB0aGUgYWJvdmUg
Y2FsbC4KLQkJCSAqCi0JCQkgKiBBdCB0aGlzIHBvaW50IHNvbWUgc3RhdGUgdXBkYXRlZCBieSB0
aGUgY29ubmVjdG9ycwotCQkJICogaW4gdGhlaXIgLT5kZXRlY3QoKSBjYWxsYmFjayBoYXMgbm90
IHJ1biB5ZXQsIHNvCi0JCQkgKiBubyByZWNhbGN1bGF0aW9uIGNhbiBiZSBkb25lIHlldC4KLQkJ
CSAqCi0JCQkgKiBFdmVuIGlmIHdlIGNvdWxkIGRvIGEgcmVjYWxjdWxhdGlvbiBhbmQgbW9kZXNl
dAotCQkJICogcmlnaHQgbm93IGl0IHdvdWxkIGNhdXNlIGEgZG91YmxlIG1vZGVzZXQgaWYKLQkJ
CSAqIGZiZGV2IG9yIHVzZXJzcGFjZSBjaG9vc2VzIGEgZGlmZmVyZW50IGluaXRpYWwgbW9kZS4K
LQkJCSAqCi0JCQkgKiBJZiB0aGF0IGhhcHBlbnMsIHNvbWVvbmUgaW5kaWNhdGVkIHRoZXkgd2Fu
dGVkIGEKLQkJCSAqIG1vZGUgY2hhbmdlLCB3aGljaCBtZWFucyBpdCdzIHNhZmUgdG8gZG8gYSBm
dWxsCi0JCQkgKiByZWNhbGN1bGF0aW9uLgotCQkJICovCi0JCQljcnRjLT5iYXNlLnN0YXRlLT5t
b2RlLnByaXZhdGVfZmxhZ3MgPSBJOTE1X01PREVfRkxBR19JTkhFUklURUQ7Ci0JCX0KLQotCQlj
cnRjLT5iYXNlLmh3bW9kZSA9IGNydGMtPmNvbmZpZy0+YmFzZS5hZGp1c3RlZF9tb2RlOwotCQly
ZWFkb3V0X3BsYW5lX3N0YXRlKGNydGMsIHRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+YmFzZS5z
dGF0ZSkpOwotCiAJCURSTV9ERUJVR19LTVMoIltDUlRDOiVkXSBodyBzdGF0ZSByZWFkb3V0OiAl
c1xuIiwKIAkJCSAgICAgIGNydGMtPmJhc2UuYmFzZS5pZCwKIAkJCSAgICAgIGNydGMtPmFjdGl2
ZSA/ICJlbmFibGVkIiA6ICJkaXNhYmxlZCIpOwpAQCAtMTUxODQsNiArMTUxNTMsNyBAQCBpbnRl
bF9tb2Rlc2V0X3NldHVwX2h3X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJZW51bSBw
aXBlIHBpcGU7CiAJc3RydWN0IGludGVsX2NydGMgKmNydGM7CiAJc3RydWN0IGludGVsX2VuY29k
ZXIgKmVuY29kZXI7CisJc3RydWN0IGludGVsX3BsYW5lICpwbGFuZTsKIAlpbnQgaTsKIAogCWlu
dGVsX21vZGVzZXRfcmVhZG91dF9od19zdGF0ZShkZXYpOwpAQCAtMTUxOTUsNiArMTUxNjUsNDAg
QEAgaW50ZWxfbW9kZXNldF9zZXR1cF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQog
CiAJZm9yX2VhY2hfcGlwZShkZXZfcHJpdiwgcGlwZSkgewogCQljcnRjID0gdG9faW50ZWxfY3J0
YyhkZXZfcHJpdi0+cGlwZV90b19jcnRjX21hcHBpbmdbcGlwZV0pOworCQljcnRjLT5iYXNlLmh3
bW9kZSA9IGNydGMtPmNvbmZpZy0+YmFzZS5hZGp1c3RlZF9tb2RlOworCQltZW1zZXQoJmNydGMt
PmJhc2UubW9kZSwgMCwgc2l6ZW9mKGNydGMtPmJhc2UubW9kZSkpOworCQlpZiAoY3J0Yy0+YmFz
ZS5zdGF0ZS0+YWN0aXZlKSB7CisJCQlpbnRlbF9tb2RlX2Zyb21fcGlwZV9jb25maWcoJmNydGMt
PmJhc2UubW9kZSwgY3J0Yy0+Y29uZmlnKTsKKwkJCWludGVsX21vZGVfZnJvbV9waXBlX2NvbmZp
ZygmY3J0Yy0+YmFzZS5zdGF0ZS0+YWRqdXN0ZWRfbW9kZSwgY3J0Yy0+Y29uZmlnKTsKKwkJCVdB
Uk5fT04oZHJtX2F0b21pY19zZXRfbW9kZV9mb3JfY3J0YyhjcnRjLT5iYXNlLnN0YXRlLCAmY3J0
Yy0+YmFzZS5tb2RlKSk7CisKKwkJCS8qCisJCQkgKiBUaGUgaW5pdGlhbCBtb2RlIG5lZWRzIHRv
IGJlIHNldCBpbiBvcmRlciB0byBrZWVwCisJCQkgKiB0aGUgYXRvbWljIGNvcmUgaGFwcHkuIEl0
IHdhbnRzIGEgdmFsaWQgbW9kZSBpZiB0aGUKKwkJCSAqIGNydGMncyBlbmFibGVkLCBzbyB3ZSBk
byB0aGUgYWJvdmUgY2FsbC4KKwkJCSAqCisJCQkgKiBBdCB0aGlzIHBvaW50IHNvbWUgc3RhdGUg
dXBkYXRlZCBieSB0aGUgY29ubmVjdG9ycworCQkJICogaW4gdGhlaXIgLT5kZXRlY3QoKSBjYWxs
YmFjayBoYXMgbm90IHJ1biB5ZXQsIHNvCisJCQkgKiBubyByZWNhbGN1bGF0aW9uIGNhbiBiZSBk
b25lIHlldC4KKwkJCSAqCisJCQkgKiBFdmVuIGlmIHdlIGNvdWxkIGRvIGEgcmVjYWxjdWxhdGlv
biBhbmQgbW9kZXNldAorCQkJICogcmlnaHQgbm93IGl0IHdvdWxkIGNhdXNlIGEgZG91YmxlIG1v
ZGVzZXQgaWYKKwkJCSAqIGZiZGV2IG9yIHVzZXJzcGFjZSBjaG9vc2VzIGEgZGlmZmVyZW50IGlu
aXRpYWwgbW9kZS4KKwkJCSAqCisJCQkgKiBJZiB0aGF0IGhhcHBlbnMsIHNvbWVvbmUgaW5kaWNh
dGVkIHRoZXkgd2FudGVkIGEKKwkJCSAqIG1vZGUgY2hhbmdlLCB3aGljaCBtZWFucyBpdCdzIHNh
ZmUgdG8gZG8gYSBmdWxsCisJCQkgKiByZWNhbGN1bGF0aW9uLgorCQkJICovCisJCQljcnRjLT5i
YXNlLnN0YXRlLT5tb2RlLnByaXZhdGVfZmxhZ3MgPSBJOTE1X01PREVfRkxBR19JTkhFUklURUQ7
CisJCX0KKworCQlmb3JfZWFjaF9pbnRlbF9wbGFuZShjcnRjLT5iYXNlLmRldiwgcGxhbmUpIHsK
KwkJCWlmIChjcnRjLT5waXBlICE9IHBsYW5lLT5waXBlKQorCQkJCWNvbnRpbnVlOworCisJCQlp
bnRlbF9zYW5pdGl6ZV9wbGFuZShwbGFuZSk7CisJCX0KKwogCQlpbnRlbF9zYW5pdGl6ZV9jcnRj
KGNydGMpOwogCQlpbnRlbF9kdW1wX3BpcGVfY29uZmlnKGNydGMsIGNydGMtPmNvbmZpZywKIAkJ
CQkgICAgICAgIltzZXR1cF9od19zdGF0ZV0iKTsKCl9fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxp
c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v
bGlzdGluZm8vaW50ZWwtZ2Z4Cg==