From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Hellstrom Subject: [PATCH 1/2] drm/vmwgfx: Fix a couple of lock dependency violations Date: Mon, 9 Mar 2015 04:55:41 -0700 Message-ID: <1425902142-10784-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 81E4A6E275 for ; Mon, 9 Mar 2015 04:56:23 -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 Cc: Thomas Hellstrom , stable@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org RXhwZXJpbWVudGFsIGxvY2tkZXAgYW5ub3RhdGlvbiBhZGRlZCB0byB0aGUgVFRNIGxvY2sgaGFz IHVudmVpbGVkIGEKY291cGxlIG9mIGxvY2sgZGVwZW5kZW5jeSB2aW9sYXRpb25zIGluIHRoZSB2 bXdnZnggZHJpdmVyLiBJbiBib3RoCmNhc2VzIGl0IHR1cm5zIG91dCB0aGF0IHRoZSBkZXZpY2Vf cHJpdmF0ZTo6cmVzZXJ2YXRpb25fc2VtIGlzIG5vdApuZWVkZWQgc28gdGhlIG9mZmVuZGluZyBj b2RlIGlzIG1vdmVkIG91dCBvZiB0aGF0IGxvY2suCgpDYzogPHN0YWJsZUB2Z2VyLmtlcm5lbC5v cmc+CkFja2VkLWJ5OiBTaW5jbGFpciBZZWggPHN5ZWhAdm13YXJlLmNvbT4KU2lnbmVkLW9mZi1i eTogVGhvbWFzIEhlbGxzdHJvbSA8dGhlbGxzdHJvbUB2bXdhcmUuY29tPgotLS0KIGRyaXZlcnMv Z3B1L2RybS92bXdnZngvdm13Z2Z4X2V4ZWNidWYuYyB8ICA4ICsrKy0tLS0tCiBkcml2ZXJzL2dw dS9kcm0vdm13Z2Z4L3Ztd2dmeF9rbXMuYyAgICAgfCAxNCArKystLS0tLS0tLS0tLQogMiBmaWxl cyBjaGFuZ2VkLCA2IGluc2VydGlvbnMoKyksIDE2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2V4ZWNidWYuYyBiL2RyaXZlcnMvZ3B1L2Ry bS92bXdnZngvdm13Z2Z4X2V4ZWNidWYuYwppbmRleCAzMzE3NmQwLi4xZTExNDg5IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9leGVjYnVmLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfZXhlY2J1Zi5jCkBAIC0yNzgwLDEzICsyNzgwLDExIEBA IGludCB2bXdfZXhlY2J1Zl9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRh LAogCQkJCSAgTlVMTCwgYXJnLT5jb21tYW5kX3NpemUsIGFyZy0+dGhyb3R0bGVfdXMsCiAJCQkJ ICAodm9pZCBfX3VzZXIgKikodW5zaWduZWQgbG9uZylhcmctPmZlbmNlX3JlcCwKIAkJCQkgIE5V TEwpOwotCisJdHRtX3JlYWRfdW5sb2NrKCZkZXZfcHJpdi0+cmVzZXJ2YXRpb25fc2VtKTsKIAlp ZiAodW5saWtlbHkocmV0ICE9IDApKQotCQlnb3RvIG91dF91bmxvY2s7CisJCXJldHVybiByZXQ7 CiAKIAl2bXdfa21zX2N1cnNvcl9wb3N0X2V4ZWNidWYoZGV2X3ByaXYpOwogCi1vdXRfdW5sb2Nr OgotCXR0bV9yZWFkX3VubG9jaygmZGV2X3ByaXYtPnJlc2VydmF0aW9uX3NlbSk7Ci0JcmV0dXJu IHJldDsKKwlyZXR1cm4gMDsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS92bXdnZngv dm13Z2Z4X2ttcy5jIGIvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfa21zLmMKaW5kZXgg ODcyNWI3OS4uMDdjZGE4YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdn Znhfa21zLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfa21zLmMKQEAgLTIw MzMsMjMgKzIwMzMsMTcgQEAgaW50IHZtd19rbXNfdXBkYXRlX2xheW91dF9pb2N0bChzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCWludCBpOwogCXN0cnVjdCBkcm1fbW9kZV9j b25maWcgKm1vZGVfY29uZmlnID0gJmRldi0+bW9kZV9jb25maWc7CiAKLQlyZXQgPSB0dG1fcmVh ZF9sb2NrKCZkZXZfcHJpdi0+cmVzZXJ2YXRpb25fc2VtLCB0cnVlKTsKLQlpZiAodW5saWtlbHko cmV0ICE9IDApKQotCQlyZXR1cm4gcmV0OwotCiAJaWYgKCFhcmctPm51bV9vdXRwdXRzKSB7CiAJ CXN0cnVjdCBkcm1fdm13X3JlY3QgZGVmX3JlY3QgPSB7MCwgMCwgODAwLCA2MDB9OwogCQl2bXdf ZHVfdXBkYXRlX2xheW91dChkZXZfcHJpdiwgMSwgJmRlZl9yZWN0KTsKLQkJZ290byBvdXRfdW5s b2NrOworCQlyZXR1cm4gMDsKIAl9CiAKIAlyZWN0c19zaXplID0gYXJnLT5udW1fb3V0cHV0cyAq IHNpemVvZihzdHJ1Y3QgZHJtX3Ztd19yZWN0KTsKIAlyZWN0cyA9IGtjYWxsb2MoYXJnLT5udW1f b3V0cHV0cywgc2l6ZW9mKHN0cnVjdCBkcm1fdm13X3JlY3QpLAogCQkJR0ZQX0tFUk5FTCk7Ci0J aWYgKHVubGlrZWx5KCFyZWN0cykpIHsKLQkJcmV0ID0gLUVOT01FTTsKLQkJZ290byBvdXRfdW5s b2NrOwotCX0KKwlpZiAodW5saWtlbHkoIXJlY3RzKSkKKwkJcmV0dXJuIC1FTk9NRU07CiAKIAl1 c2VyX3JlY3RzID0gKHZvaWQgX191c2VyICopKHVuc2lnbmVkIGxvbmcpYXJnLT5yZWN0czsKIAly ZXQgPSBjb3B5X2Zyb21fdXNlcihyZWN0cywgdXNlcl9yZWN0cywgcmVjdHNfc2l6ZSk7CkBAIC0y MDc0LDcgKzIwNjgsNSBAQCBpbnQgdm13X2ttc191cGRhdGVfbGF5b3V0X2lvY3RsKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAKIG91dF9mcmVlOgogCWtmcmVlKHJlY3RzKTsK LW91dF91bmxvY2s6Ci0JdHRtX3JlYWRfdW5sb2NrKCZkZXZfcHJpdi0+cmVzZXJ2YXRpb25fc2Vt KTsKIAlyZXR1cm4gcmV0OwogfQotLSAKMi4xLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vZHJpLWRldmVsCg==