From mboxrd@z Thu Jan 1 00:00:00 1970 From: Egbert Eich Subject: [PATCH v.3 10/12] DRM/i915: Add Reenable Timer to turn Hotplug Detection back on (v3). Date: Tue, 5 Mar 2013 07:26:43 -0500 Message-ID: <1362486403-12781-1-git-send-email-eich@suse.de> References: <20130305102809.GQ4469@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by gabe.freedesktop.org (Postfix) with ESMTP id C3E21E63A4 for ; Tue, 5 Mar 2013 05:48:51 -0800 (PST) In-Reply-To: <20130305102809.GQ4469@intel.com> 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 , Chris Wilson , Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org V2UgZGlzYWJsZSBob3B0cGx1ZyBkZXRlY3Rpb24gd2hlbiB3ZSBlbmNvdW50ZXIgYSBob3RwbHVn IGV2ZW50CnN0b3JtLiBTdGlsbCBob3RwbHVnIGRldGVjdGlvbiBpcyByZXF1aXJlZCBvbiBzb21l IG91dHB1dHMgKGxpa2UKRGlzcGxheSBQb3J0KS4gVGhlIGludGVycnVwdCBzdG9ybSBtYXkgYmUg b25seSB0ZW1wb3JhcnkgKG9uIGNlcnRhaW4KRGVsbCBMYXB0b3BzIGZvciBpbnN0YW5jZSBpdCBo YXBwZW5zIGF0IGNlcnRhaW4gY2hhcmdpbmcgc3RhdGVzIG9mCnRoZSBzeXN0ZW0pLiBUaHVzIHdl IGVuYWJsZSBpdCBhZnRlciBhIGNlcnRhaW4gZ3JhY2UgcGVyaW9kICgyIG1pbnV0ZXMpLgpTaG91 bGQgdGhlIGludGVycnVwdCBzdG9ybSBwZXJzaXN0IGl0IHdpbGwgYmUgZGV0ZWN0ZWQgaW1tZWRp YXRlbHkKYW5kIGl0IHdpbGwgYmUgZGlzYWJsZWQgYWdhaW4uCgp2MjogUmVvcmRlcmVkIGRybV9p OTE1X3ByaXZhdGU6IG1vdmVkIGhvdHBsdWdfcmVlbmFibGVfdGltZXIgdG8gaHBkIHN0YXRlIHRy YWNrZXIuCnYzOiBDbGFyaWZpZWQgbG9vcCBzdGFydCB2YWx1ZSwKICAgIFJlbW92ZWQgc3VwZXJm bHVvdXMgdGVzdCBmb3IgSXZ5YnJpZGdlIGFuZCBIYXN3ZWxsLAogICAgUmVzdHJ1Y3R1cmVkIGxv b3AgdG8gYXZvaWQgZGVlcCBuZXN0aW5nIChhbGwgc3VnZ2VzdGVkIGJ5IFZpbGxlIFN5cmrDpGzD pCkKClNpZ25lZC1vZmYtYnk6IEVnYmVydCBFaWNoIDxlaWNoQHN1c2UuZGU+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCB8ICAgIDIgKwogZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9pcnEuYyB8ICAgNTMgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKyst CiAyIGZpbGVzIGNoYW5nZWQsIDU0IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggMjk2Mjc4Zi4uMWZiN2M0NCAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oCkBAIC05MzMsNiArOTMzLDggQEAgdHlwZWRlZiBzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSB7CiAJCQlIUERfTUFSS19ESVNBQkxFRCA9IDIKIAkJfSBocGRfbWFyazsKIAl9IGhwZF9z dGF0c1tIUERfTlVNX1BJTlNdOworI2RlZmluZSBJOTE1X1JFRU5BQkxFX0hPVFBMVUdfREVMQVkg KDIqNjAqMTAwMCkKKwlzdHJ1Y3QgdGltZXJfbGlzdCBob3RwbHVnX3JlZW5hYmxlX3RpbWVyOwog CiAJaW50IG51bV9waXBlOwogCWludCBudW1fcGNoX3BsbDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5j CmluZGV4IGQxMTUzNGMuLjc2OTAzYWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfaXJxLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwpAQCAtMzY3 LDggKzM2NywxMSBAQCBzdGF0aWMgdm9pZCBpOTE1X2hvdHBsdWdfd29ya19mdW5jKHN0cnVjdCB3 b3JrX3N0cnVjdCAqd29yaykKIAkJCWNvbm5lY3Rvcl9kaXNhYmxlZCA9IHRydWU7CiAJCX0KIAl9 Ci0JaWYgKGNvbm5lY3Rvcl9kaXNhYmxlZCkKKwlpZiAoY29ubmVjdG9yX2Rpc2FibGVkKSB7CiAJ CWRybV9rbXNfaGVscGVyX3BvbGxfZW5hYmxlKGRldik7IC8qIGlmIHRoZXJlIHdlcmUgbm8gb3V0 cHV0cyB0byBwb2xsLCBwb2xsIGlzIGRpc2FibGVkICovCisJCW1vZF90aW1lcigmZGV2X3ByaXYt PmhvdHBsdWdfcmVlbmFibGVfdGltZXIsCisJCQkgIGppZmZpZXMgKyBtc2Vjc190b19qaWZmaWVz KEk5MTVfUkVFTkFCTEVfSE9UUExVR19ERUxBWSkpOworCX0KIAogCXNwaW5fdW5sb2NrX2lycXJl c3RvcmUoJmRldl9wcml2LT5pcnFfbG9jaywgaXJxZmxhZ3MpOwogCkBAIC0yMjQ0LDYgKzIyNDcs OCBAQCBzdGF0aWMgdm9pZCB2YWxsZXl2aWV3X2lycV91bmluc3RhbGwoc3RydWN0IGRybV9kZXZp Y2UgKmRldikKIAlpZiAoIWRldl9wcml2KQogCQlyZXR1cm47CiAKKwlkZWxfdGltZXJfc3luYygm ZGV2X3ByaXYtPmhvdHBsdWdfcmVlbmFibGVfdGltZXIpOworCiAJZm9yX2VhY2hfcGlwZShwaXBl KQogCQlJOTE1X1dSSVRFKFBJUEVTVEFUKHBpcGUpLCAweGZmZmYpOwogCkBAIC0yMjY1LDYgKzIy NzAsOCBAQCBzdGF0aWMgdm9pZCBpcm9ubGFrZV9pcnFfdW5pbnN0YWxsKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCiAJaWYgKCFkZXZfcHJpdikKIAkJcmV0dXJuOwogCisJZGVsX3RpbWVyX3N5bmMo JmRldl9wcml2LT5ob3RwbHVnX3JlZW5hYmxlX3RpbWVyKTsKKwogCUk5MTVfV1JJVEUoSFdTVEFN LCAweGZmZmZmZmZmKTsKIAogCUk5MTVfV1JJVEUoREVJTVIsIDB4ZmZmZmZmZmYpOwpAQCAtMjYw Myw2ICsyNjEwLDggQEAgc3RhdGljIHZvaWQgaTkxNV9pcnFfdW5pbnN0YWxsKHN0cnVjdCBkcm1f ZGV2aWNlICogZGV2KQogCWRybV9pOTE1X3ByaXZhdGVfdCAqZGV2X3ByaXYgPSAoZHJtX2k5MTVf cHJpdmF0ZV90ICopIGRldi0+ZGV2X3ByaXZhdGU7CiAJaW50IHBpcGU7CiAKKwlkZWxfdGltZXJf c3luYygmZGV2X3ByaXYtPmhvdHBsdWdfcmVlbmFibGVfdGltZXIpOworCiAJaWYgKEk5MTVfSEFT X0hPVFBMVUcoZGV2KSkgewogCQlJOTE1X1dSSVRFKFBPUlRfSE9UUExVR19FTiwgMCk7CiAJCUk5 MTVfV1JJVEUoUE9SVF9IT1RQTFVHX1NUQVQsIEk5MTVfUkVBRChQT1JUX0hPVFBMVUdfU1RBVCkp OwpAQCAtMjg1MSw2ICsyODYwLDggQEAgc3RhdGljIHZvaWQgaTk2NV9pcnFfdW5pbnN0YWxsKHN0 cnVjdCBkcm1fZGV2aWNlICogZGV2KQogCWlmICghZGV2X3ByaXYpCiAJCXJldHVybjsKIAorCWRl bF90aW1lcl9zeW5jKCZkZXZfcHJpdi0+aG90cGx1Z19yZWVuYWJsZV90aW1lcik7CisKIAlJOTE1 X1dSSVRFKFBPUlRfSE9UUExVR19FTiwgMCk7CiAJSTkxNV9XUklURShQT1JUX0hPVFBMVUdfU1RB VCwgSTkxNV9SRUFEKFBPUlRfSE9UUExVR19TVEFUKSk7CiAKQEAgLTI4NjYsNiArMjg3Nyw0NCBA QCBzdGF0aWMgdm9pZCBpOTY1X2lycV91bmluc3RhbGwoc3RydWN0IGRybV9kZXZpY2UgKiBkZXYp CiAJSTkxNV9XUklURShJSVIsIEk5MTVfUkVBRChJSVIpKTsKIH0KIAorc3RhdGljIHZvaWQgaTkx NV9yZWVuYWJsZV9ob3RwbHVnX3RpbWVyX2Z1bmModW5zaWduZWQgbG9uZyBkYXRhKQoreworCWRy bV9pOTE1X3ByaXZhdGVfdCAqZGV2X3ByaXYgPSAoZHJtX2k5MTVfcHJpdmF0ZV90ICopZGF0YTsK KwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZGV2X3ByaXYtPmRldjsKKwlzdHJ1Y3QgZHJtX21v ZGVfY29uZmlnICptb2RlX2NvbmZpZyA9ICZkZXYtPm1vZGVfY29uZmlnOworCXVuc2lnbmVkIGxv bmcgaXJxZmxhZ3M7CisJaW50IGk7CisKKwlzcGluX2xvY2tfaXJxc2F2ZSgmZGV2X3ByaXYtPmly cV9sb2NrLCBpcnFmbGFncyk7CisJZm9yIChpID0gKEhQRF9OT05FICsgMSk7IGkgPCBIUERfTlVN X1BJTlM7IGkrKykgeworCQlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yOworCisJCWlm IChkZXZfcHJpdi0+aHBkX3N0YXRzW2ldLmhwZF9tYXJrICE9IEhQRF9NQVJLX0RJU0FCTEVEKQor CQkJY29udGludWU7CisKKwkJZGV2X3ByaXYtPmhwZF9zdGF0c1tpXS5ocGRfbWFyayA9IEhQRF9F TkFCTEVEOworCisJCWxpc3RfZm9yX2VhY2hfZW50cnkoY29ubmVjdG9yLCAmbW9kZV9jb25maWct PmNvbm5lY3Rvcl9saXN0LCBoZWFkKSB7CisJCQlzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICppbnRl bF9jb25uZWN0b3IgPSB0b19pbnRlbF9jb25uZWN0b3IoY29ubmVjdG9yKTsKKworCQkJaWYgKGlu dGVsX2Nvbm5lY3Rvci0+ZW5jb2Rlci0+aHBkX3BpbiA9PSBpKSB7CisJCQkJaWYgKGNvbm5lY3Rv ci0+cG9sbGVkICE9IGludGVsX2Nvbm5lY3Rvci0+cG9sbGVkKQorCQkJCQlEUk1fREVCVUdfRFJJ VkVSKCJSZWVuYWJsaW5nIEhQRCBvbiBjb25uZWN0b3IgJXNcbiIsCisJCQkJCQkJIGRybV9nZXRf Y29ubmVjdG9yX25hbWUoY29ubmVjdG9yKSk7CisJCQkJY29ubmVjdG9yLT5wb2xsZWQgPSBpbnRl bF9jb25uZWN0b3ItPnBvbGxlZDsKKwkJCQlpZiAoIWNvbm5lY3Rvci0+cG9sbGVkKQorCQkJCQlj b25uZWN0b3ItPnBvbGxlZCA9IERSTV9DT05ORUNUT1JfUE9MTF9IUEQ7CisJCQl9CisJCX0KKwor CQlpZiAoSEFTX1BDSF9TUExJVChkZXYpKQorCQkJaWJ4X2hwZF9pcnFfc2V0dXAoZGV2KTsKKwkJ ZWxzZQorCQkJaTkxNV9ocGRfaXJxX3NldHVwKGRldik7CisJfQorCXNwaW5fdW5sb2NrX2lycXJl c3RvcmUoJmRldl9wcml2LT5pcnFfbG9jaywgaXJxZmxhZ3MpOworfQorCiB2b2lkIGludGVsX2ly cV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKQEAgLTI4NzgsNiArMjkyNyw4IEBAIHZv aWQgaW50ZWxfaXJxX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlzZXR1cF90aW1lcigm ZGV2X3ByaXYtPmdwdV9lcnJvci5oYW5nY2hlY2tfdGltZXIsCiAJCSAgICBpOTE1X2hhbmdjaGVj a19lbGFwc2VkLAogCQkgICAgKHVuc2lnbmVkIGxvbmcpIGRldik7CisJc2V0dXBfdGltZXIoJmRl dl9wcml2LT5ob3RwbHVnX3JlZW5hYmxlX3RpbWVyLCBpOTE1X3JlZW5hYmxlX2hvdHBsdWdfdGlt ZXJfZnVuYywKKwkJICAgICh1bnNpZ25lZCBsb25nKSBkZXZfcHJpdik7CiAKIAlwbV9xb3NfYWRk X3JlcXVlc3QoJmRldl9wcml2LT5wbV9xb3MsIFBNX1FPU19DUFVfRE1BX0xBVEVOQ1ksIFBNX1FP U19ERUZBVUxUX1ZBTFVFKTsKIAotLSAKMS43LjcKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vaW50ZWwtZ2Z4Cg==