From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lyude Subject: [PATCH v4 RESEND 5/5] drm/i915: Get rid of intel_dp_dpcd_read_wake() Date: Mon, 28 Mar 2016 10:33:26 -0400 Message-ID: <1459175606-13875-6-git-send-email-cpaul@redhat.com> References: <1459175606-13875-1-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: <1459175606-13875-1-git-send-email-cpaul@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: arthur.j.runyan@intel.com, open list , Daniel Vetter , Lyude List-Id: dri-devel@lists.freedesktop.org U2luY2Ugd2UndmUgZml4ZWQgdXAgZHJtX2RwX2RwY2RfcmVhZCgpIHRvIGFsbG93IGZvciByZXRy aWVzIHdoZW4gdGhpbmdzCnRpbWVvdXQsIHRoZXJlJ3Mgbm8gdXNlIGZvciBoYXZpbmcgdGhpcyBm dW5jdGlvbiBhbnltb3JlLiBHb29kIHJpZGRlbnMuCgpTaWduZWQtb2ZmLWJ5OiBMeXVkZSA8Y3Bh dWxAcmVkaGF0LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIHwgNzkg KysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk LCAyMiBpbnNlcnRpb25zKCspLCA1NyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAu YwppbmRleCBmMDY5YTgyLi40M2MyOTMzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKQEAgLTMx ODQsNDcgKzMxODQsMTQgQEAgc3RhdGljIHZvaWQgY2h2X2RwX3Bvc3RfcGxsX2Rpc2FibGUoc3Ry dWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIpCiB9CiAKIC8qCi0gKiBOYXRpdmUgcmVhZCB3aXRo IHJldHJ5IGZvciBsaW5rIHN0YXR1cyBhbmQgcmVjZWl2ZXIgY2FwYWJpbGl0eSByZWFkcyBmb3IK LSAqIGNhc2VzIHdoZXJlIHRoZSBzaW5rIG1heSBzdGlsbCBiZSBhc2xlZXAuCi0gKgotICogU2lu a3MgYXJlICpzdXBwb3NlZCogdG8gY29tZSB1cCB3aXRoaW4gMW1zIGZyb20gYW4gb2ZmIHN0YXRl LCBidXQgd2UncmUgYWxzbwotICogc3VwcG9zZWQgdG8gcmV0cnkgMyB0aW1lcyBwZXIgdGhlIHNw ZWMuCi0gKi8KLXN0YXRpYyBzc2l6ZV90Ci1pbnRlbF9kcF9kcGNkX3JlYWRfd2FrZShzdHJ1Y3Qg ZHJtX2RwX2F1eCAqYXV4LCB1bnNpZ25lZCBpbnQgb2Zmc2V0LAotCQkJdm9pZCAqYnVmZmVyLCBz aXplX3Qgc2l6ZSkKLXsKLQlzc2l6ZV90IHJldDsKLQlpbnQgaTsKLQotCS8qCi0JICogU29tZXRp bWUgd2UganVzdCBnZXQgdGhlIHNhbWUgaW5jb3JyZWN0IGJ5dGUgcmVwZWF0ZWQKLQkgKiBvdmVy IHRoZSBlbnRpcmUgYnVmZmVyLiBEb2luZyBqdXN0IG9uZSB0aHJvdyBhd2F5IHJlYWQKLQkgKiBp bml0aWFsbHkgc2VlbXMgdG8gInNvbHZlIiBpdC4KLQkgKi8KLQlkcm1fZHBfZHBjZF9yZWFkKGF1 eCwgRFBfRFBDRF9SRVYsIGJ1ZmZlciwgMSk7Ci0KLQlmb3IgKGkgPSAwOyBpIDwgMzsgaSsrKSB7 Ci0JCXJldCA9IGRybV9kcF9kcGNkX3JlYWQoYXV4LCBvZmZzZXQsIGJ1ZmZlciwgc2l6ZSk7Ci0J CWlmIChyZXQgPT0gc2l6ZSkKLQkJCXJldHVybiByZXQ7Ci0JCW1zbGVlcCgxKTsKLQl9Ci0KLQly ZXR1cm4gcmV0OwotfQotCi0vKgogICogRmV0Y2ggQVVYIENIIHJlZ2lzdGVycyAweDIwMiAtIDB4 MjA3IHdoaWNoIGNvbnRhaW4KICAqIGxpbmsgc3RhdHVzIGluZm9ybWF0aW9uCiAgKi8KIGJvb2wK IGludGVsX2RwX2dldF9saW5rX3N0YXR1cyhzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLCB1aW50 OF90IGxpbmtfc3RhdHVzW0RQX0xJTktfU1RBVFVTX1NJWkVdKQogewotCXJldHVybiBpbnRlbF9k cF9kcGNkX3JlYWRfd2FrZSgmaW50ZWxfZHAtPmF1eCwKLQkJCQkgICAgICAgRFBfTEFORTBfMV9T VEFUVVMsCi0JCQkJICAgICAgIGxpbmtfc3RhdHVzLAotCQkJCSAgICAgICBEUF9MSU5LX1NUQVRV U19TSVpFKSA9PSBEUF9MSU5LX1NUQVRVU19TSVpFOworCXJldHVybiBkcm1fZHBfZHBjZF9yZWFk KCZpbnRlbF9kcC0+YXV4LCBEUF9MQU5FMF8xX1NUQVRVUywgbGlua19zdGF0dXMsCisJCQkJRFBf TElOS19TVEFUVVNfU0laRSkgPT0gRFBfTElOS19TVEFUVVNfU0laRTsKIH0KIAogLyogVGhlc2Ug YXJlIHNvdXJjZS1zcGVjaWZpYyB2YWx1ZXMuICovCkBAIC0zODU5LDggKzM4MjYsOCBAQCBpbnRl bF9kcF9nZXRfZHBjZChzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJdWludDhfdCByZXY7CiAK LQlpZiAoaW50ZWxfZHBfZHBjZF9yZWFkX3dha2UoJmludGVsX2RwLT5hdXgsIDB4MDAwLCBpbnRl bF9kcC0+ZHBjZCwKLQkJCQkgICAgc2l6ZW9mKGludGVsX2RwLT5kcGNkKSkgPCAwKQorCWlmIChk cm1fZHBfZHBjZF9yZWFkKCZpbnRlbF9kcC0+YXV4LCAweDAwMCwgaW50ZWxfZHAtPmRwY2QsCisJ CQkgICAgIHNpemVvZihpbnRlbF9kcC0+ZHBjZCkpIDwgMCkKIAkJcmV0dXJuIGZhbHNlOyAvKiBh dXggdHJhbnNmZXIgZmFpbGVkICovCiAKIAlEUk1fREVCVUdfS01TKCJEUENEOiAlKnBoXG4iLCAo aW50KSBzaXplb2YoaW50ZWxfZHAtPmRwY2QpLCBpbnRlbF9kcC0+ZHBjZCk7CkBAIC0zODcxLDkg KzM4MzgsOSBAQCBpbnRlbF9kcF9nZXRfZHBjZChzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQog CS8qIENoZWNrIGlmIHRoZSBwYW5lbCBzdXBwb3J0cyBQU1IgKi8KIAltZW1zZXQoaW50ZWxfZHAt PnBzcl9kcGNkLCAwLCBzaXplb2YoaW50ZWxfZHAtPnBzcl9kcGNkKSk7CiAJaWYgKGlzX2VkcChp bnRlbF9kcCkpIHsKLQkJaW50ZWxfZHBfZHBjZF9yZWFkX3dha2UoJmludGVsX2RwLT5hdXgsIERQ X1BTUl9TVVBQT1JULAotCQkJCQlpbnRlbF9kcC0+cHNyX2RwY2QsCi0JCQkJCXNpemVvZihpbnRl bF9kcC0+cHNyX2RwY2QpKTsKKwkJZHJtX2RwX2RwY2RfcmVhZCgmaW50ZWxfZHAtPmF1eCwgRFBf UFNSX1NVUFBPUlQsCisJCQkJIGludGVsX2RwLT5wc3JfZHBjZCwKKwkJCQkgc2l6ZW9mKGludGVs X2RwLT5wc3JfZHBjZCkpOwogCQlpZiAoaW50ZWxfZHAtPnBzcl9kcGNkWzBdICYgRFBfUFNSX0lT X1NVUFBPUlRFRCkgewogCQkJZGV2X3ByaXYtPnBzci5zaW5rX3N1cHBvcnQgPSB0cnVlOwogCQkJ RFJNX0RFQlVHX0tNUygiRGV0ZWN0ZWQgRURQIFBTUiBQYW5lbC5cbiIpOwpAQCAtMzg4NCw5ICsz ODUxLDkgQEAgaW50ZWxfZHBfZ2V0X2RwY2Qoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIAkJ CXVpbnQ4X3QgZnJhbWVfc3luY19jYXA7CiAKIAkJCWRldl9wcml2LT5wc3Iuc2lua19zdXBwb3J0 ID0gdHJ1ZTsKLQkJCWludGVsX2RwX2RwY2RfcmVhZF93YWtlKCZpbnRlbF9kcC0+YXV4LAotCQkJ CQlEUF9TSU5LX0RFVklDRV9BVVhfRlJBTUVfU1lOQ19DQVAsCi0JCQkJCSZmcmFtZV9zeW5jX2Nh cCwgMSk7CisJCQlkcm1fZHBfZHBjZF9yZWFkKCZpbnRlbF9kcC0+YXV4LAorCQkJCQkgRFBfU0lO S19ERVZJQ0VfQVVYX0ZSQU1FX1NZTkNfQ0FQLAorCQkJCQkgJmZyYW1lX3N5bmNfY2FwLCAxKTsK IAkJCWRldl9wcml2LT5wc3IuYXV4X2ZyYW1lX3N5bmMgPSBmcmFtZV9zeW5jX2NhcCA/IHRydWUg OiBmYWxzZTsKIAkJCS8qIFBTUjIgbmVlZHMgZnJhbWUgc3luYyBhcyB3ZWxsICovCiAJCQlkZXZf cHJpdi0+cHNyLnBzcjJfc3VwcG9ydCA9IGRldl9wcml2LT5wc3IuYXV4X2ZyYW1lX3N5bmM7CkBA IC0zOTAyLDE1ICszODY5LDEzIEBAIGludGVsX2RwX2dldF9kcGNkKHN0cnVjdCBpbnRlbF9kcCAq aW50ZWxfZHApCiAJLyogSW50ZXJtZWRpYXRlIGZyZXF1ZW5jeSBzdXBwb3J0ICovCiAJaWYgKGlz X2VkcChpbnRlbF9kcCkgJiYKIAkgICAgKGludGVsX2RwLT5kcGNkW0RQX0VEUF9DT05GSUdVUkFU SU9OX0NBUF0gJglEUF9EUENEX0RJU1BMQVlfQ09OVFJPTF9DQVBBQkxFKSAmJgotCSAgICAoaW50 ZWxfZHBfZHBjZF9yZWFkX3dha2UoJmludGVsX2RwLT5hdXgsIERQX0VEUF9EUENEX1JFViwgJnJl diwgMSkgPT0gMSkgJiYKKwkgICAgKGRybV9kcF9kcGNkX3JlYWQoJmludGVsX2RwLT5hdXgsIERQ X0VEUF9EUENEX1JFViwgJnJldiwgMSkgPT0gMSkgJiYKIAkgICAgKHJldiA+PSAweDAzKSkgeyAv KiBlRHAgdjEuNCBvciBoaWdoZXIgKi8KIAkJX19sZTE2IHNpbmtfcmF0ZXNbRFBfTUFYX1NVUFBP UlRFRF9SQVRFU107CiAJCWludCBpOwogCi0JCWludGVsX2RwX2RwY2RfcmVhZF93YWtlKCZpbnRl bF9kcC0+YXV4LAotCQkJCURQX1NVUFBPUlRFRF9MSU5LX1JBVEVTLAotCQkJCXNpbmtfcmF0ZXMs Ci0JCQkJc2l6ZW9mKHNpbmtfcmF0ZXMpKTsKKwkJZHJtX2RwX2RwY2RfcmVhZCgmaW50ZWxfZHAt PmF1eCwgRFBfU1VQUE9SVEVEX0xJTktfUkFURVMsCisJCQkJc2lua19yYXRlcywgc2l6ZW9mKHNp bmtfcmF0ZXMpKTsKIAogCQlmb3IgKGkgPSAwOyBpIDwgQVJSQVlfU0laRShzaW5rX3JhdGVzKTsg aSsrKSB7CiAJCQlpbnQgdmFsID0gbGUxNl90b19jcHUoc2lua19yYXRlc1tpXSk7CkBAIC0zOTMz LDkgKzM4OTgsOSBAQCBpbnRlbF9kcF9nZXRfZHBjZChzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2Rw KQogCWlmIChpbnRlbF9kcC0+ZHBjZFtEUF9EUENEX1JFVl0gPT0gMHgxMCkKIAkJcmV0dXJuIHRy dWU7IC8qIG5vIHBlci1wb3J0IGRvd25zdHJlYW0gaW5mbyAqLwogCi0JaWYgKGludGVsX2RwX2Rw Y2RfcmVhZF93YWtlKCZpbnRlbF9kcC0+YXV4LCBEUF9ET1dOU1RSRUFNX1BPUlRfMCwKLQkJCQkg ICAgaW50ZWxfZHAtPmRvd25zdHJlYW1fcG9ydHMsCi0JCQkJICAgIERQX01BWF9ET1dOU1RSRUFN X1BPUlRTKSA8IDApCisJaWYgKGRybV9kcF9kcGNkX3JlYWQoJmludGVsX2RwLT5hdXgsIERQX0RP V05TVFJFQU1fUE9SVF8wLAorCQkJICAgICBpbnRlbF9kcC0+ZG93bnN0cmVhbV9wb3J0cywKKwkJ CSAgICAgRFBfTUFYX0RPV05TVFJFQU1fUE9SVFMpIDwgMCkKIAkJcmV0dXJuIGZhbHNlOyAvKiBk b3duc3RyZWFtIHBvcnQgc3RhdHVzIGZldGNoIGZhaWxlZCAqLwogCiAJcmV0dXJuIHRydWU7CkBA IC0zOTQ5LDExICszOTE0LDExIEBAIGludGVsX2RwX3Byb2JlX291aShzdHJ1Y3QgaW50ZWxfZHAg KmludGVsX2RwKQogCWlmICghKGludGVsX2RwLT5kcGNkW0RQX0RPV05fU1RSRUFNX1BPUlRfQ09V TlRdICYgRFBfT1VJX1NVUFBPUlQpKQogCQlyZXR1cm47CiAKLQlpZiAoaW50ZWxfZHBfZHBjZF9y ZWFkX3dha2UoJmludGVsX2RwLT5hdXgsIERQX1NJTktfT1VJLCBidWYsIDMpID09IDMpCisJaWYg KGRybV9kcF9kcGNkX3JlYWQoJmludGVsX2RwLT5hdXgsIERQX1NJTktfT1VJLCBidWYsIDMpID09 IDMpCiAJCURSTV9ERUJVR19LTVMoIlNpbmsgT1VJOiAlMDJoeCUwMmh4JTAyaHhcbiIsCiAJCQkg ICAgICBidWZbMF0sIGJ1ZlsxXSwgYnVmWzJdKTsKIAotCWlmIChpbnRlbF9kcF9kcGNkX3JlYWRf d2FrZSgmaW50ZWxfZHAtPmF1eCwgRFBfQlJBTkNIX09VSSwgYnVmLCAzKSA9PSAzKQorCWlmIChk cm1fZHBfZHBjZF9yZWFkKCZpbnRlbF9kcC0+YXV4LCBEUF9CUkFOQ0hfT1VJLCBidWYsIDMpID09 IDMpCiAJCURSTV9ERUJVR19LTVMoIkJyYW5jaCBPVUk6ICUwMmh4JTAyaHglMDJoeFxuIiwKIAkJ CSAgICAgIGJ1ZlswXSwgYnVmWzFdLCBidWZbMl0pOwogfQpAQCAtMzk2OSw3ICszOTM0LDcgQEAg aW50ZWxfZHBfcHJvYmVfbXN0KHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJaWYgKGludGVs X2RwLT5kcGNkW0RQX0RQQ0RfUkVWXSA8IDB4MTIpCiAJCXJldHVybiBmYWxzZTsKIAotCWlmIChp bnRlbF9kcF9kcGNkX3JlYWRfd2FrZSgmaW50ZWxfZHAtPmF1eCwgRFBfTVNUTV9DQVAsIGJ1Ziwg MSkpIHsKKwlpZiAoZHJtX2RwX2RwY2RfcmVhZCgmaW50ZWxfZHAtPmF1eCwgRFBfTVNUTV9DQVAs IGJ1ZiwgMSkpIHsKIAkJaWYgKGJ1ZlswXSAmIERQX01TVF9DQVApIHsKIAkJCURSTV9ERUJVR19L TVMoIlNpbmsgaXMgTVNUIGNhcGFibGVcbiIpOwogCQkJaW50ZWxfZHAtPmlzX21zdCA9IHRydWU7 CkBAIC00MTA2LDcgKzQwNzEsNyBAQCBzdG9wOgogc3RhdGljIGJvb2wKIGludGVsX2RwX2dldF9z aW5rX2lycShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLCB1OCAqc2lua19pcnFfdmVjdG9yKQog ewotCXJldHVybiBpbnRlbF9kcF9kcGNkX3JlYWRfd2FrZSgmaW50ZWxfZHAtPmF1eCwKKwlyZXR1 cm4gZHJtX2RwX2RwY2RfcmVhZCgmaW50ZWxfZHAtPmF1eCwKIAkJCQkgICAgICAgRFBfREVWSUNF X1NFUlZJQ0VfSVJRX1ZFQ1RPUiwKIAkJCQkgICAgICAgc2lua19pcnFfdmVjdG9yLCAxKSA9PSAx OwogfQpAQCAtNDExNiw3ICs0MDgxLDcgQEAgaW50ZWxfZHBfZ2V0X3NpbmtfaXJxX2VzaShzdHJ1 Y3QgaW50ZWxfZHAgKmludGVsX2RwLCB1OCAqc2lua19pcnFfdmVjdG9yKQogewogCWludCByZXQ7 CiAKLQlyZXQgPSBpbnRlbF9kcF9kcGNkX3JlYWRfd2FrZSgmaW50ZWxfZHAtPmF1eCwKKwlyZXQg PSBkcm1fZHBfZHBjZF9yZWFkKCZpbnRlbF9kcC0+YXV4LAogCQkJCQkgICAgIERQX1NJTktfQ09V TlRfRVNJLAogCQkJCQkgICAgIHNpbmtfaXJxX3ZlY3RvciwgMTQpOwogCWlmIChyZXQgIT0gMTQp CkBAIC00Mzc3LDcgKzQzNDIsNyBAQCBpbnRlbF9kcF9kZXRlY3RfZHBjZChzdHJ1Y3QgaW50ZWxf ZHAgKmludGVsX2RwKQogCSAgICBpbnRlbF9kcC0+ZG93bnN0cmVhbV9wb3J0c1swXSAmIERQX0RT X1BPUlRfSFBEKSB7CiAJCXVpbnQ4X3QgcmVnOwogCi0JCWlmIChpbnRlbF9kcF9kcGNkX3JlYWRf d2FrZSgmaW50ZWxfZHAtPmF1eCwgRFBfU0lOS19DT1VOVCwKKwkJaWYgKGRybV9kcF9kcGNkX3Jl YWQoJmludGVsX2RwLT5hdXgsIERQX1NJTktfQ09VTlQsCiAJCQkJCSAgICAmcmVnLCAxKSA8IDAp CiAJCQlyZXR1cm4gY29ubmVjdG9yX3N0YXR1c191bmtub3duOwogCi0tIAoyLjUuNQoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxp bmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==