From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Francis <David.Francis-5C7GfCeVMHo@public.gmane.org>
Subject: [PATCH 03/14] Revert "drm/amd/display: add global master update lock
 for DCN2"
Date: Mon, 19 Aug 2019 11:50:27 -0400
Message-ID: <20190819155038.1771-4-David.Francis@amd.com>
References: <20190819155038.1771-1-David.Francis@amd.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>
In-Reply-To: <20190819155038.1771-1-David.Francis-5C7GfCeVMHo@public.gmane.org>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/amd-gfx>,
 <mailto:amd-gfx-request-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/amd-gfx>
List-Post: <mailto:amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>
List-Help: <mailto:amd-gfx-request-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/amd-gfx>,
 <mailto:amd-gfx-request-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org?subject=subscribe>
Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Sender: "amd-gfx" <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>
To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Cc: David Francis <David.Francis-5C7GfCeVMHo@public.gmane.org>
List-Id: dri-devel@lists.freedesktop.org

VGhpcyByZXZlcnRzIGNvbW1pdCA1NWE2ZjViYmNmMDBhNDk1NjU5NDZjMGE5YjhjNzE2MzEzZGM2
YzA1LgoKVGhpcyBjb21taXQgd2FzIGFjY2lkZW50YWxseSBwcm9tb3RlZCB0d2ljZQoKU2lnbmVk
LW9mZi1ieTogRGF2aWQgRnJhbmNpcyA8RGF2aWQuRnJhbmNpc0BhbWQuY29tPgpSZXZpZXdlZC1i
eTogUm9tYW4gTGkgPFJvbWFuLkxpQGFtZC5jb20+ClJldmlld2VkLWJ5OiBIYXJyeSBXZW50bGFu
ZCA8aGFycnkud2VudGxhbmRAYW1kLmNvbT4KLS0tCiAuLi4vZHJtL2FtZC9kaXNwbGF5L2RjL2Rj
bjIwL2RjbjIwX2h3c2VxLmMgICAgfCAgNCAtLQogLi4uL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMv
ZGNuMjAvZGNuMjBfb3B0Yy5jIHwgNjMgKy0tLS0tLS0tLS0tLS0tLS0tLQogLi4uL2dwdS9kcm0v
YW1kL2Rpc3BsYXkvZGMvZGNuMjAvZGNuMjBfb3B0Yy5oIHwgIDMgLQogLi4uL2FtZC9kaXNwbGF5
L2RjL2luYy9ody90aW1pbmdfZ2VuZXJhdG9yLmggIHwgIDIgLQogNCBmaWxlcyBjaGFuZ2VkLCAx
IGluc2VydGlvbigrKSwgNzEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv
ZHJtL2FtZC9kaXNwbGF5L2RjL2RjbjIwL2RjbjIwX2h3c2VxLmMgYi9kcml2ZXJzL2dwdS9kcm0v
YW1kL2Rpc3BsYXkvZGMvZGNuMjAvZGNuMjBfaHdzZXEuYwppbmRleCBmYThhNzNmNmM4ZTMuLmUx
NDZkMWQ4ZDQ1ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2Rj
bjIwL2RjbjIwX2h3c2VxLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2Rj
bjIwL2RjbjIwX2h3c2VxLmMKQEAgLTU3NSwxMCArNTc1LDYgQEAgZW51bSBkY19zdGF0dXMgZGNu
MjBfZW5hYmxlX3N0cmVhbV90aW1pbmcoCiAJCQlwaXBlX2N0eC0+c3RyZWFtLT5zaWduYWwsCiAJ
CQl0cnVlKTsKIAotCWlmIChwaXBlX2N0eC0+c3RyZWFtX3Jlcy50Zy0+ZnVuY3MtPnNldHVwX2ds
b2JhbF9sb2NrKQotCQlwaXBlX2N0eC0+c3RyZWFtX3Jlcy50Zy0+ZnVuY3MtPnNldHVwX2dsb2Jh
bF9sb2NrKAotCQkJCXBpcGVfY3R4LT5zdHJlYW1fcmVzLnRnKTsKLQogCWlmIChvZG1fcGlwZSkK
IAkJb2RtX3BpcGUtPnN0cmVhbV9yZXMub3BwLT5mdW5jcy0+b3BwX3BpcGVfY2xvY2tfY29udHJv
bCgKIAkJCQlvZG1fcGlwZS0+c3RyZWFtX3Jlcy5vcHAsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw
dS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNuMjAvZGNuMjBfb3B0Yy5jIGIvZHJpdmVycy9ncHUvZHJt
L2FtZC9kaXNwbGF5L2RjL2RjbjIwL2RjbjIwX29wdGMuYwppbmRleCA5OTA3MGU5MzAyMGIuLjIx
MzdlMmJlMjE0MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2Rj
bjIwL2RjbjIwX29wdGMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNu
MjAvZGNuMjBfb3B0Yy5jCkBAIC0zMzMsNjUgKzMzMyw2IEBAIHZvaWQgb3B0YzJfdHJpcGxlYnVm
ZmVyX3VubG9jayhzdHJ1Y3QgdGltaW5nX2dlbmVyYXRvciAqb3B0YykKIAogfQogCi0KLXZvaWQg
b3B0YzJfc2V0dXBfZ2xvYmFsX2xvY2soc3RydWN0IHRpbWluZ19nZW5lcmF0b3IgKm9wdGMpCi17
Ci0Jc3RydWN0IG9wdGMgKm9wdGMxID0gRENOMTBUR19GUk9NX1RHKG9wdGMpOwotCXVpbnQzMl90
IHZfYmxhbmtfc3RhcnQgPSAwOwotCXVpbnQzMl90IGhfYmxhbmtfc3RhcnQgPSAwLCBoX3RvdGFs
ID0gMDsKLQotCVJFR19TRVQoT1RHX0dMT0JBTF9DT05UUk9MMSwgMCwgTUFTVEVSX1VQREFURV9M
T0NLX0RCX0VOLCAxKTsKLQotCVJFR19TRVQoT1RHX0dMT0JBTF9DT05UUk9MMiwgMCwgRElHX1VQ
REFURV9MT0NBVElPTiwgMjApOwotCi0JUkVHX0dFVChPVEdfVl9CTEFOS19TVEFSVF9FTkQsIE9U
R19WX0JMQU5LX1NUQVJULCAmdl9ibGFua19zdGFydCk7Ci0KLQlSRUdfR0VUKE9UR19IX0JMQU5L
X1NUQVJUX0VORCwgT1RHX0hfQkxBTktfU1RBUlQsICZoX2JsYW5rX3N0YXJ0KTsKLQotCVJFR19H
RVQoT1RHX0hfVE9UQUwsIE9UR19IX1RPVEFMLCAmaF90b3RhbCk7Ci0JUkVHX1VQREFURV8yKE9U
R19HTE9CQUxfQ09OVFJPTDEsCi0JCQlNQVNURVJfVVBEQVRFX0xPQ0tfREJfWCwKLQkJCWhfYmxh
bmtfc3RhcnQgLSAyMDAgLSAxLAotCQkJTUFTVEVSX1VQREFURV9MT0NLX0RCX1ksCi0JCQl2X2Js
YW5rX3N0YXJ0IC0gMSk7Ci19Ci0KLXZvaWQgb3B0YzJfbG9ja19nbG9iYWwoc3RydWN0IHRpbWlu
Z19nZW5lcmF0b3IgKm9wdGMpCi17Ci0Jc3RydWN0IG9wdGMgKm9wdGMxID0gRENOMTBUR19GUk9N
X1RHKG9wdGMpOwotCi0JUkVHX1VQREFURShPVEdfR0xPQkFMX0NPTlRST0wyLCBHTE9CQUxfVVBE
QVRFX0xPQ0tfRU4sIDEpOwotCi0JUkVHX1NFVChPVEdfR0xPQkFMX0NPTlRST0wwLCAwLAotCQkJ
T1RHX01BU1RFUl9VUERBVEVfTE9DS19TRUwsIG9wdGMtPmluc3QpOwotCVJFR19TRVQoT1RHX01B
U1RFUl9VUERBVEVfTE9DSywgMCwKLQkJCU9UR19NQVNURVJfVVBEQVRFX0xPQ0ssIDEpOwotCi0J
LyogU2hvdWxkIGJlIGZhc3QsIHN0YXR1cyBkb2VzIG5vdCB1cGRhdGUgb24gbWF4aW11cyAqLwot
CWlmIChvcHRjLT5jdHgtPmRjZV9lbnZpcm9ubWVudCAhPSBEQ0VfRU5WX0ZQR0FfTUFYSU1VUykK
LQkJUkVHX1dBSVQoT1RHX01BU1RFUl9VUERBVEVfTE9DSywKLQkJCQlVUERBVEVfTE9DS19TVEFU
VVMsIDEsCi0JCQkJMSwgMTApOwotfQotCi12b2lkIG9wdGMyX2xvY2soc3RydWN0IHRpbWluZ19n
ZW5lcmF0b3IgKm9wdGMpCi17Ci0Jc3RydWN0IG9wdGMgKm9wdGMxID0gRENOMTBUR19GUk9NX1RH
KG9wdGMpOwotCi0JUkVHX1VQREFURShPVEdfR0xPQkFMX0NPTlRST0wyLCBHTE9CQUxfVVBEQVRF
X0xPQ0tfRU4sIDApOwotCi0JUkVHX1NFVChPVEdfR0xPQkFMX0NPTlRST0wwLCAwLAotCQkJT1RH
X01BU1RFUl9VUERBVEVfTE9DS19TRUwsIG9wdGMtPmluc3QpOwotCVJFR19TRVQoT1RHX01BU1RF
Ul9VUERBVEVfTE9DSywgMCwKLQkJCU9UR19NQVNURVJfVVBEQVRFX0xPQ0ssIDEpOwotCi0JLyog
U2hvdWxkIGJlIGZhc3QsIHN0YXR1cyBkb2VzIG5vdCB1cGRhdGUgb24gbWF4aW11cyAqLwotCWlm
IChvcHRjLT5jdHgtPmRjZV9lbnZpcm9ubWVudCAhPSBEQ0VfRU5WX0ZQR0FfTUFYSU1VUykKLQkJ
UkVHX1dBSVQoT1RHX01BU1RFUl9VUERBVEVfTE9DSywKLQkJCQlVUERBVEVfTE9DS19TVEFUVVMs
IDEsCi0JCQkJMSwgMTApOwotfQotCiB2b2lkIG9wdGMyX2xvY2tfZG91YmxlYnVmZmVyX2VuYWJs
ZShzdHJ1Y3QgdGltaW5nX2dlbmVyYXRvciAqb3B0YykKIHsKIAlzdHJ1Y3Qgb3B0YyAqb3B0YzEg
PSBEQ04xMFRHX0ZST01fVEcob3B0Yyk7CkBAIC00ODYsMTAgKzQyNyw4IEBAIHN0YXRpYyBzdHJ1
Y3QgdGltaW5nX2dlbmVyYXRvcl9mdW5jcyBkY24yMF90Z19mdW5jcyA9IHsKIAkJLnRyaXBsZWJ1
ZmZlcl9sb2NrID0gb3B0YzJfdHJpcGxlYnVmZmVyX2xvY2ssCiAJCS50cmlwbGVidWZmZXJfdW5s
b2NrID0gb3B0YzJfdHJpcGxlYnVmZmVyX3VubG9jaywKIAkJLmRpc2FibGVfcmVzZXRfdHJpZ2dl
ciA9IG9wdGMxX2Rpc2FibGVfcmVzZXRfdHJpZ2dlciwKLQkJLmxvY2sgPSBvcHRjMl9sb2NrLAor
CQkubG9jayA9IG9wdGMxX2xvY2ssCiAJCS51bmxvY2sgPSBvcHRjMV91bmxvY2ssCi0JCS5sb2Nr
X2dsb2JhbCA9IG9wdGMyX2xvY2tfZ2xvYmFsLAotCQkuc2V0dXBfZ2xvYmFsX2xvY2sgPSBvcHRj
Ml9zZXR1cF9nbG9iYWxfbG9jaywKIAkJLmxvY2tfZG91YmxlYnVmZmVyX2VuYWJsZSA9IG9wdGMy
X2xvY2tfZG91YmxlYnVmZmVyX2VuYWJsZSwKIAkJLmxvY2tfZG91YmxlYnVmZmVyX2Rpc2FibGUg
PSBvcHRjMl9sb2NrX2RvdWJsZWJ1ZmZlcl9kaXNhYmxlLAogCQkuZW5hYmxlX29wdGNfY2xvY2sg
PSBvcHRjMV9lbmFibGVfb3B0Y19jbG9jaywKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9h
bWQvZGlzcGxheS9kYy9kY24yMC9kY24yMF9vcHRjLmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rp
c3BsYXkvZGMvZGNuMjAvZGNuMjBfb3B0Yy5oCmluZGV4IDQ3Y2I0ZGUxNTY0Yy4uMzJhNTg0MzFm
ZDA5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNuMjAvZGNu
MjBfb3B0Yy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY24yMC9kY24y
MF9vcHRjLmgKQEAgLTEwNiw5ICsxMDYsNiBAQCB2b2lkIG9wdGMyX2dldF9vcHRjX3NvdXJjZShz
dHJ1Y3QgdGltaW5nX2dlbmVyYXRvciAqb3B0YywKIAogdm9pZCBvcHRjMl90cmlwbGVidWZmZXJf
bG9jayhzdHJ1Y3QgdGltaW5nX2dlbmVyYXRvciAqb3B0Yyk7CiB2b2lkIG9wdGMyX3RyaXBsZWJ1
ZmZlcl91bmxvY2soc3RydWN0IHRpbWluZ19nZW5lcmF0b3IgKm9wdGMpOwotdm9pZCBvcHRjMl9s
b2NrKHN0cnVjdCB0aW1pbmdfZ2VuZXJhdG9yICpvcHRjKTsKLXZvaWQgb3B0YzJfbG9ja19nbG9i
YWwoc3RydWN0IHRpbWluZ19nZW5lcmF0b3IgKm9wdGMpOwotdm9pZCBvcHRjMl9zZXR1cF9nbG9i
YWxfbG9jayhzdHJ1Y3QgdGltaW5nX2dlbmVyYXRvciAqb3B0Yyk7CiB2b2lkIG9wdGMyX2xvY2tf
ZG91YmxlYnVmZmVyX2Rpc2FibGUoc3RydWN0IHRpbWluZ19nZW5lcmF0b3IgKm9wdGMpOwogdm9p
ZCBvcHRjMl9sb2NrX2RvdWJsZWJ1ZmZlcl9lbmFibGUoc3RydWN0IHRpbWluZ19nZW5lcmF0b3Ig
Km9wdGMpOwogdm9pZCBvcHRjMl9wcm9ncmFtX21hbnVhbF90cmlnZ2VyKHN0cnVjdCB0aW1pbmdf
Z2VuZXJhdG9yICpvcHRjKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxh
eS9kYy9pbmMvaHcvdGltaW5nX2dlbmVyYXRvci5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNw
bGF5L2RjL2luYy9ody90aW1pbmdfZ2VuZXJhdG9yLmgKaW5kZXggZjYwN2VmMjRjNzY2Li5lMDcx
M2Q2ZDZjOGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9pbmMv
aHcvdGltaW5nX2dlbmVyYXRvci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9k
Yy9pbmMvaHcvdGltaW5nX2dlbmVyYXRvci5oCkBAIC0xODksMTAgKzE4OSw4IEBAIHN0cnVjdCB0
aW1pbmdfZ2VuZXJhdG9yX2Z1bmNzIHsKIAlib29sICgqZGlkX3RyaWdnZXJlZF9yZXNldF9vY2N1
cikoc3RydWN0IHRpbWluZ19nZW5lcmF0b3IgKnRnKTsKIAl2b2lkICgqc2V0dXBfZ2xvYmFsX3N3
YXBfbG9jaykoc3RydWN0IHRpbWluZ19nZW5lcmF0b3IgKnRnLAogCQkJCQkJCWNvbnN0IHN0cnVj
dCBkY3BfZ3NsX3BhcmFtcyAqZ3NsX3BhcmFtcyk7Ci0Jdm9pZCAoKnNldHVwX2dsb2JhbF9sb2Nr
KShzdHJ1Y3QgdGltaW5nX2dlbmVyYXRvciAqdGcpOwogCXZvaWQgKCp1bmxvY2spKHN0cnVjdCB0
aW1pbmdfZ2VuZXJhdG9yICp0Zyk7CiAJdm9pZCAoKmxvY2spKHN0cnVjdCB0aW1pbmdfZ2VuZXJh
dG9yICp0Zyk7Ci0Jdm9pZCAoKmxvY2tfZ2xvYmFsKShzdHJ1Y3QgdGltaW5nX2dlbmVyYXRvciAq
dGcpOwogCXZvaWQgKCpsb2NrX2RvdWJsZWJ1ZmZlcl9kaXNhYmxlKShzdHJ1Y3QgdGltaW5nX2dl
bmVyYXRvciAqdGcpOwogCXZvaWQgKCpsb2NrX2RvdWJsZWJ1ZmZlcl9lbmFibGUpKHN0cnVjdCB0
aW1pbmdfZ2VuZXJhdG9yICp0Zyk7CiAjaWYgZGVmaW5lZChDT05GSUdfRFJNX0FNRF9EQ19EQ04y
XzApCi0tIAoyLjE3LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn
Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeA==