From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH v6 08/12] drm/i915: Make intel_dp->has_audio
	reflect hw state only
Date: Mon,  1 May 2017 15:38:00 +0200
Message-ID: <20170501133804.8116-9-maarten.lankhorst@linux.intel.com>
References: <20170501133804.8116-1-maarten.lankhorst@linux.intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
In-Reply-To: <20170501133804.8116-1-maarten.lankhorst@linux.intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

QWx3YXlzIGRldGVjdCBpZiBhdWRpbyBpcyBhdmFpbGFibGUgZHVyaW5nIGVkaWQgZGV0ZWN0aW9u
LgpXaXRoIGxlc3MgbWFnaWMgc3dpdGNoaW5nIGl0J3MgZWFzaWVyIHRvIGNvbnZlcnQgdGhlIGRw
IGNvbm5lY3Rvcgpwcm9wZXJ0aWVzIHRvIGF0b21pYy4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4g
TGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+ClJldmlld2VkLWJ5
OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgotLS0KIGRyaXZlcnMvZ3B1
L2RybS9pOTE1L2ludGVsX2RwLmMgfCAzOCArKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE2IGluc2VydGlvbnMoKyksIDIyIGRlbGV0aW9ucygt
KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgYi9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCmluZGV4IDhlYjM4MWViYmVhNi4uMDk2NmI5MzE5MzMy
IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCisrKyBiL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKQEAgLTE2NzEsNyArMTY3MSwxMiBAQCBpbnRlbF9k
cF9jb21wdXRlX2NvbmZpZyhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJcGlwZV9j
b25maWctPmhhc19wY2hfZW5jb2RlciA9IHRydWU7CiAKIAlwaXBlX2NvbmZpZy0+aGFzX2RycnMg
PSBmYWxzZTsKLQlwaXBlX2NvbmZpZy0+aGFzX2F1ZGlvID0gaW50ZWxfZHAtPmhhc19hdWRpbyAm
JiBwb3J0ICE9IFBPUlRfQTsKKwlpZiAocG9ydCA9PSBQT1JUX0EpCisJCXBpcGVfY29uZmlnLT5o
YXNfYXVkaW8gPSBmYWxzZTsKKwllbHNlIGlmIChpbnRlbF9kcC0+Zm9yY2VfYXVkaW8gPT0gSERN
SV9BVURJT19BVVRPKQorCQlwaXBlX2NvbmZpZy0+aGFzX2F1ZGlvID0gaW50ZWxfZHAtPmhhc19h
dWRpbzsKKwllbHNlCisJCXBpcGVfY29uZmlnLT5oYXNfYXVkaW8gPSBpbnRlbF9kcC0+Zm9yY2Vf
YXVkaW8gPT0gSERNSV9BVURJT19PTjsKIAogCWlmIChpc19lZHAoaW50ZWxfZHApICYmIGludGVs
X2Nvbm5lY3Rvci0+cGFuZWwuZml4ZWRfbW9kZSkgewogCQlpbnRlbF9maXhlZF9wYW5lbF9tb2Rl
KGludGVsX2Nvbm5lY3Rvci0+cGFuZWwuZml4ZWRfbW9kZSwKQEAgLTQ1OTgsMTAgKzQ2MDMsNyBA
QCBpbnRlbF9kcF9zZXRfZWRpZChzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogCWVkaWQgPSBp
bnRlbF9kcF9nZXRfZWRpZChpbnRlbF9kcCk7CiAJaW50ZWxfY29ubmVjdG9yLT5kZXRlY3RfZWRp
ZCA9IGVkaWQ7CiAKLQlpZiAoaW50ZWxfZHAtPmZvcmNlX2F1ZGlvICE9IEhETUlfQVVESU9fQVVU
TykKLQkJaW50ZWxfZHAtPmhhc19hdWRpbyA9IGludGVsX2RwLT5mb3JjZV9hdWRpbyA9PSBIRE1J
X0FVRElPX09OOwotCWVsc2UKLQkJaW50ZWxfZHAtPmhhc19hdWRpbyA9IGRybV9kZXRlY3RfbW9u
aXRvcl9hdWRpbyhlZGlkKTsKKwlpbnRlbF9kcC0+aGFzX2F1ZGlvID0gZHJtX2RldGVjdF9tb25p
dG9yX2F1ZGlvKGVkaWQpOwogfQogCiBzdGF0aWMgdm9pZApAQCAtNDgwOSwxOSArNDgxMSw2IEBA
IHN0YXRpYyBpbnQgaW50ZWxfZHBfZ2V0X21vZGVzKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25u
ZWN0b3IpCiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyBib29sCi1pbnRlbF9kcF9kZXRlY3RfYXVk
aW8oc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcikKLXsKLQlib29sIGhhc19hdWRpbyA9
IGZhbHNlOwotCXN0cnVjdCBlZGlkICplZGlkOwotCi0JZWRpZCA9IHRvX2ludGVsX2Nvbm5lY3Rv
cihjb25uZWN0b3IpLT5kZXRlY3RfZWRpZDsKLQlpZiAoZWRpZCkKLQkJaGFzX2F1ZGlvID0gZHJt
X2RldGVjdF9tb25pdG9yX2F1ZGlvKGVkaWQpOwotCi0JcmV0dXJuIGhhc19hdWRpbzsKLX0KLQog
c3RhdGljIGludAogaW50ZWxfZHBfc2V0X3Byb3BlcnR5KHN0cnVjdCBkcm1fY29ubmVjdG9yICpj
b25uZWN0b3IsCiAJCSAgICAgIHN0cnVjdCBkcm1fcHJvcGVydHkgKnByb3BlcnR5LApAQCAtNDgz
OCwyMiArNDgyNywyNyBAQCBpbnRlbF9kcF9zZXRfcHJvcGVydHkoc3RydWN0IGRybV9jb25uZWN0
b3IgKmNvbm5lY3RvciwKIAogCWlmIChwcm9wZXJ0eSA9PSBkZXZfcHJpdi0+Zm9yY2VfYXVkaW9f
cHJvcGVydHkpIHsKIAkJaW50IGkgPSB2YWw7Ci0JCWJvb2wgaGFzX2F1ZGlvOworCQlib29sIGhh
c19hdWRpbywgb2xkX2hhc19hdWRpbzsKKwkJaW50IG9sZF9mb3JjZV9hdWRpbyA9IGludGVsX2Rw
LT5mb3JjZV9hdWRpbzsKIAogCQlpZiAoaSA9PSBpbnRlbF9kcC0+Zm9yY2VfYXVkaW8pCiAJCQly
ZXR1cm4gMDsKIAorCQlpZiAob2xkX2ZvcmNlX2F1ZGlvID09IEhETUlfQVVESU9fQVVUTykKKwkJ
CW9sZF9oYXNfYXVkaW8gPSBpbnRlbF9kcC0+aGFzX2F1ZGlvOworCQllbHNlCisJCQlvbGRfaGFz
X2F1ZGlvID0gb2xkX2ZvcmNlX2F1ZGlvOworCiAJCWludGVsX2RwLT5mb3JjZV9hdWRpbyA9IGk7
CiAKIAkJaWYgKGkgPT0gSERNSV9BVURJT19BVVRPKQotCQkJaGFzX2F1ZGlvID0gaW50ZWxfZHBf
ZGV0ZWN0X2F1ZGlvKGNvbm5lY3Rvcik7CisJCQloYXNfYXVkaW8gPSBpbnRlbF9kcC0+aGFzX2F1
ZGlvOwogCQllbHNlCiAJCQloYXNfYXVkaW8gPSAoaSA9PSBIRE1JX0FVRElPX09OKTsKIAotCQlp
ZiAoaGFzX2F1ZGlvID09IGludGVsX2RwLT5oYXNfYXVkaW8pCisJCWlmIChoYXNfYXVkaW8gPT0g
b2xkX2hhc19hdWRpbykKIAkJCXJldHVybiAwOwogCi0JCWludGVsX2RwLT5oYXNfYXVkaW8gPSBo
YXNfYXVkaW87CiAJCWdvdG8gZG9uZTsKIAl9CiAKLS0gCjIuOS4zCgpfX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu
dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v
cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK