From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Hellstrom Subject: [PATCH] drm/ttm: Add lockdep annotation to the TTM lock Date: Mon, 9 Mar 2015 07:11:39 -0700 Message-ID: <1425910299-3429-1-git-send-email-thellstrom@vmware.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from smtp-outbound-2.vmware.com (smtp-outbound-2.vmware.com [208.91.2.13]) by gabe.freedesktop.org (Postfix) with ESMTP id 7AE7D6E11F for ; Mon, 9 Mar 2015 07:12:08 -0700 (PDT) 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, airlied@gmail.com, airlied@redhat.com Cc: Thomas Hellstrom List-Id: dri-devel@lists.freedesktop.org QWRkcywgdG8gdGhlIGV4dGVudCBwb3NzaWJsZSwgbG9ja2RlcCBhbm5vdGF0aW9uIHRvIHRoZSBU VE0gbG9jay4KQWxzbyByZW1vdmVzIHNvbWUgdW51c2VkIFRUTSBsb2NrIGNvZGUuCgpTaWduZWQt b2ZmLWJ5OiBUaG9tYXMgSGVsbHN0cm9tIDx0aGVsbHN0cm9tQHZtd2FyZS5jb20+CkFja2VkLWJ5 OiBTaW5jbGFpciBZZWggPHN5ZWhAdm13YXJlLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vdHRt L3R0bV9sb2NrLmMgfCA3MyArKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0KIGluY2x1ZGUvZHJtL3R0bS90dG1fbG9jay5oICAgICB8IDEzICsrKysrKystCiAyIGZpbGVz IGNoYW5nZWQsIDQwIGluc2VydGlvbnMoKyksIDQ2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS90dG0vdHRtX2xvY2suYyBiL2RyaXZlcnMvZ3B1L2RybS90dG0vdHRt X2xvY2suYwppbmRleCA2YTk1NDU0Li4wZTY2MmFmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vdHRtL3R0bV9sb2NrLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3R0bS90dG1fbG9jay5jCkBA IC00Miw4ICs0MiwxMiBAQAogI2RlZmluZSBUVE1fVlRfTE9DSyAgICAgICAgICAgICAgICgxIDw8 IDMpCiAjZGVmaW5lIFRUTV9TVVNQRU5EX0xPQ0sgICAgICAgICAgKDEgPDwgNCkKIAotdm9pZCB0 dG1fbG9ja19pbml0KHN0cnVjdCB0dG1fbG9jayAqbG9jaykKK3ZvaWQgX190dG1fbG9ja19pbml0 KHN0cnVjdCB0dG1fbG9jayAqbG9jaywgY29uc3QgY2hhciAqbmFtZSwKKwlzdHJ1Y3QgbG9ja19j bGFzc19rZXkgKmtleSkKIHsKKyNpZmRlZiBDT05GSUdfREVCVUdfTE9DS19BTExPQworCWxvY2tk ZXBfaW5pdF9tYXAoJmxvY2stPmRlcF9tYXAsIG5hbWUsIGtleSwgMCk7CisjZW5kaWYKIAlzcGlu X2xvY2tfaW5pdCgmbG9jay0+bG9jayk7CiAJaW5pdF93YWl0cXVldWVfaGVhZCgmbG9jay0+cXVl dWUpOwogCWxvY2stPnJ3ID0gMDsKQEAgLTUxLDEwICs1NSwxMSBAQCB2b2lkIHR0bV9sb2NrX2lu aXQoc3RydWN0IHR0bV9sb2NrICpsb2NrKQogCWxvY2stPmtpbGxfdGFrZXJzID0gZmFsc2U7CiAJ bG9jay0+c2lnbmFsID0gU0lHS0lMTDsKIH0KLUVYUE9SVF9TWU1CT0wodHRtX2xvY2tfaW5pdCk7 CitFWFBPUlRfU1lNQk9MKF9fdHRtX2xvY2tfaW5pdCk7CiAKIHZvaWQgdHRtX3JlYWRfdW5sb2Nr KHN0cnVjdCB0dG1fbG9jayAqbG9jaykKIHsKKwlsb2NrX3JlbGVhc2UoJmxvY2stPmRlcF9tYXAs IDEsIF9SRVRfSVBfKTsKIAlzcGluX2xvY2soJmxvY2stPmxvY2spOwogCWlmICgtLWxvY2stPnJ3 ID09IDApCiAJCXdha2VfdXBfYWxsKCZsb2NrLT5xdWV1ZSk7CkBAIC04NCw2MCArODksMjUgQEAg aW50IHR0bV9yZWFkX2xvY2soc3RydWN0IHR0bV9sb2NrICpsb2NrLCBib29sIGludGVycnVwdGli bGUpCiB7CiAJaW50IHJldCA9IDA7CiAKKwlsb2NrX2FjcXVpcmUoJmxvY2stPmRlcF9tYXAsIDAs IDAsIDEsIDEsIE5VTEwsIF9SRVRfSVBfKTsKIAlpZiAoaW50ZXJydXB0aWJsZSkKIAkJcmV0ID0g d2FpdF9ldmVudF9pbnRlcnJ1cHRpYmxlKGxvY2stPnF1ZXVlLAogCQkJCQkgICAgICAgX190dG1f cmVhZF9sb2NrKGxvY2spKTsKIAllbHNlCiAJCXdhaXRfZXZlbnQobG9jay0+cXVldWUsIF9fdHRt X3JlYWRfbG9jayhsb2NrKSk7Ci0JcmV0dXJuIHJldDsKLX0KLUVYUE9SVF9TWU1CT0wodHRtX3Jl YWRfbG9jayk7Ci0KLXN0YXRpYyBib29sIF9fdHRtX3JlYWRfdHJ5bG9jayhzdHJ1Y3QgdHRtX2xv Y2sgKmxvY2ssIGJvb2wgKmxvY2tlZCkKLXsKLQlib29sIGJsb2NrID0gdHJ1ZTsKLQotCSpsb2Nr ZWQgPSBmYWxzZTsKLQotCXNwaW5fbG9jaygmbG9jay0+bG9jayk7Ci0JaWYgKHVubGlrZWx5KGxv Y2stPmtpbGxfdGFrZXJzKSkgewotCQlzZW5kX3NpZyhsb2NrLT5zaWduYWwsIGN1cnJlbnQsIDAp OwotCQlzcGluX3VubG9jaygmbG9jay0+bG9jayk7Ci0JCXJldHVybiBmYWxzZTsKLQl9Ci0JaWYg KGxvY2stPnJ3ID49IDAgJiYgbG9jay0+ZmxhZ3MgPT0gMCkgewotCQkrK2xvY2stPnJ3OwotCQli bG9jayA9IGZhbHNlOwotCQkqbG9ja2VkID0gdHJ1ZTsKLQl9IGVsc2UgaWYgKGxvY2stPmZsYWdz ID09IDApIHsKLQkJYmxvY2sgPSBmYWxzZTsKLQl9Ci0Jc3Bpbl91bmxvY2soJmxvY2stPmxvY2sp OwotCi0JcmV0dXJuICFibG9jazsKLX0KIAotaW50IHR0bV9yZWFkX3RyeWxvY2soc3RydWN0IHR0 bV9sb2NrICpsb2NrLCBib29sIGludGVycnVwdGlibGUpCi17Ci0JaW50IHJldCA9IDA7Ci0JYm9v bCBsb2NrZWQ7Ci0KLQlpZiAoaW50ZXJydXB0aWJsZSkKLQkJcmV0ID0gd2FpdF9ldmVudF9pbnRl cnJ1cHRpYmxlCi0JCQkobG9jay0+cXVldWUsIF9fdHRtX3JlYWRfdHJ5bG9jayhsb2NrLCAmbG9j a2VkKSk7CisJaWYgKHJldCkKKwkJbG9ja19yZWxlYXNlKCZsb2NrLT5kZXBfbWFwLCAwLCBfUkVU X0lQXyk7CiAJZWxzZQotCQl3YWl0X2V2ZW50KGxvY2stPnF1ZXVlLCBfX3R0bV9yZWFkX3RyeWxv Y2sobG9jaywgJmxvY2tlZCkpOwotCi0JaWYgKHVubGlrZWx5KHJldCAhPSAwKSkgewotCQlCVUdf T04obG9ja2VkKTsKLQkJcmV0dXJuIHJldDsKLQl9CisJCWxvY2tfYWNxdWlyZWQoJmxvY2stPmRl cF9tYXAsIF9SRVRfSVBfKTsKIAotCXJldHVybiAobG9ja2VkKSA/IDAgOiAtRUJVU1k7CisJcmV0 dXJuIHJldDsKIH0KK0VYUE9SVF9TWU1CT0wodHRtX3JlYWRfbG9jayk7CiAKIHZvaWQgdHRtX3dy aXRlX3VubG9jayhzdHJ1Y3QgdHRtX2xvY2sgKmxvY2spCiB7CisJbG9ja19yZWxlYXNlKCZsb2Nr LT5kZXBfbWFwLCAxLCBfUkVUX0lQXyk7CiAJc3Bpbl9sb2NrKCZsb2NrLT5sb2NrKTsKIAlsb2Nr LT5ydyA9IDA7CiAJd2FrZV91cF9hbGwoJmxvY2stPnF1ZXVlKTsKQEAgLTE3MCw2ICsxNDAsOCBA QCBpbnQgdHRtX3dyaXRlX2xvY2soc3RydWN0IHR0bV9sb2NrICpsb2NrLCBib29sIGludGVycnVw dGlibGUpCiB7CiAJaW50IHJldCA9IDA7CiAKKwlsb2NrX2FjcXVpcmUoJmxvY2stPmRlcF9tYXAs IDAsIDAsIDAsIDEsIE5VTEwsIF9SRVRfSVBfKTsKKwogCWlmIChpbnRlcnJ1cHRpYmxlKSB7CiAJ CXJldCA9IHdhaXRfZXZlbnRfaW50ZXJydXB0aWJsZShsb2NrLT5xdWV1ZSwKIAkJCQkJICAgICAg IF9fdHRtX3dyaXRlX2xvY2sobG9jaykpOwpAQCAtMTgwLDcgKzE1MiwxMiBAQCBpbnQgdHRtX3dy aXRlX2xvY2soc3RydWN0IHR0bV9sb2NrICpsb2NrLCBib29sIGludGVycnVwdGlibGUpCiAJCQlz cGluX3VubG9jaygmbG9jay0+bG9jayk7CiAJCX0KIAl9IGVsc2UKLQkJd2FpdF9ldmVudChsb2Nr LT5xdWV1ZSwgX190dG1fcmVhZF9sb2NrKGxvY2spKTsKKwkJd2FpdF9ldmVudChsb2NrLT5xdWV1 ZSwgX190dG1fd3JpdGVfbG9jayhsb2NrKSk7CisKKwlpZiAocmV0KQorCQlsb2NrX3JlbGVhc2Uo JmxvY2stPmRlcF9tYXAsIDAsIF9SRVRfSVBfKTsKKwllbHNlCisJCWxvY2tfYWNxdWlyZWQoJmxv Y2stPmRlcF9tYXAsIF9SRVRfSVBfKTsKIAogCXJldHVybiByZXQ7CiB9CkBAIC0yMzMsNiArMjEw LDggQEAgaW50IHR0bV92dF9sb2NrKHN0cnVjdCB0dG1fbG9jayAqbG9jaywKIHsKIAlpbnQgcmV0 ID0gMDsKIAorCW1pZ2h0X2xvY2sobG9jayk7CisKIAlpZiAoaW50ZXJydXB0aWJsZSkgewogCQly ZXQgPSB3YWl0X2V2ZW50X2ludGVycnVwdGlibGUobG9jay0+cXVldWUsCiAJCQkJCSAgICAgICBf X3R0bV92dF9sb2NrKGxvY2spKTsKQEAgLTI0MSw2ICsyMjAsNyBAQCBpbnQgdHRtX3Z0X2xvY2so c3RydWN0IHR0bV9sb2NrICpsb2NrLAogCQkJbG9jay0+ZmxhZ3MgJj0gflRUTV9WVF9MT0NLX1BF TkRJTkc7CiAJCQl3YWtlX3VwX2FsbCgmbG9jay0+cXVldWUpOwogCQkJc3Bpbl91bmxvY2soJmxv Y2stPmxvY2spOworCQkJbG9ja19yZWxlYXNlKCZsb2NrLT5kZXBfbWFwLCAwLCBfUkVUX0lQXyk7 CiAJCQlyZXR1cm4gcmV0OwogCQl9CiAJfSBlbHNlCkBAIC0yNjUsNiArMjQ1LDcgQEAgRVhQT1JU X1NZTUJPTCh0dG1fdnRfbG9jayk7CiAKIGludCB0dG1fdnRfdW5sb2NrKHN0cnVjdCB0dG1fbG9j ayAqbG9jaykKIHsKKwogCXJldHVybiB0dG1fcmVmX29iamVjdF9iYXNlX3VucmVmKGxvY2stPnZ0 X2hvbGRlciwKIAkJCQkJIGxvY2stPmJhc2UuaGFzaC5rZXksIFRUTV9SRUZfVVNBR0UpOwogfQpA QCAtMjk3LDYgKzI3OCw4IEBAIHN0YXRpYyBib29sIF9fdHRtX3N1c3BlbmRfbG9jayhzdHJ1Y3Qg dHRtX2xvY2sgKmxvY2spCiAKIHZvaWQgdHRtX3N1c3BlbmRfbG9jayhzdHJ1Y3QgdHRtX2xvY2sg KmxvY2spCiB7CisJbWlnaHRfbG9jayhsb2NrKTsKKwogCXdhaXRfZXZlbnQobG9jay0+cXVldWUs IF9fdHRtX3N1c3BlbmRfbG9jayhsb2NrKSk7CiB9CiBFWFBPUlRfU1lNQk9MKHR0bV9zdXNwZW5k X2xvY2spOwpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9kcm0vdHRtL3R0bV9sb2NrLmggYi9pbmNsdWRl L2RybS90dG0vdHRtX2xvY2suaAppbmRleCAyOTAyYmViLi5mYjhmZGEyIDEwMDY0NAotLS0gYS9p bmNsdWRlL2RybS90dG0vdHRtX2xvY2suaAorKysgYi9pbmNsdWRlL2RybS90dG0vdHRtX2xvY2su aApAQCAtNzUsNiArNzUsOSBAQCBzdHJ1Y3QgdHRtX2xvY2sgewogCWJvb2wga2lsbF90YWtlcnM7 CiAJaW50IHNpZ25hbDsKIAlzdHJ1Y3QgdHRtX29iamVjdF9maWxlICp2dF9ob2xkZXI7CisjaWZk ZWYgQ09ORklHX0RFQlVHX0xPQ0tfQUxMT0MKKwlzdHJ1Y3QgbG9ja2RlcF9tYXAgZGVwX21hcDsK KyNlbmRpZgogfTsKIAogCkBAIC04NCw3ICs4Nyw4IEBAIHN0cnVjdCB0dG1fbG9jayB7CiAgKiBA bG9jazogUG9pbnRlciB0byBhIHN0cnVjdCB0dG1fbG9jawogICogSW5pdGlhbGl6ZXMgdGhlIGxv Y2suCiAgKi8KLWV4dGVybiB2b2lkIHR0bV9sb2NrX2luaXQoc3RydWN0IHR0bV9sb2NrICpsb2Nr KTsKK2V4dGVybiB2b2lkIF9fdHRtX2xvY2tfaW5pdChzdHJ1Y3QgdHRtX2xvY2sgKmxvY2ssIGNv bnN0IGNoYXIgKm5hbWUsCisJCQkgICAgc3RydWN0IGxvY2tfY2xhc3Nfa2V5ICprZXkpOwogCiAv KioKICAqIHR0bV9yZWFkX3VubG9jawpAQCAtMjQ0LDQgKzI0OCwxMSBAQCBzdGF0aWMgaW5saW5l IHZvaWQgdHRtX2xvY2tfc2V0X2tpbGwoc3RydWN0IHR0bV9sb2NrICpsb2NrLCBib29sIHZhbCwK IAkJbG9jay0+c2lnbmFsID0gc2lnbmFsOwogfQogCisjZGVmaW5lIHR0bV9sb2NrX2luaXQobG9j aykJCQlcCitkbyB7CQkJCQkJXAorCXN0YXRpYyBzdHJ1Y3QgbG9ja19jbGFzc19rZXkgX19rZXk7 CVwKKwkJCQkJCVwKKwlfX3R0bV9sb2NrX2luaXQoKGxvY2spLCAjbG9jaywgJl9fa2V5KTsJXAor fSB3aGlsZSAoMCkKKwogI2VuZGlmCi0tIAoyLjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9kcmktZGV2ZWwK