From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Francis Subject: [PATCH v3 03/16] Revert "drm/amd/display: add global master update lock for DCN2" Date: Wed, 21 Aug 2019 16:01:16 -0400 Message-ID: <20190821200129.11575-4-David.Francis@amd.com> References: <20190821200129.11575-1-David.Francis@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190821200129.11575-1-David.Francis@amd.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org Cc: David Francis List-Id: amd-gfx.lists.freedesktop.org VGhpcyByZXZlcnRzIGNvbW1pdCA1NWE2ZjViYmNmMDBhNDk1NjU5NDZjMGE5YjhjNzE2MzEzZGM2 YzA1LgoKVGhpcyBjb21taXQgd2FzIGFjY2lkZW50YWxseSBwcm9tb3RlZCB0d2ljZQoKU2lnbmVk LW9mZi1ieTogRGF2aWQgRnJhbmNpcyA8RGF2aWQuRnJhbmNpc0BhbWQuY29tPgpSZXZpZXdlZC1i eTogUm9tYW4gTGkgPFJvbWFuLkxpQGFtZC5jb20+ClJldmlld2VkLWJ5OiBIYXJyeSBXZW50bGFu ZCA8aGFycnkud2VudGxhbmRAYW1kLmNvbT4KUmV2aWV3ZWQtYnk6IE5pY2hvbGFzIEthemxhdXNr YXMgPG5pY2hvbGFzLmthemxhdXNrYXNAYW1kLmNvbT4KLS0tCiAuLi4vZHJtL2FtZC9kaXNwbGF5 L2RjL2RjbjIwL2RjbjIwX2h3c2VxLmMgICAgfCAgNCAtLQogLi4uL2dwdS9kcm0vYW1kL2Rpc3Bs YXkvZGMvZGNuMjAvZGNuMjBfb3B0Yy5jIHwgNjMgKy0tLS0tLS0tLS0tLS0tLS0tLQogLi4uL2dw dS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNuMjAvZGNuMjBfb3B0Yy5oIHwgIDMgLQogLi4uL2FtZC9k aXNwbGF5L2RjL2luYy9ody90aW1pbmdfZ2VuZXJhdG9yLmggIHwgIDIgLQogNCBmaWxlcyBjaGFu Z2VkLCAxIGluc2VydGlvbigrKSwgNzEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjbjIwL2RjbjIwX2h3c2VxLmMgYi9kcml2ZXJzL2dw dS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNuMjAvZGNuMjBfaHdzZXEuYwppbmRleCBmYThhNzNmNmM4 ZTMuLmUxNDZkMWQ4ZDQ1ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5 L2RjL2RjbjIwL2RjbjIwX2h3c2VxLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5 L2RjL2RjbjIwL2RjbjIwX2h3c2VxLmMKQEAgLTU3NSwxMCArNTc1LDYgQEAgZW51bSBkY19zdGF0 dXMgZGNuMjBfZW5hYmxlX3N0cmVhbV90aW1pbmcoCiAJCQlwaXBlX2N0eC0+c3RyZWFtLT5zaWdu YWwsCiAJCQl0cnVlKTsKIAotCWlmIChwaXBlX2N0eC0+c3RyZWFtX3Jlcy50Zy0+ZnVuY3MtPnNl dHVwX2dsb2JhbF9sb2NrKQotCQlwaXBlX2N0eC0+c3RyZWFtX3Jlcy50Zy0+ZnVuY3MtPnNldHVw X2dsb2JhbF9sb2NrKAotCQkJCXBpcGVfY3R4LT5zdHJlYW1fcmVzLnRnKTsKLQogCWlmIChvZG1f cGlwZSkKIAkJb2RtX3BpcGUtPnN0cmVhbV9yZXMub3BwLT5mdW5jcy0+b3BwX3BpcGVfY2xvY2tf Y29udHJvbCgKIAkJCQlvZG1fcGlwZS0+c3RyZWFtX3Jlcy5vcHAsCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNuMjAvZGNuMjBfb3B0Yy5jIGIvZHJpdmVycy9n cHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjbjIwL2RjbjIwX29wdGMuYwppbmRleCA5OTA3MGU5MzAy MGIuLjIxMzdlMmJlMjE0MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5 L2RjL2RjbjIwL2RjbjIwX29wdGMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkv ZGMvZGNuMjAvZGNuMjBfb3B0Yy5jCkBAIC0zMzMsNjUgKzMzMyw2IEBAIHZvaWQgb3B0YzJfdHJp cGxlYnVmZmVyX3VubG9jayhzdHJ1Y3QgdGltaW5nX2dlbmVyYXRvciAqb3B0YykKIAogfQogCi0K LXZvaWQgb3B0YzJfc2V0dXBfZ2xvYmFsX2xvY2soc3RydWN0IHRpbWluZ19nZW5lcmF0b3IgKm9w dGMpCi17Ci0Jc3RydWN0IG9wdGMgKm9wdGMxID0gRENOMTBUR19GUk9NX1RHKG9wdGMpOwotCXVp bnQzMl90IHZfYmxhbmtfc3RhcnQgPSAwOwotCXVpbnQzMl90IGhfYmxhbmtfc3RhcnQgPSAwLCBo X3RvdGFsID0gMDsKLQotCVJFR19TRVQoT1RHX0dMT0JBTF9DT05UUk9MMSwgMCwgTUFTVEVSX1VQ REFURV9MT0NLX0RCX0VOLCAxKTsKLQotCVJFR19TRVQoT1RHX0dMT0JBTF9DT05UUk9MMiwgMCwg RElHX1VQREFURV9MT0NBVElPTiwgMjApOwotCi0JUkVHX0dFVChPVEdfVl9CTEFOS19TVEFSVF9F TkQsIE9UR19WX0JMQU5LX1NUQVJULCAmdl9ibGFua19zdGFydCk7Ci0KLQlSRUdfR0VUKE9UR19I X0JMQU5LX1NUQVJUX0VORCwgT1RHX0hfQkxBTktfU1RBUlQsICZoX2JsYW5rX3N0YXJ0KTsKLQot CVJFR19HRVQoT1RHX0hfVE9UQUwsIE9UR19IX1RPVEFMLCAmaF90b3RhbCk7Ci0JUkVHX1VQREFU RV8yKE9UR19HTE9CQUxfQ09OVFJPTDEsCi0JCQlNQVNURVJfVVBEQVRFX0xPQ0tfREJfWCwKLQkJ CWhfYmxhbmtfc3RhcnQgLSAyMDAgLSAxLAotCQkJTUFTVEVSX1VQREFURV9MT0NLX0RCX1ksCi0J CQl2X2JsYW5rX3N0YXJ0IC0gMSk7Ci19Ci0KLXZvaWQgb3B0YzJfbG9ja19nbG9iYWwoc3RydWN0 IHRpbWluZ19nZW5lcmF0b3IgKm9wdGMpCi17Ci0Jc3RydWN0IG9wdGMgKm9wdGMxID0gRENOMTBU R19GUk9NX1RHKG9wdGMpOwotCi0JUkVHX1VQREFURShPVEdfR0xPQkFMX0NPTlRST0wyLCBHTE9C QUxfVVBEQVRFX0xPQ0tfRU4sIDEpOwotCi0JUkVHX1NFVChPVEdfR0xPQkFMX0NPTlRST0wwLCAw LAotCQkJT1RHX01BU1RFUl9VUERBVEVfTE9DS19TRUwsIG9wdGMtPmluc3QpOwotCVJFR19TRVQo T1RHX01BU1RFUl9VUERBVEVfTE9DSywgMCwKLQkJCU9UR19NQVNURVJfVVBEQVRFX0xPQ0ssIDEp OwotCi0JLyogU2hvdWxkIGJlIGZhc3QsIHN0YXR1cyBkb2VzIG5vdCB1cGRhdGUgb24gbWF4aW11 cyAqLwotCWlmIChvcHRjLT5jdHgtPmRjZV9lbnZpcm9ubWVudCAhPSBEQ0VfRU5WX0ZQR0FfTUFY SU1VUykKLQkJUkVHX1dBSVQoT1RHX01BU1RFUl9VUERBVEVfTE9DSywKLQkJCQlVUERBVEVfTE9D S19TVEFUVVMsIDEsCi0JCQkJMSwgMTApOwotfQotCi12b2lkIG9wdGMyX2xvY2soc3RydWN0IHRp bWluZ19nZW5lcmF0b3IgKm9wdGMpCi17Ci0Jc3RydWN0IG9wdGMgKm9wdGMxID0gRENOMTBUR19G Uk9NX1RHKG9wdGMpOwotCi0JUkVHX1VQREFURShPVEdfR0xPQkFMX0NPTlRST0wyLCBHTE9CQUxf VVBEQVRFX0xPQ0tfRU4sIDApOwotCi0JUkVHX1NFVChPVEdfR0xPQkFMX0NPTlRST0wwLCAwLAot CQkJT1RHX01BU1RFUl9VUERBVEVfTE9DS19TRUwsIG9wdGMtPmluc3QpOwotCVJFR19TRVQoT1RH X01BU1RFUl9VUERBVEVfTE9DSywgMCwKLQkJCU9UR19NQVNURVJfVVBEQVRFX0xPQ0ssIDEpOwot Ci0JLyogU2hvdWxkIGJlIGZhc3QsIHN0YXR1cyBkb2VzIG5vdCB1cGRhdGUgb24gbWF4aW11cyAq LwotCWlmIChvcHRjLT5jdHgtPmRjZV9lbnZpcm9ubWVudCAhPSBEQ0VfRU5WX0ZQR0FfTUFYSU1V UykKLQkJUkVHX1dBSVQoT1RHX01BU1RFUl9VUERBVEVfTE9DSywKLQkJCQlVUERBVEVfTE9DS19T VEFUVVMsIDEsCi0JCQkJMSwgMTApOwotfQotCiB2b2lkIG9wdGMyX2xvY2tfZG91YmxlYnVmZmVy X2VuYWJsZShzdHJ1Y3QgdGltaW5nX2dlbmVyYXRvciAqb3B0YykKIHsKIAlzdHJ1Y3Qgb3B0YyAq b3B0YzEgPSBEQ04xMFRHX0ZST01fVEcob3B0Yyk7CkBAIC00ODYsMTAgKzQyNyw4IEBAIHN0YXRp YyBzdHJ1Y3QgdGltaW5nX2dlbmVyYXRvcl9mdW5jcyBkY24yMF90Z19mdW5jcyA9IHsKIAkJLnRy aXBsZWJ1ZmZlcl9sb2NrID0gb3B0YzJfdHJpcGxlYnVmZmVyX2xvY2ssCiAJCS50cmlwbGVidWZm ZXJfdW5sb2NrID0gb3B0YzJfdHJpcGxlYnVmZmVyX3VubG9jaywKIAkJLmRpc2FibGVfcmVzZXRf dHJpZ2dlciA9IG9wdGMxX2Rpc2FibGVfcmVzZXRfdHJpZ2dlciwKLQkJLmxvY2sgPSBvcHRjMl9s b2NrLAorCQkubG9jayA9IG9wdGMxX2xvY2ssCiAJCS51bmxvY2sgPSBvcHRjMV91bmxvY2ssCi0J CS5sb2NrX2dsb2JhbCA9IG9wdGMyX2xvY2tfZ2xvYmFsLAotCQkuc2V0dXBfZ2xvYmFsX2xvY2sg PSBvcHRjMl9zZXR1cF9nbG9iYWxfbG9jaywKIAkJLmxvY2tfZG91YmxlYnVmZmVyX2VuYWJsZSA9 IG9wdGMyX2xvY2tfZG91YmxlYnVmZmVyX2VuYWJsZSwKIAkJLmxvY2tfZG91YmxlYnVmZmVyX2Rp c2FibGUgPSBvcHRjMl9sb2NrX2RvdWJsZWJ1ZmZlcl9kaXNhYmxlLAogCQkuZW5hYmxlX29wdGNf Y2xvY2sgPSBvcHRjMV9lbmFibGVfb3B0Y19jbG9jaywKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9hbWQvZGlzcGxheS9kYy9kY24yMC9kY24yMF9vcHRjLmggYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2Rpc3BsYXkvZGMvZGNuMjAvZGNuMjBfb3B0Yy5oCmluZGV4IDQ3Y2I0ZGUxNTY0Yy4uMzJh NTg0MzFmZDA5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNu MjAvZGNuMjBfb3B0Yy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY24y MC9kY24yMF9vcHRjLmgKQEAgLTEwNiw5ICsxMDYsNiBAQCB2b2lkIG9wdGMyX2dldF9vcHRjX3Nv dXJjZShzdHJ1Y3QgdGltaW5nX2dlbmVyYXRvciAqb3B0YywKIAogdm9pZCBvcHRjMl90cmlwbGVi dWZmZXJfbG9jayhzdHJ1Y3QgdGltaW5nX2dlbmVyYXRvciAqb3B0Yyk7CiB2b2lkIG9wdGMyX3Ry aXBsZWJ1ZmZlcl91bmxvY2soc3RydWN0IHRpbWluZ19nZW5lcmF0b3IgKm9wdGMpOwotdm9pZCBv cHRjMl9sb2NrKHN0cnVjdCB0aW1pbmdfZ2VuZXJhdG9yICpvcHRjKTsKLXZvaWQgb3B0YzJfbG9j a19nbG9iYWwoc3RydWN0IHRpbWluZ19nZW5lcmF0b3IgKm9wdGMpOwotdm9pZCBvcHRjMl9zZXR1 cF9nbG9iYWxfbG9jayhzdHJ1Y3QgdGltaW5nX2dlbmVyYXRvciAqb3B0Yyk7CiB2b2lkIG9wdGMy X2xvY2tfZG91YmxlYnVmZmVyX2Rpc2FibGUoc3RydWN0IHRpbWluZ19nZW5lcmF0b3IgKm9wdGMp Owogdm9pZCBvcHRjMl9sb2NrX2RvdWJsZWJ1ZmZlcl9lbmFibGUoc3RydWN0IHRpbWluZ19nZW5l cmF0b3IgKm9wdGMpOwogdm9pZCBvcHRjMl9wcm9ncmFtX21hbnVhbF90cmlnZ2VyKHN0cnVjdCB0 aW1pbmdfZ2VuZXJhdG9yICpvcHRjKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQv ZGlzcGxheS9kYy9pbmMvaHcvdGltaW5nX2dlbmVyYXRvci5oIGIvZHJpdmVycy9ncHUvZHJtL2Ft ZC9kaXNwbGF5L2RjL2luYy9ody90aW1pbmdfZ2VuZXJhdG9yLmgKaW5kZXggZjYwN2VmMjRjNzY2 Li5lMDcxM2Q2ZDZjOGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9k Yy9pbmMvaHcvdGltaW5nX2dlbmVyYXRvci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlz cGxheS9kYy9pbmMvaHcvdGltaW5nX2dlbmVyYXRvci5oCkBAIC0xODksMTAgKzE4OSw4IEBAIHN0 cnVjdCB0aW1pbmdfZ2VuZXJhdG9yX2Z1bmNzIHsKIAlib29sICgqZGlkX3RyaWdnZXJlZF9yZXNl dF9vY2N1cikoc3RydWN0IHRpbWluZ19nZW5lcmF0b3IgKnRnKTsKIAl2b2lkICgqc2V0dXBfZ2xv YmFsX3N3YXBfbG9jaykoc3RydWN0IHRpbWluZ19nZW5lcmF0b3IgKnRnLAogCQkJCQkJCWNvbnN0 IHN0cnVjdCBkY3BfZ3NsX3BhcmFtcyAqZ3NsX3BhcmFtcyk7Ci0Jdm9pZCAoKnNldHVwX2dsb2Jh bF9sb2NrKShzdHJ1Y3QgdGltaW5nX2dlbmVyYXRvciAqdGcpOwogCXZvaWQgKCp1bmxvY2spKHN0 cnVjdCB0aW1pbmdfZ2VuZXJhdG9yICp0Zyk7CiAJdm9pZCAoKmxvY2spKHN0cnVjdCB0aW1pbmdf Z2VuZXJhdG9yICp0Zyk7Ci0Jdm9pZCAoKmxvY2tfZ2xvYmFsKShzdHJ1Y3QgdGltaW5nX2dlbmVy YXRvciAqdGcpOwogCXZvaWQgKCpsb2NrX2RvdWJsZWJ1ZmZlcl9kaXNhYmxlKShzdHJ1Y3QgdGlt aW5nX2dlbmVyYXRvciAqdGcpOwogCXZvaWQgKCpsb2NrX2RvdWJsZWJ1ZmZlcl9lbmFibGUpKHN0 cnVjdCB0aW1pbmdfZ2VuZXJhdG9yICp0Zyk7CiAjaWYgZGVmaW5lZChDT05GSUdfRFJNX0FNRF9E Q19EQ04yXzApCi0tIAoyLjE3LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2RyaS1kZXZlbA==