From mboxrd@z Thu Jan  1 00:00:00 1970
From: Imre Deak <imre.deak@intel.com>
Subject: [PATCH v2 2/2] drm/i915: fix intel_prepare_ddi
Date: Fri, 17 Apr 2015 19:31:22 +0300
Message-ID: <1429288282-7162-2-git-send-email-imre.deak@intel.com>
References: <1429288282-7162-1-git-send-email-imre.deak@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 mga02.intel.com (mga02.intel.com [134.134.136.20])
 by gabe.freedesktop.org (Postfix) with ESMTP id B1DD56E43B
 for <intel-gfx@lists.freedesktop.org>; Fri, 17 Apr 2015 09:31:25 -0700 (PDT)
In-Reply-To: <1429288282-7162-1-git-send-email-imre.deak@intel.com>
In-Reply-To: <1429271890-7949-1-git-send-email-imre.deak@intel.com>
References: <1429271890-7949-1-git-send-email-imre.deak@intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://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: <http://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: paulo.r.zanoni@intel.com
List-Id: intel-gfx@lists.freedesktop.org

QXQgdGhlIG1vbWVudCBpbnRlbF9wcmVwYXJlX2RkaSBidWZmZXIgd2lsbCBpdGVyYXRlIHRocm91
Z2ggYm90aCBNU1QgYW5kCkNSVCBlbmNvZGVycywgd2hpY2ggaXMgaW5jb3JyZWN0LiBOZWl0aGVy
IG9mIHRoZXNlIGVuY29kZXIgdHlwZXMgaGF2ZSBhbgplbWJlZGRpbmcgaW50ZWxfZGlnaXRhbF9w
b3J0IG9iamVjdCwgc28gZm9yIHRoZXNlIGVuY29kZXIgdHlwZXMgd2Ugd2lsbAp1c2UgcmFuZG9t
IGRhdGEgd2hlbiBkZXJlZmVyZW5jaW5nIHRoZSBjb3JyZXNwb25kaW5nCmludGVsX2RpZ2l0YWxf
cG9ydC0+cG9ydCBmaWVsZC4KCkludHJvZHVjZWQgaW4KY29tbWl0IGI0MDM3NDVjODQ1OTJiMjZh
MDcxM2U2OTQ0YzJiMTA5ZjZkZjVjODIKQXV0aG9yOiBEYW1pZW4gTGVzcGlhdSA8ZGFtaWVuLmxl
c3BpYXVAaW50ZWwuY29tPgpEYXRlOiAgIE1vbiBBdWcgNCAyMjowMTozMyAyMDE0ICswMTAwCgog
ICAgZHJtL2k5MTU6IEl0ZXJhdGUgdGhyb3VnaCB0aGUgaW5pdGlhbGl6ZWQgRERJcyB0byBwcmVw
YXJlIHRoZWlyIGJ1ZmZlcnMKCnYyOgotIGZpeCBnZXR0aW5nIGF0IHRoZSBwb3J0IGZvciBNU1Qg
ZW5jb2RlcnMgdG9vCi0gbWFrZSBzdXJlIHRoYXQgaW50ZWxfcHJlcGFyZV9kZGlfYnVmZmVycygp
IGdldHMgY2FsbGVkIGZvciBwb3J0IEUgdG9vCiAgKFBhdWxvKQoKU2lnbmVkLW9mZi1ieTogSW1y
ZSBEZWFrIDxpbXJlLmRlYWtAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5
MTVfZHJ2LmggIHwgIDUgLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jIHwg
MjggKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAxOCBpbnNl
cnRpb25zKCspLCAxNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA0
MGVmNjcyLi5jNDYxYjU2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry
di5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTI1MSwxMSArMjUx
LDYgQEAgZW51bSBocGRfcGluIHsKIAkJCSAgICAmZGV2LT5tb2RlX2NvbmZpZy5jb25uZWN0b3Jf
bGlzdCwJXAogCQkJICAgIGJhc2UuaGVhZCkKIAotI2RlZmluZSBmb3JfZWFjaF9kaWdpdGFsX3Bv
cnQoZGV2LCBkaWdpdGFsX3BvcnQpCQlcCi0JbGlzdF9mb3JfZWFjaF9lbnRyeShkaWdpdGFsX3Bv
cnQsCQkJXAotCQkJICAgICZkZXYtPm1vZGVfY29uZmlnLmVuY29kZXJfbGlzdCwJXAotCQkJICAg
IGJhc2UuYmFzZS5oZWFkKQotCiAjZGVmaW5lIGZvcl9lYWNoX2VuY29kZXJfb25fY3J0YyhkZXYs
IF9fY3J0YywgaW50ZWxfZW5jb2RlcikgXAogCWxpc3RfZm9yX2VhY2hfZW50cnkoKGludGVsX2Vu
Y29kZXIpLCAmKGRldiktPm1vZGVfY29uZmlnLmVuY29kZXJfbGlzdCwgYmFzZS5oZWFkKSBcCiAJ
CWlmICgoaW50ZWxfZW5jb2RlciktPmJhc2UuY3J0YyA9PSAoX19jcnRjKSkKZGlmZiAtLWdpdCBh
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aW50ZWxfZGRpLmMKaW5kZXggOTAzZDM5NS4uOWMxZTc0YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
ZGRpLmMKQEAgLTI1NiwxMiArMjU2LDExIEBAIGludGVsX2RpZ19wb3J0X3N1cHBvcnRzX2hkbWko
Y29uc3Qgc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqaW50ZWxfZGlnX3BvcnQpCiAgKiBpbiBl
aXRoZXIgRkRJIG9yIERQIG1vZGVzIG9ubHksIGFzIEhETUkgY29ubmVjdGlvbnMgd2lsbCB3b3Jr
IHdpdGggYm90aAogICogb2YgdGhvc2UKICAqLwotc3RhdGljIHZvaWQgaW50ZWxfcHJlcGFyZV9k
ZGlfYnVmZmVycyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAotCQkJCSAgICAgIHN0cnVjdCBpbnRl
bF9kaWdpdGFsX3BvcnQgKmludGVsX2RpZ19wb3J0KQorc3RhdGljIHZvaWQgaW50ZWxfcHJlcGFy
ZV9kZGlfYnVmZmVycyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBlbnVtIHBvcnQgcG9ydCwKKwkJ
CQkgICAgICBib29sIHN1cHBvcnRzX2hkbWkpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg
KmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAl1MzIgcmVnOwotCWludCBwb3J0ID0gaW50
ZWxfZGlnX3BvcnQtPnBvcnQ7CiAJaW50IGksIG5faGRtaV9lbnRyaWVzLCBuX2RwX2VudHJpZXMs
IG5fZWRwX2VudHJpZXMsIGhkbWlfZGVmYXVsdF9lbnRyeSwKIAkgICAgc2l6ZTsKIAlpbnQgaGRt
aV9sZXZlbCA9IGRldl9wcml2LT52YnQuZGRpX3BvcnRfaW5mb1twb3J0XS5oZG1pX2xldmVsX3No
aWZ0OwpAQCAtMjcyLDcgKzI3MSw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3ByZXBhcmVfZGRpX2J1
ZmZlcnMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAljb25zdCBzdHJ1Y3QgZGRpX2J1Zl90cmFu
cyAqZGRpX3RyYW5zbGF0aW9uczsKIAogCWlmIChJU19CUk9YVE9OKGRldikpIHsKLQkJaWYgKCFp
bnRlbF9kaWdfcG9ydF9zdXBwb3J0c19oZG1pKGludGVsX2RpZ19wb3J0KSkKKwkJaWYgKCFzdXBw
b3J0c19oZG1pKQogCQkJcmV0dXJuOwogCiAJCS8qIFZzd2luZyBwcm9ncmFtbWluZyBmb3IgSERN
SSAqLwpAQCAtMzYwLDcgKzM1OSw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3ByZXBhcmVfZGRpX2J1
ZmZlcnMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJcmVnICs9IDQ7CiAJfQogCi0JaWYgKCFp
bnRlbF9kaWdfcG9ydF9zdXBwb3J0c19oZG1pKGludGVsX2RpZ19wb3J0KSkKKwlpZiAoIXN1cHBv
cnRzX2hkbWkpCiAJCXJldHVybjsKIAogCS8qIENob29zZSBhIGdvb2QgZGVmYXVsdCBpZiBWQlQg
aXMgYmFkbHkgcG9wdWxhdGVkICovCkBAIC0zODAsMTggKzM3OSwyNyBAQCBzdGF0aWMgdm9pZCBp
bnRlbF9wcmVwYXJlX2RkaV9idWZmZXJzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAgKi8KIHZv
aWQgaW50ZWxfcHJlcGFyZV9kZGkoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKLQlzdHJ1Y3Qg
aW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydDsKKwlzdHJ1Y3QgaW50ZWxfZW5jb2Rl
ciAqaW50ZWxfZW5jb2RlcjsKIAlib29sIHZpc2l0ZWRbSTkxNV9NQVhfUE9SVFNdID0geyAwLCB9
OwogCiAJaWYgKCFIQVNfRERJKGRldikpCiAJCXJldHVybjsKIAotCWZvcl9lYWNoX2RpZ2l0YWxf
cG9ydChkZXYsIGludGVsX2RpZ19wb3J0KSB7Ci0JCWlmICh2aXNpdGVkW2ludGVsX2RpZ19wb3J0
LT5wb3J0XSkKKwlmb3JfZWFjaF9pbnRlbF9lbmNvZGVyKGRldiwgaW50ZWxfZW5jb2Rlcikgewor
CQlzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydDsKKwkJZW51bSBwb3J0
IHBvcnQ7CisJCWJvb2wgc3VwcG9ydHNfaGRtaTsKKworCQlkZGlfZ2V0X2VuY29kZXJfcG9ydChp
bnRlbF9lbmNvZGVyLCAmaW50ZWxfZGlnX3BvcnQsICZwb3J0KTsKKworCQlpZiAodmlzaXRlZFtw
b3J0XSkKIAkJCWNvbnRpbnVlOwogCi0JCWludGVsX3ByZXBhcmVfZGRpX2J1ZmZlcnMoZGV2LCBp
bnRlbF9kaWdfcG9ydCk7Ci0JCXZpc2l0ZWRbaW50ZWxfZGlnX3BvcnQtPnBvcnRdID0gdHJ1ZTsK
KwkJc3VwcG9ydHNfaGRtaSA9IGludGVsX2RpZ19wb3J0ICYmCisJCQkJaW50ZWxfZGlnX3BvcnRf
c3VwcG9ydHNfaGRtaShpbnRlbF9kaWdfcG9ydCk7CisKKwkJaW50ZWxfcHJlcGFyZV9kZGlfYnVm
ZmVycyhkZXYsIHBvcnQsIHN1cHBvcnRzX2hkbWkpOworCQl2aXNpdGVkW3BvcnRdID0gdHJ1ZTsK
IAl9CiB9CiAKLS0gCjIuMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz
a3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu
dGVsLWdmeAo=