From: Imre Deak Subject: [PATCH v4 2/5] drm/i915: fix HPD IRQ reenable work cancelation Date: Mon, 18 Aug 2014 15:37:02 +0300 Message-ID: <1408365422-21833-1-git-send-email-imre.deak@intel.com> References: <1408362166-9543-2-git-send-email-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 171056E074 for ; Mon, 18 Aug 2014 05:37:35 -0700 (PDT) In-Reply-To: <1408362166-9543-2-git-send-email-imre.deak@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org QXRtLCB0aGUgSFBEIElSUSByZWVuYWJsZSB0aW1lciBjYW4gZ2V0IHJlYXJtZWQgcmlnaHQgYWZ0 ZXIgaXQncwpjYW5jZWxlZC4gQWxzbyB0byBhY2Nlc3MgdGhlIEhQRCBJUlEgbWFzayByZWdpc3Rl cnMgd2UgbmVlZCB0byB3YWtlIHVwCnRoZSBIVy4KClNvbHZlIGJvdGggaXNzdWVzIGJ5IGNvbnZl cnRpbmcgdGhlIHJlZW5hYmxlIHRpbWVyIHRvIGEgZGVsYXllZCB3b3JrIGFuZApncmFiYmluZyBh IHJ1bnRpbWUgUE0gcmVmZXJlbmNlIGluIHRoZSB3b3JrLiBCeSB0aGlzIHdlIGNhbiBhbHNvIGZv cmdvCmNhbmNlbGluZyB0aGUgdGltZXIgZHVyaW5nIHJ1bnRpbWUgc3VzcGVuZCwgc2luY2UgdGhl IG9ubHkgaW1wb3J0YW50CnRoaW5nIHRoZXJlIGlzIHRoYXQgdGhlIEhXIGlzIGF3YWtlIHdoZW4g d2Ugd3JpdGUgdGhlIHJlZ2lzdGVycyBhbmQKdGhhdCdzIGVuc3VyZWQgYnkgdGhlIFJQTSByZWYu IFNvIGRvIHRoZSBjYW5jZWxhdGlvbiBvbmx5IGR1cmluZyBkcml2ZXIKdW5sb2FkIHRpbWU7IHRo aXMgaXMgYWxzbyBhIHJlcXVpcmVtZW50IGZvciBhbiB1cGNvbWluZyBwYXRjaCB3aGVyZSB3ZQp3 YW50IHRvIGNhbmNlbCBhbGwgSFBEIHJlbGF0ZWQgd29ya3Mgb25seSBkdXJpbmcgc3lzdGVtIHN1 c3BlbmQgYW5kCmRyaXZlciB1bmxvYWQgdGltZSwgYnV0IG5vdCBkdXJpbmcgcnVudGltZSBzdXNw ZW5kLgoKTm90ZSB0aGF0IHRoZXJlIGlzIHN0aWxsIGEgcmFjZSBiZXR3ZWVuIHRoZSBIUEQgSVJR IHJlZW5hYmxlIHdvcmsgYW5kCmRybV9pcnFfdW5pbnN0YWxsKCkgZHVyaW5nIGRyaXZlciB1bmxv YWQsIHdoZXJlIHRoZSB3b3JrIGNhbiByZWVuYWJsZQp0aGUgSFBEIElSUXMgZGlzYWJsZWQgYnkg ZHJtX2lycV91bmluc3RhbGwoKS4gVGhpcyBpc24ndCBhIHByb2JsZW0gc2luY2UKdGhlIEhQRCBJ UlFzIHdpbGwgc3RpbGwgYmUgZWZmZWN0aXZlbHkgbWFza2VkIGJ5IHRoZSBmaXJzdCBsZXZlbApp bnRlcnJ1cHQgbWFzay4KCnYyLTM6Ci0gdW5jaGFuZ2VkCnY0OgotIHVzZSBwcm9wZXIgQVBJIGZv ciBjaGFuZ2luZyB0aGUgZXhwaXJhdGlvbiB0aW1lIGZvciBhbiBhbHJlYWR5IHBlbmRpbmcKICBk ZWxheWVkIHdvcmsgKEphbmkpCgpTaWduZWQtb2ZmLWJ5OiBJbXJlIERlYWsgPGltcmUuZGVha0Bp bnRlbC5jb20+ClJldmlld2VkLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGlu dXguaW50ZWwuY29tPiAodjIpCi0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAg ICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgICAgICB8IDMzICsr KysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jIHwgIDEgKwogMyBmaWxlcyBjaGFuZ2VkLCAxNCBpbnNlcnRpb25zKCspLCAy MiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA0NDEyZjZhLi4xMjYz YWFjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTE0NTgsNyArMTQ1OCw3IEBAIHN0cnVj dCBkcm1faTkxNV9wcml2YXRlIHsKIAkJfSBocGRfbWFyazsKIAl9IGhwZF9zdGF0c1tIUERfTlVN X1BJTlNdOwogCXUzMiBocGRfZXZlbnRfYml0czsKLQlzdHJ1Y3QgdGltZXJfbGlzdCBob3RwbHVn X3JlZW5hYmxlX3RpbWVyOworCXN0cnVjdCBkZWxheWVkX3dvcmsgaG90cGx1Z19yZWVuYWJsZV93 b3JrOwogCiAJc3RydWN0IGk5MTVfZmJjIGZiYzsKIAlzdHJ1Y3QgaTkxNV9kcnJzIGRycnM7CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9pcnEuYwppbmRleCAzOTBjY2MyLi43MThhYTVlIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfaXJxLmMKQEAgLTExODksOCArMTE4OSw4IEBAIHN0YXRpYyB2b2lkIGk5MTVfaG90cGx1 Z193b3JrX2Z1bmMoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQogCSAgKiBzb21lIGNvbm5lY3Rv cnMgKi8KIAlpZiAoaHBkX2Rpc2FibGVkKSB7CiAJCWRybV9rbXNfaGVscGVyX3BvbGxfZW5hYmxl KGRldik7Ci0JCW1vZF90aW1lcigmZGV2X3ByaXYtPmhvdHBsdWdfcmVlbmFibGVfdGltZXIsCi0J CQkgIGppZmZpZXMgKyBtc2Vjc190b19qaWZmaWVzKEk5MTVfUkVFTkFCTEVfSE9UUExVR19ERUxB WSkpOworCQltb2RfZGVsYXllZF93b3JrKHN5c3RlbV93cSwgJmRldl9wcml2LT5ob3RwbHVnX3Jl ZW5hYmxlX3dvcmssCisJCQkgIG1zZWNzX3RvX2ppZmZpZXMoSTkxNV9SRUVOQUJMRV9IT1RQTFVH X0RFTEFZKSk7CiAJfQogCiAJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmZGV2X3ByaXYtPmlycV9s b2NrLCBpcnFmbGFncyk7CkBAIC0xMjEzLDExICsxMjEzLDYgQEAgc3RhdGljIHZvaWQgaTkxNV9o b3RwbHVnX3dvcmtfZnVuYyhzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCiAJCWRybV9rbXNfaGVs cGVyX2hvdHBsdWdfZXZlbnQoZGV2KTsKIH0KIAotc3RhdGljIHZvaWQgaW50ZWxfaHBkX2lycV91 bmluc3RhbGwoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQotewotCWRlbF90aW1l cl9zeW5jKCZkZXZfcHJpdi0+aG90cGx1Z19yZWVuYWJsZV90aW1lcik7Ci19Ci0KIHN0YXRpYyB2 b2lkIGlyb25sYWtlX3Jwc19jaGFuZ2VfaXJxX2hhbmRsZXIoc3RydWN0IGRybV9kZXZpY2UgKmRl dikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2 YXRlOwpAQCAtMzg5Miw4ICszODg3LDYgQEAgc3RhdGljIHZvaWQgZ2VuOF9pcnFfdW5pbnN0YWxs KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaWYgKCFkZXZfcHJpdikKIAkJcmV0dXJuOwogCi0J aW50ZWxfaHBkX2lycV91bmluc3RhbGwoZGV2X3ByaXYpOwotCiAJZ2VuOF9pcnFfcmVzZXQoZGV2 KTsKIH0KIApAQCAtMzkwOCw4ICszOTAxLDYgQEAgc3RhdGljIHZvaWQgdmFsbGV5dmlld19pcnFf dW5pbnN0YWxsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAlJOTE1X1dSSVRFKFZMVl9NQVNU RVJfSUVSLCAwKTsKIAotCWludGVsX2hwZF9pcnFfdW5pbnN0YWxsKGRldl9wcml2KTsKLQogCWZv cl9lYWNoX3BpcGUocGlwZSkKIAkJSTkxNV9XUklURShQSVBFU1RBVChwaXBlKSwgMHhmZmZmKTsK IApAQCAtMzk4OCw4ICszOTc5LDYgQEAgc3RhdGljIHZvaWQgaXJvbmxha2VfaXJxX3VuaW5zdGFs bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWlmICghZGV2X3ByaXYpCiAJCXJldHVybjsKIAot CWludGVsX2hwZF9pcnFfdW5pbnN0YWxsKGRldl9wcml2KTsKLQogCWlyb25sYWtlX2lycV9yZXNl dChkZXYpOwogfQogCkBAIC00MzYwLDggKzQzNDksNiBAQCBzdGF0aWMgdm9pZCBpOTE1X2lycV91 bmluc3RhbGwoc3RydWN0IGRybV9kZXZpY2UgKiBkZXYpCiAJc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlpbnQgcGlwZTsKIAotCWludGVsX2hw ZF9pcnFfdW5pbnN0YWxsKGRldl9wcml2KTsKLQogCWlmIChJOTE1X0hBU19IT1RQTFVHKGRldikp IHsKIAkJSTkxNV9XUklURShQT1JUX0hPVFBMVUdfRU4sIDApOwogCQlJOTE1X1dSSVRFKFBPUlRf SE9UUExVR19TVEFULCBJOTE1X1JFQUQoUE9SVF9IT1RQTFVHX1NUQVQpKTsKQEAgLTQ1OTgsOCAr NDU4NSw2IEBAIHN0YXRpYyB2b2lkIGk5NjVfaXJxX3VuaW5zdGFsbChzdHJ1Y3QgZHJtX2Rldmlj ZSAqIGRldikKIAlpZiAoIWRldl9wcml2KQogCQlyZXR1cm47CiAKLQlpbnRlbF9ocGRfaXJxX3Vu aW5zdGFsbChkZXZfcHJpdik7Ci0KIAlJOTE1X1dSSVRFKFBPUlRfSE9UUExVR19FTiwgMCk7CiAJ STkxNV9XUklURShQT1JUX0hPVFBMVUdfU1RBVCwgSTkxNV9SRUFEKFBPUlRfSE9UUExVR19TVEFU KSk7CiAKQEAgLTQ2MTUsMTQgKzQ2MDAsMTggQEAgc3RhdGljIHZvaWQgaTk2NV9pcnFfdW5pbnN0 YWxsKHN0cnVjdCBkcm1fZGV2aWNlICogZGV2KQogCUk5MTVfV1JJVEUoSUlSLCBJOTE1X1JFQUQo SUlSKSk7CiB9CiAKLXN0YXRpYyB2b2lkIGludGVsX2hwZF9pcnFfcmVlbmFibGUodW5zaWduZWQg bG9uZyBkYXRhKQorc3RhdGljIHZvaWQgaW50ZWxfaHBkX2lycV9yZWVuYWJsZShzdHJ1Y3Qgd29y a19zdHJ1Y3QgKndvcmspCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICopZGF0YTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYgPQorCQljb250YWluZXJfb2Yod29yaywgdHlwZW9mKCpkZXZfcHJpdiksCisJ CQkgICAgIGhvdHBsdWdfcmVlbmFibGVfd29yay53b3JrKTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2ID0gZGV2X3ByaXYtPmRldjsKIAlzdHJ1Y3QgZHJtX21vZGVfY29uZmlnICptb2RlX2NvbmZp ZyA9ICZkZXYtPm1vZGVfY29uZmlnOwogCXVuc2lnbmVkIGxvbmcgaXJxZmxhZ3M7CiAJaW50IGk7 CiAKKwlpbnRlbF9ydW50aW1lX3BtX2dldChkZXZfcHJpdik7CisKIAlzcGluX2xvY2tfaXJxc2F2 ZSgmZGV2X3ByaXYtPmlycV9sb2NrLCBpcnFmbGFncyk7CiAJZm9yIChpID0gKEhQRF9OT05FICsg MSk7IGkgPCBIUERfTlVNX1BJTlM7IGkrKykgewogCQlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29u bmVjdG9yOwpAQCAtNDY0OCw2ICs0NjM3LDggQEAgc3RhdGljIHZvaWQgaW50ZWxfaHBkX2lycV9y ZWVuYWJsZSh1bnNpZ25lZCBsb25nIGRhdGEpCiAJaWYgKGRldl9wcml2LT5kaXNwbGF5LmhwZF9p cnFfc2V0dXApCiAJCWRldl9wcml2LT5kaXNwbGF5LmhwZF9pcnFfc2V0dXAoZGV2KTsKIAlzcGlu X3VubG9ja19pcnFyZXN0b3JlKCZkZXZfcHJpdi0+aXJxX2xvY2ssIGlycWZsYWdzKTsKKworCWlu dGVsX3J1bnRpbWVfcG1fcHV0KGRldl9wcml2KTsKIH0KIAogdm9pZCBpbnRlbF9pcnFfaW5pdChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQpAQCAtNDY3MCw4ICs0NjYxLDggQEAgdm9pZCBpbnRlbF9p cnFfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCXNldHVwX3RpbWVyKCZkZXZfcHJpdi0+ Z3B1X2Vycm9yLmhhbmdjaGVja190aW1lciwKIAkJICAgIGk5MTVfaGFuZ2NoZWNrX2VsYXBzZWQs CiAJCSAgICAodW5zaWduZWQgbG9uZykgZGV2KTsKLQlzZXR1cF90aW1lcigmZGV2X3ByaXYtPmhv dHBsdWdfcmVlbmFibGVfdGltZXIsIGludGVsX2hwZF9pcnFfcmVlbmFibGUsCi0JCSAgICAodW5z aWduZWQgbG9uZykgZGV2X3ByaXYpOworCUlOSVRfREVMQVlFRF9XT1JLKCZkZXZfcHJpdi0+aG90 cGx1Z19yZWVuYWJsZV93b3JrLAorCQkJICBpbnRlbF9ocGRfaXJxX3JlZW5hYmxlKTsKIAogCXBt X3Fvc19hZGRfcmVxdWVzdCgmZGV2X3ByaXYtPnBtX3FvcywgUE1fUU9TX0NQVV9ETUFfTEFURU5D WSwgUE1fUU9TX0RFRkFVTFRfVkFMVUUpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMKaW5kZXggMjgzODMwMC4uYmNmOGQxOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYwpAQCAtMTMxMDQsNiArMTMxMDQsNyBAQCB2b2lkIGludGVsX21vZGVzZXRfY2xlYW51cChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCSAqLwogCWRybV9pcnFfdW5pbnN0YWxsKGRldik7CiAJ Y2FuY2VsX3dvcmtfc3luYygmZGV2X3ByaXYtPmhvdHBsdWdfd29yayk7CisJY2FuY2VsX2RlbGF5 ZWRfd29ya19zeW5jKCZkZXZfcHJpdi0+aG90cGx1Z19yZWVuYWJsZV93b3JrKTsKIAlkZXZfcHJp di0+cG0uX2lycXNfZGlzYWJsZWQgPSB0cnVlOwogCiAJLyoKLS0gCjEuOC40CgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=