From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Hellstrom Subject: [PATCH 1/2] drm/vmwgfx: Fix a circular locking dependency in the fbdev code Date: Fri, 21 Aug 2015 01:20:40 -0700 Message-ID: <1440145241-3367-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-1.vmware.com (smtp-outbound-1.vmware.com [208.91.2.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4A66888FDA for ; Fri, 21 Aug 2015 01:21:07 -0700 (PDT) Received: from sc9-mailhost3.vmware.com (sc9-mailhost3.vmware.com [10.113.161.73]) by smtp-outbound-1.vmware.com (Postfix) with ESMTP id 1087828E20 for ; Fri, 21 Aug 2015 01:23:21 -0700 (PDT) Received: from EX13-CAS-013.vmware.com (EX13-CAS-013.vmware.com [10.113.191.65]) by sc9-mailhost3.vmware.com (Postfix) with ESMTP id 0345B40691 for ; Fri, 21 Aug 2015 01:21:06 -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: pv-drivers@vmware.com, Thomas Hellstrom , linux-graphics-maintainer@vmware.com List-Id: dri-devel@lists.freedesktop.org V2hlbiBhIHVzZXItc3BhY2UgcHJvY2VzcyB3cml0ZXMgZGlyZWN0bHkgdG8gdGhlIGZiZGV2IGZy YW1lYnVmZmVyLAp3ZSBoaXQgYSBjaXJjdWxhciBsb2NraW5nIGRlcGVuZGVuY3kuIEZpeCB0aGlz IGJ5IGludHJvZHVjaW5nIGEgbG9jYWwKZGVsYXllZCB3b3JrIGNhbGxiYWNrIHNvIHRoYXQgdGhl IGRlZmlvIGxvY2sgY2FuIGJlIHJlbGVhc2VkIGJlZm9yZQpjYWxsaW5nIGludG8gdGhlIG1vZGVz ZXR0aW5nIGNvZGUgZm9yIGEgZGlydHkgdXBkYXRlLgoKU2lnbmVkLW9mZi1ieTogVGhvbWFzIEhl bGxzdHJvbSA8dGhlbGxzdHJvbUB2bXdhcmUuY29tPgpSZXZpZXdlZC1ieTogU2luY2xhaXIgWWVo IDxzeWVoQHZtd2FyZS5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfZmIu YyB8IDI5ICsrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTcg aW5zZXJ0aW9ucygrKSwgMTIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL3Ztd2dmeC92bXdnZnhfZmIuYyBiL2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2Zi LmMKaW5kZXggMDQyYzViNC4uM2IxZmFmNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3Zt d2dmeC92bXdnZnhfZmIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9mYi5j CkBAIC02OCw4ICs2OCw3IEBAIHN0cnVjdCB2bXdfZmJfcGFyIHsKIAogCXN0cnVjdCBkcm1fY3J0 YyAqY3J0YzsKIAlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29uOwotCi0JYm9vbCBsb2NhbF9tb2Rl OworCXN0cnVjdCBkZWxheWVkX3dvcmsgbG9jYWxfd29yazsKIH07CiAKIHN0YXRpYyBpbnQgdm13 X2ZiX3NldGNvbHJlZyh1bnNpZ25lZCByZWdubywgdW5zaWduZWQgcmVkLCB1bnNpZ25lZCBncmVl biwKQEAgLTE2Nyw4ICsxNjYsMTAgQEAgc3RhdGljIGludCB2bXdfZmJfYmxhbmsoaW50IGJsYW5r LCBzdHJ1Y3QgZmJfaW5mbyAqaW5mbykKICAqIERpcnR5IGNvZGUKICAqLwogCi1zdGF0aWMgdm9p ZCB2bXdfZmJfZGlydHlfZmx1c2goc3RydWN0IHZtd19mYl9wYXIgKnBhcikKK3N0YXRpYyB2b2lk IHZtd19mYl9kaXJ0eV9mbHVzaChzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCiB7CisJc3RydWN0 IHZtd19mYl9wYXIgKnBhciA9IGNvbnRhaW5lcl9vZih3b3JrLCBzdHJ1Y3Qgdm13X2ZiX3BhciwK KwkJCQkJICAgICAgbG9jYWxfd29yay53b3JrKTsKIAlzdHJ1Y3Qgdm13X3ByaXZhdGUgKnZtd19w cml2ID0gcGFyLT52bXdfcHJpdjsKIAlzdHJ1Y3QgZmJfaW5mbyAqaW5mbyA9IHZtd19wcml2LT5m Yl9pbmZvOwogCXVuc2lnbmVkIGxvbmcgaXJxX2ZsYWdzOwpAQCAtMjQ4LDcgKzI0OSw2IEBAIHN0 YXRpYyB2b2lkIHZtd19mYl9kaXJ0eV9tYXJrKHN0cnVjdCB2bXdfZmJfcGFyICpwYXIsCiAJCQkg ICAgICB1bnNpZ25lZCB4MSwgdW5zaWduZWQgeTEsCiAJCQkgICAgICB1bnNpZ25lZCB3aWR0aCwg dW5zaWduZWQgaGVpZ2h0KQogewotCXN0cnVjdCBmYl9pbmZvICppbmZvID0gcGFyLT52bXdfcHJp di0+ZmJfaW5mbzsKIAl1bnNpZ25lZCBsb25nIGZsYWdzOwogCXVuc2lnbmVkIHgyID0geDEgKyB3 aWR0aDsKIAl1bnNpZ25lZCB5MiA9IHkxICsgaGVpZ2h0OwpAQCAtMjYyLDcgKzI2Miw4IEBAIHN0 YXRpYyB2b2lkIHZtd19mYl9kaXJ0eV9tYXJrKHN0cnVjdCB2bXdfZmJfcGFyICpwYXIsCiAJCS8q IGlmIHdlIGFyZSBhY3RpdmUgc3RhcnQgdGhlIGRpcnR5IHdvcmsKIAkJICogd2Ugc2hhcmUgdGhl IHdvcmsgd2l0aCB0aGUgZGVmaW8gc3lzdGVtICovCiAJCWlmIChwYXItPmRpcnR5LmFjdGl2ZSkK LQkJCXNjaGVkdWxlX2RlbGF5ZWRfd29yaygmaW5mby0+ZGVmZXJyZWRfd29yaywgVk1XX0RJUlRZ X0RFTEFZKTsKKwkJCXNjaGVkdWxlX2RlbGF5ZWRfd29yaygmcGFyLT5sb2NhbF93b3JrLAorCQkJ CQkgICAgICBWTVdfRElSVFlfREVMQVkpOwogCX0gZWxzZSB7CiAJCWlmICh4MSA8IHBhci0+ZGly dHkueDEpCiAJCQlwYXItPmRpcnR5LngxID0geDE7CkBAIC0zMjYsOSArMzI3LDE0IEBAIHN0YXRp YyB2b2lkIHZtd19kZWZlcnJlZF9pbyhzdHJ1Y3QgZmJfaW5mbyAqaW5mbywKIAkJcGFyLT5kaXJ0 eS54MiA9IGluZm8tPnZhci54cmVzOwogCQlwYXItPmRpcnR5LnkyID0geTI7CiAJCXNwaW5fdW5s b2NrX2lycXJlc3RvcmUoJnBhci0+ZGlydHkubG9jaywgZmxhZ3MpOwotCX0KIAotCXZtd19mYl9k aXJ0eV9mbHVzaChwYXIpOworCQkvKgorCQkgKiBTaW5jZSB3ZSd2ZSBhbHJlYWR5IHdhaXRlZCBv biB0aGlzIHdvcmsgb25jZSwgdHJ5IHRvCisJCSAqIGV4ZWN1dGUgYXNhcC4KKwkJICovCisJCWNh bmNlbF9kZWxheWVkX3dvcmsoJnBhci0+bG9jYWxfd29yayk7CisJCXNjaGVkdWxlX2RlbGF5ZWRf d29yaygmcGFyLT5sb2NhbF93b3JrLCAwKTsKKwl9CiB9OwogCiBzdGF0aWMgc3RydWN0IGZiX2Rl ZmVycmVkX2lvIHZtd19kZWZpbyA9IHsKQEAgLTYwMSwxMSArNjA3LDcgQEAgc3RhdGljIGludCB2 bXdfZmJfc2V0X3BhcihzdHJ1Y3QgZmJfaW5mbyAqaW5mbykKIAkvKiBJZiB0aGVyZSBhbHJlYWR5 IHdhcyBzdHVmZiBkaXJ0eSB3ZSB3b250CiAJICogc2NoZWR1bGUgYSBuZXcgd29yaywgc28gbGV0 cyBkbyBpdCBub3cgKi8KIAotI2lmIChkZWZpbmVkKFZNV0dGWF9TVEFOREFMT05FKSAmJiBkZWZp bmVkKFZNV0dGWF9GQl9ERUZFUlJFRCkpCi0Jc2NoZWR1bGVfZGVsYXllZF93b3JrKCZwYXItPmRl Zl9wYXIuZGVmZXJyZWRfd29yaywgMCk7Ci0jZWxzZQotCXNjaGVkdWxlX2RlbGF5ZWRfd29yaygm aW5mby0+ZGVmZXJyZWRfd29yaywgMCk7Ci0jZW5kaWYKKwlzY2hlZHVsZV9kZWxheWVkX3dvcmso JnBhci0+bG9jYWxfd29yaywgMCk7CiAKIG91dF91bmxvY2s6CiAJaWYgKG9sZF9tb2RlKQpAQCAt NjYyLDYgKzY2NCw3IEBAIGludCB2bXdfZmJfaW5pdChzdHJ1Y3Qgdm13X3ByaXZhdGUgKnZtd19w cml2KQogCXZtd19wcml2LT5mYl9pbmZvID0gaW5mbzsKIAlwYXIgPSBpbmZvLT5wYXI7CiAJbWVt c2V0KHBhciwgMCwgc2l6ZW9mKCpwYXIpKTsKKwlJTklUX0RFTEFZRURfV09SSygmcGFyLT5sb2Nh bF93b3JrLCAmdm13X2ZiX2RpcnR5X2ZsdXNoKTsKIAlwYXItPnZtd19wcml2ID0gdm13X3ByaXY7 CiAJcGFyLT52bWFsbG9jID0gTlVMTDsKIAlwYXItPm1heF93aWR0aCA9IGZiX3dpZHRoOwpAQCAt Nzg0LDYgKzc4Nyw3IEBAIGludCB2bXdfZmJfY2xvc2Uoc3RydWN0IHZtd19wcml2YXRlICp2bXdf cHJpdikKIAogCS8qID8/PyBvcmRlciAqLwogCWZiX2RlZmVycmVkX2lvX2NsZWFudXAoaW5mbyk7 CisJY2FuY2VsX2RlbGF5ZWRfd29ya19zeW5jKCZwYXItPmxvY2FsX3dvcmspOwogCXVucmVnaXN0 ZXJfZnJhbWVidWZmZXIoaW5mbyk7CiAKIAkodm9pZCkgdm13X2ZiX2ttc19kZXRhY2gocGFyLCB0 cnVlLCB0cnVlKTsKQEAgLTgxMSw2ICs4MTUsNyBAQCBpbnQgdm13X2ZiX29mZihzdHJ1Y3Qgdm13 X3ByaXZhdGUgKnZtd19wcml2KQogCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJnBhci0+ZGlydHku bG9jaywgZmxhZ3MpOwogCiAJZmx1c2hfZGVsYXllZF93b3JrKCZpbmZvLT5kZWZlcnJlZF93b3Jr KTsKKwlmbHVzaF9kZWxheWVkX3dvcmsoJnBhci0+bG9jYWxfd29yayk7CiAKIAltdXRleF9sb2Nr KCZwYXItPmJvX211dGV4KTsKIAkodm9pZCkgdm13X2ZiX2ttc19kZXRhY2gocGFyLCB0cnVlLCBm YWxzZSk7Ci0tIAoyLjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmkt ZGV2ZWwK