From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH 3/5] drm/i915: Call i915_pipe_update_start with
 uncore.lock held.
Date: Fri,  9 Feb 2018 10:54:02 +0100
Message-ID: <20180209095404.76418-4-maarten.lankhorst@linux.intel.com>
References: <20180209095404.76418-1-maarten.lankhorst@linux.intel.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 mblankhorst.nl (mblankhorst.nl
 [IPv6:2a02:2308::216:3eff:fe92:dfa3])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 92F4B6E7A3
 for <intel-gfx@lists.freedesktop.org>; Fri,  9 Feb 2018 09:54:57 +0000 (UTC)
In-Reply-To: <20180209095404.76418-1-maarten.lankhorst@linux.intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://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: <https://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: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

VGhpcyByZXF1aXJlcyBiZWluZyBhYmxlIHRvIHJlYWQgdGhlIHZibGFuayBjb3VudGVyIHdpdGgg
dGhlCnVuY29yZS5sb2NrIGFscmVhZHkgaGVsZC4gVGhpcyBpcyBhbHNvIGEgcHJlcGFyYXRpb24g
Zm9yCmJlaW5nIGFibGUgdG8gcnVuIHRoZSBlbnRpcmUgdmJsYW5rIHVwZGF0ZSBzZXF1ZW5jZSB3
aXRoCnRoZSB1bmNvcmUgbG9jayBoZWxkLgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9y
c3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9k
cm0vaTkxNS9pOTE1X2lycS5jICAgICB8IDY2ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysr
Ky0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfdHJhY2UuaCAgIHwgIDUgKystCiBk
cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICB8ICAxICsKIGRyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX3Nwcml0ZS5jIHwgIDMgKy0KIDQgZmlsZXMgY2hhbmdlZCwgNjAgaW5zZXJ0
aW9ucygrKSwgMTUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaTkxNV9pcnEuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKaW5kZXggZWRh
OTU0M2EwMTk5Li42YzQ5MWU2M2UwN2MgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2k5MTVfaXJxLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwpAQCAtNzM2
LDEzICs3MzYsMTIgQEAgc3RhdGljIHZvaWQgaTkxNV9lbmFibGVfYXNsZV9waXBlc3RhdChzdHJ1
Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAvKiBDYWxsZWQgZnJvbSBkcm0gZ2VuZXJp
YyBjb2RlLCBwYXNzZWQgYSAnY3J0YycsIHdoaWNoCiAgKiB3ZSB1c2UgYXMgYSBwaXBlIGluZGV4
CiAgKi8KLXN0YXRpYyB1MzIgaTkxNV9nZXRfdmJsYW5rX2NvdW50ZXIoc3RydWN0IGRybV9kZXZp
Y2UgKmRldiwgdW5zaWduZWQgaW50IHBpcGUpCitzdGF0aWMgdTMyIF9faTkxNV9nZXRfdmJsYW5r
X2NvdW50ZXIoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3By
aXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl
ICpkZXZfcHJpdiA9IHRvX2k5MTUoY3J0Yy0+YmFzZS5kZXYpOwogCWk5MTVfcmVnX3QgaGlnaF9m
cmFtZSwgbG93X2ZyYW1lOwogCXUzMiBoaWdoMSwgaGlnaDIsIGxvdywgcGl4ZWwsIHZibF9zdGFy
dCwgaHN5bmNfc3RhcnQsIGh0b3RhbDsKLQljb25zdCBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAq
bW9kZSA9ICZkZXYtPnZibGFua1twaXBlXS5od21vZGU7Ci0JdW5zaWduZWQgbG9uZyBpcnFmbGFn
czsKKwljb25zdCBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZSA9ICZjcnRjLT5iYXNlLmRl
di0+dmJsYW5rW2NydGMtPnBpcGVdLmh3bW9kZTsKIAogCWh0b3RhbCA9IG1vZGUtPmNydGNfaHRv
dGFsOwogCWhzeW5jX3N0YXJ0ID0gbW9kZS0+Y3J0Y19oc3luY19zdGFydDsKQEAgLTc1NiwxMCAr
NzU1LDggQEAgc3RhdGljIHUzMiBpOTE1X2dldF92YmxhbmtfY291bnRlcihzdHJ1Y3QgZHJtX2Rl
dmljZSAqZGV2LCB1bnNpZ25lZCBpbnQgcGlwZSkKIAkvKiBTdGFydCBvZiB2YmxhbmsgZXZlbnQg
b2NjdXJzIGF0IHN0YXJ0IG9mIGhzeW5jICovCiAJdmJsX3N0YXJ0IC09IGh0b3RhbCAtIGhzeW5j
X3N0YXJ0OwogCi0JaGlnaF9mcmFtZSA9IFBJUEVGUkFNRShwaXBlKTsKLQlsb3dfZnJhbWUgPSBQ
SVBFRlJBTUVQSVhFTChwaXBlKTsKLQotCXNwaW5fbG9ja19pcnFzYXZlKCZkZXZfcHJpdi0+dW5j
b3JlLmxvY2ssIGlycWZsYWdzKTsKKwloaWdoX2ZyYW1lID0gUElQRUZSQU1FKGNydGMtPnBpcGUp
OworCWxvd19mcmFtZSA9IFBJUEVGUkFNRVBJWEVMKGNydGMtPnBpcGUpOwogCiAJLyoKIAkgKiBI
aWdoICYgbG93IHJlZ2lzdGVyIGZpZWxkcyBhcmVuJ3Qgc3luY2hyb25pemVkLCBzbyBtYWtlIHN1
cmUKQEAgLTc3Miw4ICs3NjksNiBAQCBzdGF0aWMgdTMyIGk5MTVfZ2V0X3ZibGFua19jb3VudGVy
KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIGludCBwaXBlKQogCQloaWdoMiA9IEk5
MTVfUkVBRF9GVyhoaWdoX2ZyYW1lKSAmIFBJUEVfRlJBTUVfSElHSF9NQVNLOwogCX0gd2hpbGUg
KGhpZ2gxICE9IGhpZ2gyKTsKIAotCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmRldl9wcml2LT51
bmNvcmUubG9jaywgaXJxZmxhZ3MpOwotCiAJaGlnaDEgPj49IFBJUEVfRlJBTUVfSElHSF9TSElG
VDsKIAlwaXhlbCA9IGxvdyAmIFBJUEVfUElYRUxfTUFTSzsKIAlsb3cgPj49IFBJUEVfRlJBTUVf
TE9XX1NISUZUOwpAQCAtNzg2LDExICs3ODEsNjAgQEAgc3RhdGljIHUzMiBpOTE1X2dldF92Ymxh
bmtfY291bnRlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1bnNpZ25lZCBpbnQgcGlwZSkKIAly
ZXR1cm4gKCgoaGlnaDEgPDwgOCkgfCBsb3cpICsgKHBpeGVsID49IHZibF9zdGFydCkpICYgMHhm
ZmZmZmY7CiB9CiAKK3N0YXRpYyB1MzIgaTkxNV9nZXRfdmJsYW5rX2NvdW50ZXIoc3RydWN0IGRy
bV9kZXZpY2UgKmRldiwgdW5zaWduZWQgaW50IHBpcGUpCit7CisJc3RydWN0IGRybV9pOTE1X3By
aXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOworCXVuc2lnbmVkIGxvbmcgaXJxZmxhZ3M7
CisJdTMyIHJldDsKKworCXNwaW5fbG9ja19pcnFzYXZlKCZkZXZfcHJpdi0+dW5jb3JlLmxvY2ss
IGlycWZsYWdzKTsKKwlyZXQgPSBpOTE1X2dldF92YmxhbmtfY291bnRlcihkZXYsIHBpcGUpOwor
CXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmRldl9wcml2LT51bmNvcmUubG9jaywgaXJxZmxhZ3Mp
OworCisJcmV0dXJuIHJldDsKK30KKworc3RhdGljIHUzMiBfX2c0eF9nZXRfdmJsYW5rX2NvdW50
ZXIoc3RydWN0IGludGVsX2NydGMgKmNydGMpCit7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg
KmRldl9wcml2ID0gdG9faTkxNShjcnRjLT5iYXNlLmRldik7CisKKwlyZXR1cm4gSTkxNV9SRUFE
X0ZXKFBJUEVfRlJNQ09VTlRfRzRYKGNydGMtPnBpcGUpKTsKK30KKwogc3RhdGljIHUzMiBnNHhf
Z2V0X3ZibGFua19jb3VudGVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIGludCBw
aXBlKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2
KTsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YyA9IGludGVsX2dldF9jcnRjX2Zvcl9waXBlKGRl
dl9wcml2LCBwaXBlKTsKKwl1bnNpZ25lZCBsb25nIGlycWZsYWdzOworCXUzMiByZXQ7CisKKwlz
cGluX2xvY2tfaXJxc2F2ZSgmZGV2X3ByaXYtPnVuY29yZS5sb2NrLCBpcnFmbGFncyk7CisJcmV0
ID0gX19nNHhfZ2V0X3ZibGFua19jb3VudGVyKGNydGMpOworCXNwaW5fdW5sb2NrX2lycXJlc3Rv
cmUoJmRldl9wcml2LT51bmNvcmUubG9jaywgaXJxZmxhZ3MpOworCisJcmV0dXJuIHJldDsKK30K
KwordTMyIF9faW50ZWxfY3J0Y19nZXRfdmJsYW5rX2NvdW50ZXIoc3RydWN0IGludGVsX2NydGMg
KmNydGMpCit7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShj
cnRjLT5iYXNlLmRldik7CisKKwlpZiAoSVNfRzRYKGRldl9wcml2KSB8fCBJTlRFTF9HRU4oZGV2
X3ByaXYpID49IDUpCisJCXJldHVybiBfX2c0eF9nZXRfdmJsYW5rX2NvdW50ZXIoY3J0Yyk7CisJ
ZWxzZSBpZiAoSVNfR0VOMihkZXZfcHJpdikpCisJCXJldHVybiAwOworCWVsc2UKKwkJcmV0dXJu
IF9faTkxNV9nZXRfdmJsYW5rX2NvdW50ZXIoY3J0Yyk7Cit9CisKK3UzMiBpbnRlbF9jcnRjX2dl
dF92YmxhbmtfY291bnRlcihzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKK3sKKwlzdHJ1Y3QgZHJt
X2RldmljZSAqZGV2ID0gY3J0Yy0+YmFzZS5kZXY7CisKKwlpZiAoIWRldi0+bWF4X3ZibGFua19j
b3VudCkKKwkJcmV0dXJuIGRybV9jcnRjX2FjY3VyYXRlX3ZibGFua19jb3VudCgmY3J0Yy0+YmFz
ZSk7CiAKLQlyZXR1cm4gSTkxNV9SRUFEKFBJUEVfRlJNQ09VTlRfRzRYKHBpcGUpKTsKKwlyZXR1
cm4gZGV2LT5kcml2ZXItPmdldF92YmxhbmtfY291bnRlcihkZXYsIGNydGMtPnBpcGUpOwogfQog
CiAvKgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV90cmFjZS5oIGIvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaTkxNV90cmFjZS5oCmluZGV4IGUxMTY5YzAyZWIyYi4uZDRhNTc3
NjI4MmZmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3RyYWNlLmgKKysr
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV90cmFjZS5oCkBAIC0yODAsOSArMjgwLDggQEAg
VFJBQ0VfRVZFTlQoaTkxNV9waXBlX3VwZGF0ZV9zdGFydCwKIAogCSAgICBUUF9mYXN0X2Fzc2ln
bigKIAkJCSAgIF9fZW50cnktPnBpcGUgPSBjcnRjLT5waXBlOwotCQkJICAgX19lbnRyeS0+ZnJh
bWUgPSBjcnRjLT5iYXNlLmRldi0+ZHJpdmVyLT5nZXRfdmJsYW5rX2NvdW50ZXIoY3J0Yy0+YmFz
ZS5kZXYsCi0JCQkJCQkJCQkJICAgICAgIGNydGMtPnBpcGUpOwotCQkJICAgX19lbnRyeS0+c2Nh
bmxpbmUgPSBpbnRlbF9nZXRfY3J0Y19zY2FubGluZShjcnRjKTsKKwkJCSAgIF9fZW50cnktPmZy
YW1lID0gX19pbnRlbF9jcnRjX2dldF92YmxhbmtfY291bnRlcihjcnRjKTsKKwkJCSAgIF9fZW50
cnktPnNjYW5saW5lID0gX19pbnRlbF9nZXRfY3J0Y19zY2FubGluZShjcnRjKTsKIAkJCSAgIF9f
ZW50cnktPm1pbiA9IGNydGMtPmRlYnVnLm1pbl92Ymw7CiAJCQkgICBfX2VudHJ5LT5tYXggPSBj
cnRjLT5kZWJ1Zy5tYXhfdmJsOwogCQkJICAgKSwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5k
ZXggZmJkYmJlNzQxYjJmLi4wNDhmY2QzYzk2MGUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5o
CkBAIC0xNDg5LDYgKzE0ODksNyBAQCBpbnRlbF93YWl0X2Zvcl92YmxhbmtfaWZfYWN0aXZlKHN0
cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgaW50IHBpcGUpCiB9CiAKIHUzMiBpbnRl
bF9jcnRjX2dldF92YmxhbmtfY291bnRlcihzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0Yyk7Cit1MzIg
X19pbnRlbF9jcnRjX2dldF92YmxhbmtfY291bnRlcihzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0Yyk7
CiAKIGludCBpcm9ubGFrZV9nZXRfbGFuZXNfcmVxdWlyZWQoaW50IHRhcmdldF9jbG9jaywgaW50
IGxpbmtfYncsIGludCBicHApOwogdm9pZCB2bHZfd2FpdF9wb3J0X3JlYWR5KHN0cnVjdCBkcm1f
aTkxNV9wcml2YXRlICpkZXZfcHJpdiwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX3Nwcml0ZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKaW5k
ZXggM2EzNGJlNGZkOTU2Li45NWYwOTk5ZWExOGEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nw
cml0ZS5jCkBAIC0xMTcsOSArMTE3LDEwIEBAIHZvaWQgaW50ZWxfcGlwZV91cGRhdGVfc3RhcnQo
Y29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm5ld19jcnRjX3N0YXRlKQogCiAJY3J0Yy0+
ZGVidWcubWluX3ZibCA9IG1pbjsKIAljcnRjLT5kZWJ1Zy5tYXhfdmJsID0gbWF4OwotCXRyYWNl
X2k5MTVfcGlwZV91cGRhdGVfc3RhcnQoY3J0Yyk7CiAKIAlzcGluX2xvY2soJmRldl9wcml2LT51
bmNvcmUubG9jayk7CisJdHJhY2VfaTkxNV9waXBlX3VwZGF0ZV9zdGFydChjcnRjKTsKKwogCWZv
ciAoOzspIHsKIAkJLyoKIAkJICogcHJlcGFyZV90b193YWl0KCkgaGFzIGEgbWVtb3J5IGJhcnJp
ZXIsIHdoaWNoIGd1YXJhbnRlZXMKLS0gCjIuMTYuMQoKX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA
bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt
YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==