From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v4 5/9] drm/i915: Make intel_dp->has_audio reflect hw state only Date: Wed, 12 Apr 2017 12:50:03 +0200 Message-ID: <1491994207-25965-6-git-send-email-maarten.lankhorst@linux.intel.com> References: <1491994207-25965-1-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id E0C3D6E6D4 for ; Wed, 12 Apr 2017 10:50:38 +0000 (UTC) In-Reply-To: <1491994207-25965-1-git-send-email-maarten.lankhorst@linux.intel.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 List-Id: intel-gfx@lists.freedesktop.org QWx3YXlzIGRldGVjdCBpZiBhdWRpbyBpcyBhdmFpbGFibGUgZHVyaW5nIGVkaWQgZGV0ZWN0aW9u LgpXaXRoIGxlc3MgbWFnaWMgc3dpdGNoaW5nIGl0J3MgZWFzaWVyIHRvIGNvbnZlcnQgdGhlIGRw IGNvbm5lY3Rvcgpwcm9wZXJ0aWVzIHRvIGF0b21pYy4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4g TGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyB8IDM4ICsrKysrKysrKysrKysrKystLS0tLS0tLS0t LS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTYgaW5zZXJ0aW9ucygrKSwgMjIgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKaW5kZXggMGFmZDhmMzAzN2YwLi5iMWEwY2Iz Yzc5ZDQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwpAQCAtMTY1Myw3ICsxNjUzLDEyIEBAIGlu dGVsX2RwX2NvbXB1dGVfY29uZmlnKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCQlw aXBlX2NvbmZpZy0+aGFzX3BjaF9lbmNvZGVyID0gdHJ1ZTsKIAogCXBpcGVfY29uZmlnLT5oYXNf ZHJycyA9IGZhbHNlOwotCXBpcGVfY29uZmlnLT5oYXNfYXVkaW8gPSBpbnRlbF9kcC0+aGFzX2F1 ZGlvICYmIHBvcnQgIT0gUE9SVF9BOworCWlmIChwb3J0ID09IFBPUlRfQSkKKwkJcGlwZV9jb25m aWctPmhhc19hdWRpbyA9IGZhbHNlOworCWVsc2UgaWYgKGludGVsX2RwLT5mb3JjZV9hdWRpbyA9 PSBIRE1JX0FVRElPX0FVVE8pCisJCXBpcGVfY29uZmlnLT5oYXNfYXVkaW8gPSBpbnRlbF9kcC0+ aGFzX2F1ZGlvOworCWVsc2UKKwkJcGlwZV9jb25maWctPmhhc19hdWRpbyA9IGludGVsX2RwLT5m b3JjZV9hdWRpbyA9PSBIRE1JX0FVRElPX09OOwogCiAJaWYgKGlzX2VkcChpbnRlbF9kcCkgJiYg aW50ZWxfY29ubmVjdG9yLT5wYW5lbC5maXhlZF9tb2RlKSB7CiAJCWludGVsX2ZpeGVkX3BhbmVs X21vZGUoaW50ZWxfY29ubmVjdG9yLT5wYW5lbC5maXhlZF9tb2RlLApAQCAtNDU3OCwxMCArNDU4 Myw3IEBAIGludGVsX2RwX3NldF9lZGlkKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJZWRp ZCA9IGludGVsX2RwX2dldF9lZGlkKGludGVsX2RwKTsKIAlpbnRlbF9jb25uZWN0b3ItPmRldGVj dF9lZGlkID0gZWRpZDsKIAotCWlmIChpbnRlbF9kcC0+Zm9yY2VfYXVkaW8gIT0gSERNSV9BVURJ T19BVVRPKQotCQlpbnRlbF9kcC0+aGFzX2F1ZGlvID0gaW50ZWxfZHAtPmZvcmNlX2F1ZGlvID09 IEhETUlfQVVESU9fT047Ci0JZWxzZQotCQlpbnRlbF9kcC0+aGFzX2F1ZGlvID0gZHJtX2RldGVj dF9tb25pdG9yX2F1ZGlvKGVkaWQpOworCWludGVsX2RwLT5oYXNfYXVkaW8gPSBkcm1fZGV0ZWN0 X21vbml0b3JfYXVkaW8oZWRpZCk7CiB9CiAKIHN0YXRpYyB2b2lkCkBAIC00Nzc4LDE5ICs0Nzgw LDYgQEAgc3RhdGljIGludCBpbnRlbF9kcF9nZXRfbW9kZXMoc3RydWN0IGRybV9jb25uZWN0b3Ig KmNvbm5lY3RvcikKIAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIGJvb2wKLWludGVsX2RwX2RldGVj dF9hdWRpbyhzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yKQotewotCWJvb2wgaGFzX2F1 ZGlvID0gZmFsc2U7Ci0Jc3RydWN0IGVkaWQgKmVkaWQ7Ci0KLQllZGlkID0gdG9faW50ZWxfY29u bmVjdG9yKGNvbm5lY3RvciktPmRldGVjdF9lZGlkOwotCWlmIChlZGlkKQotCQloYXNfYXVkaW8g PSBkcm1fZGV0ZWN0X21vbml0b3JfYXVkaW8oZWRpZCk7Ci0KLQlyZXR1cm4gaGFzX2F1ZGlvOwot fQotCiBzdGF0aWMgaW50CiBpbnRlbF9kcF9zZXRfcHJvcGVydHkoc3RydWN0IGRybV9jb25uZWN0 b3IgKmNvbm5lY3RvciwKIAkJICAgICAgc3RydWN0IGRybV9wcm9wZXJ0eSAqcHJvcGVydHksCkBA IC00ODA4LDIyICs0Nzk3LDI3IEBAIGludGVsX2RwX3NldF9wcm9wZXJ0eShzdHJ1Y3QgZHJtX2Nv bm5lY3RvciAqY29ubmVjdG9yLAogCiAJaWYgKHByb3BlcnR5ID09IGRldl9wcml2LT5mb3JjZV9h dWRpb19wcm9wZXJ0eSkgewogCQlpbnQgaSA9IHZhbDsKLQkJYm9vbCBoYXNfYXVkaW87CisJCWJv b2wgaGFzX2F1ZGlvLCBvbGRfaGFzX2F1ZGlvOworCQlpbnQgb2xkX2ZvcmNlX2F1ZGlvID0gaW50 ZWxfZHAtPmZvcmNlX2F1ZGlvOwogCiAJCWlmIChpID09IGludGVsX2RwLT5mb3JjZV9hdWRpbykK IAkJCXJldHVybiAwOwogCisJCWlmIChvbGRfZm9yY2VfYXVkaW8gPT0gSERNSV9BVURJT19BVVRP KQorCQkJb2xkX2hhc19hdWRpbyA9IGludGVsX2RwLT5oYXNfYXVkaW87CisJCWVsc2UKKwkJCW9s ZF9oYXNfYXVkaW8gPSBvbGRfZm9yY2VfYXVkaW87CisKIAkJaW50ZWxfZHAtPmZvcmNlX2F1ZGlv ID0gaTsKIAogCQlpZiAoaSA9PSBIRE1JX0FVRElPX0FVVE8pCi0JCQloYXNfYXVkaW8gPSBpbnRl bF9kcF9kZXRlY3RfYXVkaW8oY29ubmVjdG9yKTsKKwkJCWhhc19hdWRpbyA9IGludGVsX2RwLT5o YXNfYXVkaW87CiAJCWVsc2UKIAkJCWhhc19hdWRpbyA9IChpID09IEhETUlfQVVESU9fT04pOwog Ci0JCWlmIChoYXNfYXVkaW8gPT0gaW50ZWxfZHAtPmhhc19hdWRpbykKKwkJaWYgKGhhc19hdWRp byA9PSBvbGRfaGFzX2F1ZGlvKQogCQkJcmV0dXJuIDA7CiAKLQkJaW50ZWxfZHAtPmhhc19hdWRp byA9IGhhc19hdWRpbzsKIAkJZ290byBkb25lOwogCX0KIAotLSAKMi43LjQKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=