From mboxrd@z Thu Jan 1 00:00:00 1970 From: Egbert Eich Subject: [PATCH v4] drm/i915: Add Reenable Timer to turn Hotplug Detection back on (v4) Date: Thu, 11 Apr 2013 15:28:07 +0200 Message-ID: <1365686887-10748-1-git-send-email-eich@suse.de> References: <8738uxpcrg.fsf@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 848E2E5DEB for ; Thu, 11 Apr 2013 06:28:21 -0700 (PDT) In-Reply-To: <8738uxpcrg.fsf@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 , Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org V2UgZGlzYWJsZSBob3B0cGx1ZyBkZXRlY3Rpb24gd2hlbiB3ZSBlbmNvdW50ZXIgYSBob3RwbHVn IGV2ZW50CnN0b3JtLiBTdGlsbCBob3RwbHVnIGRldGVjdGlvbiBpcyByZXF1aXJlZCBvbiBzb21l IG91dHB1dHMgKGxpa2UKRGlzcGxheSBQb3J0KS4gVGhlIGludGVycnVwdCBzdG9ybSBtYXkgYmUg b25seSB0ZW1wb3JhcnkgKG9uIGNlcnRhaW4KRGVsbCBMYXB0b3BzIGZvciBpbnN0YW5jZSBpdCBo YXBwZW5zIGF0IGNlcnRhaW4gY2hhcmdpbmcgc3RhdGVzIG9mCnRoZSBzeXN0ZW0pLiBUaHVzIHdl IGVuYWJsZSBpdCBhZnRlciBhIGNlcnRhaW4gZ3JhY2UgcGVyaW9kICgyIG1pbnV0ZXMpLgpTaG91 bGQgdGhlIGludGVycnVwdCBzdG9ybSBwZXJzaXN0IGl0IHdpbGwgYmUgZGV0ZWN0ZWQgaW1tZWRp YXRlbHkKYW5kIGl0IHdpbGwgYmUgZGlzYWJsZWQgYWdhaW4uCgp2MjogUmVvcmRlcmVkIGRybV9p OTE1X3ByaXZhdGU6IG1vdmVkIGhvdHBsdWdfcmVlbmFibGVfdGltZXIgdG8gaHBkIHN0YXRlIHRy YWNrZXIuCnYzOiBDbGFyaWZpZWQgbG9vcCBzdGFydCB2YWx1ZSwKICAgIFJlbW92ZWQgc3VwZXJm bHVvdXMgdGVzdCBmb3IgSXZ5YnJpZGdlIGFuZCBIYXN3ZWxsLAogICAgUmVzdHJ1Y3R1cmVkIGxv b3AgdG8gYXZvaWQgZGVlcCBuZXN0aW5nIChhbGwgc3VnZ2VzdGVkIGJ5IFZpbGxlIFN5cmrDpGzD pCkKdjQ6IEZpeGVkIHR3byBidWdzIHBvaW50ZWQgb3V0IGJ5IEphbmkgTmlrdWxhLgoKU2lnbmVk LW9mZi1ieTogRWdiZXJ0IEVpY2ggPGVpY2hAc3VzZS5kZT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oIHwgIDEgKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyB8 IDUwICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiAyIGZpbGVzIGNo YW5nZWQsIDUxIGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA4M2Zj MWE2Li4xOTViOWZlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTkzOCw2ICs5MzgsNyBA QCB0eXBlZGVmIHN0cnVjdCBkcm1faTkxNV9wcml2YXRlIHsKIAkJCUhQRF9NQVJLX0RJU0FCTEVE ID0gMgogCQl9IGhwZF9tYXJrOwogCX0gaHBkX3N0YXRzW0hQRF9OVU1fUElOU107CisJc3RydWN0 IHRpbWVyX2xpc3QgaG90cGx1Z19yZWVuYWJsZV90aW1lcjsKIAogCWludCBudW1fcGNoX3BsbDsK IAlpbnQgbnVtX3BsYW5lOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9p cnEuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKaW5kZXggODM0YzcxNy4uZjYw YzY0MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCkBAIC0zMzcsNiArMzM3LDggQEAgc3RhdGlj IGludCBpOTE1X2dldF92YmxhbmtfdGltZXN0YW1wKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGlu dCBwaXBlLAogLyoKICAqIEhhbmRsZSBob3RwbHVnIGV2ZW50cyBvdXRzaWRlIHRoZSBpbnRlcnJ1 cHQgaGFuZGxlciBwcm9wZXIuCiAgKi8KKyNkZWZpbmUgSTkxNV9SRUVOQUJMRV9IT1RQTFVHX0RF TEFZICgyKjYwKjEwMDApCisKIHN0YXRpYyB2b2lkIGk5MTVfaG90cGx1Z193b3JrX2Z1bmMoc3Ry dWN0IHdvcmtfc3RydWN0ICp3b3JrKQogewogCWRybV9pOTE1X3ByaXZhdGVfdCAqZGV2X3ByaXYg PSBjb250YWluZXJfb2Yod29yaywgZHJtX2k5MTVfcHJpdmF0ZV90LApAQCAtMzc3LDcgKzM3OSwx MCBAQCBzdGF0aWMgdm9pZCBpOTE1X2hvdHBsdWdfd29ya19mdW5jKHN0cnVjdCB3b3JrX3N0cnVj dCAqd29yaykKIAkgICogc29tZSBjb25uZWN0b3JzICovCiAJaWYgKGhwZF9kaXNhYmxlZCkgewog CQlkcm1fa21zX2hlbHBlcl9wb2xsX2VuYWJsZShkZXYpOworCQltb2RfdGltZXIoJmRldl9wcml2 LT5ob3RwbHVnX3JlZW5hYmxlX3RpbWVyLAorCQkJICBqaWZmaWVzICsgbXNlY3NfdG9famlmZmll cyhJOTE1X1JFRU5BQkxFX0hPVFBMVUdfREVMQVkpKTsKIAl9CisKIAlzcGluX3VubG9ja19pcnFy ZXN0b3JlKCZkZXZfcHJpdi0+aXJxX2xvY2ssIGlycWZsYWdzKTsKIAogCWxpc3RfZm9yX2VhY2hf ZW50cnkoaW50ZWxfZW5jb2RlciwgJm1vZGVfY29uZmlnLT5lbmNvZGVyX2xpc3QsIGJhc2UuaGVh ZCkKQEAgLTIzNTIsNiArMjM1Nyw4IEBAIHN0YXRpYyB2b2lkIHZhbGxleXZpZXdfaXJxX3VuaW5z dGFsbChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWlmICghZGV2X3ByaXYpCiAJCXJldHVybjsK IAorCWRlbF90aW1lcl9zeW5jKCZkZXZfcHJpdi0+aG90cGx1Z19yZWVuYWJsZV90aW1lcik7CisK IAlmb3JfZWFjaF9waXBlKHBpcGUpCiAJCUk5MTVfV1JJVEUoUElQRVNUQVQocGlwZSksIDB4ZmZm Zik7CiAKQEAgLTIzNzMsNiArMjM4MCw4IEBAIHN0YXRpYyB2b2lkIGlyb25sYWtlX2lycV91bmlu c3RhbGwoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpZiAoIWRldl9wcml2KQogCQlyZXR1cm47 CiAKKwlkZWxfdGltZXJfc3luYygmZGV2X3ByaXYtPmhvdHBsdWdfcmVlbmFibGVfdGltZXIpOwor CiAJSTkxNV9XUklURShIV1NUQU0sIDB4ZmZmZmZmZmYpOwogCiAJSTkxNV9XUklURShERUlNUiwg MHhmZmZmZmZmZik7CkBAIC0yNzQ5LDYgKzI3NTgsOCBAQCBzdGF0aWMgdm9pZCBpOTE1X2lycV91 bmluc3RhbGwoc3RydWN0IGRybV9kZXZpY2UgKiBkZXYpCiAJZHJtX2k5MTVfcHJpdmF0ZV90ICpk ZXZfcHJpdiA9IChkcm1faTkxNV9wcml2YXRlX3QgKikgZGV2LT5kZXZfcHJpdmF0ZTsKIAlpbnQg cGlwZTsKIAorCWRlbF90aW1lcl9zeW5jKCZkZXZfcHJpdi0+aG90cGx1Z19yZWVuYWJsZV90aW1l cik7CisKIAlpZiAoSTkxNV9IQVNfSE9UUExVRyhkZXYpKSB7CiAJCUk5MTVfV1JJVEUoUE9SVF9I T1RQTFVHX0VOLCAwKTsKIAkJSTkxNV9XUklURShQT1JUX0hPVFBMVUdfU1RBVCwgSTkxNV9SRUFE KFBPUlRfSE9UUExVR19TVEFUKSk7CkBAIC0yOTkzLDYgKzMwMDQsOCBAQCBzdGF0aWMgdm9pZCBp OTY1X2lycV91bmluc3RhbGwoc3RydWN0IGRybV9kZXZpY2UgKiBkZXYpCiAJaWYgKCFkZXZfcHJp dikKIAkJcmV0dXJuOwogCisJZGVsX3RpbWVyX3N5bmMoJmRldl9wcml2LT5ob3RwbHVnX3JlZW5h YmxlX3RpbWVyKTsKKwogCUk5MTVfV1JJVEUoUE9SVF9IT1RQTFVHX0VOLCAwKTsKIAlJOTE1X1dS SVRFKFBPUlRfSE9UUExVR19TVEFULCBJOTE1X1JFQUQoUE9SVF9IT1RQTFVHX1NUQVQpKTsKIApA QCAtMzAwOCw2ICszMDIxLDQxIEBAIHN0YXRpYyB2b2lkIGk5NjVfaXJxX3VuaW5zdGFsbChzdHJ1 Y3QgZHJtX2RldmljZSAqIGRldikKIAlJOTE1X1dSSVRFKElJUiwgSTkxNV9SRUFEKElJUikpOwog fQogCitzdGF0aWMgdm9pZCBpOTE1X3JlZW5hYmxlX2hvdHBsdWdfdGltZXJfZnVuYyh1bnNpZ25l ZCBsb25nIGRhdGEpCit7CisJZHJtX2k5MTVfcHJpdmF0ZV90ICpkZXZfcHJpdiA9IChkcm1faTkx NV9wcml2YXRlX3QgKilkYXRhOworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBkZXZfcHJpdi0+ ZGV2OworCXN0cnVjdCBkcm1fbW9kZV9jb25maWcgKm1vZGVfY29uZmlnID0gJmRldi0+bW9kZV9j b25maWc7CisJdW5zaWduZWQgbG9uZyBpcnFmbGFnczsKKwlpbnQgaTsKKworCXNwaW5fbG9ja19p cnFzYXZlKCZkZXZfcHJpdi0+aXJxX2xvY2ssIGlycWZsYWdzKTsKKwlmb3IgKGkgPSAoSFBEX05P TkUgKyAxKTsgaSA8IEhQRF9OVU1fUElOUzsgaSsrKSB7CisJCXN0cnVjdCBkcm1fY29ubmVjdG9y ICpjb25uZWN0b3I7CisKKwkJaWYgKGRldl9wcml2LT5ocGRfc3RhdHNbaV0uaHBkX21hcmsgIT0g SFBEX0RJU0FCTEVEKQorCQkJY29udGludWU7CisKKwkJZGV2X3ByaXYtPmhwZF9zdGF0c1tpXS5o cGRfbWFyayA9IEhQRF9FTkFCTEVEOworCisJCWxpc3RfZm9yX2VhY2hfZW50cnkoY29ubmVjdG9y LCAmbW9kZV9jb25maWctPmNvbm5lY3Rvcl9saXN0LCBoZWFkKSB7CisJCQlzdHJ1Y3QgaW50ZWxf Y29ubmVjdG9yICppbnRlbF9jb25uZWN0b3IgPSB0b19pbnRlbF9jb25uZWN0b3IoY29ubmVjdG9y KTsKKworCQkJaWYgKGludGVsX2Nvbm5lY3Rvci0+ZW5jb2Rlci0+aHBkX3BpbiA9PSBpKSB7CisJ CQkJaWYgKGNvbm5lY3Rvci0+cG9sbGVkICE9IGludGVsX2Nvbm5lY3Rvci0+cG9sbGVkKQorCQkJ CQlEUk1fREVCVUdfRFJJVkVSKCJSZWVuYWJsaW5nIEhQRCBvbiBjb25uZWN0b3IgJXNcbiIsCisJ CQkJCQkJIGRybV9nZXRfY29ubmVjdG9yX25hbWUoY29ubmVjdG9yKSk7CisJCQkJY29ubmVjdG9y LT5wb2xsZWQgPSBpbnRlbF9jb25uZWN0b3ItPnBvbGxlZDsKKwkJCQlpZiAoIWNvbm5lY3Rvci0+ cG9sbGVkKQorCQkJCQljb25uZWN0b3ItPnBvbGxlZCA9IERSTV9DT05ORUNUT1JfUE9MTF9IUEQ7 CisJCQl9CisJCX0KKwl9CisJaWYgKGRldl9wcml2LT5kaXNwbGF5LmhwZF9pcnFfc2V0dXApCisJ CWRldl9wcml2LT5kaXNwbGF5LmhwZF9pcnFfc2V0dXAoZGV2KTsKKwlzcGluX3VubG9ja19pcnFy ZXN0b3JlKCZkZXZfcHJpdi0+aXJxX2xvY2ssIGlycWZsYWdzKTsKK30KKwogdm9pZCBpbnRlbF9p cnFfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CkBAIC0zMDIwLDYgKzMwNjgsOCBAQCB2 b2lkIGludGVsX2lycV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJc2V0dXBfdGltZXIo JmRldl9wcml2LT5ncHVfZXJyb3IuaGFuZ2NoZWNrX3RpbWVyLAogCQkgICAgaTkxNV9oYW5nY2hl Y2tfZWxhcHNlZCwKIAkJICAgICh1bnNpZ25lZCBsb25nKSBkZXYpOworCXNldHVwX3RpbWVyKCZk ZXZfcHJpdi0+aG90cGx1Z19yZWVuYWJsZV90aW1lciwgaTkxNV9yZWVuYWJsZV9ob3RwbHVnX3Rp bWVyX2Z1bmMsCisJCSAgICAodW5zaWduZWQgbG9uZykgZGV2X3ByaXYpOwogCiAJcG1fcW9zX2Fk ZF9yZXF1ZXN0KCZkZXZfcHJpdi0+cG1fcW9zLCBQTV9RT1NfQ1BVX0RNQV9MQVRFTkNZLCBQTV9R T1NfREVGQVVMVF9WQUxVRSk7CiAKLS0gCjEuOC4xLjQKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==