From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lyude Subject: [PATCH 2/2] drm/i915: Get rid of intel_dp_dpcd_read_wake() Date: Thu, 17 Mar 2016 11:40:45 -0400 Message-ID: <1458229245-8634-2-git-send-email-cpaul@redhat.com> References: <1458229245-8634-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: <1458229245-8634-1-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: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: David Airlie , arthur.j.runyan@intel.com, open list , Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org U2luY2Ugd2UndmUgZml4ZWQgdXAgZHJtX2RwX2RwY2RfcmVhZCgpIHRvIGFsbG93IGZvciByZXRy aWVzIHdoZW4gdGhpbmdzCnRpbWVvdXQsIHRoZXJlJ3Mgbm8gdXNlIGZvciBoYXZpbmcgdGhpcyBm dW5jdGlvbiBhbnltb3JlLiBHb29kIHJpZGRlbnMuCgpTaWduZWQtb2ZmLWJ5OiBMeXVkZSA8Y3Bh dWxAcmVkaGF0LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIHwgNzkg KysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk LCAyMiBpbnNlcnRpb25zKCspLCA1NyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAu YwppbmRleCBjZGMyYzE1Li5mYjRjYmJlNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCkBAIC0z MTkwLDQ3ICszMTkwLDE0IEBAIHN0YXRpYyB2b2lkIGNodl9kcF9wb3N0X3BsbF9kaXNhYmxlKHN0 cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyKQogfQogCiAvKgotICogTmF0aXZlIHJlYWQgd2l0 aCByZXRyeSBmb3IgbGluayBzdGF0dXMgYW5kIHJlY2VpdmVyIGNhcGFiaWxpdHkgcmVhZHMgZm9y Ci0gKiBjYXNlcyB3aGVyZSB0aGUgc2luayBtYXkgc3RpbGwgYmUgYXNsZWVwLgotICoKLSAqIFNp bmtzIGFyZSAqc3VwcG9zZWQqIHRvIGNvbWUgdXAgd2l0aGluIDFtcyBmcm9tIGFuIG9mZiBzdGF0 ZSwgYnV0IHdlJ3JlIGFsc28KLSAqIHN1cHBvc2VkIHRvIHJldHJ5IDMgdGltZXMgcGVyIHRoZSBz cGVjLgotICovCi1zdGF0aWMgc3NpemVfdAotaW50ZWxfZHBfZHBjZF9yZWFkX3dha2Uoc3RydWN0 IGRybV9kcF9hdXggKmF1eCwgdW5zaWduZWQgaW50IG9mZnNldCwKLQkJCXZvaWQgKmJ1ZmZlciwg c2l6ZV90IHNpemUpCi17Ci0Jc3NpemVfdCByZXQ7Ci0JaW50IGk7Ci0KLQkvKgotCSAqIFNvbWV0 aW1lIHdlIGp1c3QgZ2V0IHRoZSBzYW1lIGluY29ycmVjdCBieXRlIHJlcGVhdGVkCi0JICogb3Zl ciB0aGUgZW50aXJlIGJ1ZmZlci4gRG9pbmcganVzdCBvbmUgdGhyb3cgYXdheSByZWFkCi0JICog aW5pdGlhbGx5IHNlZW1zIHRvICJzb2x2ZSIgaXQuCi0JICovCi0JZHJtX2RwX2RwY2RfcmVhZChh dXgsIERQX0RQQ0RfUkVWLCBidWZmZXIsIDEpOwotCi0JZm9yIChpID0gMDsgaSA8IDM7IGkrKykg ewotCQlyZXQgPSBkcm1fZHBfZHBjZF9yZWFkKGF1eCwgb2Zmc2V0LCBidWZmZXIsIHNpemUpOwot CQlpZiAocmV0ID09IHNpemUpCi0JCQlyZXR1cm4gcmV0OwotCQltc2xlZXAoMSk7Ci0JfQotCi0J cmV0dXJuIHJldDsKLX0KLQotLyoKICAqIEZldGNoIEFVWCBDSCByZWdpc3RlcnMgMHgyMDIgLSAw eDIwNyB3aGljaCBjb250YWluCiAgKiBsaW5rIHN0YXR1cyBpbmZvcm1hdGlvbgogICovCiBib29s CiBpbnRlbF9kcF9nZXRfbGlua19zdGF0dXMoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCwgdWlu dDhfdCBsaW5rX3N0YXR1c1tEUF9MSU5LX1NUQVRVU19TSVpFXSkKIHsKLQlyZXR1cm4gaW50ZWxf ZHBfZHBjZF9yZWFkX3dha2UoJmludGVsX2RwLT5hdXgsCi0JCQkJICAgICAgIERQX0xBTkUwXzFf U1RBVFVTLAotCQkJCSAgICAgICBsaW5rX3N0YXR1cywKLQkJCQkgICAgICAgRFBfTElOS19TVEFU VVNfU0laRSkgPT0gRFBfTElOS19TVEFUVVNfU0laRTsKKwlyZXR1cm4gZHJtX2RwX2RwY2RfcmVh ZCgmaW50ZWxfZHAtPmF1eCwgRFBfTEFORTBfMV9TVEFUVVMsIGxpbmtfc3RhdHVzLAorCQkJCURQ X0xJTktfU1RBVFVTX1NJWkUpID09IERQX0xJTktfU1RBVFVTX1NJWkU7CiB9CiAKIC8qIFRoZXNl IGFyZSBzb3VyY2Utc3BlY2lmaWMgdmFsdWVzLiAqLwpAQCAtMzg2NSw4ICszODMyLDggQEAgaW50 ZWxfZHBfZ2V0X2RwY2Qoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIAlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXVpbnQ4X3QgcmV2Owog Ci0JaWYgKGludGVsX2RwX2RwY2RfcmVhZF93YWtlKCZpbnRlbF9kcC0+YXV4LCAweDAwMCwgaW50 ZWxfZHAtPmRwY2QsCi0JCQkJICAgIHNpemVvZihpbnRlbF9kcC0+ZHBjZCkpIDwgMCkKKwlpZiAo ZHJtX2RwX2RwY2RfcmVhZCgmaW50ZWxfZHAtPmF1eCwgMHgwMDAsIGludGVsX2RwLT5kcGNkLAor CQkJICAgICBzaXplb2YoaW50ZWxfZHAtPmRwY2QpKSA8IDApCiAJCXJldHVybiBmYWxzZTsgLyog YXV4IHRyYW5zZmVyIGZhaWxlZCAqLwogCiAJRFJNX0RFQlVHX0tNUygiRFBDRDogJSpwaFxuIiwg KGludCkgc2l6ZW9mKGludGVsX2RwLT5kcGNkKSwgaW50ZWxfZHAtPmRwY2QpOwpAQCAtMzg3Nyw5 ICszODQ0LDkgQEAgaW50ZWxfZHBfZ2V0X2RwY2Qoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkK IAkvKiBDaGVjayBpZiB0aGUgcGFuZWwgc3VwcG9ydHMgUFNSICovCiAJbWVtc2V0KGludGVsX2Rw LT5wc3JfZHBjZCwgMCwgc2l6ZW9mKGludGVsX2RwLT5wc3JfZHBjZCkpOwogCWlmIChpc19lZHAo aW50ZWxfZHApKSB7Ci0JCWludGVsX2RwX2RwY2RfcmVhZF93YWtlKCZpbnRlbF9kcC0+YXV4LCBE UF9QU1JfU1VQUE9SVCwKLQkJCQkJaW50ZWxfZHAtPnBzcl9kcGNkLAotCQkJCQlzaXplb2YoaW50 ZWxfZHAtPnBzcl9kcGNkKSk7CisJCWRybV9kcF9kcGNkX3JlYWQoJmludGVsX2RwLT5hdXgsIERQ X1BTUl9TVVBQT1JULAorCQkJCSBpbnRlbF9kcC0+cHNyX2RwY2QsCisJCQkJIHNpemVvZihpbnRl bF9kcC0+cHNyX2RwY2QpKTsKIAkJaWYgKGludGVsX2RwLT5wc3JfZHBjZFswXSAmIERQX1BTUl9J U19TVVBQT1JURUQpIHsKIAkJCWRldl9wcml2LT5wc3Iuc2lua19zdXBwb3J0ID0gdHJ1ZTsKIAkJ CURSTV9ERUJVR19LTVMoIkRldGVjdGVkIEVEUCBQU1IgUGFuZWwuXG4iKTsKQEAgLTM4OTAsOSAr Mzg1Nyw5IEBAIGludGVsX2RwX2dldF9kcGNkKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJ CQl1aW50OF90IGZyYW1lX3N5bmNfY2FwOwogCiAJCQlkZXZfcHJpdi0+cHNyLnNpbmtfc3VwcG9y dCA9IHRydWU7Ci0JCQlpbnRlbF9kcF9kcGNkX3JlYWRfd2FrZSgmaW50ZWxfZHAtPmF1eCwKLQkJ CQkJRFBfU0lOS19ERVZJQ0VfQVVYX0ZSQU1FX1NZTkNfQ0FQLAotCQkJCQkmZnJhbWVfc3luY19j YXAsIDEpOworCQkJZHJtX2RwX2RwY2RfcmVhZCgmaW50ZWxfZHAtPmF1eCwKKwkJCQkJIERQX1NJ TktfREVWSUNFX0FVWF9GUkFNRV9TWU5DX0NBUCwKKwkJCQkJICZmcmFtZV9zeW5jX2NhcCwgMSk7 CiAJCQlkZXZfcHJpdi0+cHNyLmF1eF9mcmFtZV9zeW5jID0gZnJhbWVfc3luY19jYXAgPyB0cnVl IDogZmFsc2U7CiAJCQkvKiBQU1IyIG5lZWRzIGZyYW1lIHN5bmMgYXMgd2VsbCAqLwogCQkJZGV2 X3ByaXYtPnBzci5wc3IyX3N1cHBvcnQgPSBkZXZfcHJpdi0+cHNyLmF1eF9mcmFtZV9zeW5jOwpA QCAtMzkwOCwxNSArMzg3NSwxMyBAQCBpbnRlbF9kcF9nZXRfZHBjZChzdHJ1Y3QgaW50ZWxfZHAg KmludGVsX2RwKQogCS8qIEludGVybWVkaWF0ZSBmcmVxdWVuY3kgc3VwcG9ydCAqLwogCWlmIChp c19lZHAoaW50ZWxfZHApICYmCiAJICAgIChpbnRlbF9kcC0+ZHBjZFtEUF9FRFBfQ09ORklHVVJB VElPTl9DQVBdICYJRFBfRFBDRF9ESVNQTEFZX0NPTlRST0xfQ0FQQUJMRSkgJiYKLQkgICAgKGlu dGVsX2RwX2RwY2RfcmVhZF93YWtlKCZpbnRlbF9kcC0+YXV4LCBEUF9FRFBfRFBDRF9SRVYsICZy ZXYsIDEpID09IDEpICYmCisJICAgIChkcm1fZHBfZHBjZF9yZWFkKCZpbnRlbF9kcC0+YXV4LCBE UF9FRFBfRFBDRF9SRVYsICZyZXYsIDEpID09IDEpICYmCiAJICAgIChyZXYgPj0gMHgwMykpIHsg LyogZURwIHYxLjQgb3IgaGlnaGVyICovCiAJCV9fbGUxNiBzaW5rX3JhdGVzW0RQX01BWF9TVVBQ T1JURURfUkFURVNdOwogCQlpbnQgaTsKIAotCQlpbnRlbF9kcF9kcGNkX3JlYWRfd2FrZSgmaW50 ZWxfZHAtPmF1eCwKLQkJCQlEUF9TVVBQT1JURURfTElOS19SQVRFUywKLQkJCQlzaW5rX3JhdGVz LAotCQkJCXNpemVvZihzaW5rX3JhdGVzKSk7CisJCWRybV9kcF9kcGNkX3JlYWQoJmludGVsX2Rw LT5hdXgsIERQX1NVUFBPUlRFRF9MSU5LX1JBVEVTLAorCQkJCXNpbmtfcmF0ZXMsIHNpemVvZihz aW5rX3JhdGVzKSk7CiAKIAkJZm9yIChpID0gMDsgaSA8IEFSUkFZX1NJWkUoc2lua19yYXRlcyk7 IGkrKykgewogCQkJaW50IHZhbCA9IGxlMTZfdG9fY3B1KHNpbmtfcmF0ZXNbaV0pOwpAQCAtMzkz OSw5ICszOTA0LDkgQEAgaW50ZWxfZHBfZ2V0X2RwY2Qoc3RydWN0IGludGVsX2RwICppbnRlbF9k cCkKIAlpZiAoaW50ZWxfZHAtPmRwY2RbRFBfRFBDRF9SRVZdID09IDB4MTApCiAJCXJldHVybiB0 cnVlOyAvKiBubyBwZXItcG9ydCBkb3duc3RyZWFtIGluZm8gKi8KIAotCWlmIChpbnRlbF9kcF9k cGNkX3JlYWRfd2FrZSgmaW50ZWxfZHAtPmF1eCwgRFBfRE9XTlNUUkVBTV9QT1JUXzAsCi0JCQkJ ICAgIGludGVsX2RwLT5kb3duc3RyZWFtX3BvcnRzLAotCQkJCSAgICBEUF9NQVhfRE9XTlNUUkVB TV9QT1JUUykgPCAwKQorCWlmIChkcm1fZHBfZHBjZF9yZWFkKCZpbnRlbF9kcC0+YXV4LCBEUF9E T1dOU1RSRUFNX1BPUlRfMCwKKwkJCSAgICAgaW50ZWxfZHAtPmRvd25zdHJlYW1fcG9ydHMsCisJ CQkgICAgIERQX01BWF9ET1dOU1RSRUFNX1BPUlRTKSA8IDApCiAJCXJldHVybiBmYWxzZTsgLyog ZG93bnN0cmVhbSBwb3J0IHN0YXR1cyBmZXRjaCBmYWlsZWQgKi8KIAogCXJldHVybiB0cnVlOwpA QCAtMzk1NSwxMSArMzkyMCwxMSBAQCBpbnRlbF9kcF9wcm9iZV9vdWkoc3RydWN0IGludGVsX2Rw ICppbnRlbF9kcCkKIAlpZiAoIShpbnRlbF9kcC0+ZHBjZFtEUF9ET1dOX1NUUkVBTV9QT1JUX0NP VU5UXSAmIERQX09VSV9TVVBQT1JUKSkKIAkJcmV0dXJuOwogCi0JaWYgKGludGVsX2RwX2RwY2Rf cmVhZF93YWtlKCZpbnRlbF9kcC0+YXV4LCBEUF9TSU5LX09VSSwgYnVmLCAzKSA9PSAzKQorCWlm IChkcm1fZHBfZHBjZF9yZWFkKCZpbnRlbF9kcC0+YXV4LCBEUF9TSU5LX09VSSwgYnVmLCAzKSA9 PSAzKQogCQlEUk1fREVCVUdfS01TKCJTaW5rIE9VSTogJTAyaHglMDJoeCUwMmh4XG4iLAogCQkJ ICAgICAgYnVmWzBdLCBidWZbMV0sIGJ1ZlsyXSk7CiAKLQlpZiAoaW50ZWxfZHBfZHBjZF9yZWFk X3dha2UoJmludGVsX2RwLT5hdXgsIERQX0JSQU5DSF9PVUksIGJ1ZiwgMykgPT0gMykKKwlpZiAo ZHJtX2RwX2RwY2RfcmVhZCgmaW50ZWxfZHAtPmF1eCwgRFBfQlJBTkNIX09VSSwgYnVmLCAzKSA9 PSAzKQogCQlEUk1fREVCVUdfS01TKCJCcmFuY2ggT1VJOiAlMDJoeCUwMmh4JTAyaHhcbiIsCiAJ CQkgICAgICBidWZbMF0sIGJ1ZlsxXSwgYnVmWzJdKTsKIH0KQEAgLTM5NzUsNyArMzk0MCw3IEBA IGludGVsX2RwX3Byb2JlX21zdChzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogCWlmIChpbnRl bF9kcC0+ZHBjZFtEUF9EUENEX1JFVl0gPCAweDEyKQogCQlyZXR1cm4gZmFsc2U7CiAKLQlpZiAo aW50ZWxfZHBfZHBjZF9yZWFkX3dha2UoJmludGVsX2RwLT5hdXgsIERQX01TVE1fQ0FQLCBidWYs IDEpKSB7CisJaWYgKGRybV9kcF9kcGNkX3JlYWQoJmludGVsX2RwLT5hdXgsIERQX01TVE1fQ0FQ LCBidWYsIDEpKSB7CiAJCWlmIChidWZbMF0gJiBEUF9NU1RfQ0FQKSB7CiAJCQlEUk1fREVCVUdf S01TKCJTaW5rIGlzIE1TVCBjYXBhYmxlXG4iKTsKIAkJCWludGVsX2RwLT5pc19tc3QgPSB0cnVl OwpAQCAtNDExMiw3ICs0MDc3LDcgQEAgc3RvcDoKIHN0YXRpYyBib29sCiBpbnRlbF9kcF9nZXRf c2lua19pcnEoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCwgdTggKnNpbmtfaXJxX3ZlY3RvcikK IHsKLQlyZXR1cm4gaW50ZWxfZHBfZHBjZF9yZWFkX3dha2UoJmludGVsX2RwLT5hdXgsCisJcmV0 dXJuIGRybV9kcF9kcGNkX3JlYWQoJmludGVsX2RwLT5hdXgsCiAJCQkJICAgICAgIERQX0RFVklD RV9TRVJWSUNFX0lSUV9WRUNUT1IsCiAJCQkJICAgICAgIHNpbmtfaXJxX3ZlY3RvciwgMSkgPT0g MTsKIH0KQEAgLTQxMjIsNyArNDA4Nyw3IEBAIGludGVsX2RwX2dldF9zaW5rX2lycV9lc2koc3Ry dWN0IGludGVsX2RwICppbnRlbF9kcCwgdTggKnNpbmtfaXJxX3ZlY3RvcikKIHsKIAlpbnQgcmV0 OwogCi0JcmV0ID0gaW50ZWxfZHBfZHBjZF9yZWFkX3dha2UoJmludGVsX2RwLT5hdXgsCisJcmV0 ID0gZHJtX2RwX2RwY2RfcmVhZCgmaW50ZWxfZHAtPmF1eCwKIAkJCQkJICAgICBEUF9TSU5LX0NP VU5UX0VTSSwKIAkJCQkJICAgICBzaW5rX2lycV92ZWN0b3IsIDE0KTsKIAlpZiAocmV0ICE9IDE0 KQpAQCAtNDM4Myw3ICs0MzQ4LDcgQEAgaW50ZWxfZHBfZGV0ZWN0X2RwY2Qoc3RydWN0IGludGVs X2RwICppbnRlbF9kcCkKIAkgICAgaW50ZWxfZHAtPmRvd25zdHJlYW1fcG9ydHNbMF0gJiBEUF9E U19QT1JUX0hQRCkgewogCQl1aW50OF90IHJlZzsKIAotCQlpZiAoaW50ZWxfZHBfZHBjZF9yZWFk X3dha2UoJmludGVsX2RwLT5hdXgsIERQX1NJTktfQ09VTlQsCisJCWlmIChkcm1fZHBfZHBjZF9y ZWFkKCZpbnRlbF9kcC0+YXV4LCBEUF9TSU5LX0NPVU5ULAogCQkJCQkgICAgJnJlZywgMSkgPCAw KQogCQkJcmV0dXJuIGNvbm5lY3Rvcl9zdGF0dXNfdW5rbm93bjsKIAotLSAKMi41LjAKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=