From mboxrd@z Thu Jan  1 00:00:00 1970
From: Imre Deak <imre.deak@intel.com>
Subject: [PATCH 6/7] drm/i915: Move MCHBAR setup earlier during
	init
Date: Tue, 19 Jan 2016 15:26:31 +0200
Message-ID: <1453209992-25995-7-git-send-email-imre.deak@intel.com>
References: <1453209992-25995-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 mga11.intel.com (mga11.intel.com [192.55.52.93])
 by gabe.freedesktop.org (Postfix) with ESMTP id D2BDA6E08D
 for <intel-gfx@lists.freedesktop.org>; Tue, 19 Jan 2016 05:26:46 -0800 (PST)
In-Reply-To: <1453209992-25995-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
List-Id: intel-gfx@lists.freedesktop.org

TW92ZSB0aGUgTUNIQkFSIHNldHVwIHJpZ2h0IGFmdGVyIHRoZSBNTUlPIHNldHVwLCBzaW5jZSB0
aGUgdHdvIHRoaW5ncwphcmUgbG9naWNhbGx5IHJlbGF0ZWQgYW5kIHRoZSBNQ0hCQVIgc2V0dXAg
Y29kZSBkb2Vzbid0IGRlcGVuZCBvbiBhbnkKb3RoZXIgZGV2aWNlIHNwZWNpZmljIHJlc291cmNl
LiBXZSdsbCBhbHNvIG5lZWQgTUNIQkFSIHRvIGJlIHJlYWR5CmVhcmxpZXIgaW4gYW4gdXBjb21p
bmcgcGF0Y2gsIHNvIHRoaXMgaXMgYWxzbyBhIHByZXBhcmF0aW9uIGZvciB0aGF0LgoKRmFjdG9y
IG91dCB0aGUgaW5pdC9jbGVhbi11cCBjb2RlIHRvIHNlcGFyYXRlIGZ1bmN0aW9ucyB0byBtYWtl
IHRoaW5ncwpjbGVhcmVyIGluIHRoZSBpOTE1X2RyaXZlcl9sb2FkKCkvdW5sb2FkKCkgZnVuY3Rp
b25zLgoKU3VnZ2VzdGVkLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51
az4KU2lnbmVkLW9mZi1ieTogSW1yZSBEZWFrIDxpbXJlLmRlYWtAaW50ZWwuY29tPgotLS0KIGRy
aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMgfCA3MSArKysrKysrKysrKysrKysrKysrKysr
KysrKy0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDQ1IGluc2VydGlvbnMoKyksIDI2
IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1h
LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jCmluZGV4IDc5MzQ2MTEuLmEwNTQx
NjkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMKKysrIGIvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYwpAQCAtOTA0LDYgKzkwNCw0NiBAQCBzdGF0aWMg
dm9pZCBpOTE1X3dvcmtxdWV1ZXNfY2xlYW51cChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2
X3ByaXYpCiAJZGVzdHJveV93b3JrcXVldWUoZGV2X3ByaXYtPndxKTsKIH0KIAorc3RhdGljIGlu
dCBpOTE1X21taW9fc2V0dXAoc3RydWN0IGRybV9kZXZpY2UgKmRldikKK3sKKwlzdHJ1Y3QgZHJt
X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CisJaW50IG1taW9fYmFyOwor
CWludCBtbWlvX3NpemU7CisKKwltbWlvX2JhciA9IElTX0dFTjIoZGV2KSA/IDEgOiAwOworCS8q
CisJICogQmVmb3JlIGdlbjQsIHRoZSByZWdpc3RlcnMgYW5kIHRoZSBHVFQgYXJlIGJlaGluZCBk
aWZmZXJlbnQgQkFScy4KKwkgKiBIb3dldmVyLCBmcm9tIGdlbjQgb253YXJkcywgdGhlIHJlZ2lz
dGVycyBhbmQgdGhlIEdUVCBhcmUgc2hhcmVkCisJICogaW4gdGhlIHNhbWUgQkFSLCBzbyB3ZSB3
YW50IHRvIHJlc3RyaWN0IHRoaXMgaW9yZW1hcCBmcm9tCisJICogY2xvYmJlcmluZyB0aGUgR1RU
IHdoaWNoIHdlIHdhbnQgaW9yZW1hcF93YyBpbnN0ZWFkLiBGb3J0dW5hdGVseSwKKwkgKiB0aGUg
cmVnaXN0ZXIgQkFSIHJlbWFpbnMgdGhlIHNhbWUgc2l6ZSBmb3IgYWxsIHRoZSBlYXJsaWVyCisJ
ICogZ2VuZXJhdGlvbnMgdXAgdG8gSXJvbmxha2UuCisJICovCisJaWYgKElOVEVMX0lORk8oZGV2
KS0+Z2VuIDwgNSkKKwkJbW1pb19zaXplID0gNTEyICogMTAyNDsKKwllbHNlCisJCW1taW9fc2l6
ZSA9IDIgKiAxMDI0ICogMTAyNDsKKwlkZXZfcHJpdi0+cmVncyA9IHBjaV9pb21hcChkZXYtPnBk
ZXYsIG1taW9fYmFyLCBtbWlvX3NpemUpOworCWlmIChkZXZfcHJpdi0+cmVncyA9PSBOVUxMKSB7
CisJCURSTV9FUlJPUigiZmFpbGVkIHRvIG1hcCByZWdpc3RlcnNcbiIpOworCisJCXJldHVybiAt
RUlPOworCX0KKworCS8qIFRyeSB0byBtYWtlIHN1cmUgTUNIQkFSIGlzIGVuYWJsZWQgYmVmb3Jl
IHBva2luZyBhdCBpdCAqLworCWludGVsX3NldHVwX21jaGJhcihkZXYpOworCisJcmV0dXJuIDA7
Cit9CisKK3N0YXRpYyB2b2lkIGk5MTVfbW1pb19jbGVhbnVwKHN0cnVjdCBkcm1fZGV2aWNlICpk
ZXYpCit7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYp
OworCisJaW50ZWxfdGVhcmRvd25fbWNoYmFyKGRldik7CisJcGNpX2lvdW5tYXAoZGV2LT5wZGV2
LCBkZXZfcHJpdi0+cmVncyk7Cit9CisKIC8qKgogICogaTkxNV9kcml2ZXJfbG9hZCAtIHNldHVw
IGNoaXAgYW5kIGNyZWF0ZSBhbiBpbml0aWFsIGNvbmZpZwogICogQGRldjogRFJNIGRldmljZQpA
QCAtOTE5LDcgKzk1OSw3IEBAIGludCBpOTE1X2RyaXZlcl9sb2FkKHN0cnVjdCBkcm1fZGV2aWNl
ICpkZXYsIHVuc2lnbmVkIGxvbmcgZmxhZ3MpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg
KmRldl9wcml2OwogCXN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyAqaW5mbywgKmRldmljZV9pbmZv
OwotCWludCByZXQgPSAwLCBtbWlvX2JhciwgbW1pb19zaXplOworCWludCByZXQgPSAwOwogCXVp
bnQzMl90IGFwZXJ0dXJlX3NpemU7CiAKIAlpbmZvID0gKHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5m
byAqKSBmbGFnczsKQEAgLTk3MiwyNSArMTAxMiw5IEBAIGludCBpOTE1X2RyaXZlcl9sb2FkKHN0
cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIGxvbmcgZmxhZ3MpCiAJCWdvdG8gb3V0X3J1
bnRpbWVfcG1fcHV0OwogCX0KIAotCW1taW9fYmFyID0gSVNfR0VOMihkZXYpID8gMSA6IDA7Ci0J
LyogQmVmb3JlIGdlbjQsIHRoZSByZWdpc3RlcnMgYW5kIHRoZSBHVFQgYXJlIGJlaGluZCBkaWZm
ZXJlbnQgQkFScy4KLQkgKiBIb3dldmVyLCBmcm9tIGdlbjQgb253YXJkcywgdGhlIHJlZ2lzdGVy
cyBhbmQgdGhlIEdUVCBhcmUgc2hhcmVkCi0JICogaW4gdGhlIHNhbWUgQkFSLCBzbyB3ZSB3YW50
IHRvIHJlc3RyaWN0IHRoaXMgaW9yZW1hcCBmcm9tCi0JICogY2xvYmJlcmluZyB0aGUgR1RUIHdo
aWNoIHdlIHdhbnQgaW9yZW1hcF93YyBpbnN0ZWFkLiBGb3J0dW5hdGVseSwKLQkgKiB0aGUgcmVn
aXN0ZXIgQkFSIHJlbWFpbnMgdGhlIHNhbWUgc2l6ZSBmb3IgYWxsIHRoZSBlYXJsaWVyCi0JICog
Z2VuZXJhdGlvbnMgdXAgdG8gSXJvbmxha2UuCi0JICovCi0JaWYgKGluZm8tPmdlbiA8IDUpCi0J
CW1taW9fc2l6ZSA9IDUxMioxMDI0OwotCWVsc2UKLQkJbW1pb19zaXplID0gMioxMDI0KjEwMjQ7
Ci0KLQlkZXZfcHJpdi0+cmVncyA9IHBjaV9pb21hcChkZXYtPnBkZXYsIG1taW9fYmFyLCBtbWlv
X3NpemUpOwotCWlmICghZGV2X3ByaXYtPnJlZ3MpIHsKLQkJRFJNX0VSUk9SKCJmYWlsZWQgdG8g
bWFwIHJlZ2lzdGVyc1xuIik7Ci0JCXJldCA9IC1FSU87CisJcmV0ID0gaTkxNV9tbWlvX3NldHVw
KGRldik7CisJaWYgKHJldCA8IDApCiAJCWdvdG8gcHV0X2JyaWRnZTsKLQl9CiAKIAkvKiBUaGlz
IG11c3QgYmUgY2FsbGVkIGJlZm9yZSBhbnkgY2FsbHMgdG8gSEFTX1BDSF8qICovCiAJaW50ZWxf
ZGV0ZWN0X3BjaChkZXYpOwpAQCAtMTA0OCw4ICsxMDcyLDYgQEAgaW50IGk5MTVfZHJpdmVyX2xv
YWQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdW5zaWduZWQgbG9uZyBmbGFncykKIAlpbnRlbF9p
cnFfaW5pdChkZXZfcHJpdik7CiAJaW50ZWxfdW5jb3JlX3Nhbml0aXplKGRldik7CiAKLQkvKiBU
cnkgdG8gbWFrZSBzdXJlIE1DSEJBUiBpcyBlbmFibGVkIGJlZm9yZSBwb2tpbmcgYXQgaXQgKi8K
LQlpbnRlbF9zZXR1cF9tY2hiYXIoZGV2KTsKIAlpbnRlbF9vcHJlZ2lvbl9zZXR1cChkZXYpOwog
CiAJaTkxNV9nZW1fbG9hZF9pbml0KGRldik7CkBAIC0xMTMwLDcgKzExNTIsNyBAQCBvdXRfZ3R0
OgogCWk5MTVfZ2xvYmFsX2d0dF9jbGVhbnVwKGRldik7CiBvdXRfdW5jb3JlX2Zpbmk6CiAJaW50
ZWxfdW5jb3JlX2ZpbmkoZGV2KTsKLQlwY2lfaW91bm1hcChkZXYtPnBkZXYsIGRldl9wcml2LT5y
ZWdzKTsKKwlpOTE1X21taW9fY2xlYW51cChkZXYpOwogcHV0X2JyaWRnZToKIAlwY2lfZGV2X3B1
dChkZXZfcHJpdi0+YnJpZGdlX2Rldik7CiAJaTkxNV9nZW1fbG9hZF9jbGVhbnVwKGRldik7CkBA
IC0xMjE0LDE1ICsxMjM2LDEyIEBAIGludCBpOTE1X2RyaXZlcl91bmxvYWQoc3RydWN0IGRybV9k
ZXZpY2UgKmRldikKIAlpbnRlbF9mYmNfY2xlYW51cF9jZmIoZGV2X3ByaXYpOwogCWk5MTVfZ2Vt
X2NsZWFudXBfc3RvbGVuKGRldik7CiAKLQlpbnRlbF90ZWFyZG93bl9tY2hiYXIoZGV2KTsKLQog
CXBtX3Fvc19yZW1vdmVfcmVxdWVzdCgmZGV2X3ByaXYtPnBtX3Fvcyk7CiAKIAlpOTE1X2dsb2Jh
bF9ndHRfY2xlYW51cChkZXYpOwogCiAJaW50ZWxfdW5jb3JlX2ZpbmkoZGV2KTsKLQlpZiAoZGV2
X3ByaXYtPnJlZ3MgIT0gTlVMTCkKLQkJcGNpX2lvdW5tYXAoZGV2LT5wZGV2LCBkZXZfcHJpdi0+
cmVncyk7CisJaTkxNV9tbWlvX2NsZWFudXAoZGV2KTsKIAogCWk5MTVfZ2VtX2xvYWRfY2xlYW51
cChkZXYpOwogCXBjaV9kZXZfcHV0KGRldl9wcml2LT5icmlkZ2VfZGV2KTsKLS0gCjIuNS4wCgpf
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg
bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3Rz
LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=