From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: [PATCH 22/22] drm/vmwgfx: Nuke preclose hook Date: Mon, 11 Jan 2016 22:41:16 +0100 Message-ID: <1452548477-15905-23-git-send-email-daniel.vetter@ffwll.ch> References: <1452548477-15905-1-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: <1452548477-15905-1-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: DRI Development Cc: Daniel Vetter , Intel Graphics Development , =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org QWdhaW4gc2luY2UgdGhlIGRybSBjb3JlIHRha2VzIGNhcmUgb2YgZXZlbnQgdW5saW5raW5nL2Rp c2FybWluZyB0aGlzCmlzIG5vdyBqdXN0IG5lZWRsZXNzIGNvZGUuCgp2MjogSSd2ZSBjb21wbGV0 ZWx5IG1pc3NlZCBlYWN0aW9uLT5mcHJpdl9oZWFkIGFuZCBhbGwgdGhlIHJlbGF0ZWQKY29kZS4g V2UgbmVlZCB0byBudWtlIHRoYXQgdG9vIHRvIGF2b2lkIGFjY2lkZW50YWxseSBkZWZlcmVuY2lu ZyB0aGUKZnJlZWQtdXAgdm13Z2Z4LXByaXZhdGUgZnByaXYuCgp2MzogQWxzbyByZW1vdmUgdm13 X2Zwcml2LT5mZW5jZV9ldmVudHMgYW5kIHVudXNlZCB2YXJpYWJsZXMgSSBtaXNzZWQuCgpDYzog VGhvbWFzIEhlbGxzdHLDtm0gPHRoZWxsc3Ryb21Adm13YXJlLmNvbT4KQWNrZWQtYnk6IERhbmll bCBTdG9uZSA8ZGFuaWVsc0Bjb2xsYWJvcmEuY29tPgpSZXZpZXdlZC1ieTogQWxleCBEZXVjaGVy IDxhbGV4YW5kZXIuZGV1Y2hlckBhbWQuY29tPgpSZXZpZXdlZC1ieTogVGhvbWFzIEhlbGxzdHJv bSA8dGhlbGxzdHJvbUB2bXdhcmUuY29tPgpTaWduZWQtb2ZmLWJ5OiBEYW5pZWwgVmV0dGVyIDxk YW5pZWwudmV0dGVyQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dm eF9kcnYuYyAgIHwgMTEgLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2Ry di5oICAgfCAgMSAtCiBkcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9mZW5jZS5jIHwgNTIg LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS92bXdn Zngvdm13Z2Z4X2ZlbmNlLmggfCAgMiAtLQogNCBmaWxlcyBjaGFuZ2VkLCA2NiBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9kcnYuYyBiL2Ry aXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2Rydi5jCmluZGV4IGM0OTgxMmI4MGRkMC4uYzk2 YTJkMmQ1MTA3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9kcnYu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9kcnYuYwpAQCAtOTcxLDE1ICs5 NzEsNiBAQCBzdGF0aWMgaW50IHZtd19kcml2ZXJfdW5sb2FkKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyB2b2lkIHZtd19wcmVjbG9zZShzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LAotCQkJIHN0cnVjdCBkcm1fZmlsZSAqZmlsZV9wcml2KQotewotCXN0cnVj dCB2bXdfZnByaXYgKnZtd19mcCA9IHZtd19mcHJpdihmaWxlX3ByaXYpOwotCXN0cnVjdCB2bXdf cHJpdmF0ZSAqZGV2X3ByaXYgPSB2bXdfcHJpdihkZXYpOwotCi0Jdm13X2V2ZW50X2ZlbmNlX2Zw cml2X2dvbmUoZGV2X3ByaXYtPmZtYW4sICZ2bXdfZnAtPmZlbmNlX2V2ZW50cyk7Ci19Ci0KIHN0 YXRpYyB2b2lkIHZtd19wb3N0Y2xvc2Uoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCSBzdHJ1 Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdikKIHsKQEAgLTEwMTAsNyArMTAwMSw2IEBAIHN0YXRpYyBp bnQgdm13X2RyaXZlcl9vcGVuKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fZmls ZSAqZmlsZV9wcml2KQogCWlmICh1bmxpa2VseSh2bXdfZnAgPT0gTlVMTCkpCiAJCXJldHVybiBy ZXQ7CiAKLQlJTklUX0xJU1RfSEVBRCgmdm13X2ZwLT5mZW5jZV9ldmVudHMpOwogCXZtd19mcC0+ dGZpbGUgPSB0dG1fb2JqZWN0X2ZpbGVfaW5pdChkZXZfcHJpdi0+dGRldiwgMTApOwogCWlmICh1 bmxpa2VseSh2bXdfZnAtPnRmaWxlID09IE5VTEwpKQogCQlnb3RvIG91dF9ub190ZmlsZTsKQEAg LTE1MDAsNyArMTQ5MCw2IEBAIHN0YXRpYyBzdHJ1Y3QgZHJtX2RyaXZlciBkcml2ZXIgPSB7CiAJ Lm1hc3Rlcl9zZXQgPSB2bXdfbWFzdGVyX3NldCwKIAkubWFzdGVyX2Ryb3AgPSB2bXdfbWFzdGVy X2Ryb3AsCiAJLm9wZW4gPSB2bXdfZHJpdmVyX29wZW4sCi0JLnByZWNsb3NlID0gdm13X3ByZWNs b3NlLAogCS5wb3N0Y2xvc2UgPSB2bXdfcG9zdGNsb3NlLAogCS5zZXRfYnVzaWQgPSBkcm1fcGNp X3NldF9idXNpZCwKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhf ZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9kcnYuaAppbmRleCA0NjljZGQ1 MjA2MTUuLjVjYjFiMTY4N2NkNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92 bXdnZnhfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfZHJ2LmgKQEAg LTgwLDcgKzgwLDYgQEAKIHN0cnVjdCB2bXdfZnByaXYgewogCXN0cnVjdCBkcm1fbWFzdGVyICps b2NrZWRfbWFzdGVyOwogCXN0cnVjdCB0dG1fb2JqZWN0X2ZpbGUgKnRmaWxlOwotCXN0cnVjdCBs aXN0X2hlYWQgZmVuY2VfZXZlbnRzOwogCWJvb2wgZ2JfYXdhcmU7CiB9OwogCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9mZW5jZS5jIGIvZHJpdmVycy9ncHUvZHJt L3Ztd2dmeC92bXdnZnhfZmVuY2UuYwppbmRleCBlMGVkZjE0OWQ5ZDUuLmFjNDc3ODYzZmMwNyAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfZmVuY2UuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9mZW5jZS5jCkBAIC03MSw3ICs3MSw2IEBAIHN0 cnVjdCB2bXdfdXNlcl9mZW5jZSB7CiAgKi8KIHN0cnVjdCB2bXdfZXZlbnRfZmVuY2VfYWN0aW9u IHsKIAlzdHJ1Y3Qgdm13X2ZlbmNlX2FjdGlvbiBhY3Rpb247Ci0Jc3RydWN0IGxpc3RfaGVhZCBm cHJpdl9oZWFkOwogCiAJc3RydWN0IGRybV9wZW5kaW5nX2V2ZW50ICpldmVudDsKIAlzdHJ1Y3Qg dm13X2ZlbmNlX29iaiAqZmVuY2U7CkBAIC04MDgsNDQgKzgwNyw2IEBAIGludCB2bXdfZmVuY2Vf b2JqX3VucmVmX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiB9CiAK IC8qKgotICogdm13X2V2ZW50X2ZlbmNlX2Zwcml2X2dvbmUgLSBSZW1vdmUgcmVmZXJlbmNlcyB0 byBzdHJ1Y3QgZHJtX2ZpbGUgb2JqZWN0cwotICoKLSAqIEBmbWFuOiBQb2ludGVyIHRvIGEgc3Ry dWN0IHZtd19mZW5jZV9tYW5hZ2VyCi0gKiBAZXZlbnRfbGlzdDogUG9pbnRlciB0byBsaW5rZWQg bGlzdCBvZiBzdHJ1Y3Qgdm13X2V2ZW50X2ZlbmNlX2FjdGlvbiBvYmplY3RzCi0gKiB3aXRoIHBv aW50ZXJzIHRvIGEgc3RydWN0IGRybV9maWxlIG9iamVjdCBhYm91dCB0byBiZSBjbG9zZWQuCi0g KgotICogVGhpcyBmdW5jdGlvbiByZW1vdmVzIGFsbCBwZW5kaW5nIGZlbmNlIGV2ZW50cyB3aXRo IHJlZmVyZW5jZXMgdG8gYQotICogc3BlY2lmaWMgc3RydWN0IGRybV9maWxlIG9iamVjdCBhYm91 dCB0byBiZSBjbG9zZWQuIFRoZSBjYWxsZXIgaXMgcmVxdWlyZWQKLSAqIHRvIHBhc3MgYSBsaXN0 IG9mIGFsbCBzdHJ1Y3Qgdm13X2V2ZW50X2ZlbmNlX2FjdGlvbiBvYmplY3RzIHdpdGggc3VjaAot ICogZXZlbnRzIGF0dGFjaGVkLiBUaGlzIGZ1bmN0aW9uIGlzIHR5cGljYWxseSBjYWxsZWQgYmVm b3JlIHRoZQotICogc3RydWN0IGRybV9maWxlIG9iamVjdCdzIGV2ZW50IG1hbmFnZW1lbnQgaXMg dGFrZW4gZG93bi4KLSAqLwotdm9pZCB2bXdfZXZlbnRfZmVuY2VfZnByaXZfZ29uZShzdHJ1Y3Qg dm13X2ZlbmNlX21hbmFnZXIgKmZtYW4sCi0JCQkJc3RydWN0IGxpc3RfaGVhZCAqZXZlbnRfbGlz dCkKLXsKLQlzdHJ1Y3Qgdm13X2V2ZW50X2ZlbmNlX2FjdGlvbiAqZWFjdGlvbjsKLQlzdHJ1Y3Qg ZHJtX3BlbmRpbmdfZXZlbnQgKmV2ZW50OwotCXVuc2lnbmVkIGxvbmcgaXJxX2ZsYWdzOwotCi0J d2hpbGUgKDEpIHsKLQkJc3Bpbl9sb2NrX2lycXNhdmUoJmZtYW4tPmxvY2ssIGlycV9mbGFncyk7 Ci0JCWlmIChsaXN0X2VtcHR5KGV2ZW50X2xpc3QpKQotCQkJZ290byBvdXRfdW5sb2NrOwotCQll YWN0aW9uID0gbGlzdF9maXJzdF9lbnRyeShldmVudF9saXN0LAotCQkJCQkgICBzdHJ1Y3Qgdm13 X2V2ZW50X2ZlbmNlX2FjdGlvbiwKLQkJCQkJICAgZnByaXZfaGVhZCk7Ci0JCWxpc3RfZGVsX2lu aXQoJmVhY3Rpb24tPmZwcml2X2hlYWQpOwotCQlldmVudCA9IGVhY3Rpb24tPmV2ZW50OwotCQll YWN0aW9uLT5ldmVudCA9IE5VTEw7Ci0JCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmZtYW4tPmxv Y2ssIGlycV9mbGFncyk7Ci0JCWV2ZW50LT5kZXN0cm95KGV2ZW50KTsKLQl9Ci1vdXRfdW5sb2Nr OgotCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmZtYW4tPmxvY2ssIGlycV9mbGFncyk7Ci19Ci0K LQotLyoqCiAgKiB2bXdfZXZlbnRfZmVuY2VfYWN0aW9uX3NlcV9wYXNzZWQKICAqCiAgKiBAYWN0 aW9uOiBUaGUgc3RydWN0IHZtd19mZW5jZV9hY3Rpb24gZW1iZWRkZWQgaW4gYSBzdHJ1Y3QKQEAg LTg3OSw3ICs4NDAsNiBAQCBzdGF0aWMgdm9pZCB2bXdfZXZlbnRfZmVuY2VfYWN0aW9uX3NlcV9w YXNzZWQoc3RydWN0IHZtd19mZW5jZV9hY3Rpb24gKmFjdGlvbikKIAkJKmVhY3Rpb24tPnR2X3Vz ZWMgPSB0di50dl91c2VjOwogCX0KIAotCWxpc3RfZGVsX2luaXQoJmVhY3Rpb24tPmZwcml2X2hl YWQpOwogCWVhY3Rpb24tPmV2ZW50ID0gTlVMTDsKIAlkcm1fc2VuZF9ldmVudF9sb2NrZWQoZGV2 LCBlYWN0aW9uLT5ldmVudCk7CiAJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmZGV2LT5ldmVudF9s b2NrLCBpcnFfZmxhZ3MpOwpAQCAtODk4LDEyICs4NTgsNiBAQCBzdGF0aWMgdm9pZCB2bXdfZXZl bnRfZmVuY2VfYWN0aW9uX2NsZWFudXAoc3RydWN0IHZtd19mZW5jZV9hY3Rpb24gKmFjdGlvbikK IHsKIAlzdHJ1Y3Qgdm13X2V2ZW50X2ZlbmNlX2FjdGlvbiAqZWFjdGlvbiA9CiAJCWNvbnRhaW5l cl9vZihhY3Rpb24sIHN0cnVjdCB2bXdfZXZlbnRfZmVuY2VfYWN0aW9uLCBhY3Rpb24pOwotCXN0 cnVjdCB2bXdfZmVuY2VfbWFuYWdlciAqZm1hbiA9IGZtYW5fZnJvbV9mZW5jZShlYWN0aW9uLT5m ZW5jZSk7Ci0JdW5zaWduZWQgbG9uZyBpcnFfZmxhZ3M7Ci0KLQlzcGluX2xvY2tfaXJxc2F2ZSgm Zm1hbi0+bG9jaywgaXJxX2ZsYWdzKTsKLQlsaXN0X2RlbCgmZWFjdGlvbi0+ZnByaXZfaGVhZCk7 Ci0Jc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmZm1hbi0+bG9jaywgaXJxX2ZsYWdzKTsKIAogCXZt d19mZW5jZV9vYmpfdW5yZWZlcmVuY2UoJmVhY3Rpb24tPmZlbmNlKTsKIAlrZnJlZShlYWN0aW9u KTsKQEAgLTk4Myw4ICs5MzcsNiBAQCBpbnQgdm13X2V2ZW50X2ZlbmNlX2FjdGlvbl9xdWV1ZShz dHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdiwKIHsKIAlzdHJ1Y3Qgdm13X2V2ZW50X2ZlbmNlX2Fj dGlvbiAqZWFjdGlvbjsKIAlzdHJ1Y3Qgdm13X2ZlbmNlX21hbmFnZXIgKmZtYW4gPSBmbWFuX2Zy b21fZmVuY2UoZmVuY2UpOwotCXN0cnVjdCB2bXdfZnByaXYgKnZtd19mcCA9IHZtd19mcHJpdihm aWxlX3ByaXYpOwotCXVuc2lnbmVkIGxvbmcgaXJxX2ZsYWdzOwogCiAJZWFjdGlvbiA9IGt6YWxs b2Moc2l6ZW9mKCplYWN0aW9uKSwgR0ZQX0tFUk5FTCk7CiAJaWYgKHVubGlrZWx5KGVhY3Rpb24g PT0gTlVMTCkpCkBAIC0xMDAxLDEwICs5NTMsNiBAQCBpbnQgdm13X2V2ZW50X2ZlbmNlX2FjdGlv bl9xdWV1ZShzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdiwKIAllYWN0aW9uLT50dl9zZWMgPSB0 dl9zZWM7CiAJZWFjdGlvbi0+dHZfdXNlYyA9IHR2X3VzZWM7CiAKLQlzcGluX2xvY2tfaXJxc2F2 ZSgmZm1hbi0+bG9jaywgaXJxX2ZsYWdzKTsKLQlsaXN0X2FkZF90YWlsKCZlYWN0aW9uLT5mcHJp dl9oZWFkLCAmdm13X2ZwLT5mZW5jZV9ldmVudHMpOwotCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUo JmZtYW4tPmxvY2ssIGlycV9mbGFncyk7Ci0KIAl2bXdfZmVuY2Vfb2JqX2FkZF9hY3Rpb24oZmVu Y2UsICZlYWN0aW9uLT5hY3Rpb24pOwogCiAJcmV0dXJuIDA7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9mZW5jZS5oIGIvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92 bXdnZnhfZmVuY2UuaAppbmRleCA4YmU2YzI5ZjVlYjUuLjgzYWUzMDFlZTE0MSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfZmVuY2UuaAorKysgYi9kcml2ZXJzL2dw dS9kcm0vdm13Z2Z4L3Ztd2dmeF9mZW5jZS5oCkBAIC0xMTYsOCArMTE2LDYgQEAgZXh0ZXJuIGlu dCB2bXdfZmVuY2Vfb2JqX3VucmVmX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQg KmRhdGEsCiAJCQkJICAgICBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdik7CiBleHRlcm4gaW50 IHZtd19mZW5jZV9ldmVudF9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRh LAogCQkJCSBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdik7Ci1leHRlcm4gdm9pZCB2bXdfZXZl bnRfZmVuY2VfZnByaXZfZ29uZShzdHJ1Y3Qgdm13X2ZlbmNlX21hbmFnZXIgKmZtYW4sCi0JCQkJ ICAgICAgIHN0cnVjdCBsaXN0X2hlYWQgKmV2ZW50X2xpc3QpOwogZXh0ZXJuIGludCB2bXdfZXZl bnRfZmVuY2VfYWN0aW9uX3F1ZXVlKHN0cnVjdCBkcm1fZmlsZSAqZmlsZWVfcHJpdiwKIAkJCQkJ c3RydWN0IHZtd19mZW5jZV9vYmogKmZlbmNlLAogCQkJCQlzdHJ1Y3QgZHJtX3BlbmRpbmdfZXZl bnQgKmV2ZW50LAotLSAKMi42LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v ZHJpLWRldmVsCg==