From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH 2/2] drm/i915: Get rid of intel_dp_dpcd_read_wake() Date: Thu, 17 Mar 2016 19:56:33 +0200 Message-ID: <877fh1htta.fsf@intel.com> References: <1458229245-8634-1-git-send-email-cpaul@redhat.com> <1458229245-8634-2-git-send-email-cpaul@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1458229245-8634-2-git-send-email-cpaul@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Lyude , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: David Airlie , Daniel Vetter , arthur.j.runyan@intel.com, open list List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCAxNyBNYXIgMjAxNiwgTHl1ZGUgPGNwYXVsQHJlZGhhdC5jb20+IHdyb3RlOgo+IFNp bmNlIHdlJ3ZlIGZpeGVkIHVwIGRybV9kcF9kcGNkX3JlYWQoKSB0byBhbGxvdyBmb3IgcmV0cmll cyB3aGVuIHRoaW5ncwo+IHRpbWVvdXQsIHRoZXJlJ3Mgbm8gdXNlIGZvciBoYXZpbmcgdGhpcyBm dW5jdGlvbiBhbnltb3JlLiBHb29kIHJpZGRlbnMuCj4KPiBTaWduZWQtb2ZmLWJ5OiBMeXVkZSA8 Y3BhdWxAcmVkaGF0LmNvbT4KPiAtLS0KPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAu YyB8IDc5ICsrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCj4gIDEgZmls ZSBjaGFuZ2VkLCAyMiBpbnNlcnRpb25zKCspLCA1NyBkZWxldGlvbnMoLSkKPgo+IGRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHAuYwo+IGluZGV4IGNkYzJjMTUuLmZiNGNiYmU1IDEwMDY0NAo+IC0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcC5jCj4gQEAgLTMxOTAsNDcgKzMxOTAsMTQgQEAgc3RhdGljIHZvaWQgY2h2X2Rw X3Bvc3RfcGxsX2Rpc2FibGUoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIpCj4gIH0KPiAg Cj4gIC8qCj4gLSAqIE5hdGl2ZSByZWFkIHdpdGggcmV0cnkgZm9yIGxpbmsgc3RhdHVzIGFuZCBy ZWNlaXZlciBjYXBhYmlsaXR5IHJlYWRzIGZvcgo+IC0gKiBjYXNlcyB3aGVyZSB0aGUgc2luayBt YXkgc3RpbGwgYmUgYXNsZWVwLgo+IC0gKgo+IC0gKiBTaW5rcyBhcmUgKnN1cHBvc2VkKiB0byBj b21lIHVwIHdpdGhpbiAxbXMgZnJvbSBhbiBvZmYgc3RhdGUsIGJ1dCB3ZSdyZSBhbHNvCj4gLSAq IHN1cHBvc2VkIHRvIHJldHJ5IDMgdGltZXMgcGVyIHRoZSBzcGVjLgo+IC0gKi8KPiAtc3RhdGlj IHNzaXplX3QKPiAtaW50ZWxfZHBfZHBjZF9yZWFkX3dha2Uoc3RydWN0IGRybV9kcF9hdXggKmF1 eCwgdW5zaWduZWQgaW50IG9mZnNldCwKPiAtCQkJdm9pZCAqYnVmZmVyLCBzaXplX3Qgc2l6ZSkK PiAtewo+IC0Jc3NpemVfdCByZXQ7Cj4gLQlpbnQgaTsKPiAtCj4gLQkvKgo+IC0JICogU29tZXRp bWUgd2UganVzdCBnZXQgdGhlIHNhbWUgaW5jb3JyZWN0IGJ5dGUgcmVwZWF0ZWQKPiAtCSAqIG92 ZXIgdGhlIGVudGlyZSBidWZmZXIuIERvaW5nIGp1c3Qgb25lIHRocm93IGF3YXkgcmVhZAo+IC0J ICogaW5pdGlhbGx5IHNlZW1zIHRvICJzb2x2ZSIgaXQuCj4gLQkgKi8KPiAtCWRybV9kcF9kcGNk X3JlYWQoYXV4LCBEUF9EUENEX1JFViwgYnVmZmVyLCAxKTsKCkxhc3QgdGltZSBhcm91bmQgSSBk dWcgb3V0IHRoZSBjb21taXQgYWRkaW5nIHRoZSBsaW5lIGFib3ZlLCB3aGljaCBmaXhlZAphIGJ1 ZywgYW5kIHNhaWQgaXQgc2hvdWxkIGJlIGFjY291bnRlZCBmb3Igc29tZWhvdy4gQnV0IEkndmUg aGFkIGEKY2hhbmdlIG9mIGhlYXJ0LiBJIHdhbnQgdGhpcyBmdW5jdGlvbiBnb25lIGFscmVhZHku IFdlJ3ZlIGltcHJvdmVkIHRoZQpkcCBoZWxwZXJzIGNvbnNpZGVyYWJseSwgYW5kIGlmIHRoaXMg cmVncmVzc2VzLCB3ZSBuZWVkIHRvIGxvb2sgYXQKZml4aW5nIHRoaXMgZWl0aGVyIGF0IHRoZSBk cm0gbGV2ZWwgb3IgaW4gb3VyIC0+dHJhbnNmZXIgaG9vay4KCkFja2VkLWJ5OiBKYW5pIE5pa3Vs YSA8amFuaS5uaWt1bGFAaW50ZWwuY29tPgoKCj4gLQo+IC0JZm9yIChpID0gMDsgaSA8IDM7IGkr Kykgewo+IC0JCXJldCA9IGRybV9kcF9kcGNkX3JlYWQoYXV4LCBvZmZzZXQsIGJ1ZmZlciwgc2l6 ZSk7Cj4gLQkJaWYgKHJldCA9PSBzaXplKQo+IC0JCQlyZXR1cm4gcmV0Owo+IC0JCW1zbGVlcCgx KTsKPiAtCX0KPiAtCj4gLQlyZXR1cm4gcmV0Owo+IC19Cj4gLQo+IC0vKgo+ICAgKiBGZXRjaCBB VVggQ0ggcmVnaXN0ZXJzIDB4MjAyIC0gMHgyMDcgd2hpY2ggY29udGFpbgo+ICAgKiBsaW5rIHN0 YXR1cyBpbmZvcm1hdGlvbgo+ICAgKi8KPiAgYm9vbAo+ICBpbnRlbF9kcF9nZXRfbGlua19zdGF0 dXMoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCwgdWludDhfdCBsaW5rX3N0YXR1c1tEUF9MSU5L X1NUQVRVU19TSVpFXSkKPiAgewo+IC0JcmV0dXJuIGludGVsX2RwX2RwY2RfcmVhZF93YWtlKCZp bnRlbF9kcC0+YXV4LAo+IC0JCQkJICAgICAgIERQX0xBTkUwXzFfU1RBVFVTLAo+IC0JCQkJICAg ICAgIGxpbmtfc3RhdHVzLAo+IC0JCQkJICAgICAgIERQX0xJTktfU1RBVFVTX1NJWkUpID09IERQ X0xJTktfU1RBVFVTX1NJWkU7Cj4gKwlyZXR1cm4gZHJtX2RwX2RwY2RfcmVhZCgmaW50ZWxfZHAt PmF1eCwgRFBfTEFORTBfMV9TVEFUVVMsIGxpbmtfc3RhdHVzLAo+ICsJCQkJRFBfTElOS19TVEFU VVNfU0laRSkgPT0gRFBfTElOS19TVEFUVVNfU0laRTsKPiAgfQo+ICAKPiAgLyogVGhlc2UgYXJl IHNvdXJjZS1zcGVjaWZpYyB2YWx1ZXMuICovCj4gQEAgLTM4NjUsOCArMzgzMiw4IEBAIGludGVs X2RwX2dldF9kcGNkKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCj4gIAlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwo+ICAJdWludDhfdCByZXY7 Cj4gIAo+IC0JaWYgKGludGVsX2RwX2RwY2RfcmVhZF93YWtlKCZpbnRlbF9kcC0+YXV4LCAweDAw MCwgaW50ZWxfZHAtPmRwY2QsCj4gLQkJCQkgICAgc2l6ZW9mKGludGVsX2RwLT5kcGNkKSkgPCAw KQo+ICsJaWYgKGRybV9kcF9kcGNkX3JlYWQoJmludGVsX2RwLT5hdXgsIDB4MDAwLCBpbnRlbF9k cC0+ZHBjZCwKPiArCQkJICAgICBzaXplb2YoaW50ZWxfZHAtPmRwY2QpKSA8IDApCj4gIAkJcmV0 dXJuIGZhbHNlOyAvKiBhdXggdHJhbnNmZXIgZmFpbGVkICovCj4gIAo+ICAJRFJNX0RFQlVHX0tN UygiRFBDRDogJSpwaFxuIiwgKGludCkgc2l6ZW9mKGludGVsX2RwLT5kcGNkKSwgaW50ZWxfZHAt PmRwY2QpOwo+IEBAIC0zODc3LDkgKzM4NDQsOSBAQCBpbnRlbF9kcF9nZXRfZHBjZChzdHJ1Y3Qg aW50ZWxfZHAgKmludGVsX2RwKQo+ICAJLyogQ2hlY2sgaWYgdGhlIHBhbmVsIHN1cHBvcnRzIFBT UiAqLwo+ICAJbWVtc2V0KGludGVsX2RwLT5wc3JfZHBjZCwgMCwgc2l6ZW9mKGludGVsX2RwLT5w c3JfZHBjZCkpOwo+ICAJaWYgKGlzX2VkcChpbnRlbF9kcCkpIHsKPiAtCQlpbnRlbF9kcF9kcGNk X3JlYWRfd2FrZSgmaW50ZWxfZHAtPmF1eCwgRFBfUFNSX1NVUFBPUlQsCj4gLQkJCQkJaW50ZWxf ZHAtPnBzcl9kcGNkLAo+IC0JCQkJCXNpemVvZihpbnRlbF9kcC0+cHNyX2RwY2QpKTsKPiArCQlk cm1fZHBfZHBjZF9yZWFkKCZpbnRlbF9kcC0+YXV4LCBEUF9QU1JfU1VQUE9SVCwKPiArCQkJCSBp bnRlbF9kcC0+cHNyX2RwY2QsCj4gKwkJCQkgc2l6ZW9mKGludGVsX2RwLT5wc3JfZHBjZCkpOwo+ ICAJCWlmIChpbnRlbF9kcC0+cHNyX2RwY2RbMF0gJiBEUF9QU1JfSVNfU1VQUE9SVEVEKSB7Cj4g IAkJCWRldl9wcml2LT5wc3Iuc2lua19zdXBwb3J0ID0gdHJ1ZTsKPiAgCQkJRFJNX0RFQlVHX0tN UygiRGV0ZWN0ZWQgRURQIFBTUiBQYW5lbC5cbiIpOwo+IEBAIC0zODkwLDkgKzM4NTcsOSBAQCBp bnRlbF9kcF9nZXRfZHBjZChzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQo+ICAJCQl1aW50OF90 IGZyYW1lX3N5bmNfY2FwOwo+ICAKPiAgCQkJZGV2X3ByaXYtPnBzci5zaW5rX3N1cHBvcnQgPSB0 cnVlOwo+IC0JCQlpbnRlbF9kcF9kcGNkX3JlYWRfd2FrZSgmaW50ZWxfZHAtPmF1eCwKPiAtCQkJ CQlEUF9TSU5LX0RFVklDRV9BVVhfRlJBTUVfU1lOQ19DQVAsCj4gLQkJCQkJJmZyYW1lX3N5bmNf Y2FwLCAxKTsKPiArCQkJZHJtX2RwX2RwY2RfcmVhZCgmaW50ZWxfZHAtPmF1eCwKPiArCQkJCQkg RFBfU0lOS19ERVZJQ0VfQVVYX0ZSQU1FX1NZTkNfQ0FQLAo+ICsJCQkJCSAmZnJhbWVfc3luY19j YXAsIDEpOwo+ICAJCQlkZXZfcHJpdi0+cHNyLmF1eF9mcmFtZV9zeW5jID0gZnJhbWVfc3luY19j YXAgPyB0cnVlIDogZmFsc2U7Cj4gIAkJCS8qIFBTUjIgbmVlZHMgZnJhbWUgc3luYyBhcyB3ZWxs ICovCj4gIAkJCWRldl9wcml2LT5wc3IucHNyMl9zdXBwb3J0ID0gZGV2X3ByaXYtPnBzci5hdXhf ZnJhbWVfc3luYzsKPiBAQCAtMzkwOCwxNSArMzg3NSwxMyBAQCBpbnRlbF9kcF9nZXRfZHBjZChz dHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQo+ICAJLyogSW50ZXJtZWRpYXRlIGZyZXF1ZW5jeSBz dXBwb3J0ICovCj4gIAlpZiAoaXNfZWRwKGludGVsX2RwKSAmJgo+ICAJICAgIChpbnRlbF9kcC0+ ZHBjZFtEUF9FRFBfQ09ORklHVVJBVElPTl9DQVBdICYJRFBfRFBDRF9ESVNQTEFZX0NPTlRST0xf Q0FQQUJMRSkgJiYKPiAtCSAgICAoaW50ZWxfZHBfZHBjZF9yZWFkX3dha2UoJmludGVsX2RwLT5h dXgsIERQX0VEUF9EUENEX1JFViwgJnJldiwgMSkgPT0gMSkgJiYKPiArCSAgICAoZHJtX2RwX2Rw Y2RfcmVhZCgmaW50ZWxfZHAtPmF1eCwgRFBfRURQX0RQQ0RfUkVWLCAmcmV2LCAxKSA9PSAxKSAm Jgo+ICAJICAgIChyZXYgPj0gMHgwMykpIHsgLyogZURwIHYxLjQgb3IgaGlnaGVyICovCj4gIAkJ X19sZTE2IHNpbmtfcmF0ZXNbRFBfTUFYX1NVUFBPUlRFRF9SQVRFU107Cj4gIAkJaW50IGk7Cj4g IAo+IC0JCWludGVsX2RwX2RwY2RfcmVhZF93YWtlKCZpbnRlbF9kcC0+YXV4LAo+IC0JCQkJRFBf U1VQUE9SVEVEX0xJTktfUkFURVMsCj4gLQkJCQlzaW5rX3JhdGVzLAo+IC0JCQkJc2l6ZW9mKHNp bmtfcmF0ZXMpKTsKPiArCQlkcm1fZHBfZHBjZF9yZWFkKCZpbnRlbF9kcC0+YXV4LCBEUF9TVVBQ T1JURURfTElOS19SQVRFUywKPiArCQkJCXNpbmtfcmF0ZXMsIHNpemVvZihzaW5rX3JhdGVzKSk7 Cj4gIAo+ICAJCWZvciAoaSA9IDA7IGkgPCBBUlJBWV9TSVpFKHNpbmtfcmF0ZXMpOyBpKyspIHsK PiAgCQkJaW50IHZhbCA9IGxlMTZfdG9fY3B1KHNpbmtfcmF0ZXNbaV0pOwo+IEBAIC0zOTM5LDkg KzM5MDQsOSBAQCBpbnRlbF9kcF9nZXRfZHBjZChzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQo+ ICAJaWYgKGludGVsX2RwLT5kcGNkW0RQX0RQQ0RfUkVWXSA9PSAweDEwKQo+ICAJCXJldHVybiB0 cnVlOyAvKiBubyBwZXItcG9ydCBkb3duc3RyZWFtIGluZm8gKi8KPiAgCj4gLQlpZiAoaW50ZWxf ZHBfZHBjZF9yZWFkX3dha2UoJmludGVsX2RwLT5hdXgsIERQX0RPV05TVFJFQU1fUE9SVF8wLAo+ IC0JCQkJICAgIGludGVsX2RwLT5kb3duc3RyZWFtX3BvcnRzLAo+IC0JCQkJICAgIERQX01BWF9E T1dOU1RSRUFNX1BPUlRTKSA8IDApCj4gKwlpZiAoZHJtX2RwX2RwY2RfcmVhZCgmaW50ZWxfZHAt PmF1eCwgRFBfRE9XTlNUUkVBTV9QT1JUXzAsCj4gKwkJCSAgICAgaW50ZWxfZHAtPmRvd25zdHJl YW1fcG9ydHMsCj4gKwkJCSAgICAgRFBfTUFYX0RPV05TVFJFQU1fUE9SVFMpIDwgMCkKPiAgCQly ZXR1cm4gZmFsc2U7IC8qIGRvd25zdHJlYW0gcG9ydCBzdGF0dXMgZmV0Y2ggZmFpbGVkICovCj4g IAo+ICAJcmV0dXJuIHRydWU7Cj4gQEAgLTM5NTUsMTEgKzM5MjAsMTEgQEAgaW50ZWxfZHBfcHJv YmVfb3VpKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCj4gIAlpZiAoIShpbnRlbF9kcC0+ZHBj ZFtEUF9ET1dOX1NUUkVBTV9QT1JUX0NPVU5UXSAmIERQX09VSV9TVVBQT1JUKSkKPiAgCQlyZXR1 cm47Cj4gIAo+IC0JaWYgKGludGVsX2RwX2RwY2RfcmVhZF93YWtlKCZpbnRlbF9kcC0+YXV4LCBE UF9TSU5LX09VSSwgYnVmLCAzKSA9PSAzKQo+ICsJaWYgKGRybV9kcF9kcGNkX3JlYWQoJmludGVs X2RwLT5hdXgsIERQX1NJTktfT1VJLCBidWYsIDMpID09IDMpCj4gIAkJRFJNX0RFQlVHX0tNUygi U2luayBPVUk6ICUwMmh4JTAyaHglMDJoeFxuIiwKPiAgCQkJICAgICAgYnVmWzBdLCBidWZbMV0s IGJ1ZlsyXSk7Cj4gIAo+IC0JaWYgKGludGVsX2RwX2RwY2RfcmVhZF93YWtlKCZpbnRlbF9kcC0+ YXV4LCBEUF9CUkFOQ0hfT1VJLCBidWYsIDMpID09IDMpCj4gKwlpZiAoZHJtX2RwX2RwY2RfcmVh ZCgmaW50ZWxfZHAtPmF1eCwgRFBfQlJBTkNIX09VSSwgYnVmLCAzKSA9PSAzKQo+ICAJCURSTV9E RUJVR19LTVMoIkJyYW5jaCBPVUk6ICUwMmh4JTAyaHglMDJoeFxuIiwKPiAgCQkJICAgICAgYnVm WzBdLCBidWZbMV0sIGJ1ZlsyXSk7Cj4gIH0KPiBAQCAtMzk3NSw3ICszOTQwLDcgQEAgaW50ZWxf ZHBfcHJvYmVfbXN0KHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCj4gIAlpZiAoaW50ZWxfZHAt PmRwY2RbRFBfRFBDRF9SRVZdIDwgMHgxMikKPiAgCQlyZXR1cm4gZmFsc2U7Cj4gIAo+IC0JaWYg KGludGVsX2RwX2RwY2RfcmVhZF93YWtlKCZpbnRlbF9kcC0+YXV4LCBEUF9NU1RNX0NBUCwgYnVm LCAxKSkgewo+ICsJaWYgKGRybV9kcF9kcGNkX3JlYWQoJmludGVsX2RwLT5hdXgsIERQX01TVE1f Q0FQLCBidWYsIDEpKSB7Cj4gIAkJaWYgKGJ1ZlswXSAmIERQX01TVF9DQVApIHsKPiAgCQkJRFJN X0RFQlVHX0tNUygiU2luayBpcyBNU1QgY2FwYWJsZVxuIik7Cj4gIAkJCWludGVsX2RwLT5pc19t c3QgPSB0cnVlOwo+IEBAIC00MTEyLDcgKzQwNzcsNyBAQCBzdG9wOgo+ICBzdGF0aWMgYm9vbAo+ ICBpbnRlbF9kcF9nZXRfc2lua19pcnEoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCwgdTggKnNp bmtfaXJxX3ZlY3RvcikKPiAgewo+IC0JcmV0dXJuIGludGVsX2RwX2RwY2RfcmVhZF93YWtlKCZp bnRlbF9kcC0+YXV4LAo+ICsJcmV0dXJuIGRybV9kcF9kcGNkX3JlYWQoJmludGVsX2RwLT5hdXgs Cj4gIAkJCQkgICAgICAgRFBfREVWSUNFX1NFUlZJQ0VfSVJRX1ZFQ1RPUiwKPiAgCQkJCSAgICAg ICBzaW5rX2lycV92ZWN0b3IsIDEpID09IDE7Cj4gIH0KPiBAQCAtNDEyMiw3ICs0MDg3LDcgQEAg aW50ZWxfZHBfZ2V0X3NpbmtfaXJxX2VzaShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLCB1OCAq c2lua19pcnFfdmVjdG9yKQo+ICB7Cj4gIAlpbnQgcmV0Owo+ICAKPiAtCXJldCA9IGludGVsX2Rw X2RwY2RfcmVhZF93YWtlKCZpbnRlbF9kcC0+YXV4LAo+ICsJcmV0ID0gZHJtX2RwX2RwY2RfcmVh ZCgmaW50ZWxfZHAtPmF1eCwKPiAgCQkJCQkgICAgIERQX1NJTktfQ09VTlRfRVNJLAo+ICAJCQkJ CSAgICAgc2lua19pcnFfdmVjdG9yLCAxNCk7Cj4gIAlpZiAocmV0ICE9IDE0KQo+IEBAIC00Mzgz LDcgKzQzNDgsNyBAQCBpbnRlbF9kcF9kZXRlY3RfZHBjZChzdHJ1Y3QgaW50ZWxfZHAgKmludGVs X2RwKQo+ICAJICAgIGludGVsX2RwLT5kb3duc3RyZWFtX3BvcnRzWzBdICYgRFBfRFNfUE9SVF9I UEQpIHsKPiAgCQl1aW50OF90IHJlZzsKPiAgCj4gLQkJaWYgKGludGVsX2RwX2RwY2RfcmVhZF93 YWtlKCZpbnRlbF9kcC0+YXV4LCBEUF9TSU5LX0NPVU5ULAo+ICsJCWlmIChkcm1fZHBfZHBjZF9y ZWFkKCZpbnRlbF9kcC0+YXV4LCBEUF9TSU5LX0NPVU5ULAo+ICAJCQkJCSAgICAmcmVnLCAxKSA8 IDApCj4gIAkJCXJldHVybiBjb25uZWN0b3Jfc3RhdHVzX3Vua25vd247CgotLSAKSmFuaSBOaWt1 bGEsIEludGVsIE9wZW4gU291cmNlIFRlY2hub2xvZ3kgQ2VudGVyCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031874AbcCQR5B (ORCPT ); Thu, 17 Mar 2016 13:57:01 -0400 Received: from mga04.intel.com ([192.55.52.120]:8931 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932954AbcCQR4z (ORCPT ); Thu, 17 Mar 2016 13:56:55 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,350,1455004800"; d="scan'208";a="939554738" From: Jani Nikula To: Lyude , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: arthur.j.runyan@intel.com, Lyude , Daniel Vetter , David Airlie , open list Subject: Re: [PATCH 2/2] drm/i915: Get rid of intel_dp_dpcd_read_wake() In-Reply-To: <1458229245-8634-2-git-send-email-cpaul@redhat.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <1458229245-8634-1-git-send-email-cpaul@redhat.com> <1458229245-8634-2-git-send-email-cpaul@redhat.com> User-Agent: Notmuch/0.21+69~gd27d908 (http://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) Date: Thu, 17 Mar 2016 19:56:33 +0200 Message-ID: <877fh1htta.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 17 Mar 2016, Lyude wrote: > Since we've fixed up drm_dp_dpcd_read() to allow for retries when things > timeout, there's no use for having this function anymore. Good riddens. > > Signed-off-by: Lyude > --- > drivers/gpu/drm/i915/intel_dp.c | 79 ++++++++++++----------------------------- > 1 file changed, 22 insertions(+), 57 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index cdc2c15..fb4cbbe5 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -3190,47 +3190,14 @@ static void chv_dp_post_pll_disable(struct intel_encoder *encoder) > } > > /* > - * Native read with retry for link status and receiver capability reads for > - * cases where the sink may still be asleep. > - * > - * Sinks are *supposed* to come up within 1ms from an off state, but we're also > - * supposed to retry 3 times per the spec. > - */ > -static ssize_t > -intel_dp_dpcd_read_wake(struct drm_dp_aux *aux, unsigned int offset, > - void *buffer, size_t size) > -{ > - ssize_t ret; > - int i; > - > - /* > - * Sometime we just get the same incorrect byte repeated > - * over the entire buffer. Doing just one throw away read > - * initially seems to "solve" it. > - */ > - drm_dp_dpcd_read(aux, DP_DPCD_REV, buffer, 1); Last time around I dug out the commit adding the line above, which fixed a bug, and said it should be accounted for somehow. But I've had a change of heart. I want this function gone already. We've improved the dp helpers considerably, and if this regresses, we need to look at fixing this either at the drm level or in our ->transfer hook. Acked-by: Jani Nikula > - > - for (i = 0; i < 3; i++) { > - ret = drm_dp_dpcd_read(aux, offset, buffer, size); > - if (ret == size) > - return ret; > - msleep(1); > - } > - > - return ret; > -} > - > -/* > * Fetch AUX CH registers 0x202 - 0x207 which contain > * link status information > */ > bool > intel_dp_get_link_status(struct intel_dp *intel_dp, uint8_t link_status[DP_LINK_STATUS_SIZE]) > { > - return intel_dp_dpcd_read_wake(&intel_dp->aux, > - DP_LANE0_1_STATUS, > - link_status, > - DP_LINK_STATUS_SIZE) == DP_LINK_STATUS_SIZE; > + return drm_dp_dpcd_read(&intel_dp->aux, DP_LANE0_1_STATUS, link_status, > + DP_LINK_STATUS_SIZE) == DP_LINK_STATUS_SIZE; > } > > /* These are source-specific values. */ > @@ -3865,8 +3832,8 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) > struct drm_i915_private *dev_priv = dev->dev_private; > uint8_t rev; > > - if (intel_dp_dpcd_read_wake(&intel_dp->aux, 0x000, intel_dp->dpcd, > - sizeof(intel_dp->dpcd)) < 0) > + if (drm_dp_dpcd_read(&intel_dp->aux, 0x000, intel_dp->dpcd, > + sizeof(intel_dp->dpcd)) < 0) > return false; /* aux transfer failed */ > > DRM_DEBUG_KMS("DPCD: %*ph\n", (int) sizeof(intel_dp->dpcd), intel_dp->dpcd); > @@ -3877,9 +3844,9 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) > /* Check if the panel supports PSR */ > memset(intel_dp->psr_dpcd, 0, sizeof(intel_dp->psr_dpcd)); > if (is_edp(intel_dp)) { > - intel_dp_dpcd_read_wake(&intel_dp->aux, DP_PSR_SUPPORT, > - intel_dp->psr_dpcd, > - sizeof(intel_dp->psr_dpcd)); > + drm_dp_dpcd_read(&intel_dp->aux, DP_PSR_SUPPORT, > + intel_dp->psr_dpcd, > + sizeof(intel_dp->psr_dpcd)); > if (intel_dp->psr_dpcd[0] & DP_PSR_IS_SUPPORTED) { > dev_priv->psr.sink_support = true; > DRM_DEBUG_KMS("Detected EDP PSR Panel.\n"); > @@ -3890,9 +3857,9 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) > uint8_t frame_sync_cap; > > dev_priv->psr.sink_support = true; > - intel_dp_dpcd_read_wake(&intel_dp->aux, > - DP_SINK_DEVICE_AUX_FRAME_SYNC_CAP, > - &frame_sync_cap, 1); > + drm_dp_dpcd_read(&intel_dp->aux, > + DP_SINK_DEVICE_AUX_FRAME_SYNC_CAP, > + &frame_sync_cap, 1); > dev_priv->psr.aux_frame_sync = frame_sync_cap ? true : false; > /* PSR2 needs frame sync as well */ > dev_priv->psr.psr2_support = dev_priv->psr.aux_frame_sync; > @@ -3908,15 +3875,13 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) > /* Intermediate frequency support */ > if (is_edp(intel_dp) && > (intel_dp->dpcd[DP_EDP_CONFIGURATION_CAP] & DP_DPCD_DISPLAY_CONTROL_CAPABLE) && > - (intel_dp_dpcd_read_wake(&intel_dp->aux, DP_EDP_DPCD_REV, &rev, 1) == 1) && > + (drm_dp_dpcd_read(&intel_dp->aux, DP_EDP_DPCD_REV, &rev, 1) == 1) && > (rev >= 0x03)) { /* eDp v1.4 or higher */ > __le16 sink_rates[DP_MAX_SUPPORTED_RATES]; > int i; > > - intel_dp_dpcd_read_wake(&intel_dp->aux, > - DP_SUPPORTED_LINK_RATES, > - sink_rates, > - sizeof(sink_rates)); > + drm_dp_dpcd_read(&intel_dp->aux, DP_SUPPORTED_LINK_RATES, > + sink_rates, sizeof(sink_rates)); > > for (i = 0; i < ARRAY_SIZE(sink_rates); i++) { > int val = le16_to_cpu(sink_rates[i]); > @@ -3939,9 +3904,9 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) > if (intel_dp->dpcd[DP_DPCD_REV] == 0x10) > return true; /* no per-port downstream info */ > > - if (intel_dp_dpcd_read_wake(&intel_dp->aux, DP_DOWNSTREAM_PORT_0, > - intel_dp->downstream_ports, > - DP_MAX_DOWNSTREAM_PORTS) < 0) > + if (drm_dp_dpcd_read(&intel_dp->aux, DP_DOWNSTREAM_PORT_0, > + intel_dp->downstream_ports, > + DP_MAX_DOWNSTREAM_PORTS) < 0) > return false; /* downstream port status fetch failed */ > > return true; > @@ -3955,11 +3920,11 @@ intel_dp_probe_oui(struct intel_dp *intel_dp) > if (!(intel_dp->dpcd[DP_DOWN_STREAM_PORT_COUNT] & DP_OUI_SUPPORT)) > return; > > - if (intel_dp_dpcd_read_wake(&intel_dp->aux, DP_SINK_OUI, buf, 3) == 3) > + if (drm_dp_dpcd_read(&intel_dp->aux, DP_SINK_OUI, buf, 3) == 3) > DRM_DEBUG_KMS("Sink OUI: %02hx%02hx%02hx\n", > buf[0], buf[1], buf[2]); > > - if (intel_dp_dpcd_read_wake(&intel_dp->aux, DP_BRANCH_OUI, buf, 3) == 3) > + if (drm_dp_dpcd_read(&intel_dp->aux, DP_BRANCH_OUI, buf, 3) == 3) > DRM_DEBUG_KMS("Branch OUI: %02hx%02hx%02hx\n", > buf[0], buf[1], buf[2]); > } > @@ -3975,7 +3940,7 @@ intel_dp_probe_mst(struct intel_dp *intel_dp) > if (intel_dp->dpcd[DP_DPCD_REV] < 0x12) > return false; > > - if (intel_dp_dpcd_read_wake(&intel_dp->aux, DP_MSTM_CAP, buf, 1)) { > + if (drm_dp_dpcd_read(&intel_dp->aux, DP_MSTM_CAP, buf, 1)) { > if (buf[0] & DP_MST_CAP) { > DRM_DEBUG_KMS("Sink is MST capable\n"); > intel_dp->is_mst = true; > @@ -4112,7 +4077,7 @@ stop: > static bool > intel_dp_get_sink_irq(struct intel_dp *intel_dp, u8 *sink_irq_vector) > { > - return intel_dp_dpcd_read_wake(&intel_dp->aux, > + return drm_dp_dpcd_read(&intel_dp->aux, > DP_DEVICE_SERVICE_IRQ_VECTOR, > sink_irq_vector, 1) == 1; > } > @@ -4122,7 +4087,7 @@ intel_dp_get_sink_irq_esi(struct intel_dp *intel_dp, u8 *sink_irq_vector) > { > int ret; > > - ret = intel_dp_dpcd_read_wake(&intel_dp->aux, > + ret = drm_dp_dpcd_read(&intel_dp->aux, > DP_SINK_COUNT_ESI, > sink_irq_vector, 14); > if (ret != 14) > @@ -4383,7 +4348,7 @@ intel_dp_detect_dpcd(struct intel_dp *intel_dp) > intel_dp->downstream_ports[0] & DP_DS_PORT_HPD) { > uint8_t reg; > > - if (intel_dp_dpcd_read_wake(&intel_dp->aux, DP_SINK_COUNT, > + if (drm_dp_dpcd_read(&intel_dp->aux, DP_SINK_COUNT, > ®, 1) < 0) > return connector_status_unknown; -- Jani Nikula, Intel Open Source Technology Center