From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 13/41] drm/i915: Markup GEM API with lockdep asserts Date: Fri, 14 Oct 2016 13:18:05 +0100 Message-ID: <20161014121833.439-14-chris@chris-wilson.co.uk> References: <20161014121833.439-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-lf0-x243.google.com (mail-lf0-x243.google.com [IPv6:2a00:1450:4010:c07::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 457AE6E11E for ; Fri, 14 Oct 2016 12:18:55 +0000 (UTC) Received: by mail-lf0-x243.google.com with SMTP id b75so17763610lfg.3 for ; Fri, 14 Oct 2016 05:18:55 -0700 (PDT) In-Reply-To: <20161014121833.439-1-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org QWRkIGxvY2tkZXBfYXNzZXJ0X2hlbGQoc3RydWN0X211dGV4KSB0byB0aGUgQVBJIHByZWFtYmxl IG9mIHRoZQppbnRlcm5hbCBHRU0gaW50ZXJmYWNlcy4KClNpZ25lZC1vZmYtYnk6IENocmlzIFdp bHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpSZXZpZXdlZC1ieTogSm9vbmFzIExhaHRp bmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtLmMgICAgICAgICAgICAgIHwgMjEgKysrKysrKysrKysrKysrKysrKysr CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ldmljdC5jICAgICAgICB8ICA1ICsrKyst CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyAgICAgICAgICB8ICAyICsrCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJfc3RhdGUuYyB8ICAyICsrCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZXF1ZXN0LmMgICAgICB8ICA2ICsrKysrKwogNSBm aWxlcyBjaGFuZ2VkLCAzNSBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtLmMKaW5kZXggMDljYWRiM2FmNDliLi45NTc4MWM2M2Y2MDUgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW0uYwpAQCAtMTA0LDYgKzEwNCw4IEBAIGk5MTVfZ2VtX3dhaXRfZm9yX2Vycm9y KHN0cnVjdCBpOTE1X2dwdV9lcnJvciAqZXJyb3IpCiB7CiAJaW50IHJldDsKIAorCW1pZ2h0X3Ns ZWVwKCk7CisKIAlpZiAoIWk5MTVfcmVzZXRfaW5fcHJvZ3Jlc3MoZXJyb3IpKQogCQlyZXR1cm4g MDsKIApAQCAtMjMzNiw2ICsyMzM4LDggQEAgaTkxNV9nZW1fb2JqZWN0X3B1dF9wYWdlcyhzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQogewogCWNvbnN0IHN0cnVjdCBkcm1faTkxNV9n ZW1fb2JqZWN0X29wcyAqb3BzID0gb2JqLT5vcHM7CiAKKwlsb2NrZGVwX2Fzc2VydF9oZWxkKCZv YmotPmJhc2UuZGV2LT5zdHJ1Y3RfbXV0ZXgpOworCiAJaWYgKG9iai0+cGFnZXMgPT0gTlVMTCkK IAkJcmV0dXJuIDA7CiAKQEAgLTI1MTIsNiArMjUxNiw4IEBAIGk5MTVfZ2VtX29iamVjdF9nZXRf cGFnZXMoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIAljb25zdCBzdHJ1Y3QgZHJt X2k5MTVfZ2VtX29iamVjdF9vcHMgKm9wcyA9IG9iai0+b3BzOwogCWludCByZXQ7CiAKKwlsb2Nr ZGVwX2Fzc2VydF9oZWxkKCZvYmotPmJhc2UuZGV2LT5zdHJ1Y3RfbXV0ZXgpOworCiAJaWYgKG9i ai0+cGFnZXMpCiAJCXJldHVybiAwOwogCkBAIC0yNzkzLDYgKzI3OTksOCBAQCB2b2lkIGk5MTVf Z2VtX3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICplbmdpbmU7CiAJZW51bSBpbnRlbF9lbmdpbmVfaWQgaWQ7CiAKKwlsb2Nr ZGVwX2Fzc2VydF9oZWxkKCZkZXZfcHJpdi0+ZHJtLnN0cnVjdF9tdXRleCk7CisKIAlpOTE1X2dl bV9yZXRpcmVfcmVxdWVzdHMoZGV2X3ByaXYpOwogCiAJZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwg ZGV2X3ByaXYsIGlkKQpAQCAtMzAzNCw2ICszMDQyLDggQEAgaW50IGk5MTVfdm1hX3VuYmluZChz dHJ1Y3QgaTkxNV92bWEgKnZtYSkKIAl1bnNpZ25lZCBsb25nIGFjdGl2ZTsKIAlpbnQgcmV0Owog CisJbG9ja2RlcF9hc3NlcnRfaGVsZCgmb2JqLT5iYXNlLmRldi0+c3RydWN0X211dGV4KTsKKwog CS8qIEZpcnN0IHdhaXQgdXBvbiBhbnkgYWN0aXZpdHkgYXMgcmV0aXJpbmcgdGhlIHJlcXVlc3Qg bWF5CiAJICogaGF2ZSBzaWRlLWVmZmVjdHMgc3VjaCBhcyB1bnBpbm5pbmcgb3IgZXZlbiB1bmJp bmRpbmcgdGhpcyB2bWEuCiAJICovCkBAIC0zNDMwLDYgKzM0NDAsNyBAQCBpOTE1X2dlbV9vYmpl Y3Rfc2V0X3RvX2d0dF9kb21haW4oc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwgYm9v bCB3cml0ZSkKIAlpbnQgcmV0OwogCiAJbG9ja2RlcF9hc3NlcnRfaGVsZCgmb2JqLT5iYXNlLmRl di0+c3RydWN0X211dGV4KTsKKwogCXJldCA9IGk5MTVfZ2VtX29iamVjdF93YWl0KG9iaiwKIAkJ CQkgICBJOTE1X1dBSVRfSU5URVJSVVBUSUJMRSB8CiAJCQkJICAgSTkxNV9XQUlUX0xPQ0tFRCB8 CkBAIC0zNTA4LDYgKzM1MTksOCBAQCBpbnQgaTkxNV9nZW1fb2JqZWN0X3NldF9jYWNoZV9sZXZl bChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCXN0cnVjdCBpOTE1X3ZtYSAqdm1h OwogCWludCByZXQgPSAwOwogCisJbG9ja2RlcF9hc3NlcnRfaGVsZCgmb2JqLT5iYXNlLmRldi0+ c3RydWN0X211dGV4KTsKKwogCWlmIChvYmotPmNhY2hlX2xldmVsID09IGNhY2hlX2xldmVsKQog CQlnb3RvIG91dDsKIApAQCAtMzcxMiw2ICszNzI1LDggQEAgaTkxNV9nZW1fb2JqZWN0X3Bpbl90 b19kaXNwbGF5X3BsYW5lKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJdTMyIG9s ZF9yZWFkX2RvbWFpbnMsIG9sZF93cml0ZV9kb21haW47CiAJaW50IHJldDsKIAorCWxvY2tkZXBf YXNzZXJ0X2hlbGQoJm9iai0+YmFzZS5kZXYtPnN0cnVjdF9tdXRleCk7CisKIAkvKiBNYXJrIHRo ZSBwaW5fZGlzcGxheSBlYXJseSBzbyB0aGF0IHdlIGFjY291bnQgZm9yIHRoZQogCSAqIGRpc3Bs YXkgY29oZXJlbmN5IHdoaWxzdCBzZXR0aW5nIHVwIHRoZSBjYWNoZSBkb21haW5zLgogCSAqLwpA QCAtMzc3OSw2ICszNzk0LDggQEAgZXJyX3VucGluX2Rpc3BsYXk6CiB2b2lkCiBpOTE1X2dlbV9v YmplY3RfdW5waW5fZnJvbV9kaXNwbGF5X3BsYW5lKHN0cnVjdCBpOTE1X3ZtYSAqdm1hKQogewor CWxvY2tkZXBfYXNzZXJ0X2hlbGQoJnZtYS0+dm0tPmRldi0+c3RydWN0X211dGV4KTsKKwogCWlm IChXQVJOX09OKHZtYS0+b2JqLT5waW5fZGlzcGxheSA9PSAwKSkKIAkJcmV0dXJuOwogCkBAIC0z ODA4LDYgKzM4MjUsNyBAQCBpOTE1X2dlbV9vYmplY3Rfc2V0X3RvX2NwdV9kb21haW4oc3RydWN0 IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwgYm9vbCB3cml0ZSkKIAlpbnQgcmV0OwogCiAJbG9j a2RlcF9hc3NlcnRfaGVsZCgmb2JqLT5iYXNlLmRldi0+c3RydWN0X211dGV4KTsKKwogCXJldCA9 IGk5MTVfZ2VtX29iamVjdF93YWl0KG9iaiwKIAkJCQkgICBJOTE1X1dBSVRfSU5URVJSVVBUSUJM RSB8CiAJCQkJICAgSTkxNV9XQUlUX0xPQ0tFRCB8CkBAIC0zOTYzLDYgKzM5ODEsNyBAQCBpbnQg X19pOTE1X3ZtYV9kb19waW4oc3RydWN0IGk5MTVfdm1hICp2bWEsCiAJdW5zaWduZWQgaW50IGJv dW5kID0gdm1hLT5mbGFnczsKIAlpbnQgcmV0OwogCisJbG9ja2RlcF9hc3NlcnRfaGVsZCgmdm1h LT52bS0+ZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCUdFTV9CVUdfT04oKGZsYWdzICYgKFBJTl9HTE9C QUwgfCBQSU5fVVNFUikpID09IDApOwogCUdFTV9CVUdfT04oKGZsYWdzICYgUElOX0dMT0JBTCkg JiYgIWk5MTVfdm1hX2lzX2dndHQodm1hKSk7CiAKQEAgLTQwMDQsNiArNDAyMyw4IEBAIGk5MTVf Z2VtX29iamVjdF9nZ3R0X3BpbihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCXN0 cnVjdCBpOTE1X3ZtYSAqdm1hOwogCWludCByZXQ7CiAKKwlsb2NrZGVwX2Fzc2VydF9oZWxkKCZv YmotPmJhc2UuZGV2LT5zdHJ1Y3RfbXV0ZXgpOworCiAJdm1hID0gaTkxNV9nZW1fb2JqX2xvb2t1 cF9vcl9jcmVhdGVfdm1hKG9iaiwgdm0sIHZpZXcpOwogCWlmIChJU19FUlIodm1hKSkKIAkJcmV0 dXJuIHZtYTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V2aWN0 LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ldmljdC5jCmluZGV4IGE5MzRmMzcy YzVjZS4uNzliOTY0MTUyY2Q5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9ldmljdC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V2aWN0LmMK QEAgLTEwMyw2ICsxMDMsNyBAQCBpOTE1X2dlbV9ldmljdF9zb21ldGhpbmcoc3RydWN0IGk5MTVf YWRkcmVzc19zcGFjZSAqdm0sCiAJc3RydWN0IGk5MTVfdm1hICp2bWEsICpuZXh0OwogCWludCBy ZXQ7CiAKKwlsb2NrZGVwX2Fzc2VydF9oZWxkKCZ2bS0+ZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCXRy YWNlX2k5MTVfZ2VtX2V2aWN0KHZtLCBtaW5fc2l6ZSwgYWxpZ25tZW50LCBmbGFncyk7CiAKIAkv KgpAQCAtMjEzLDYgKzIxNCw4IEBAIGk5MTVfZ2VtX2V2aWN0X2Zvcl92bWEoc3RydWN0IGk5MTVf dm1hICp0YXJnZXQpCiB7CiAJc3RydWN0IGRybV9tbV9ub2RlICpub2RlLCAqbmV4dDsKIAorCWxv Y2tkZXBfYXNzZXJ0X2hlbGQoJnRhcmdldC0+dm0tPmRldi0+c3RydWN0X211dGV4KTsKKwogCWxp c3RfZm9yX2VhY2hfZW50cnlfc2FmZShub2RlLCBuZXh0LAogCQkJJnRhcmdldC0+dm0tPm1tLmhl YWRfbm9kZS5ub2RlX2xpc3QsCiAJCQlub2RlX2xpc3QpIHsKQEAgLTI2Niw3ICsyNjksNyBAQCBp bnQgaTkxNV9nZW1fZXZpY3Rfdm0oc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sIGJvb2wg ZG9faWRsZSkKIAlzdHJ1Y3QgaTkxNV92bWEgKnZtYSwgKm5leHQ7CiAJaW50IHJldDsKIAotCVdB Uk5fT04oIW11dGV4X2lzX2xvY2tlZCgmdm0tPmRldi0+c3RydWN0X211dGV4KSk7CisJbG9ja2Rl cF9hc3NlcnRfaGVsZCgmdm0tPmRldi0+c3RydWN0X211dGV4KTsKIAl0cmFjZV9pOTE1X2dlbV9l dmljdF92bSh2bSk7CiAKIAlpZiAoZG9faWRsZSkgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9n dHQuYwppbmRleCBhM2EzNjQ0NzhhODkuLjJiYmJkYTE5MWU5MyAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fZ3R0LmMKQEAgLTM0NDksNiArMzQ0OSw3IEBAIGk5MTVfdm1hX2NyZWF0ZShzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCQlzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNl ICp2bSwKIAkJY29uc3Qgc3RydWN0IGk5MTVfZ2d0dF92aWV3ICp2aWV3KQogeworCWxvY2tkZXBf YXNzZXJ0X2hlbGQoJm9iai0+YmFzZS5kZXYtPnN0cnVjdF9tdXRleCk7CiAJR0VNX0JVR19PTih2 aWV3ICYmICFpOTE1X2lzX2dndHQodm0pKTsKIAlHRU1fQlVHX09OKGk5MTVfZ2VtX29ial90b192 bWEob2JqLCB2bSwgdmlldykpOwogCkBAIC0zNDc2LDYgKzM0NzcsNyBAQCBpOTE1X2dlbV9vYmpf bG9va3VwX29yX2NyZWF0ZV92bWEoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIHsK IAlzdHJ1Y3QgaTkxNV92bWEgKnZtYTsKIAorCWxvY2tkZXBfYXNzZXJ0X2hlbGQoJm9iai0+YmFz ZS5kZXYtPnN0cnVjdF9tdXRleCk7CiAJR0VNX0JVR19PTih2aWV3ICYmICFpOTE1X2lzX2dndHQo dm0pKTsKIAogCXZtYSA9IGk5MTVfZ2VtX29ial90b192bWEob2JqLCB2bSwgdmlldyk7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJfc3RhdGUuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5jCmluZGV4IDk2MjVlMWE2 NjJlZC4uMDUyOTMyNDZlMGI5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9yZW5kZXJfc3RhdGUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9y ZW5kZXJfc3RhdGUuYwpAQCAtMjIzLDYgKzIyMyw4IEBAIGludCBpOTE1X2dlbV9yZW5kZXJfc3Rh dGVfZW1pdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIAlzdHJ1Y3QgaW50ZWxf cmVuZGVyX3N0YXRlICpzbzsKIAlpbnQgcmV0OwogCisJbG9ja2RlcF9hc3NlcnRfaGVsZCgmcmVx LT5pOTE1LT5kcm0uc3RydWN0X211dGV4KTsKKwogCXNvID0gcmVxLT5lbmdpbmUtPnJlbmRlcl9z dGF0ZTsKIAlpZiAoIXNvKQogCQlyZXR1cm4gMDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X3JlcXVlc3QuYwppbmRleCA0ZTRkMDRiMDMxZmEuLmYwOWI4ZTNhODI3NiAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVxdWVzdC5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuYwpAQCAtMTQzLDYgKzE0Myw5IEBAIHN0YXRpYyB2 b2lkIGk5MTVfZ2VtX3JlcXVlc3RfcmV0aXJlKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAq cmVxdWVzdCkKIHsKIAlzdHJ1Y3QgaTkxNV9nZW1fYWN0aXZlICphY3RpdmUsICpuZXh0OwogCisJ bG9ja2RlcF9hc3NlcnRfaGVsZCgmcmVxdWVzdC0+aTkxNS0+ZHJtLnN0cnVjdF9tdXRleCk7CisJ R0VNX0JVR19PTighaTkxNV9nZW1fcmVxdWVzdF9jb21wbGV0ZWQocmVxdWVzdCkpOworCiAJdHJh Y2VfaTkxNV9nZW1fcmVxdWVzdF9yZXRpcmUocmVxdWVzdCk7CiAJbGlzdF9kZWxfaW5pdCgmcmVx dWVzdC0+bGluayk7CiAKQEAgLTI2OCw2ICsyNzEsOCBAQCBpbnQgaTkxNV9nZW1fc2V0X3NlcW5v KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHUzMiBzZXFubykKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJaW50IHJldDsKIAorCWxvY2tkZXBfYXNz ZXJ0X2hlbGQoJmRldl9wcml2LT5kcm0uc3RydWN0X211dGV4KTsKKwogCWlmIChzZXFubyA9PSAw KQogCQlyZXR1cm4gLUVJTlZBTDsKIApAQCAtNjEyLDYgKzYxNyw3IEBAIHZvaWQgX19pOTE1X2Fk ZF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCwgYm9vbCBmbHVz aF9jYWNoZXMpCiAJdTMyIHJlc2VydmVkX3RhaWw7CiAJaW50IHJldDsKIAorCWxvY2tkZXBfYXNz ZXJ0X2hlbGQoJnJlcXVlc3QtPmk5MTUtPmRybS5zdHJ1Y3RfbXV0ZXgpOwogCXRyYWNlX2k5MTVf Z2VtX3JlcXVlc3RfYWRkKHJlcXVlc3QpOwogCiAJLyoKLS0gCjIuOS4zCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK