From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH 2/8] drm/i915: Differentiate between ggtt->mutex
 and ppgtt->mutex
Date: Mon, 14 Jan 2019 21:04:02 +0000
Message-ID: <20190114210408.4561-3-chris@chris-wilson.co.uk>
References: <20190114210408.4561-1-chris@chris-wilson.co.uk>
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 fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 5A3846EB3F
 for <intel-gfx@lists.freedesktop.org>; Mon, 14 Jan 2019 21:06:03 +0000 (UTC)
In-Reply-To: <20190114210408.4561-1-chris@chris-wilson.co.uk>
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
Cc: mika.kuoppala@intel.com
List-Id: intel-gfx@lists.freedesktop.org

V2UgaGF2ZSB0d28gY2xhc3NlcyBvZiBWTSwgZ2xvYmFsIEdUVCBhbmQgcGVyLXByb2Nlc3MgR1RU
LiBJbiBvcmRlciB0bwphbGxvdyBvdXJzZWx2ZXMgdGhlIGZyZWVkb20gdG8gbWl4IGJvdGggYWxv
bmcgY2FsbCBjaGFpbnMsIGRpc3Rpbmd1aXNoCnRoZSB0d28gY2xhc3NlcyB3aXRoIHJlZ2FyZHMg
dG8gdGhlaXIgbXV0ZXggYW5kIGxvY2tkZXAgbWFwcy4KClNpZ25lZC1vZmYtYnk6IENocmlzIFdp
bHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpSZXZpZXdlZC1ieTogVHZydGtvIFVyc3Vs
aW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p
OTE1X2dlbV9ndHQuYyAgICAgICB8IDEwICsrKysrLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1
L2k5MTVfZ2VtX2d0dC5oICAgICAgIHwgIDIgKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0
ZXN0cy9tb2NrX2d0dC5jIHwgIDYgKysrLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDEwIGluc2VydGlv
bnMoKyksIDggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aTkxNV9nZW1fZ3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRl
eCBkYmVhMTRiZjY3Y2MuLjc0ZTZkMDJkY2JiZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f
Z3R0LmMKQEAgLTQ3Myw4ICs0NzMsNyBAQCBzdGF0aWMgdm9pZCB2bV9mcmVlX3BhZ2Uoc3RydWN0
IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sIHN0cnVjdCBwYWdlICpwYWdlKQogCXNwaW5fdW5sb2Nr
KCZ2bS0+ZnJlZV9wYWdlcy5sb2NrKTsKIH0KIAotc3RhdGljIHZvaWQgaTkxNV9hZGRyZXNzX3Nw
YWNlX2luaXQoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCi0JCQkJICAgIHN0cnVjdCBk
cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK3N0YXRpYyB2b2lkIGk5MTVfYWRkcmVzc19zcGFj
ZV9pbml0KHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLCBpbnQgc3ViY2xhc3MpCiB7CiAJ
LyoKIAkgKiBUaGUgdm0tPm11dGV4IG11c3QgYmUgcmVjbGFpbSBzYWZlIChmb3IgdXNlIGluIHRo
ZSBzaHJpbmtlcikuCkBAIC00ODIsNiArNDgxLDcgQEAgc3RhdGljIHZvaWQgaTkxNV9hZGRyZXNz
X3NwYWNlX2luaXQoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJICogYXR0ZW1wdCBo
b2xkaW5nIHRoZSBsb2NrIGlzIGltbWVkaWF0ZWx5IHJlcG9ydGVkIGJ5IGxvY2tkZXAuCiAJICov
CiAJbXV0ZXhfaW5pdCgmdm0tPm11dGV4KTsKKwlsb2NrZGVwX3NldF9zdWJjbGFzcygmdm0tPm11
dGV4LCBzdWJjbGFzcyk7CiAJaTkxNV9nZW1fc2hyaW5rZXJfdGFpbnRzX211dGV4KHZtLT5pOTE1
LCAmdm0tPm11dGV4KTsKIAogCUdFTV9CVUdfT04oIXZtLT50b3RhbCk7CkBAIC0xNTQ3LDcgKzE1
NDcsNyBAQCBzdGF0aWMgc3RydWN0IGk5MTVfaHdfcHBndHQgKmdlbjhfcHBndHRfY3JlYXRlKHN0
cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQogCS8qIEZyb20gYmR3LCB0aGVyZSBpcyBzdXBw
b3J0IGZvciByZWFkLW9ubHkgcGFnZXMgaW4gdGhlIFBQR1RULiAqLwogCXBwZ3R0LT52bS5oYXNf
cmVhZF9vbmx5ID0gdHJ1ZTsKIAotCWk5MTVfYWRkcmVzc19zcGFjZV9pbml0KCZwcGd0dC0+dm0s
IGk5MTUpOworCWk5MTVfYWRkcmVzc19zcGFjZV9pbml0KCZwcGd0dC0+dm0sIFZNX0NMQVNTX1BQ
R1RUKTsKIAogCS8qIFRoZXJlIGFyZSBvbmx5IGZldyBleGNlcHRpb25zIGZvciBnZW4gPj02LiBj
aHYgYW5kIGJ4dC4KIAkgKiBBbmQgd2UgYXJlIG5vdCBzdXJlIGFib3V0IHRoZSBsYXR0ZXIgc28g
cGxheSBzYWZlIGZvciBub3cuCkBAIC0xOTk2LDcgKzE5OTYsNyBAQCBzdGF0aWMgc3RydWN0IGk5
MTVfaHdfcHBndHQgKmdlbjZfcHBndHRfY3JlYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpp
OTE1KQogCiAJcHBndHQtPmJhc2Uudm0udG90YWwgPSBJOTE1X1BERVMgKiBHRU42X1BURVMgKiBJ
OTE1X0dUVF9QQUdFX1NJWkU7CiAKLQlpOTE1X2FkZHJlc3Nfc3BhY2VfaW5pdCgmcHBndHQtPmJh
c2Uudm0sIGk5MTUpOworCWk5MTVfYWRkcmVzc19zcGFjZV9pbml0KCZwcGd0dC0+YmFzZS52bSwg
Vk1fQ0xBU1NfUFBHVFQpOwogCiAJcHBndHQtPmJhc2Uudm0uYWxsb2NhdGVfdmFfcmFuZ2UgPSBn
ZW42X2FsbG9jX3ZhX3JhbmdlOwogCXBwZ3R0LT5iYXNlLnZtLmNsZWFyX3JhbmdlID0gZ2VuNl9w
cGd0dF9jbGVhcl9yYW5nZTsKQEAgLTM0MzMsNyArMzQzMyw3IEBAIGludCBpOTE1X2dndHRfaW5p
dF9odyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJICogYW5kIGJleW9uZCB0
aGUgZW5kIG9mIHRoZSBHVFQgaWYgd2UgZG8gbm90IHByb3ZpZGUgYSBndWFyZC4KIAkgKi8KIAlt
dXRleF9sb2NrKCZkZXZfcHJpdi0+ZHJtLnN0cnVjdF9tdXRleCk7Ci0JaTkxNV9hZGRyZXNzX3Nw
YWNlX2luaXQoJmdndHQtPnZtLCBkZXZfcHJpdik7CisJaTkxNV9hZGRyZXNzX3NwYWNlX2luaXQo
JmdndHQtPnZtLCBWTV9DTEFTU19HR1RUKTsKIAogCWdndHQtPnZtLmlzX2dndHQgPSB0cnVlOwog
CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaCBiL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCmluZGV4IGUyMzYwZjE2NDI3YS4uOTIyOWIw
M2Q2MjliIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAor
KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaApAQCAtMjg4LDYgKzI4OCw4
IEBAIHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgewogCWJvb2wgY2xvc2VkOwogCiAJc3RydWN0
IG11dGV4IG11dGV4OyAvKiBwcm90ZWN0cyB2bWEgYW5kIG91ciBsaXN0cyAqLworI2RlZmluZSBW
TV9DTEFTU19HR1RUIDAKKyNkZWZpbmUgVk1fQ0xBU1NfUFBHVFQgMQogCiAJdTY0IHNjcmF0Y2hf
cHRlOwogCXN0cnVjdCBpOTE1X3BhZ2VfZG1hIHNjcmF0Y2hfcGFnZTsKZGlmZiAtLWdpdCBhL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9tb2NrX2d0dC5jIGIvZHJpdmVycy9ncHUvZHJt
L2k5MTUvc2VsZnRlc3RzL21vY2tfZ3R0LmMKaW5kZXggNmFlNDE4Yzc2MDE1Li45NzZjODYyYjM4
NDIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9tb2NrX2d0dC5j
CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9tb2NrX2d0dC5jCkBAIC03MCw3
ICs3MCw3IEBAIG1vY2tfcHBndHQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsCiAJcHBn
dHQtPnZtLnRvdGFsID0gcm91bmRfZG93bihVNjRfTUFYLCBQQUdFX1NJWkUpOwogCXBwZ3R0LT52
bS5maWxlID0gRVJSX1BUUigtRU5PREVWKTsKIAotCWk5MTVfYWRkcmVzc19zcGFjZV9pbml0KCZw
cGd0dC0+dm0sIGk5MTUpOworCWk5MTVfYWRkcmVzc19zcGFjZV9pbml0KCZwcGd0dC0+dm0sIFZN
X0NMQVNTX1BQR1RUKTsKIAogCXBwZ3R0LT52bS5jbGVhcl9yYW5nZSA9IG5vcF9jbGVhcl9yYW5n
ZTsKIAlwcGd0dC0+dm0uaW5zZXJ0X3BhZ2UgPSBtb2NrX2luc2VydF9wYWdlOwpAQCAtMTAyLDYg
KzEwMiw3IEBAIHZvaWQgbW9ja19pbml0X2dndHQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5
MTUpCiAJc3RydWN0IGk5MTVfZ2d0dCAqZ2d0dCA9ICZpOTE1LT5nZ3R0OwogCiAJZ2d0dC0+dm0u
aTkxNSA9IGk5MTU7CisJZ2d0dC0+dm0uaXNfZ2d0dCA9IHRydWU7CiAKIAlnZ3R0LT5nbWFkciA9
IChzdHJ1Y3QgcmVzb3VyY2UpIERFRklORV9SRVNfTUVNKDAsIDIwNDggKiBQQUdFX1NJWkUpOwog
CWdndHQtPm1hcHBhYmxlX2VuZCA9IHJlc291cmNlX3NpemUoJmdndHQtPmdtYWRyKTsKQEAgLTEx
Nyw5ICsxMTgsOCBAQCB2b2lkIG1vY2tfaW5pdF9nZ3R0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRl
ICppOTE1KQogCWdndHQtPnZtLnZtYV9vcHMuc2V0X3BhZ2VzICAgPSBnZ3R0X3NldF9wYWdlczsK
IAlnZ3R0LT52bS52bWFfb3BzLmNsZWFyX3BhZ2VzID0gY2xlYXJfcGFnZXM7CiAKLQlpOTE1X2Fk
ZHJlc3Nfc3BhY2VfaW5pdCgmZ2d0dC0+dm0sIGk5MTUpOwogCi0JZ2d0dC0+dm0uaXNfZ2d0dCA9
IHRydWU7CisJaTkxNV9hZGRyZXNzX3NwYWNlX2luaXQoJmdndHQtPnZtLCBWTV9DTEFTU19HR1RU
KTsKIH0KIAogdm9pZCBtb2NrX2ZpbmlfZ2d0dChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkx
NSkKLS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au
b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt
Z2Z4Cg==