From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH v2] drm/i915: Fix DDC probe for passive adapters Date: Thu, 28 May 2015 15:34:32 +0300 Message-ID: <871ti0hodj.fsf@intel.com> References: <1432803106-4105-1-git-send-email-jani.nikula@intel.com> <1432807539-11944-1-git-send-email-jani.nikula@intel.com> <20150528104808.GM18908@intel.com> <874mmxgcim.fsf@intel.com> <20150528122834.GF8341@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 7CE466EB91 for ; Thu, 28 May 2015 05:32:18 -0700 (PDT) In-Reply-To: <20150528122834.GF8341@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter Cc: intel-gfx@lists.freedesktop.org, stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org T24gVGh1LCAyOCBNYXkgMjAxNSwgRGFuaWVsIFZldHRlciA8ZGFuaWVsQGZmd2xsLmNoPiB3cm90 ZToKPiBPbiBUaHUsIE1heSAyOCwgMjAxNSBhdCAwMjozNjowMVBNICswMzAwLCBKYW5pIE5pa3Vs YSB3cm90ZToKPj4gT24gVGh1LCAyOCBNYXkgMjAxNSwgVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5z eXJqYWxhQGxpbnV4LmludGVsLmNvbT4gd3JvdGU6Cj4+ID4gT24gVGh1LCBNYXkgMjgsIDIwMTUg YXQgMDE6MDU6MzlQTSArMDMwMCwgSmFuaSBOaWt1bGEgd3JvdGU6Cj4+ID4+IFBhc3NpdmUgRFAt PkRWSS9IRE1JIGRvbmdsZXMgb24gRFArKyBwb3J0cyBzaG93IHVwIHRvIHRoZSBzeXN0ZW0gYXMg SERNSQo+PiA+PiBkZXZpY2VzLCBhcyB0aGV5IGRvIG5vdCBoYXZlIGEgc2luayBkZXZpY2UgaW4g dGhlbSB0byByZXNwb25kIHRvIGFueSBBVVgKPj4gPj4gdHJhZmZpYy4gV2hlbiBwcm9iaW5nIHRo ZXNlIGRvbmdsZXMgb3ZlciB0aGUgRERDLCBzb21ldGltZXMgdGhleSB3aWxsCj4+ID4+IE5BSyB0 aGUgZmlyc3QgYXR0ZW1wdCBldmVuIHRob3VnaCB0aGUgdHJhbnNhY3Rpb24gaXMgdmFsaWQgYW5k IHRoZXkKPj4gPj4gc3VwcG9ydCB0aGUgRERDIHByb3RvY29sLiBUaGUgcmV0cnkgbG9vcCBpbnNp ZGUgb2YKPj4gPj4gZHJtX2RvX3Byb2JlX2RkY19lZGlkKCkgd291bGQgbm9ybWFsbHkgY2F0Y2gg dGhpcyBjYXNlIGFuZCB0cnkgdGhlCj4+ID4+IHRyYW5zYWN0aW9uIGFnYWluLCByZXN1bHRpbmcg aW4gc3VjY2Vzcy4KPj4gPj4gCj4+ID4+IFRoYXQsIGhvd2V2ZXIsIHdhcyB0aHdhcnRlZCBieSB0 aGUgZml4IGZvciBbMV06Cj4+ID4+IAo+PiA+PiBjb21taXQgOTI5MmYzN2UxZjVjNzk0MDAyNTRk Y2E0NmY4MzMxMzQ4ODA5MzgyNQo+PiA+PiBBdXRob3I6IEV1Z2VuaSBEb2Rvbm92IDxldWdlbmku ZG9kb25vdkBpbnRlbC5jb20+Cj4+ID4+IERhdGU6ICAgVGh1IEphbiA1IDA5OjM0OjI4IDIwMTIg LTAyMDAKPj4gPj4gCj4+ID4+ICAgICBkcm06IGdpdmUgdXAgb24gZWRpZCByZXRyaWVzIHdoZW4g aTJjIGJ1cyBpcyBub3QgcmVzcG9uZGluZwo+PiA+PiAKPj4gPj4gVGhpcyBhZGRlZCBjb2RlIHRv IGV4aXQgaW1tZWRpYXRlbHkgaWYgdGhlIHJldHVybiBjb2RlIGZyb20gdGhlCj4+ID4+IGkyY190 cmFuc2ZlciBmdW5jdGlvbiB3YXMgLUVOWElPIGluIG9yZGVyIHRvIHJlZHVjZSB0aGUgYW1vdW50 IG9mIHRpbWUKPj4gPj4gc3BlbnQgaW4gd2FpdGluZyBmb3IgdW5yZXNwb25zaXZlIG9yIGRpc2Nv bm5lY3RlZCBkZXZpY2VzLiBUaGF0IHdhcwo+PiA+PiBwb3NzaWJsZSBiZWNhdXNlIHRoZSB1bmRl cmx5aW5nIGkyYyBiaXQgYmFuZ2luZyBhbGdvcml0aG0gaGFkIHJldHJpZXMgb2YKPj4gPj4gaXRz IG93biAod2hpY2gsIG9mIGNvdXJzZSwgd2VyZSBwYXJ0IG9mIHRoZSByZWFzb24gZm9yIHRoZSBi dWcgdGhlCj4+ID4+IGNvbW1pdCBmaXhlcykuCj4+ID4+IAo+PiA+PiBTaW5jZSBpdHMgaW50cm9k dWN0aW9uIGluCj4+ID4+IAo+PiA+PiBjb21taXQgZjg5OWZjNjRjZGE4NTY5ZDA1Mjk0NTJhYWZj MGRhMzFjMDQyZGYyZQo+PiA+PiBBdXRob3I6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2ls c29uLmNvLnVrPgo+PiA+PiBEYXRlOiAgIFR1ZSBKdWwgMjAgMTU6NDQ6NDUgMjAxMCAtMDcwMAo+ PiA+PiAKPj4gPj4gICAgIGRybS9pOTE1OiB1c2UgR01CVVMgdG8gbWFuYWdlIGkyYyBsaW5rcwo+ PiA+PiAKPj4gPj4gd2UndmUgYmVlbiBmbGlwcGluZyBiYWNrIGFuZCBmb3J0aCBlbmFibGluZyB0 aGUgR01CVVMgdHJhbnNmZXJzLCBidXQKPj4gPj4gd2UndmUgc2V0dGxlZCBzaW5jZSB0aGVuLiBU aGUgR01CVVMgaW1wbGVtZW50YXRpb24gZG9lcyBub3QgZG8gYW55Cj4+ID4+IHJldHJpZXMsIGhv d2V2ZXIsIGJhaWxpbmcgb3V0IG9mIHRoZSBkcm1fZG9fcHJvYmVfZGRjX2VkaWQoKSByZXRyeSBs b29wCj4+ID4+IG9uIGZpcnN0IGVuY291bnRlciBvZiAtRU5YSU8uIFRoaXMsIGNvbWJpbmVkIHdp dGggRXVnZW5pJ3MgY29tbWl0LCBicm9rZQo+PiA+PiB0aGUgcmV0cnkgb24gLUVOWElPLgo+PiA+ PiAKPj4gPj4gUmV0cnkgR01CVVMgb25jZSBvbiAtRU5YSU8gdG8gbWl0aWdhdGUgdGhlIGlzc3Vl cyB3aXRoIHBhc3NpdmUgYWRhcHRlcnMuCj4+ID4+IAo+PiA+PiBUaGlzIHBhdGNoIGlzIGJhc2Vk IG9uIHRoZSB3b3JrLCBhbmQgY29tbWl0IG1lc3NhZ2UsIGJ5IFRvZGQgUHJldml0ZQo+PiA+PiA8 dHByZXZpdGVAZ21haWwuY29tPi4KPj4gPj4gCj4+ID4+IFsxXSBodHRwczovL2J1Z3MuZnJlZWRl c2t0b3Aub3JnL3Nob3dfYnVnLmNnaT9pZD00MTA1OQo+PiA+PiAKPj4gPj4gdjI6IERvbid0IHJl dHJ5IGlmIHVzaW5nIGJpdCBiYW5naW5nLgo+PiA+PiAKPj4gPj4gQnVnemlsbGE6IGh0dHBzOi8v YnVncy5mcmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTg1OTI0Cj4+ID4+IENjOiBUb2Rk IFByZXZpdGUgPHRwcmV2aXRlQGdtYWlsLmNvbT4KPj4gPj4gQ2M6IHN0YWJsZUB2Z2VyLmtlcm5l bC5vcmcKPj4gPj4gU2lnbmVkLW9mZi1ieTogSmFuaSBOaWt1bGEgPGphbmkubmlrdWxhQGludGVs LmNvbT4KPj4gPj4gLS0tCj4+ID4+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9pMmMuYyB8 IDI1ICsrKysrKysrKysrKysrKysrKysrKystLS0KPj4gPj4gIDEgZmlsZSBjaGFuZ2VkLCAyMiBp bnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQo+PiA+PiAKPj4gPj4gZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2kyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfaTJjLmMKPj4gPj4gaW5kZXggOTIwNzJmNTZlNDE4Li5jM2Y3MmI1MDlkMWYgMTAwNjQ0Cj4+ ID4+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2kyYy5jCj4+ID4+ICsrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2kyYy5jCj4+ID4+IEBAIC00NzgsOSArNDc4LDcgQEAg Z21idXNfeGZlcl9pbmRleF9yZWFkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwg c3RydWN0IGkyY19tc2cgKm1zZ3MpCj4+ID4+ICB9Cj4+ID4+ICAKPj4gPj4gIHN0YXRpYyBpbnQK Pj4gPj4gLWdtYnVzX3hmZXIoc3RydWN0IGkyY19hZGFwdGVyICphZGFwdGVyLAo+PiA+PiAtCSAg IHN0cnVjdCBpMmNfbXNnICptc2dzLAo+PiA+PiAtCSAgIGludCBudW0pCj4+ID4+ICtkb19nbWJ1 c194ZmVyKHN0cnVjdCBpMmNfYWRhcHRlciAqYWRhcHRlciwgc3RydWN0IGkyY19tc2cgKm1zZ3Ms IGludCBudW0pCj4+ID4+ICB7Cj4+ID4+ICAJc3RydWN0IGludGVsX2dtYnVzICpidXMgPSBjb250 YWluZXJfb2YoYWRhcHRlciwKPj4gPj4gIAkJCQkJICAgICAgIHN0cnVjdCBpbnRlbF9nbWJ1cywK Pj4gPj4gQEAgLTU5Myw2ICs1OTEsMjcgQEAgb3V0Ogo+PiA+PiAgCXJldHVybiByZXQ7Cj4+ID4+ ICB9Cj4+ID4+ICAKPj4gPj4gK3N0YXRpYyBpbnQKPj4gPj4gK2dtYnVzX3hmZXIoc3RydWN0IGky Y19hZGFwdGVyICphZGFwdGVyLCBzdHJ1Y3QgaTJjX21zZyAqbXNncywgaW50IG51bSkKPj4gPj4g K3sKPj4gPj4gKwlzdHJ1Y3QgaW50ZWxfZ21idXMgKmJ1cyA9IGNvbnRhaW5lcl9vZihhZGFwdGVy LCBzdHJ1Y3QgaW50ZWxfZ21idXMsCj4+ID4+ICsJCQkJCSAgICAgICBhZGFwdGVyKTsKPj4gPj4g KwlpbnQgcmV0Owo+PiA+PiArCj4+ID4+ICsJcmV0ID0gZG9fZ21idXNfeGZlcihhZGFwdGVyLCBt c2dzLCBudW0pOwo+PiA+PiArCj4+ID4+ICsJLyoKPj4gPj4gKwkgKiBQYXNzaXZlIGFkYXB0ZXJz IHNvbWV0aW1lcyBOQUsgdGhlIGZpcnN0IHByb2JlLiBSZXRyeSBvbmNlIG9uIC1FTlhJTwo+PiA+ PiArCSAqIGZvciBHTUJVUyB0cmFuc2ZlcnM7IHRoZSBiaXQgYmFuZ2luZyBhbGdvcml0aG0gaGFz IHJldHJpZXMKPj4gPj4gKwkgKiBpbnRlcm5hbGx5LiBTZWUgYWxzbyB0aGUgcmV0cnkgbG9vcCBp biBkcm1fZG9fcHJvYmVfZGRjX2VkaWQsIHdoaWNoCj4+ID4+ICsJICogYmFpbHMgb3V0IG9uIHRo ZSBmaXJzdCAtRU5YSU8uCj4+ID4+ICsJICovCj4+ID4+ICsJaWYgKHJldCA9PSAtRU5YSU8gJiYg IWJ1cy0+Zm9yY2VfYml0KQo+PiA+PiArCQlyZXQgPSBkb19nbWJ1c194ZmVyKGFkYXB0ZXIsIG1z Z3MsIG51bSk7Cj4+ID4KPj4gPiBpMmMtYWxnby1iaXQgZG9lcyB0aGUgcmV0cnkgZm9yIGVhY2gg bXNnIHdoZW4gc2VuZGluZyB0aGUgYWRkcmVzcy4gVGhpcwo+PiA+IG9uIHRoZSBvdGhlciBoYW5k IHdpbGwgcmVkbyB0aGUgZW50aXJlIHRyYW5zZmVyLiBTbyBpZiB3ZSBnZXQgYSBuYWsgYnV0Cj4+ ID4gbm90IG9uIHRoZSBmaXJzdCBtZXNzYWdlIHdlIGVuZCB1cCByZXBlYXRpbmcgdGhlIHN1Y2Nl c2Z1bCBwYXJ0IG9mIHRoZQo+PiA+IHRyYW5zZmVyIHR3aWNlLgo+PiAKPj4gV2hpY2ggaXMgYWxz byB0aGUgY2FzZSBmb3IgdGhlIHJldHJ5IGxvb3AgaW4gZHJtX2RvX3Byb2JlX2RkY19lZGlkIGZv cgo+PiBlcnJvcnMgb3RoZXIgdGhhbiAtRU5YSU8uCj4+IAo+PiBIb3cgbGlrZWx5IGRvIHlvdSB0 aGluayBpdCBpcyB0byAqbm90KiBnZXQgLUVOWElPIGF0IGZpcnN0LCBidXQgZ2V0IGl0Cj4+IGlu IGEgbGF0ZXIgbWVzc2FnZT8KPj4gCj4+ID4gVG8gbWF0Y2ggaTJjLWFsZ28tYml0IHdlJ2QgbmVl ZCB0byBkbyB0aGUgcmV0cnkgZm9yIGVhY2ggaW5kaXZpZHVhbAo+PiA+IG1lc3NhZ2UuIEkgc3Vw cG9zZSB0aGF0IHdvdWxkIG1ha2UgdGhlIGVycm9yIGhhbmRsaW5nIG1vcmUKPj4gPiBjb21wbGlj YXRlZCBhcyB3ZSdkIHN1cHBvc2VkbHkgc3RpbGwgbmVlZCB0byBjbGVhciB0aGUgZXJyb3IsIGJ1 dAo+PiA+IHRoZW4gcmVwZWF0IHRoZSBzYW1lIG1zZyB3aXRob3V0IGdlbmVyYXRpbmcgYSBTVE9Q IGluIGJldHdlZW4uCj4+IAo+PiBMb29raW5nIGF0IHRoZSBjb2RlLCBhbmQgaTJjLWFsZ28tYml0 LmMsIEknbSBub3Qgc3VyZSBpZiBJJ2QgYmUKPj4gY29tZm9ydGFibGUgYmFja3BvcnRpbmcgc29t ZXRoaW5nIGxpa2UgdGhhdCB0byBzdGFibGUuIEl0IGRvZXMgZ2V0Cj4+IGNvbXBsaWNhdGVkLiBT byBzdXJlLCB0aGlzIGlzIGFuIGF0dGVtcHQgdG8gcGljayB0aGUgbG93IGhhbmdpbmcgZnJ1aXQu Cj4+IAo+PiBEbyB5b3UgdGhpbmsgdGhpcyBtYWtlcyB0aGUgZHJpdmVyIHdvcnNlPwo+PiAKPj4g SSBwbGVhZCBpdGVtIChjKSBvZiB0aGUgUmV2aWV3ZXIncyBzdGF0ZW1lbnQgb2Ygb3ZlcnNpZ2h0 LiA7KQo+Cj4gRG9lc24ndCBsb29rIHRvbyBjb21wbGljYXRlZCB0ZHJ0IGhlcmU6Cj4KPiBkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaTJjLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9pMmMuYwo+IGluZGV4IDkyMDcyZjU2ZTQxOC4uYWU5ZjRiZTFiNjQ0IDEw MDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2kyYy5jCj4gKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaTJjLmMKPiBAQCAtNDg2LDcgKzQ4Niw3IEBAIGdtYnVz X3hmZXIoc3RydWN0IGkyY19hZGFwdGVyICphZGFwdGVyLAo+ICAJCQkJCSAgICAgICBzdHJ1Y3Qg aW50ZWxfZ21idXMsCj4gIAkJCQkJICAgICAgIGFkYXB0ZXIpOwo+ICAJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gYnVzLT5kZXZfcHJpdjsKPiAtCWludCBpLCByZWdfb2Zmc2V0 Owo+ICsJaW50IGkgPSAwLCByZWdfb2Zmc2V0Owo+ICAJaW50IHJldCA9IDA7Cj4gIAo+ICAJaW50 ZWxfYXV4X2Rpc3BsYXlfcnVudGltZV9nZXQoZGV2X3ByaXYpOwo+IEBAIC00OTksOSArNDk5LDEw IEBAIGdtYnVzX3hmZXIoc3RydWN0IGkyY19hZGFwdGVyICphZGFwdGVyLAo+ICAKPiAgCXJlZ19v ZmZzZXQgPSBkZXZfcHJpdi0+Z3Bpb19tbWlvX2Jhc2U7Cj4gIAo+ICtyZXRyeToKPiAgCUk5MTVf V1JJVEUoR01CVVMwICsgcmVnX29mZnNldCwgYnVzLT5yZWcwKTsKPiAgCj4gLQlmb3IgKGkgPSAw OyBpIDwgbnVtOyBpKyspIHsKPiArCWZvciAoaTsgaSA8IG51bTsgaSsrKSB7Cj4gIAkJaWYgKGdt YnVzX2lzX2luZGV4X3JlYWQobXNncywgaSwgbnVtKSkgewo+ICAJCQlyZXQgPSBnbWJ1c194ZmVy X2luZGV4X3JlYWQoZGV2X3ByaXYsICZtc2dzW2ldKTsKPiAgCQkJaSArPSAxOyAgLyogc2V0IGkg dG8gdGhlIGluZGV4IG9mIHRoZSByZWFkIHhmZXIgKi8KPiBAQCAtNTc2LDYgKzU3Nyw5IEBAIGNs ZWFyX2VycjoKPiAgCQkJIGFkYXB0ZXItPm5hbWUsIG1zZ3NbaV0uYWRkciwKPiAgCQkJIChtc2dz W2ldLmZsYWdzICYgSTJDX01fUkQpID8gJ3InIDogJ3cnLCBtc2dzW2ldLmxlbik7Cj4gIAo+ICsJ aWYgKGJsYSkKPiArCQlnb3RvIHJldHJ5OwoKQmxhIGluZGVlZC4gQWxyZWFkeSB0b28gbWFueSBn b3RvcyBpbiB0aGlzIHBpZWNlIG9mIGNvZGUgdG8gbXkgdGFzdGUuLi4KCj4gKwo+ICAJZ290byBv dXQ7Cj4gIAo+ICB0aW1lb3V0Ogo+Cj4gLS0tCj4gVG90YWxseSB1bnRlc3RlZCBvZmMgOy0pCgpI ZXkgZG9uJ3Qgd29ycnksIHNvIHdhcyBtaW5lLiBCdXQgYXQgbGVhc3QgbWluZSBjb21waWxlcy4g OykKCkJSLApKYW5pLgoKCgo+Cj4gQ2hlZXJzLCBEYW5pZWwKPiAtLSAKPiBEYW5pZWwgVmV0dGVy Cj4gU29mdHdhcmUgRW5naW5lZXIsIEludGVsIENvcnBvcmF0aW9uCj4gaHR0cDovL2Jsb2cuZmZ3 bGwuY2gKCi0tIApKYW5pIE5pa3VsYSwgSW50ZWwgT3BlbiBTb3VyY2UgVGVjaG5vbG9neSBDZW50 ZXIKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com ([134.134.136.24]:34363 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753862AbbE1Mc2 convert rfc822-to-8bit (ORCPT ); Thu, 28 May 2015 08:32:28 -0400 From: Jani Nikula To: Daniel Vetter Cc: Ville =?utf-8?B?U3lyasOkbMOk?= , intel-gfx@lists.freedesktop.org, stable@vger.kernel.org Subject: Re: [Intel-gfx] [PATCH v2] drm/i915: Fix DDC probe for passive adapters In-Reply-To: <20150528122834.GF8341@phenom.ffwll.local> References: <1432803106-4105-1-git-send-email-jani.nikula@intel.com> <1432807539-11944-1-git-send-email-jani.nikula@intel.com> <20150528104808.GM18908@intel.com> <874mmxgcim.fsf@intel.com> <20150528122834.GF8341@phenom.ffwll.local> Date: Thu, 28 May 2015 15:34:32 +0300 Message-ID: <871ti0hodj.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Sender: stable-owner@vger.kernel.org List-ID: On Thu, 28 May 2015, Daniel Vetter wrote: > On Thu, May 28, 2015 at 02:36:01PM +0300, Jani Nikula wrote: >> On Thu, 28 May 2015, Ville Syrjälä wrote: >> > On Thu, May 28, 2015 at 01:05:39PM +0300, Jani Nikula wrote: >> >> Passive DP->DVI/HDMI dongles on DP++ ports show up to the system as HDMI >> >> devices, as they do not have a sink device in them to respond to any AUX >> >> traffic. When probing these dongles over the DDC, sometimes they will >> >> NAK the first attempt even though the transaction is valid and they >> >> support the DDC protocol. The retry loop inside of >> >> drm_do_probe_ddc_edid() would normally catch this case and try the >> >> transaction again, resulting in success. >> >> >> >> That, however, was thwarted by the fix for [1]: >> >> >> >> commit 9292f37e1f5c79400254dca46f83313488093825 >> >> Author: Eugeni Dodonov >> >> Date: Thu Jan 5 09:34:28 2012 -0200 >> >> >> >> drm: give up on edid retries when i2c bus is not responding >> >> >> >> This added code to exit immediately if the return code from the >> >> i2c_transfer function was -ENXIO in order to reduce the amount of time >> >> spent in waiting for unresponsive or disconnected devices. That was >> >> possible because the underlying i2c bit banging algorithm had retries of >> >> its own (which, of course, were part of the reason for the bug the >> >> commit fixes). >> >> >> >> Since its introduction in >> >> >> >> commit f899fc64cda8569d0529452aafc0da31c042df2e >> >> Author: Chris Wilson >> >> Date: Tue Jul 20 15:44:45 2010 -0700 >> >> >> >> drm/i915: use GMBUS to manage i2c links >> >> >> >> we've been flipping back and forth enabling the GMBUS transfers, but >> >> we've settled since then. The GMBUS implementation does not do any >> >> retries, however, bailing out of the drm_do_probe_ddc_edid() retry loop >> >> on first encounter of -ENXIO. This, combined with Eugeni's commit, broke >> >> the retry on -ENXIO. >> >> >> >> Retry GMBUS once on -ENXIO to mitigate the issues with passive adapters. >> >> >> >> This patch is based on the work, and commit message, by Todd Previte >> >> . >> >> >> >> [1] https://bugs.freedesktop.org/show_bug.cgi?id=41059 >> >> >> >> v2: Don't retry if using bit banging. >> >> >> >> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85924 >> >> Cc: Todd Previte >> >> Cc: stable@vger.kernel.org >> >> Signed-off-by: Jani Nikula >> >> --- >> >> drivers/gpu/drm/i915/intel_i2c.c | 25 ++++++++++++++++++++++--- >> >> 1 file changed, 22 insertions(+), 3 deletions(-) >> >> >> >> diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c >> >> index 92072f56e418..c3f72b509d1f 100644 >> >> --- a/drivers/gpu/drm/i915/intel_i2c.c >> >> +++ b/drivers/gpu/drm/i915/intel_i2c.c >> >> @@ -478,9 +478,7 @@ gmbus_xfer_index_read(struct drm_i915_private *dev_priv, struct i2c_msg *msgs) >> >> } >> >> >> >> static int >> >> -gmbus_xfer(struct i2c_adapter *adapter, >> >> - struct i2c_msg *msgs, >> >> - int num) >> >> +do_gmbus_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num) >> >> { >> >> struct intel_gmbus *bus = container_of(adapter, >> >> struct intel_gmbus, >> >> @@ -593,6 +591,27 @@ out: >> >> return ret; >> >> } >> >> >> >> +static int >> >> +gmbus_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num) >> >> +{ >> >> + struct intel_gmbus *bus = container_of(adapter, struct intel_gmbus, >> >> + adapter); >> >> + int ret; >> >> + >> >> + ret = do_gmbus_xfer(adapter, msgs, num); >> >> + >> >> + /* >> >> + * Passive adapters sometimes NAK the first probe. Retry once on -ENXIO >> >> + * for GMBUS transfers; the bit banging algorithm has retries >> >> + * internally. See also the retry loop in drm_do_probe_ddc_edid, which >> >> + * bails out on the first -ENXIO. >> >> + */ >> >> + if (ret == -ENXIO && !bus->force_bit) >> >> + ret = do_gmbus_xfer(adapter, msgs, num); >> > >> > i2c-algo-bit does the retry for each msg when sending the address. This >> > on the other hand will redo the entire transfer. So if we get a nak but >> > not on the first message we end up repeating the succesful part of the >> > transfer twice. >> >> Which is also the case for the retry loop in drm_do_probe_ddc_edid for >> errors other than -ENXIO. >> >> How likely do you think it is to *not* get -ENXIO at first, but get it >> in a later message? >> >> > To match i2c-algo-bit we'd need to do the retry for each individual >> > message. I suppose that would make the error handling more >> > complicated as we'd supposedly still need to clear the error, but >> > then repeat the same msg without generating a STOP in between. >> >> Looking at the code, and i2c-algo-bit.c, I'm not sure if I'd be >> comfortable backporting something like that to stable. It does get >> complicated. So sure, this is an attempt to pick the low hanging fruit. >> >> Do you think this makes the driver worse? >> >> I plead item (c) of the Reviewer's statement of oversight. ;) > > Doesn't look too complicated tdrt here: > > diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c > index 92072f56e418..ae9f4be1b644 100644 > --- a/drivers/gpu/drm/i915/intel_i2c.c > +++ b/drivers/gpu/drm/i915/intel_i2c.c > @@ -486,7 +486,7 @@ gmbus_xfer(struct i2c_adapter *adapter, > struct intel_gmbus, > adapter); > struct drm_i915_private *dev_priv = bus->dev_priv; > - int i, reg_offset; > + int i = 0, reg_offset; > int ret = 0; > > intel_aux_display_runtime_get(dev_priv); > @@ -499,9 +499,10 @@ gmbus_xfer(struct i2c_adapter *adapter, > > reg_offset = dev_priv->gpio_mmio_base; > > +retry: > I915_WRITE(GMBUS0 + reg_offset, bus->reg0); > > - for (i = 0; i < num; i++) { > + for (i; i < num; i++) { > if (gmbus_is_index_read(msgs, i, num)) { > ret = gmbus_xfer_index_read(dev_priv, &msgs[i]); > i += 1; /* set i to the index of the read xfer */ > @@ -576,6 +577,9 @@ clear_err: > adapter->name, msgs[i].addr, > (msgs[i].flags & I2C_M_RD) ? 'r' : 'w', msgs[i].len); > > + if (bla) > + goto retry; Bla indeed. Already too many gotos in this piece of code to my taste... > + > goto out; > > timeout: > > --- > Totally untested ofc ;-) Hey don't worry, so was mine. But at least mine compiles. ;) BR, Jani. > > Cheers, Daniel > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch -- Jani Nikula, Intel Open Source Technology Center