From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH 11/15] drm/i915: Convert intel_sdvo to use
	atomic state
Date: Tue,  9 Aug 2016 17:04:10 +0200
Message-ID: <1470755054-32699-12-git-send-email-maarten.lankhorst@linux.intel.com>
References: <1470755054-32699-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 B1AE66E251
 for <intel-gfx@lists.freedesktop.org>; Tue,  9 Aug 2016 15:04:20 +0000 (UTC)
In-Reply-To: <1470755054-32699-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

U2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4
LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zZHZvLmMgfCAyNyAr
KysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMSBpbnNlcnRpb25z
KCspLCAxNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
bnRlbF9zZHZvLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zZHZvLmMKaW5kZXggN2Mw
OGQ1NTVmMzVkLi43NGE3YzZjOWI5NzQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX3Nkdm8uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zZHZvLmMKQEAg
LTEwMDMsMjQgKzEwMDMsMjIgQEAgc3RhdGljIGJvb2wgaW50ZWxfc2R2b193cml0ZV9pbmZvZnJh
bWUoc3RydWN0IGludGVsX3Nkdm8gKmludGVsX3Nkdm8sCiB9CiAKIHN0YXRpYyBib29sIGludGVs
X3Nkdm9fc2V0X2F2aV9pbmZvZnJhbWUoc3RydWN0IGludGVsX3Nkdm8gKmludGVsX3Nkdm8sCi0J
CQkJCSBjb25zdCBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqYWRqdXN0ZWRfbW9kZSkKKwkJCQkJ
IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZykKIHsKIAl1aW50OF90IHNkdm9f
ZGF0YVtIRE1JX0lORk9GUkFNRV9TSVpFKEFWSSldOwotCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9
IGludGVsX3Nkdm8tPmJhc2UuYmFzZS5jcnRjOwotCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9j
cnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKIAl1bmlvbiBoZG1pX2luZm9mcmFtZSBmcmFtZTsK
IAlpbnQgcmV0OwogCXNzaXplX3QgbGVuOwogCiAJcmV0ID0gZHJtX2hkbWlfYXZpX2luZm9mcmFt
ZV9mcm9tX2Rpc3BsYXlfbW9kZSgmZnJhbWUuYXZpLAotCQkJCQkJICAgICAgIGFkanVzdGVkX21v
ZGUpOworCQkJCQkJICAgICAgICZwaXBlX2NvbmZpZy0+YmFzZS5hZGp1c3RlZF9tb2RlKTsKIAlp
ZiAocmV0IDwgMCkgewogCQlEUk1fRVJST1IoImNvdWxkbid0IGZpbGwgQVZJIGluZm9mcmFtZVxu
Iik7CiAJCXJldHVybiBmYWxzZTsKIAl9CiAKIAlpZiAoaW50ZWxfc2R2by0+cmdiX3F1YW50X3Jh
bmdlX3NlbGVjdGFibGUpIHsKLQkJaWYgKGludGVsX2NydGMtPmNvbmZpZy0+bGltaXRlZF9jb2xv
cl9yYW5nZSkKKwkJaWYgKHBpcGVfY29uZmlnLT5saW1pdGVkX2NvbG9yX3JhbmdlKQogCQkJZnJh
bWUuYXZpLnF1YW50aXphdGlvbl9yYW5nZSA9CiAJCQkJSERNSV9RVUFOVElaQVRJT05fUkFOR0Vf
TElNSVRFRDsKIAkJZWxzZQpAQCAtMTE5OSwxOCArMTE5NywxNSBAQCBzdGF0aWMgdm9pZCBpbnRl
bF9zZHZvX3ByZV9lbmFibGUoc3RydWN0IGludGVsX2VuY29kZXIgKmludGVsX2VuY29kZXIsCiB7
CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGludGVsX2VuY29kZXItPmJhc2UuZGV2OwogCXN0
cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKLQlzdHJ1Y3Qg
aW50ZWxfY3J0YyAqY3J0YyA9IHRvX2ludGVsX2NydGMoaW50ZWxfZW5jb2Rlci0+YmFzZS5jcnRj
KTsKLQljb25zdCBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqYWRqdXN0ZWRfbW9kZSA9ICZjcnRj
LT5jb25maWctPmJhc2UuYWRqdXN0ZWRfbW9kZTsKLQlzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAq
bW9kZSA9ICZjcnRjLT5jb25maWctPmJhc2UubW9kZTsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0
YyA9IHRvX2ludGVsX2NydGMoY3J0Y19zdGF0ZS0+YmFzZS5jcnRjKTsKKwljb25zdCBzdHJ1Y3Qg
ZHJtX2Rpc3BsYXlfbW9kZSAqYWRqdXN0ZWRfbW9kZSA9ICZjcnRjX3N0YXRlLT5iYXNlLmFkanVz
dGVkX21vZGU7CisJc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGUgPSAmY3J0Y19zdGF0ZS0+
YmFzZS5tb2RlOwogCXN0cnVjdCBpbnRlbF9zZHZvICppbnRlbF9zZHZvID0gdG9fc2R2byhpbnRl
bF9lbmNvZGVyKTsKIAl1MzIgc2R2b3g7CiAJc3RydWN0IGludGVsX3Nkdm9faW5fb3V0X21hcCBp
bl9vdXQ7CiAJc3RydWN0IGludGVsX3Nkdm9fZHRkIGlucHV0X2R0ZCwgb3V0cHV0X2R0ZDsKIAlp
bnQgcmF0ZTsKIAotCWlmICghbW9kZSkKLQkJcmV0dXJuOwotCiAJLyogRmlyc3QsIHNldCB0aGUg
aW5wdXQgbWFwcGluZyBmb3IgdGhlIGZpcnN0IGlucHV0IHRvIG91ciBjb250cm9sbGVkCiAJICog
b3V0cHV0LiBUaGlzIGlzIG9ubHkgY29ycmVjdCBpZiB3ZSdyZSBhIHNpbmdsZS1pbnB1dCBkZXZp
Y2UsIGluCiAJICogd2hpY2ggY2FzZSB0aGUgZmlyc3QgaW5wdXQgaXMgdGhlIG91dHB1dCBmcm9t
IHRoZSBhcHByb3ByaWF0ZSBTRFZPCkBAIC0xMjQzLDExICsxMjM4LDExIEBAIHN0YXRpYyB2b2lk
IGludGVsX3Nkdm9fcHJlX2VuYWJsZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2Rl
ciwKIAlpZiAoIWludGVsX3Nkdm9fc2V0X3RhcmdldF9pbnB1dChpbnRlbF9zZHZvKSkKIAkJcmV0
dXJuOwogCi0JaWYgKGNydGMtPmNvbmZpZy0+aGFzX2hkbWlfc2luaykgeworCWlmIChjcnRjX3N0
YXRlLT5oYXNfaGRtaV9zaW5rKSB7CiAJCWludGVsX3Nkdm9fc2V0X2VuY29kZShpbnRlbF9zZHZv
LCBTRFZPX0VOQ09ERV9IRE1JKTsKIAkJaW50ZWxfc2R2b19zZXRfY29sb3JpbWV0cnkoaW50ZWxf
c2R2bywKIAkJCQkJICAgU0RWT19DT0xPUklNRVRSWV9SR0IyNTYpOwotCQlpbnRlbF9zZHZvX3Nl
dF9hdmlfaW5mb2ZyYW1lKGludGVsX3Nkdm8sIGFkanVzdGVkX21vZGUpOworCQlpbnRlbF9zZHZv
X3NldF9hdmlfaW5mb2ZyYW1lKGludGVsX3Nkdm8sIGNydGNfc3RhdGUpOwogCX0gZWxzZQogCQlp
bnRlbF9zZHZvX3NldF9lbmNvZGUoaW50ZWxfc2R2bywgU0RWT19FTkNPREVfRFZJKTsKIApAQCAt
MTI2Myw3ICsxMjU4LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfc2R2b19wcmVfZW5hYmxlKHN0cnVj
dCBpbnRlbF9lbmNvZGVyICppbnRlbF9lbmNvZGVyLAogCQlEUk1fSU5GTygiU2V0dGluZyBpbnB1
dCB0aW1pbmdzIG9uICVzIGZhaWxlZFxuIiwKIAkJCSBTRFZPX05BTUUoaW50ZWxfc2R2bykpOwog
Ci0Jc3dpdGNoIChjcnRjLT5jb25maWctPnBpeGVsX211bHRpcGxpZXIpIHsKKwlzd2l0Y2ggKGNy
dGNfc3RhdGUtPnBpeGVsX211bHRpcGxpZXIpIHsKIAlkZWZhdWx0OgogCQlXQVJOKDEsICJ1bmtu
b3duIHBpeGVsIG11bHRpcGxpZXIgc3BlY2lmaWVkXG4iKTsKIAljYXNlIDE6IHJhdGUgPSBTRFZP
X0NMT0NLX1JBVEVfTVVMVF8xWDsgYnJlYWs7CkBAIC0xMjc4LDcgKzEyNzMsNyBAQCBzdGF0aWMg
dm9pZCBpbnRlbF9zZHZvX3ByZV9lbmFibGUoc3RydWN0IGludGVsX2VuY29kZXIgKmludGVsX2Vu
Y29kZXIsCiAJCS8qIFRoZSByZWFsIG1vZGUgcG9sYXJpdHkgaXMgc2V0IGJ5IHRoZSBTRFZPIGNv
bW1hbmRzLCB1c2luZwogCQkgKiBzdHJ1Y3QgaW50ZWxfc2R2b19kdGQuICovCiAJCXNkdm94ID0g
U0RWT19WU1lOQ19BQ1RJVkVfSElHSCB8IFNEVk9fSFNZTkNfQUNUSVZFX0hJR0g7Ci0JCWlmICgh
SEFTX1BDSF9TUExJVChkZXYpICYmIGNydGMtPmNvbmZpZy0+bGltaXRlZF9jb2xvcl9yYW5nZSkK
KwkJaWYgKCFIQVNfUENIX1NQTElUKGRldikgJiYgY3J0Y19zdGF0ZS0+bGltaXRlZF9jb2xvcl9y
YW5nZSkKIAkJCXNkdm94IHw9IEhETUlfQ09MT1JfUkFOR0VfMTZfMjM1OwogCQlpZiAoSU5URUxf
SU5GTyhkZXYpLT5nZW4gPCA1KQogCQkJc2R2b3ggfD0gU0RWT19CT1JERVJfRU5BQkxFOwpAQCAt
MTMwNCw3ICsxMjk5LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfc2R2b19wcmVfZW5hYmxlKHN0cnVj
dCBpbnRlbF9lbmNvZGVyICppbnRlbF9lbmNvZGVyLAogCX0gZWxzZSBpZiAoSVNfSTk0NUcoZGV2
KSB8fCBJU19JOTQ1R00oZGV2KSB8fCBJU19HMzMoZGV2KSkgewogCQkvKiBkb25lIGluIGNydGNf
bW9kZV9zZXQgYXMgaXQgbGl2ZXMgaW5zaWRlIHRoZSBkcGxsIHJlZ2lzdGVyICovCiAJfSBlbHNl
IHsKLQkJc2R2b3ggfD0gKGNydGMtPmNvbmZpZy0+cGl4ZWxfbXVsdGlwbGllciAtIDEpCisJCXNk
dm94IHw9IChjcnRjX3N0YXRlLT5waXhlbF9tdWx0aXBsaWVyIC0gMSkKIAkJCTw8IFNEVk9fUE9S
VF9NVUxUSVBMWV9TSElGVDsKIAl9CiAKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdm
eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp
bG1hbi9saXN0aW5mby9pbnRlbC1nZngK