From mboxrd@z Thu Jan 1 00:00:00 1970 From: Egbert Eich Subject: [PATCH v3 5/7] drm/i915: Add Reenable Timer to turn Hotplug Detection back on (v3) Date: Tue, 9 Apr 2013 11:24:28 +0200 Message-ID: <1365499470-28646-6-git-send-email-eich@freedesktop.org> References: <1365499470-28646-1-git-send-email-eich@freedesktop.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.126.186]) by gabe.freedesktop.org (Postfix) with ESMTP id B7DB8E5FFA for ; Tue, 9 Apr 2013 02:25:49 -0700 (PDT) In-Reply-To: <1365499470-28646-1-git-send-email-eich@freedesktop.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org Cc: Egbert Eich , Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org RnJvbTogRWdiZXJ0IEVpY2ggPGVpY2hAc3VzZS5kZT4KCldlIGRpc2FibGUgaG9wdHBsdWcgZGV0 ZWN0aW9uIHdoZW4gd2UgZW5jb3VudGVyIGEgaG90cGx1ZyBldmVudApzdG9ybS4gU3RpbGwgaG90 cGx1ZyBkZXRlY3Rpb24gaXMgcmVxdWlyZWQgb24gc29tZSBvdXRwdXRzIChsaWtlCkRpc3BsYXkg UG9ydCkuIFRoZSBpbnRlcnJ1cHQgc3Rvcm0gbWF5IGJlIG9ubHkgdGVtcG9yYXJ5IChvbiBjZXJ0 YWluCkRlbGwgTGFwdG9wcyBmb3IgaW5zdGFuY2UgaXQgaGFwcGVucyBhdCBjZXJ0YWluIGNoYXJn aW5nIHN0YXRlcyBvZgp0aGUgc3lzdGVtKS4gVGh1cyB3ZSBlbmFibGUgaXQgYWZ0ZXIgYSBjZXJ0 YWluIGdyYWNlIHBlcmlvZCAoMiBtaW51dGVzKS4KU2hvdWxkIHRoZSBpbnRlcnJ1cHQgc3Rvcm0g cGVyc2lzdCBpdCB3aWxsIGJlIGRldGVjdGVkIGltbWVkaWF0ZWx5CmFuZCBpdCB3aWxsIGJlIGRp c2FibGVkIGFnYWluLgoKdjI6IFJlb3JkZXJlZCBkcm1faTkxNV9wcml2YXRlOiBtb3ZlZCBob3Rw bHVnX3JlZW5hYmxlX3RpbWVyIHRvIGhwZCBzdGF0ZSB0cmFja2VyLgp2MzogQ2xhcmlmaWVkIGxv b3Agc3RhcnQgdmFsdWUsCiAgICBSZW1vdmVkIHN1cGVyZmx1b3VzIHRlc3QgZm9yIEl2eWJyaWRn ZSBhbmQgSGFzd2VsbCwKICAgIFJlc3RydWN0dXJlZCBsb29wIHRvIGF2b2lkIGRlZXAgbmVzdGlu ZyAoYWxsIHN1Z2dlc3RlZCBieSBWaWxsZSBTeXJqw6Rsw6QpCgpTaWduZWQtb2ZmLWJ5OiBFZ2Jl cnQgRWljaCA8ZWljaEBzdXNlLmRlPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmggfCAgMiArKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyB8IDQ5ICsrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystCiAyIGZpbGVzIGNoYW5nZWQsIDUwIGlu c2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA4 M2ZjMWE2Li5hM2VkMmUzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTkzOCw2ICs5Mzgs OCBAQCB0eXBlZGVmIHN0cnVjdCBkcm1faTkxNV9wcml2YXRlIHsKIAkJCUhQRF9NQVJLX0RJU0FC TEVEID0gMgogCQl9IGhwZF9tYXJrOwogCX0gaHBkX3N0YXRzW0hQRF9OVU1fUElOU107CisjZGVm aW5lIEk5MTVfUkVFTkFCTEVfSE9UUExVR19ERUxBWSAoMio2MCoxMDAwKQorCXN0cnVjdCB0aW1l cl9saXN0IGhvdHBsdWdfcmVlbmFibGVfdGltZXI7CiAKIAlpbnQgbnVtX3BjaF9wbGw7CiAJaW50 IG51bV9wbGFuZTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCmluZGV4IGQwZTZmNmQuLjFhMDA1MzMg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwpAQCAtMzcxLDggKzM3MSwxMSBAQCBzdGF0aWMgdm9p ZCBpOTE1X2hvdHBsdWdfd29ya19mdW5jKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKIAkJCWNv bm5lY3Rvcl9kaXNhYmxlZCA9IHRydWU7CiAJCX0KIAl9Ci0JaWYgKGNvbm5lY3Rvcl9kaXNhYmxl ZCkKKwlpZiAoY29ubmVjdG9yX2Rpc2FibGVkKSB7CiAJCWRybV9rbXNfaGVscGVyX3BvbGxfZW5h YmxlKGRldik7IC8qIGlmIHRoZXJlIHdlcmUgbm8gb3V0cHV0cyB0byBwb2xsLCBwb2xsIGlzIGRp c2FibGVkICovCisJCW1vZF90aW1lcigmZGV2X3ByaXYtPmhvdHBsdWdfcmVlbmFibGVfdGltZXIs CisJCQkgIGppZmZpZXMgKyBtc2Vjc190b19qaWZmaWVzKEk5MTVfUkVFTkFCTEVfSE9UUExVR19E RUxBWSkpOworCX0KIAogCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmRldl9wcml2LT5pcnFfbG9j aywgaXJxZmxhZ3MpOwogCkBAIC0yMzQ4LDYgKzIzNTEsOCBAQCBzdGF0aWMgdm9pZCB2YWxsZXl2 aWV3X2lycV91bmluc3RhbGwoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpZiAoIWRldl9wcml2 KQogCQlyZXR1cm47CiAKKwlkZWxfdGltZXJfc3luYygmZGV2X3ByaXYtPmhvdHBsdWdfcmVlbmFi bGVfdGltZXIpOworCiAJZm9yX2VhY2hfcGlwZShwaXBlKQogCQlJOTE1X1dSSVRFKFBJUEVTVEFU KHBpcGUpLCAweGZmZmYpOwogCkBAIC0yMzY5LDYgKzIzNzQsOCBAQCBzdGF0aWMgdm9pZCBpcm9u bGFrZV9pcnFfdW5pbnN0YWxsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaWYgKCFkZXZfcHJp dikKIAkJcmV0dXJuOwogCisJZGVsX3RpbWVyX3N5bmMoJmRldl9wcml2LT5ob3RwbHVnX3JlZW5h YmxlX3RpbWVyKTsKKwogCUk5MTVfV1JJVEUoSFdTVEFNLCAweGZmZmZmZmZmKTsKIAogCUk5MTVf V1JJVEUoREVJTVIsIDB4ZmZmZmZmZmYpOwpAQCAtMjc0NSw2ICsyNzUyLDggQEAgc3RhdGljIHZv aWQgaTkxNV9pcnFfdW5pbnN0YWxsKHN0cnVjdCBkcm1fZGV2aWNlICogZGV2KQogCWRybV9pOTE1 X3ByaXZhdGVfdCAqZGV2X3ByaXYgPSAoZHJtX2k5MTVfcHJpdmF0ZV90ICopIGRldi0+ZGV2X3By aXZhdGU7CiAJaW50IHBpcGU7CiAKKwlkZWxfdGltZXJfc3luYygmZGV2X3ByaXYtPmhvdHBsdWdf cmVlbmFibGVfdGltZXIpOworCiAJaWYgKEk5MTVfSEFTX0hPVFBMVUcoZGV2KSkgewogCQlJOTE1 X1dSSVRFKFBPUlRfSE9UUExVR19FTiwgMCk7CiAJCUk5MTVfV1JJVEUoUE9SVF9IT1RQTFVHX1NU QVQsIEk5MTVfUkVBRChQT1JUX0hPVFBMVUdfU1RBVCkpOwpAQCAtMjk4OSw2ICsyOTk4LDggQEAg c3RhdGljIHZvaWQgaTk2NV9pcnFfdW5pbnN0YWxsKHN0cnVjdCBkcm1fZGV2aWNlICogZGV2KQog CWlmICghZGV2X3ByaXYpCiAJCXJldHVybjsKIAorCWRlbF90aW1lcl9zeW5jKCZkZXZfcHJpdi0+ aG90cGx1Z19yZWVuYWJsZV90aW1lcik7CisKIAlJOTE1X1dSSVRFKFBPUlRfSE9UUExVR19FTiwg MCk7CiAJSTkxNV9XUklURShQT1JUX0hPVFBMVUdfU1RBVCwgSTkxNV9SRUFEKFBPUlRfSE9UUExV R19TVEFUKSk7CiAKQEAgLTMwMDQsNiArMzAxNSw0MCBAQCBzdGF0aWMgdm9pZCBpOTY1X2lycV91 bmluc3RhbGwoc3RydWN0IGRybV9kZXZpY2UgKiBkZXYpCiAJSTkxNV9XUklURShJSVIsIEk5MTVf UkVBRChJSVIpKTsKIH0KIAorc3RhdGljIHZvaWQgaTkxNV9yZWVuYWJsZV9ob3RwbHVnX3RpbWVy X2Z1bmModW5zaWduZWQgbG9uZyBkYXRhKQoreworCWRybV9pOTE1X3ByaXZhdGVfdCAqZGV2X3By aXYgPSAoZHJtX2k5MTVfcHJpdmF0ZV90ICopZGF0YTsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 ID0gZGV2X3ByaXYtPmRldjsKKwlzdHJ1Y3QgZHJtX21vZGVfY29uZmlnICptb2RlX2NvbmZpZyA9 ICZkZXYtPm1vZGVfY29uZmlnOworCXVuc2lnbmVkIGxvbmcgaXJxZmxhZ3M7CisJaW50IGk7CisK KwlzcGluX2xvY2tfaXJxc2F2ZSgmZGV2X3ByaXYtPmlycV9sb2NrLCBpcnFmbGFncyk7CisJZm9y IChpID0gKEhQRF9OT05FICsgMSk7IGkgPCBIUERfTlVNX1BJTlM7IGkrKykgeworCQlzdHJ1Y3Qg ZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yOworCisJCWlmIChkZXZfcHJpdi0+aHBkX3N0YXRzW2ld LmhwZF9tYXJrICE9IEhQRF9NQVJLX0RJU0FCTEVEKQorCQkJY29udGludWU7CisKKwkJZGV2X3By aXYtPmhwZF9zdGF0c1tpXS5ocGRfbWFyayA9IEhQRF9FTkFCTEVEOworCisJCWxpc3RfZm9yX2Vh Y2hfZW50cnkoY29ubmVjdG9yLCAmbW9kZV9jb25maWctPmNvbm5lY3Rvcl9saXN0LCBoZWFkKSB7 CisJCQlzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICppbnRlbF9jb25uZWN0b3IgPSB0b19pbnRlbF9j b25uZWN0b3IoY29ubmVjdG9yKTsKKworCQkJaWYgKGludGVsX2Nvbm5lY3Rvci0+ZW5jb2Rlci0+ aHBkX3BpbiA9PSBpKSB7CisJCQkJaWYgKGNvbm5lY3Rvci0+cG9sbGVkICE9IGludGVsX2Nvbm5l Y3Rvci0+cG9sbGVkKQorCQkJCQlEUk1fREVCVUdfRFJJVkVSKCJSZWVuYWJsaW5nIEhQRCBvbiBj b25uZWN0b3IgJXNcbiIsCisJCQkJCQkJIGRybV9nZXRfY29ubmVjdG9yX25hbWUoY29ubmVjdG9y KSk7CisJCQkJY29ubmVjdG9yLT5wb2xsZWQgPSBpbnRlbF9jb25uZWN0b3ItPnBvbGxlZDsKKwkJ CQlpZiAoIWNvbm5lY3Rvci0+cG9sbGVkKQorCQkJCQljb25uZWN0b3ItPnBvbGxlZCA9IERSTV9D T05ORUNUT1JfUE9MTF9IUEQ7CisJCQl9CisJCX0KKwkJZGV2X3ByaXYtPmRpc3BsYXkuaHBkX2ly cV9zZXR1cChkZXYpOworCX0KKwlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZkZXZfcHJpdi0+aXJx X2xvY2ssIGlycWZsYWdzKTsKK30KKwogdm9pZCBpbnRlbF9pcnFfaW5pdChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ ZGV2X3ByaXZhdGU7CkBAIC0zMDE2LDYgKzMwNjEsOCBAQCB2b2lkIGludGVsX2lycV9pbml0KHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJc2V0dXBfdGltZXIoJmRldl9wcml2LT5ncHVfZXJyb3Iu aGFuZ2NoZWNrX3RpbWVyLAogCQkgICAgaTkxNV9oYW5nY2hlY2tfZWxhcHNlZCwKIAkJICAgICh1 bnNpZ25lZCBsb25nKSBkZXYpOworCXNldHVwX3RpbWVyKCZkZXZfcHJpdi0+aG90cGx1Z19yZWVu YWJsZV90aW1lciwgaTkxNV9yZWVuYWJsZV9ob3RwbHVnX3RpbWVyX2Z1bmMsCisJCSAgICAodW5z aWduZWQgbG9uZykgZGV2X3ByaXYpOwogCiAJcG1fcW9zX2FkZF9yZXF1ZXN0KCZkZXZfcHJpdi0+ cG1fcW9zLCBQTV9RT1NfQ1BVX0RNQV9MQVRFTkNZLCBQTV9RT1NfREVGQVVMVF9WQUxVRSk7CiAK LS0gCjEuOC4xLjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 Cg==