From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: [PATCH] drm/vmwgfx: Nuke preclose hook Date: Sun, 10 Jan 2016 23:02:03 +0100 Message-ID: <1452463323-4499-1-git-send-email-daniel.vetter@ffwll.ch> References: <1452285413-28459-22-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1452285413-28459-22-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Intel Graphics Development , DRI Development Cc: Daniel Vetter , =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , Daniel Vetter List-Id: dri-devel@lists.freedesktop.org QWdhaW4gc2luY2UgdGhlIGRybSBjb3JlIHRha2VzIGNhcmUgb2YgZXZlbnQgdW5saW5raW5nL2Rp c2FybWluZyB0aGlzCmlzIG5vdyBqdXN0IG5lZWRsZXNzIGNvZGUuCgp2MjogSSd2ZSBjb21wbGV0 ZWx5IG1pc3NlZCBlYWN0aW9uLT5mcHJpdl9oZWFkIGFuZCBhbGwgdGhlIHJlbGF0ZWQKY29kZS4g V2UgbmVlZCB0byBudWtlIHRoYXQgdG9vIHRvIGF2b2lkIGFjY2lkZW50YWxseSBkZWZlcmVuY2lu ZyB0aGUKZnJlZWQtdXAgdm13Z2Z4LXByaXZhdGUgZnByaXYuCgpDYzogVGhvbWFzIEhlbGxzdHLD tm0gPHRoZWxsc3Ryb21Adm13YXJlLmNvbT4KU2lnbmVkLW9mZi1ieTogRGFuaWVsIFZldHRlciA8 ZGFuaWVsLnZldHRlckBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfZHJ2 LmggICAgICAgICB8ICAxIC0KIGRyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2Rydi5jICAg fCAxMCAtLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfZmVuY2UuYyB8IDQ4 IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vdm13 Z2Z4L3Ztd2dmeF9mZW5jZS5oIHwgIDIgLS0KIDQgZmlsZXMgY2hhbmdlZCwgNjEgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfZHJ2LmggYi9kcml2ZXJz L2dwdS9kcm0vdmM0L3ZjNF9kcnYuaAppbmRleCAwODA4NjVlYzJiYWUuLjRjNzM0ZDA4N2Q3ZiAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfZHJ2LmgKKysrIGIvZHJpdmVycy9n cHUvZHJtL3ZjNC92YzRfZHJ2LmgKQEAgLTM3Niw3ICszNzYsNiBAQCBpbnQgdmM0X2JvX3N0YXRz X2RlYnVnZnMoc3RydWN0IHNlcV9maWxlICptLCB2b2lkICphcmcpOwogZXh0ZXJuIHN0cnVjdCBw bGF0Zm9ybV9kcml2ZXIgdmM0X2NydGNfZHJpdmVyOwogaW50IHZjNF9lbmFibGVfdmJsYW5rKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIGludCBjcnRjX2lkKTsKIHZvaWQgdmM0X2Rp c2FibGVfdmJsYW5rKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIGludCBjcnRjX2lk KTsKLXZvaWQgdmM0X2NhbmNlbF9wYWdlX2ZsaXAoc3RydWN0IGRybV9jcnRjICpjcnRjLCBzdHJ1 Y3QgZHJtX2ZpbGUgKmZpbGUpOwogaW50IHZjNF9jcnRjX2RlYnVnZnNfcmVncyhzdHJ1Y3Qgc2Vx X2ZpbGUgKm0sIHZvaWQgKmFyZyk7CiAKIC8qIHZjNF9kZWJ1Z2ZzLmMgKi8KZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL3Zt d2dmeC92bXdnZnhfZHJ2LmMKaW5kZXggYzQ5ODEyYjgwZGQwLi5jMDRjNGQxZTJmM2UgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2Rydi5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS92bXdnZngvdm13Z2Z4X2Rydi5jCkBAIC05NzEsMTUgKzk3MSw2IEBAIHN0YXRpYyBp bnQgdm13X2RyaXZlcl91bmxvYWQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlyZXR1cm4gMDsK IH0KIAotc3RhdGljIHZvaWQgdm13X3ByZWNsb3NlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCi0J CQkgc3RydWN0IGRybV9maWxlICpmaWxlX3ByaXYpCi17Ci0Jc3RydWN0IHZtd19mcHJpdiAqdm13 X2ZwID0gdm13X2Zwcml2KGZpbGVfcHJpdik7Ci0Jc3RydWN0IHZtd19wcml2YXRlICpkZXZfcHJp diA9IHZtd19wcml2KGRldik7Ci0KLQl2bXdfZXZlbnRfZmVuY2VfZnByaXZfZ29uZShkZXZfcHJp di0+Zm1hbiwgJnZtd19mcC0+ZmVuY2VfZXZlbnRzKTsKLX0KLQogc3RhdGljIHZvaWQgdm13X3Bv c3RjbG9zZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJIHN0cnVjdCBkcm1fZmlsZSAqZmls ZV9wcml2KQogewpAQCAtMTUwMCw3ICsxNDkxLDYgQEAgc3RhdGljIHN0cnVjdCBkcm1fZHJpdmVy IGRyaXZlciA9IHsKIAkubWFzdGVyX3NldCA9IHZtd19tYXN0ZXJfc2V0LAogCS5tYXN0ZXJfZHJv cCA9IHZtd19tYXN0ZXJfZHJvcCwKIAkub3BlbiA9IHZtd19kcml2ZXJfb3BlbiwKLQkucHJlY2xv c2UgPSB2bXdfcHJlY2xvc2UsCiAJLnBvc3RjbG9zZSA9IHZtd19wb3N0Y2xvc2UsCiAJLnNldF9i dXNpZCA9IGRybV9wY2lfc2V0X2J1c2lkLAogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v dm13Z2Z4L3Ztd2dmeF9mZW5jZS5jIGIvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfZmVu Y2UuYwppbmRleCBlMGVkZjE0OWQ5ZDUuLmJiOTViZDIwZDQxNSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfZmVuY2UuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdm13 Z2Z4L3Ztd2dmeF9mZW5jZS5jCkBAIC03MSw3ICs3MSw2IEBAIHN0cnVjdCB2bXdfdXNlcl9mZW5j ZSB7CiAgKi8KIHN0cnVjdCB2bXdfZXZlbnRfZmVuY2VfYWN0aW9uIHsKIAlzdHJ1Y3Qgdm13X2Zl bmNlX2FjdGlvbiBhY3Rpb247Ci0Jc3RydWN0IGxpc3RfaGVhZCBmcHJpdl9oZWFkOwogCiAJc3Ry dWN0IGRybV9wZW5kaW5nX2V2ZW50ICpldmVudDsKIAlzdHJ1Y3Qgdm13X2ZlbmNlX29iaiAqZmVu Y2U7CkBAIC04MDgsNDQgKzgwNyw2IEBAIGludCB2bXdfZmVuY2Vfb2JqX3VucmVmX2lvY3RsKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiB9CiAKIC8qKgotICogdm13X2V2ZW50 X2ZlbmNlX2Zwcml2X2dvbmUgLSBSZW1vdmUgcmVmZXJlbmNlcyB0byBzdHJ1Y3QgZHJtX2ZpbGUg b2JqZWN0cwotICoKLSAqIEBmbWFuOiBQb2ludGVyIHRvIGEgc3RydWN0IHZtd19mZW5jZV9tYW5h Z2VyCi0gKiBAZXZlbnRfbGlzdDogUG9pbnRlciB0byBsaW5rZWQgbGlzdCBvZiBzdHJ1Y3Qgdm13 X2V2ZW50X2ZlbmNlX2FjdGlvbiBvYmplY3RzCi0gKiB3aXRoIHBvaW50ZXJzIHRvIGEgc3RydWN0 IGRybV9maWxlIG9iamVjdCBhYm91dCB0byBiZSBjbG9zZWQuCi0gKgotICogVGhpcyBmdW5jdGlv biByZW1vdmVzIGFsbCBwZW5kaW5nIGZlbmNlIGV2ZW50cyB3aXRoIHJlZmVyZW5jZXMgdG8gYQot ICogc3BlY2lmaWMgc3RydWN0IGRybV9maWxlIG9iamVjdCBhYm91dCB0byBiZSBjbG9zZWQuIFRo ZSBjYWxsZXIgaXMgcmVxdWlyZWQKLSAqIHRvIHBhc3MgYSBsaXN0IG9mIGFsbCBzdHJ1Y3Qgdm13 X2V2ZW50X2ZlbmNlX2FjdGlvbiBvYmplY3RzIHdpdGggc3VjaAotICogZXZlbnRzIGF0dGFjaGVk LiBUaGlzIGZ1bmN0aW9uIGlzIHR5cGljYWxseSBjYWxsZWQgYmVmb3JlIHRoZQotICogc3RydWN0 IGRybV9maWxlIG9iamVjdCdzIGV2ZW50IG1hbmFnZW1lbnQgaXMgdGFrZW4gZG93bi4KLSAqLwot dm9pZCB2bXdfZXZlbnRfZmVuY2VfZnByaXZfZ29uZShzdHJ1Y3Qgdm13X2ZlbmNlX21hbmFnZXIg KmZtYW4sCi0JCQkJc3RydWN0IGxpc3RfaGVhZCAqZXZlbnRfbGlzdCkKLXsKLQlzdHJ1Y3Qgdm13 X2V2ZW50X2ZlbmNlX2FjdGlvbiAqZWFjdGlvbjsKLQlzdHJ1Y3QgZHJtX3BlbmRpbmdfZXZlbnQg KmV2ZW50OwotCXVuc2lnbmVkIGxvbmcgaXJxX2ZsYWdzOwotCi0Jd2hpbGUgKDEpIHsKLQkJc3Bp bl9sb2NrX2lycXNhdmUoJmZtYW4tPmxvY2ssIGlycV9mbGFncyk7Ci0JCWlmIChsaXN0X2VtcHR5 KGV2ZW50X2xpc3QpKQotCQkJZ290byBvdXRfdW5sb2NrOwotCQllYWN0aW9uID0gbGlzdF9maXJz dF9lbnRyeShldmVudF9saXN0LAotCQkJCQkgICBzdHJ1Y3Qgdm13X2V2ZW50X2ZlbmNlX2FjdGlv biwKLQkJCQkJICAgZnByaXZfaGVhZCk7Ci0JCWxpc3RfZGVsX2luaXQoJmVhY3Rpb24tPmZwcml2 X2hlYWQpOwotCQlldmVudCA9IGVhY3Rpb24tPmV2ZW50OwotCQllYWN0aW9uLT5ldmVudCA9IE5V TEw7Ci0JCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmZtYW4tPmxvY2ssIGlycV9mbGFncyk7Ci0J CWV2ZW50LT5kZXN0cm95KGV2ZW50KTsKLQl9Ci1vdXRfdW5sb2NrOgotCXNwaW5fdW5sb2NrX2ly cXJlc3RvcmUoJmZtYW4tPmxvY2ssIGlycV9mbGFncyk7Ci19Ci0KLQotLyoqCiAgKiB2bXdfZXZl bnRfZmVuY2VfYWN0aW9uX3NlcV9wYXNzZWQKICAqCiAgKiBAYWN0aW9uOiBUaGUgc3RydWN0IHZt d19mZW5jZV9hY3Rpb24gZW1iZWRkZWQgaW4gYSBzdHJ1Y3QKQEAgLTg3OSw3ICs4NDAsNiBAQCBz dGF0aWMgdm9pZCB2bXdfZXZlbnRfZmVuY2VfYWN0aW9uX3NlcV9wYXNzZWQoc3RydWN0IHZtd19m ZW5jZV9hY3Rpb24gKmFjdGlvbikKIAkJKmVhY3Rpb24tPnR2X3VzZWMgPSB0di50dl91c2VjOwog CX0KIAotCWxpc3RfZGVsX2luaXQoJmVhY3Rpb24tPmZwcml2X2hlYWQpOwogCWVhY3Rpb24tPmV2 ZW50ID0gTlVMTDsKIAlkcm1fc2VuZF9ldmVudF9sb2NrZWQoZGV2LCBlYWN0aW9uLT5ldmVudCk7 CiAJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmZGV2LT5ldmVudF9sb2NrLCBpcnFfZmxhZ3MpOwpA QCAtOTAxLDEwICs4NjEsNiBAQCBzdGF0aWMgdm9pZCB2bXdfZXZlbnRfZmVuY2VfYWN0aW9uX2Ns ZWFudXAoc3RydWN0IHZtd19mZW5jZV9hY3Rpb24gKmFjdGlvbikKIAlzdHJ1Y3Qgdm13X2ZlbmNl X21hbmFnZXIgKmZtYW4gPSBmbWFuX2Zyb21fZmVuY2UoZWFjdGlvbi0+ZmVuY2UpOwogCXVuc2ln bmVkIGxvbmcgaXJxX2ZsYWdzOwogCi0Jc3Bpbl9sb2NrX2lycXNhdmUoJmZtYW4tPmxvY2ssIGly cV9mbGFncyk7Ci0JbGlzdF9kZWwoJmVhY3Rpb24tPmZwcml2X2hlYWQpOwotCXNwaW5fdW5sb2Nr X2lycXJlc3RvcmUoJmZtYW4tPmxvY2ssIGlycV9mbGFncyk7Ci0KIAl2bXdfZmVuY2Vfb2JqX3Vu cmVmZXJlbmNlKCZlYWN0aW9uLT5mZW5jZSk7CiAJa2ZyZWUoZWFjdGlvbik7CiB9CkBAIC0xMDAx LDEwICs5NTcsNiBAQCBpbnQgdm13X2V2ZW50X2ZlbmNlX2FjdGlvbl9xdWV1ZShzdHJ1Y3QgZHJt X2ZpbGUgKmZpbGVfcHJpdiwKIAllYWN0aW9uLT50dl9zZWMgPSB0dl9zZWM7CiAJZWFjdGlvbi0+ dHZfdXNlYyA9IHR2X3VzZWM7CiAKLQlzcGluX2xvY2tfaXJxc2F2ZSgmZm1hbi0+bG9jaywgaXJx X2ZsYWdzKTsKLQlsaXN0X2FkZF90YWlsKCZlYWN0aW9uLT5mcHJpdl9oZWFkLCAmdm13X2ZwLT5m ZW5jZV9ldmVudHMpOwotCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmZtYW4tPmxvY2ssIGlycV9m bGFncyk7Ci0KIAl2bXdfZmVuY2Vfb2JqX2FkZF9hY3Rpb24oZmVuY2UsICZlYWN0aW9uLT5hY3Rp b24pOwogCiAJcmV0dXJuIDA7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Zt d2dmeF9mZW5jZS5oIGIvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfZmVuY2UuaAppbmRl eCA4YmU2YzI5ZjVlYjUuLjgzYWUzMDFlZTE0MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L3Ztd2dmeC92bXdnZnhfZmVuY2UuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dm eF9mZW5jZS5oCkBAIC0xMTYsOCArMTE2LDYgQEAgZXh0ZXJuIGludCB2bXdfZmVuY2Vfb2JqX3Vu cmVmX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJCQkJICAgICBz dHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdik7CiBleHRlcm4gaW50IHZtd19mZW5jZV9ldmVudF9p b2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCQkJCSBzdHJ1Y3QgZHJt X2ZpbGUgKmZpbGVfcHJpdik7Ci1leHRlcm4gdm9pZCB2bXdfZXZlbnRfZmVuY2VfZnByaXZfZ29u ZShzdHJ1Y3Qgdm13X2ZlbmNlX21hbmFnZXIgKmZtYW4sCi0JCQkJICAgICAgIHN0cnVjdCBsaXN0 X2hlYWQgKmV2ZW50X2xpc3QpOwogZXh0ZXJuIGludCB2bXdfZXZlbnRfZmVuY2VfYWN0aW9uX3F1 ZXVlKHN0cnVjdCBkcm1fZmlsZSAqZmlsZWVfcHJpdiwKIAkJCQkJc3RydWN0IHZtd19mZW5jZV9v YmogKmZlbmNlLAogCQkJCQlzdHJ1Y3QgZHJtX3BlbmRpbmdfZXZlbnQgKmV2ZW50LAotLSAKMi42 LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVs LWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==