From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH v4 8/9] drm/i915: Handle force_audio correctly
	in intel_sdvo
Date: Wed, 12 Apr 2017 12:50:06 +0200
Message-ID: <1491994207-25965-9-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mblankhorst.nl (mblankhorst.nl
 [IPv6:2a02:2308::216:3eff:fe92:dfa3])
 by gabe.freedesktop.org (Postfix) with ESMTPS id C0F2C6E6CE
 for <intel-gfx@lists.freedesktop.org>; 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: <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
List-Id: intel-gfx@lists.freedesktop.org

RG8gdGhlIHNhbWUgYXMgb3RoZXIgY29ubmVjdG9ycywgYXR0ZW1wdCB0byBkZXRlY3QgaGRtaSBh
dWRpbyBpbgp0aGUgZGV0ZWN0KCkgY2FsbGJhY2ssIGFuZCBvbmx5IHVzZSB0aGUgZm9yY2VfYXVk
aW8gcHJvcGVydHkgYXMKb3ZlcnJpZGUuIENvbXB1dGUgaGFzX2F1ZGlvIGluIHBpcGVfY29uZmln
LCBhbmQgdXNlIHRoYXQgdmFsdWUKaW5zdGVhZCBvZiB0aGUgcHJvYmVkIHZhbHVlIGRpcmVjdGx5
LgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxp
bnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zZHZvLmMgfCA1
MSArKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk
LCAxOCBpbnNlcnRpb25zKCspLCAzMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9zZHZvLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9z
ZHZvLmMKaW5kZXggODE2YTZmNWEzZmQ5Li45ODU1ZTRkNDg1NDIgMTAwNjQ0Ci0tLSBhL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nkdm8uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
bnRlbF9zZHZvLmMKQEAgLTExMjcsNiArMTEyNyw4IEBAIHN0YXRpYyBib29sIGludGVsX3Nkdm9f
Y29tcHV0ZV9jb25maWcoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJCQkJICAgICAg
c3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5fc3RhdGUpCiB7CiAJc3RydWN0IGludGVs
X3Nkdm8gKmludGVsX3Nkdm8gPSB0b19zZHZvKGVuY29kZXIpOworCXN0cnVjdCBpbnRlbF9zZHZv
X2Nvbm5lY3RvciAqaW50ZWxfc2R2b19jb25uZWN0b3IgPQorCQl0b19pbnRlbF9zZHZvX2Nvbm5l
Y3Rvcihjb25uX3N0YXRlLT5jb25uZWN0b3IpOwogCXN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICph
ZGp1c3RlZF9tb2RlID0gJnBpcGVfY29uZmlnLT5iYXNlLmFkanVzdGVkX21vZGU7CiAJc3RydWN0
IGRybV9kaXNwbGF5X21vZGUgKm1vZGUgPSAmcGlwZV9jb25maWctPmJhc2UubW9kZTsKIApAQCAt
MTE2NSw3ICsxMTY3LDEyIEBAIHN0YXRpYyBib29sIGludGVsX3Nkdm9fY29tcHV0ZV9jb25maWco
c3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJcGlwZV9jb25maWctPnBpeGVsX211bHRp
cGxpZXIgPQogCQlpbnRlbF9zZHZvX2dldF9waXhlbF9tdWx0aXBsaWVyKGFkanVzdGVkX21vZGUp
OwogCi0JcGlwZV9jb25maWctPmhhc19oZG1pX3NpbmsgPSBpbnRlbF9zZHZvLT5oYXNfaGRtaV9t
b25pdG9yOworCWlmIChpbnRlbF9zZHZvX2Nvbm5lY3Rvci0+Zm9yY2VfYXVkaW8gIT0gSERNSV9B
VURJT19PRkZfRFZJKQorCQlwaXBlX2NvbmZpZy0+aGFzX2hkbWlfc2luayA9IGludGVsX3Nkdm8t
Pmhhc19oZG1pX21vbml0b3I7CisKKwlpZiAoaW50ZWxfc2R2b19jb25uZWN0b3ItPmZvcmNlX2F1
ZGlvID09IEhETUlfQVVESU9fT04gfHwKKwkgICAgKGludGVsX3Nkdm9fY29ubmVjdG9yLT5mb3Jj
ZV9hdWRpbyA9PSBIRE1JX0FVRElPX0FVVE8gJiYgaW50ZWxfc2R2by0+aGFzX2hkbWlfYXVkaW8p
KQorCQlwaXBlX2NvbmZpZy0+aGFzX2F1ZGlvID0gdHJ1ZTsKIAogCWlmIChpbnRlbF9zZHZvLT5j
b2xvcl9yYW5nZV9hdXRvKSB7CiAJCS8qIFNlZSBDRUEtODYxLUUgLSA1LjEgRGVmYXVsdCBFbmNv
ZGluZyBQYXJhbWV0ZXJzICovCkBAIC0xMjkwLDcgKzEyOTcsNyBAQCBzdGF0aWMgdm9pZCBpbnRl
bF9zZHZvX3ByZV9lbmFibGUoc3RydWN0IGludGVsX2VuY29kZXIgKmludGVsX2VuY29kZXIsCiAJ
ZWxzZQogCQlzZHZveCB8PSBTRFZPX1BJUEVfU0VMKGNydGMtPnBpcGUpOwogCi0JaWYgKGludGVs
X3Nkdm8tPmhhc19oZG1pX2F1ZGlvKQorCWlmIChjcnRjX3N0YXRlLT5oYXNfYXVkaW8pCiAJCXNk
dm94IHw9IFNEVk9fQVVESU9fRU5BQkxFOwogCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0g
NCkgewpAQCAtMTY5OSwxMiArMTcwNiw2IEBAIGludGVsX3Nkdm9fdG1kc19zaW5rX2RldGVjdChz
dHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yKQogCQlrZnJlZShlZGlkKTsKIAl9CiAKLQlp
ZiAoc3RhdHVzID09IGNvbm5lY3Rvcl9zdGF0dXNfY29ubmVjdGVkKSB7Ci0JCXN0cnVjdCBpbnRl
bF9zZHZvX2Nvbm5lY3RvciAqaW50ZWxfc2R2b19jb25uZWN0b3IgPSB0b19pbnRlbF9zZHZvX2Nv
bm5lY3Rvcihjb25uZWN0b3IpOwotCQlpZiAoaW50ZWxfc2R2b19jb25uZWN0b3ItPmZvcmNlX2F1
ZGlvICE9IEhETUlfQVVESU9fQVVUTykKLQkJCWludGVsX3Nkdm8tPmhhc19oZG1pX2F1ZGlvID0g
KGludGVsX3Nkdm9fY29ubmVjdG9yLT5mb3JjZV9hdWRpbyA9PSBIRE1JX0FVRElPX09OKTsKLQl9
Ci0KIAlyZXR1cm4gc3RhdHVzOwogfQogCkBAIC0xOTgzLDIzICsxOTg0LDYgQEAgc3RhdGljIHZv
aWQgaW50ZWxfc2R2b19kZXN0cm95KHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCiAJ
a2ZyZWUoaW50ZWxfc2R2b19jb25uZWN0b3IpOwogfQogCi1zdGF0aWMgYm9vbCBpbnRlbF9zZHZv
X2RldGVjdF9oZG1pX2F1ZGlvKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCi17Ci0J
c3RydWN0IGludGVsX3Nkdm8gKmludGVsX3Nkdm8gPSBpbnRlbF9hdHRhY2hlZF9zZHZvKGNvbm5l
Y3Rvcik7Ci0Jc3RydWN0IGVkaWQgKmVkaWQ7Ci0JYm9vbCBoYXNfYXVkaW8gPSBmYWxzZTsKLQot
CWlmICghaW50ZWxfc2R2by0+aXNfaGRtaSkKLQkJcmV0dXJuIGZhbHNlOwotCi0JZWRpZCA9IGlu
dGVsX3Nkdm9fZ2V0X2VkaWQoY29ubmVjdG9yKTsKLQlpZiAoZWRpZCAhPSBOVUxMICYmIGVkaWQt
PmlucHV0ICYgRFJNX0VESURfSU5QVVRfRElHSVRBTCkKLQkJaGFzX2F1ZGlvID0gZHJtX2RldGVj
dF9tb25pdG9yX2F1ZGlvKGVkaWQpOwotCWtmcmVlKGVkaWQpOwotCi0JcmV0dXJuIGhhc19hdWRp
bzsKLX0KLQogc3RhdGljIGludAogaW50ZWxfc2R2b19zZXRfcHJvcGVydHkoc3RydWN0IGRybV9j
b25uZWN0b3IgKmNvbm5lY3RvciwKIAkJCXN0cnVjdCBkcm1fcHJvcGVydHkgKnByb3BlcnR5LApA
QCAtMjAxOCwyMiArMjAwMiwyMyBAQCBpbnRlbF9zZHZvX3NldF9wcm9wZXJ0eShzdHJ1Y3QgZHJt
X2Nvbm5lY3RvciAqY29ubmVjdG9yLAogCiAJaWYgKHByb3BlcnR5ID09IGRldl9wcml2LT5mb3Jj
ZV9hdWRpb19wcm9wZXJ0eSkgewogCQlpbnQgaSA9IHZhbDsKLQkJYm9vbCBoYXNfYXVkaW87Ci0K
LQkJaWYgKGkgPT0gaW50ZWxfc2R2b19jb25uZWN0b3ItPmZvcmNlX2F1ZGlvKQotCQkJcmV0dXJu
IDA7CisJCWJvb2wgaGFzX2F1ZGlvLCBvbGRfYXVkaW87CiAKLQkJaW50ZWxfc2R2b19jb25uZWN0
b3ItPmZvcmNlX2F1ZGlvID0gaTsKKwkJaWYgKGludGVsX3Nkdm9fY29ubmVjdG9yLT5mb3JjZV9h
dWRpbyA9PSBIRE1JX0FVRElPX0FVVE8pCisJCQlvbGRfYXVkaW8gPSBpbnRlbF9zZHZvLT5oYXNf
aGRtaV9hdWRpbzsKKwkJZWxzZQorCQkJb2xkX2F1ZGlvID0gaW50ZWxfc2R2b19jb25uZWN0b3It
PmZvcmNlX2F1ZGlvID09IEhETUlfQVVESU9fT047CiAKIAkJaWYgKGkgPT0gSERNSV9BVURJT19B
VVRPKQotCQkJaGFzX2F1ZGlvID0gaW50ZWxfc2R2b19kZXRlY3RfaGRtaV9hdWRpbyhjb25uZWN0
b3IpOworCQkJaGFzX2F1ZGlvID0gaW50ZWxfc2R2by0+aGFzX2hkbWlfYXVkaW87CiAJCWVsc2UK
IAkJCWhhc19hdWRpbyA9IChpID09IEhETUlfQVVESU9fT04pOwogCi0JCWlmIChoYXNfYXVkaW8g
PT0gaW50ZWxfc2R2by0+aGFzX2hkbWlfYXVkaW8pCisJCWludGVsX3Nkdm9fY29ubmVjdG9yLT5m
b3JjZV9hdWRpbyA9IGk7CisKKwkJaWYgKGhhc19hdWRpbyA9PSBvbGRfYXVkaW8pCiAJCQlyZXR1
cm4gMDsKIAotCQlpbnRlbF9zZHZvLT5oYXNfaGRtaV9hdWRpbyA9IGhhc19hdWRpbzsKIAkJZ290
byBkb25lOwogCX0KIAotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy
ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp
bmZvL2ludGVsLWdmeAo=