From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH 7/7] drm/i915: Move stolen memory initialization earlier during loading Date: Tue, 19 Jan 2016 15:26:32 +0200 Message-ID: <1453209992-25995-8-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: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 59EE26E73E for ; Tue, 19 Jan 2016 05:26:48 -0800 (PST) In-Reply-To: <1453209992-25995-1-git-send-email-imre.deak@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org VGhlIG9ubHkgZGV2aWNlIHNwZWNpZmljIGRlcGVuZGVuY3kgb2YgdGhlIHN0b2xlbiBtZW1vcnkg c2V0dXAgaXMgdGhlCk1NSU8gbWFwcGluZyBhbmQgdGhlIHN0b2xlbiBtZW1vcnkgc2l6ZS4gQm90 aCBhcmUgYWxyZWFkeSBhdmFpbGFibGUgaW4KaTkxNV9ndHRfaW5pdCgpLCBzbyBtb3ZlIHRoZSBz dG9sZW4gaW5pdGlhbGl6YXRpb24gdG8gdGhlcmUuIFRoZQpjbGVhbi11cCBjb2RlIGZvciBpOTE1 X2d0dF9pbml0KCkgaXMgaW4gaTkxNV9nbG9iYWxfZ3R0X2NsZWFudXAoKSwgc28KbW92ZSB0aGUg c3RvbGVuIG1lbW9yeSBjbGVhbi11cCBjb2RlIHRoZXJlIHRvby4KClRoaXMgd2lsbCBiZSBuZWVk ZWQgYnkgYW4gdXBjb21pbmcgcGF0Y2ggdGhhdCBuZWVkcyB0aGUgZGV0YWlscyBvZiB0aGUKbWVt b3J5IHdlIHJlc2VydmUsIGJ1dCB0aGUgY2hhbmdlIGlzIGFsc28gcGFydCBvZiBvdXIgZ2VuZXJp YyBnb2FsIHRvCm1vdmUgdGhlIGluaXRpYWxpemF0aW9uIG9mIHJlc291cmNlcyB3aXRoIG5vIG9y IGxpdHRsZSBkZXBlbmRlbmNpZXMgb24Kb3RoZXIgZGV2aWNlIHNwZWNpZmljIHJlc291cmNlcyB0 b3dhcmRzIHRoZSBiZWdpbm5pbmcgb2YgdGhlIGluaXQKc2VxdWVuY2UuCgpTdWdnZXN0ZWQtYnk6 IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpTaWduZWQtb2ZmLWJ5OiBJ bXJlIERlYWsgPGltcmUuZGVha0BpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kbWEuYyAgICAgfCAxMCAtLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9ndHQuYyB8IDE1ICsrKysrKysrKysrKysrKwogMiBmaWxlcyBjaGFuZ2VkLCAxNSBpbnNl cnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2RtYS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYwppbmRleCBh MDU0MTY5Li5kMjNjZjAxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rt YS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMKQEAgLTM5MSwxMyArMzkx LDYgQEAgc3RhdGljIGludCBpOTE1X2xvYWRfbW9kZXNldF9pbml0KHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCiAJaWYgKHJldCkKIAkJZ290byBjbGVhbnVwX3ZnYV9jbGllbnQ7CiAKLQkvKiBJbml0 aWFsaXNlIHN0b2xlbiBmaXJzdCBzbyB0aGF0IHdlIG1heSByZXNlcnZlIHByZWFsbG9jYXRlZAot CSAqIG9iamVjdHMgZm9yIHRoZSBCSU9TIHRvIEtNUyB0cmFuc2l0aW9uLgotCSAqLwotCXJldCA9 IGk5MTVfZ2VtX2luaXRfc3RvbGVuKGRldik7Ci0JaWYgKHJldCkKLQkJZ290byBjbGVhbnVwX3Zn YV9zd2l0Y2hlcm9vOwotCiAJaW50ZWxfcG93ZXJfZG9tYWluc19pbml0X2h3KGRldl9wcml2LCBm YWxzZSk7CiAKIAlpbnRlbF9jc3JfdWNvZGVfaW5pdChkZXZfcHJpdik7CkBAIC00NjAsOCArNDUz LDYgQEAgY2xlYW51cF9pcnE6CiAJaW50ZWxfdGVhcmRvd25fZ21idXMoZGV2KTsKIGNsZWFudXBf Y3NyOgogCWludGVsX2Nzcl91Y29kZV9maW5pKGRldl9wcml2KTsKLQlpOTE1X2dlbV9jbGVhbnVw X3N0b2xlbihkZXYpOwotY2xlYW51cF92Z2Ffc3dpdGNoZXJvbzoKIAl2Z2Ffc3dpdGNoZXJvb191 bnJlZ2lzdGVyX2NsaWVudChkZXYtPnBkZXYpOwogY2xlYW51cF92Z2FfY2xpZW50OgogCXZnYV9j bGllbnRfcmVnaXN0ZXIoZGV2LT5wZGV2LCBOVUxMLCBOVUxMLCBOVUxMKTsKQEAgLTEyMzQsNyAr MTIyNSw2IEBAIGludCBpOTE1X2RyaXZlcl91bmxvYWQoc3RydWN0IGRybV9kZXZpY2UgKmRldikK IAlpOTE1X2dlbV9jb250ZXh0X2ZpbmkoZGV2KTsKIAltdXRleF91bmxvY2soJmRldi0+c3RydWN0 X211dGV4KTsKIAlpbnRlbF9mYmNfY2xlYW51cF9jZmIoZGV2X3ByaXYpOwotCWk5MTVfZ2VtX2Ns ZWFudXBfc3RvbGVuKGRldik7CiAKIAlwbV9xb3NfcmVtb3ZlX3JlcXVlc3QoJmRldl9wcml2LT5w bV9xb3MpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4IDczNzdiNjcuLjJj Y2IyYjUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC0yODA5LDYgKzI4MDks OCBAQCB2b2lkIGk5MTVfZ2xvYmFsX2d0dF9jbGVhbnVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp CiAJCXBwZ3R0LT5iYXNlLmNsZWFudXAoJnBwZ3R0LT5iYXNlKTsKIAl9CiAKKwlpOTE1X2dlbV9j bGVhbnVwX3N0b2xlbihkZXYpOworCiAJaWYgKGRybV9tbV9pbml0aWFsaXplZCgmdm0tPm1tKSkg ewogCQlpZiAoaW50ZWxfdmdwdV9hY3RpdmUoZGV2KSkKIAkJCWludGVsX3ZndF9kZWJhbGxvb24o KTsKQEAgLTMxODEsNiArMzE4MywxNCBAQCBpbnQgaTkxNV9nZW1fZ3R0X2luaXQoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCisJLyoKKwkgKiBJbml0 aWFsaXNlIHN0b2xlbiBlYXJseSBzbyB0aGF0IHdlIG1heSByZXNlcnZlIHByZWFsbG9jYXRlZAor CSAqIG9iamVjdHMgZm9yIHRoZSBCSU9TIHRvIEtNUyB0cmFuc2l0aW9uLgorCSAqLworCXJldCA9 IGk5MTVfZ2VtX2luaXRfc3RvbGVuKGRldik7CisJaWYgKHJldCkKKwkJZ290byBvdXRfZ3R0X2Ns ZWFudXA7CisKIAkvKiBHTUFEUiBpcyB0aGUgUENJIG1taW8gYXBlcnR1cmUgaW50byB0aGUgZ2xv YmFsIEdUVC4gKi8KIAlEUk1fSU5GTygiTWVtb3J5IHVzYWJsZSBieSBncmFwaGljcyBkZXZpY2Ug PSAlbGx1TVxuIiwKIAkJIGd0dC0+YmFzZS50b3RhbCA+PiAyMCk7CkBAIC0zMjAwLDYgKzMyMTAs MTEgQEAgaW50IGk5MTVfZ2VtX2d0dF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJRFJN X0RFQlVHX0RSSVZFUigicHBndHQgbW9kZTogJWlcbiIsIGk5MTUuZW5hYmxlX3BwZ3R0KTsKIAog CXJldHVybiAwOworCitvdXRfZ3R0X2NsZWFudXA6CisJZ3R0LT5iYXNlLmNsZWFudXAoJmRldl9w cml2LT5ndHQuYmFzZSk7CisKKwlyZXR1cm4gcmV0OwogfQogCiB2b2lkIGk5MTVfZ2VtX3Jlc3Rv cmVfZ3R0X21hcHBpbmdzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCi0tIAoyLjUuMAoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxp bmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK