From: Imre Deak Subject: [PATCH v3 2/5] drm/i915: fix HPD IRQ reenable work cancelation Date: Mon, 18 Aug 2014 14:42:43 +0300 Message-ID: <1408362166-9543-2-git-send-email-imre.deak@intel.com> References: <1408362166-9543-1-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 292396E3D9 for ; Mon, 18 Aug 2014 04:44:57 -0700 (PDT) In-Reply-To: <1408362166-9543-1-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 bnRlcnJ1cHQgbWFzay4KClNpZ25lZC1vZmYtYnk6IEltcmUgRGVhayA8aW1yZS5kZWFrQGludGVs LmNvbT4KUmV2aWV3ZWQtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5p bnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgIHwgIDIg Ky0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgICAgICB8IDMzICsrKysrKysrKysr Ky0tLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jIHwgIDEgKwogMyBmaWxlcyBjaGFuZ2VkLCAxNCBpbnNlcnRpb25zKCspLCAyMiBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA0NDEyZjZhLi4xMjYzYWFjIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTE0NTgsNyArMTQ1OCw3IEBAIHN0cnVjdCBkcm1faTkx NV9wcml2YXRlIHsKIAkJfSBocGRfbWFyazsKIAl9IGhwZF9zdGF0c1tIUERfTlVNX1BJTlNdOwog CXUzMiBocGRfZXZlbnRfYml0czsKLQlzdHJ1Y3QgdGltZXJfbGlzdCBob3RwbHVnX3JlZW5hYmxl X3RpbWVyOworCXN0cnVjdCBkZWxheWVkX3dvcmsgaG90cGx1Z19yZWVuYWJsZV93b3JrOwogCiAJ c3RydWN0IGk5MTVfZmJjIGZiYzsKIAlzdHJ1Y3QgaTkxNV9kcnJzIGRycnM7CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9pcnEuYwppbmRleCAzOTBjY2MyLi44YTVhMDNmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2lycS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJx LmMKQEAgLTExODksOCArMTE4OSw4IEBAIHN0YXRpYyB2b2lkIGk5MTVfaG90cGx1Z193b3JrX2Z1 bmMoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQogCSAgKiBzb21lIGNvbm5lY3RvcnMgKi8KIAlp ZiAoaHBkX2Rpc2FibGVkKSB7CiAJCWRybV9rbXNfaGVscGVyX3BvbGxfZW5hYmxlKGRldik7Ci0J CW1vZF90aW1lcigmZGV2X3ByaXYtPmhvdHBsdWdfcmVlbmFibGVfdGltZXIsCi0JCQkgIGppZmZp ZXMgKyBtc2Vjc190b19qaWZmaWVzKEk5MTVfUkVFTkFCTEVfSE9UUExVR19ERUxBWSkpOworCQlz Y2hlZHVsZV9kZWxheWVkX3dvcmsoJmRldl9wcml2LT5ob3RwbHVnX3JlZW5hYmxlX3dvcmssCisJ CQkgIG1zZWNzX3RvX2ppZmZpZXMoSTkxNV9SRUVOQUJMRV9IT1RQTFVHX0RFTEFZKSk7CiAJfQog CiAJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmZGV2X3ByaXYtPmlycV9sb2NrLCBpcnFmbGFncyk7 CkBAIC0xMjEzLDExICsxMjEzLDYgQEAgc3RhdGljIHZvaWQgaTkxNV9ob3RwbHVnX3dvcmtfZnVu YyhzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCiAJCWRybV9rbXNfaGVscGVyX2hvdHBsdWdfZXZl bnQoZGV2KTsKIH0KIAotc3RhdGljIHZvaWQgaW50ZWxfaHBkX2lycV91bmluc3RhbGwoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQotewotCWRlbF90aW1lcl9zeW5jKCZkZXZfcHJp di0+aG90cGx1Z19yZWVuYWJsZV90aW1lcik7Ci19Ci0KIHN0YXRpYyB2b2lkIGlyb25sYWtlX3Jw c19jaGFuZ2VfaXJxX2hhbmRsZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwpAQCAtMzg5Miw4 ICszODg3LDYgQEAgc3RhdGljIHZvaWQgZ2VuOF9pcnFfdW5pbnN0YWxsKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCiAJaWYgKCFkZXZfcHJpdikKIAkJcmV0dXJuOwogCi0JaW50ZWxfaHBkX2lycV91 bmluc3RhbGwoZGV2X3ByaXYpOwotCiAJZ2VuOF9pcnFfcmVzZXQoZGV2KTsKIH0KIApAQCAtMzkw OCw4ICszOTAxLDYgQEAgc3RhdGljIHZvaWQgdmFsbGV5dmlld19pcnFfdW5pbnN0YWxsKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCiAKIAlJOTE1X1dSSVRFKFZMVl9NQVNURVJfSUVSLCAwKTsKIAot CWludGVsX2hwZF9pcnFfdW5pbnN0YWxsKGRldl9wcml2KTsKLQogCWZvcl9lYWNoX3BpcGUocGlw ZSkKIAkJSTkxNV9XUklURShQSVBFU1RBVChwaXBlKSwgMHhmZmZmKTsKIApAQCAtMzk4OCw4ICsz OTc5LDYgQEAgc3RhdGljIHZvaWQgaXJvbmxha2VfaXJxX3VuaW5zdGFsbChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQogCWlmICghZGV2X3ByaXYpCiAJCXJldHVybjsKIAotCWludGVsX2hwZF9pcnFf dW5pbnN0YWxsKGRldl9wcml2KTsKLQogCWlyb25sYWtlX2lycV9yZXNldChkZXYpOwogfQogCkBA IC00MzYwLDggKzQzNDksNiBAQCBzdGF0aWMgdm9pZCBpOTE1X2lycV91bmluc3RhbGwoc3RydWN0 IGRybV9kZXZpY2UgKiBkZXYpCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g ZGV2LT5kZXZfcHJpdmF0ZTsKIAlpbnQgcGlwZTsKIAotCWludGVsX2hwZF9pcnFfdW5pbnN0YWxs KGRldl9wcml2KTsKLQogCWlmIChJOTE1X0hBU19IT1RQTFVHKGRldikpIHsKIAkJSTkxNV9XUklU RShQT1JUX0hPVFBMVUdfRU4sIDApOwogCQlJOTE1X1dSSVRFKFBPUlRfSE9UUExVR19TVEFULCBJ OTE1X1JFQUQoUE9SVF9IT1RQTFVHX1NUQVQpKTsKQEAgLTQ1OTgsOCArNDU4NSw2IEBAIHN0YXRp YyB2b2lkIGk5NjVfaXJxX3VuaW5zdGFsbChzdHJ1Y3QgZHJtX2RldmljZSAqIGRldikKIAlpZiAo IWRldl9wcml2KQogCQlyZXR1cm47CiAKLQlpbnRlbF9ocGRfaXJxX3VuaW5zdGFsbChkZXZfcHJp dik7Ci0KIAlJOTE1X1dSSVRFKFBPUlRfSE9UUExVR19FTiwgMCk7CiAJSTkxNV9XUklURShQT1JU X0hPVFBMVUdfU1RBVCwgSTkxNV9SRUFEKFBPUlRfSE9UUExVR19TVEFUKSk7CiAKQEAgLTQ2MTUs MTQgKzQ2MDAsMTggQEAgc3RhdGljIHZvaWQgaTk2NV9pcnFfdW5pbnN0YWxsKHN0cnVjdCBkcm1f ZGV2aWNlICogZGV2KQogCUk5MTVfV1JJVEUoSUlSLCBJOTE1X1JFQUQoSUlSKSk7CiB9CiAKLXN0 YXRpYyB2b2lkIGludGVsX2hwZF9pcnFfcmVlbmFibGUodW5zaWduZWQgbG9uZyBkYXRhKQorc3Rh dGljIHZvaWQgaW50ZWxfaHBkX2lycV9yZWVuYWJsZShzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmsp CiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICopZGF0YTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPQor CQljb250YWluZXJfb2Yod29yaywgdHlwZW9mKCpkZXZfcHJpdiksCisJCQkgICAgIGhvdHBsdWdf cmVlbmFibGVfd29yay53b3JrKTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZGV2X3ByaXYt PmRldjsKIAlzdHJ1Y3QgZHJtX21vZGVfY29uZmlnICptb2RlX2NvbmZpZyA9ICZkZXYtPm1vZGVf Y29uZmlnOwogCXVuc2lnbmVkIGxvbmcgaXJxZmxhZ3M7CiAJaW50IGk7CiAKKwlpbnRlbF9ydW50 aW1lX3BtX2dldChkZXZfcHJpdik7CisKIAlzcGluX2xvY2tfaXJxc2F2ZSgmZGV2X3ByaXYtPmly cV9sb2NrLCBpcnFmbGFncyk7CiAJZm9yIChpID0gKEhQRF9OT05FICsgMSk7IGkgPCBIUERfTlVN X1BJTlM7IGkrKykgewogCQlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yOwpAQCAtNDY0 OCw2ICs0NjM3LDggQEAgc3RhdGljIHZvaWQgaW50ZWxfaHBkX2lycV9yZWVuYWJsZSh1bnNpZ25l ZCBsb25nIGRhdGEpCiAJaWYgKGRldl9wcml2LT5kaXNwbGF5LmhwZF9pcnFfc2V0dXApCiAJCWRl dl9wcml2LT5kaXNwbGF5LmhwZF9pcnFfc2V0dXAoZGV2KTsKIAlzcGluX3VubG9ja19pcnFyZXN0 b3JlKCZkZXZfcHJpdi0+aXJxX2xvY2ssIGlycWZsYWdzKTsKKworCWludGVsX3J1bnRpbWVfcG1f cHV0KGRldl9wcml2KTsKIH0KIAogdm9pZCBpbnRlbF9pcnFfaW5pdChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQpAQCAtNDY3MCw4ICs0NjYxLDggQEAgdm9pZCBpbnRlbF9pcnFfaW5pdChzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KQogCXNldHVwX3RpbWVyKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLmhhbmdj aGVja190aW1lciwKIAkJICAgIGk5MTVfaGFuZ2NoZWNrX2VsYXBzZWQsCiAJCSAgICAodW5zaWdu ZWQgbG9uZykgZGV2KTsKLQlzZXR1cF90aW1lcigmZGV2X3ByaXYtPmhvdHBsdWdfcmVlbmFibGVf dGltZXIsIGludGVsX2hwZF9pcnFfcmVlbmFibGUsCi0JCSAgICAodW5zaWduZWQgbG9uZykgZGV2 X3ByaXYpOworCUlOSVRfREVMQVlFRF9XT1JLKCZkZXZfcHJpdi0+aG90cGx1Z19yZWVuYWJsZV93 b3JrLAorCQkJICBpbnRlbF9ocGRfaXJxX3JlZW5hYmxlKTsKIAogCXBtX3Fvc19hZGRfcmVxdWVz dCgmZGV2X3ByaXYtPnBtX3FvcywgUE1fUU9TX0NQVV9ETUFfTEFURU5DWSwgUE1fUU9TX0RFRkFV TFRfVkFMVUUpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggMjgzODMw MC4uYmNmOGQxOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTMxMDQs NiArMTMxMDQsNyBAQCB2b2lkIGludGVsX21vZGVzZXRfY2xlYW51cChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogCSAqLwogCWRybV9pcnFfdW5pbnN0YWxsKGRldik7CiAJY2FuY2VsX3dvcmtfc3lu YygmZGV2X3ByaXYtPmhvdHBsdWdfd29yayk7CisJY2FuY2VsX2RlbGF5ZWRfd29ya19zeW5jKCZk ZXZfcHJpdi0+aG90cGx1Z19yZWVuYWJsZV93b3JrKTsKIAlkZXZfcHJpdi0+cG0uX2lycXNfZGlz YWJsZWQgPSB0cnVlOwogCiAJLyoKLS0gCjEuOC40CgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo=