From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH] drm/i915: Fix module initialisation, v2.
Date: Thu, 27 Aug 2015 15:15:15 +0200
Message-ID: <55DF0D63.9000308@linux.intel.com>
References: <55D1B0C6.3030906@linux.intel.com>
 <20150826075150.GU20434@phenom.ffwll.local> <55DD7179.208@linux.intel.com>
 <20150826081208.GY20434@phenom.ffwll.local>
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 635296ED20
 for <intel-gfx@lists.freedesktop.org>; Thu, 27 Aug 2015 06:15:17 -0700 (PDT)
In-Reply-To: <20150826081208.GY20434@phenom.ffwll.local>
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: Daniel Vetter <daniel@ffwll.ch>
Cc: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
List-Id: intel-gfx@lists.freedesktop.org

U2V0IERSSVZFUl9NT0RFU0VUIGFuZCBEUklWRVJfQVRPTUlDIGJ5IGRlZmF1bHQuIFRoZSBkcml2
ZXIgaXMgZnVsbHkgYXRvbWljLgpSZW1vdmUgdGhlIGxlZ2FjeSBzdXNwZW5kL3Jlc3VtZSwgdG8g
Zml4IGEgd2FybmluZyBpbnRyb2R1Y2VkIGJ5OgoKImRybTogV0FSTl9PTiBpZiBhIG1vZGVzZXQg
ZHJpdmVyIHVzZXMgbGVnYWN5IHN1c3BlbmQvcmVzdW1lIGhlbHBlcnMiCgphbmQgcmVtb3Zpbmcg
dGhlIC5nZXRfdmJsYW5rX3RpbWVzdGFtcCByZXNldCB0byBOVUxMLiBJdCdzIGEgbm9vcCB3aXRo
b3V0IFVNUy4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmto
b3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaTkxNV9kbWEuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMKaW5kZXggMDk3
ZDRiYTA0MjFjLi5mMGVhYTZmODgyNmIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2k5MTVfZG1hLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYwpAQCAtMzY0
LDEyICszNjQsMTIgQEAgc3RhdGljIHZvaWQgaTkxNV9zd2l0Y2hlcm9vX3NldF9zdGF0ZShzdHJ1
Y3QgcGNpX2RldiAqcGRldiwgZW51bSB2Z2Ffc3dpdGNoZXJvb18KIAkJZGV2LT5zd2l0Y2hfcG93
ZXJfc3RhdGUgPSBEUk1fU1dJVENIX1BPV0VSX0NIQU5HSU5HOwogCQkvKiBpOTE1IHJlc3VtZSBo
YW5kbGVyIGRvZXNuJ3Qgc2V0IHRvIEQwICovCiAJCXBjaV9zZXRfcG93ZXJfc3RhdGUoZGV2LT5w
ZGV2LCBQQ0lfRDApOwotCQlpOTE1X3Jlc3VtZV9sZWdhY3koZGV2KTsKKwkJaTkxNV9yZXN1bWVf
c3dpdGNoZXJvbyhkZXYpOwogCQlkZXYtPnN3aXRjaF9wb3dlcl9zdGF0ZSA9IERSTV9TV0lUQ0hf
UE9XRVJfT047CiAJfSBlbHNlIHsKIAkJcHJfZXJyKCJzd2l0Y2hlZCBvZmZcbiIpOwogCQlkZXYt
PnN3aXRjaF9wb3dlcl9zdGF0ZSA9IERSTV9TV0lUQ0hfUE9XRVJfQ0hBTkdJTkc7Ci0JCWk5MTVf
c3VzcGVuZF9sZWdhY3koZGV2LCBwbW0pOworCQlpOTE1X3N1c3BlbmRfc3dpdGNoZXJvbyhkZXYs
IHBtbSk7CiAJCWRldi0+c3dpdGNoX3Bvd2VyX3N0YXRlID0gRFJNX1NXSVRDSF9QT1dFUl9PRkY7
CiAJfQogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyBiL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXggY2UzYmQwYzcxM2I5Li40NjQ2ZmUx
YTA0OTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKKysrIGIv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpAQCAtNjc5LDcgKzY3OSw3IEBAIHN0YXRp
YyBpbnQgaTkxNV9kcm1fc3VzcGVuZF9sYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkcm1fZGV2LCBi
b29sIGhpYmVybmF0aW9uKQogCXJldHVybiAwOwogfQogCi1pbnQgaTkxNV9zdXNwZW5kX2xlZ2Fj
eShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBwbV9tZXNzYWdlX3Qgc3RhdGUpCitpbnQgaTkxNV9z
dXNwZW5kX3N3aXRjaGVyb28oc3RydWN0IGRybV9kZXZpY2UgKmRldiwgcG1fbWVzc2FnZV90IHN0
YXRlKQogewogCWludCBlcnJvcjsKIApAQCAtODEyLDcgKzgxMiw3IEBAIHN0YXRpYyBpbnQgaTkx
NV9kcm1fcmVzdW1lX2Vhcmx5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJcmV0dXJuIHJldDsK
IH0KIAotaW50IGk5MTVfcmVzdW1lX2xlZ2FjeShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQoraW50
IGk5MTVfcmVzdW1lX3N3aXRjaGVyb28oc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlpbnQg
cmV0OwogCkBAIC0xNjQ5LDcgKzE2NDksNyBAQCBzdGF0aWMgc3RydWN0IGRybV9kcml2ZXIgZHJp
dmVyID0gewogCSAqLwogCS5kcml2ZXJfZmVhdHVyZXMgPQogCSAgICBEUklWRVJfSEFWRV9JUlEg
fCBEUklWRVJfSVJRX1NIQVJFRCB8IERSSVZFUl9HRU0gfCBEUklWRVJfUFJJTUUgfAotCSAgICBE
UklWRVJfUkVOREVSLAorCSAgICBEUklWRVJfUkVOREVSIHwgRFJJVkVSX01PREVTRVQsCiAJLmxv
YWQgPSBpOTE1X2RyaXZlcl9sb2FkLAogCS51bmxvYWQgPSBpOTE1X2RyaXZlcl91bmxvYWQsCiAJ
Lm9wZW4gPSBpOTE1X2RyaXZlcl9vcGVuLApAQCAtMTY1OCwxMCArMTY1OCw2IEBAIHN0YXRpYyBz
dHJ1Y3QgZHJtX2RyaXZlciBkcml2ZXIgPSB7CiAJLnBvc3RjbG9zZSA9IGk5MTVfZHJpdmVyX3Bv
c3RjbG9zZSwKIAkuc2V0X2J1c2lkID0gZHJtX3BjaV9zZXRfYnVzaWQsCiAKLQkvKiBVc2VkIGlu
IHBsYWNlIG9mIGk5MTVfcG1fb3BzIGZvciBub24tRFJJVkVSX01PREVTRVQgKi8KLQkuc3VzcGVu
ZCA9IGk5MTVfc3VzcGVuZF9sZWdhY3ksCi0JLnJlc3VtZSA9IGk5MTVfcmVzdW1lX2xlZ2FjeSwK
LQogI2lmIGRlZmluZWQoQ09ORklHX0RFQlVHX0ZTKQogCS5kZWJ1Z2ZzX2luaXQgPSBpOTE1X2Rl
YnVnZnNfaW5pdCwKIAkuZGVidWdmc19jbGVhbnVwID0gaTkxNV9kZWJ1Z2ZzX2NsZWFudXAsCkBA
IC0xNzA0LDcgKzE3MDAsNiBAQCBzdGF0aWMgaW50IF9faW5pdCBpOTE1X2luaXQodm9pZCkKIAkg
KiBlaXRoZXIgdGhlIGk5MTUubW9kZXNldCBwcmFyYW1ldGVyIG9yIGJ5IHRoZQogCSAqIHZnYV90
ZXh0X21vZGVfZm9yY2UgYm9vdCBvcHRpb24uCiAJICovCi0JZHJpdmVyLmRyaXZlcl9mZWF0dXJl
cyB8PSBEUklWRVJfTU9ERVNFVDsKIAogCWlmIChpOTE1Lm1vZGVzZXQgPT0gMCkKIAkJZHJpdmVy
LmRyaXZlcl9mZWF0dXJlcyAmPSB+RFJJVkVSX01PREVTRVQ7CkBAIC0xNzE1LDE3ICsxNzEwLDEx
IEBAIHN0YXRpYyBpbnQgX19pbml0IGk5MTVfaW5pdCh2b2lkKQogI2VuZGlmCiAKIAlpZiAoIShk
cml2ZXIuZHJpdmVyX2ZlYXR1cmVzICYgRFJJVkVSX01PREVTRVQpKSB7Ci0JCWRyaXZlci5nZXRf
dmJsYW5rX3RpbWVzdGFtcCA9IE5VTEw7CiAJCS8qIFNpbGVudGx5IGZhaWwgbG9hZGluZyB0byBu
b3QgdXBzZXQgdXNlcnNwYWNlLiAqLwogCQlEUk1fREVCVUdfRFJJVkVSKCJLTVMgYW5kIFVNUyBk
aXNhYmxlZC5cbiIpOwogCQlyZXR1cm4gMDsKIAl9CiAKLQkvKgotCSAqIEZJWE1FOiBOb3RlIHRo
YXQgd2UncmUgbHlpbmcgdG8gdGhlIERSTSBjb3JlIGhlcmUgc28gdGhhdCB3ZSBjYW4gZ2V0IGFj
Y2VzcwotCSAqIHRvIHRoZSBhdG9taWMgaW9jdGwgYW5kIHRoZSBhdG9taWMgcHJvcGVydGllcy4g
IE9ubHkgcGxhbmUgb3BlcmF0aW9ucyBvbgotCSAqIGEgc2luZ2xlIENSVEMgd2lsbCBhY3R1YWxs
eSB3b3JrLgotCSAqLwogCWlmIChpOTE1Lm51Y2xlYXJfcGFnZWZsaXApCiAJCWRyaXZlci5kcml2
ZXJfZmVhdHVyZXMgfD0gRFJJVkVSX0FUT01JQzsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5k
ZXggOGM5Mzg0NTFhMDVlLi41YzI1NDFkZGYyMTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApA
QCAtMjYwNyw4ICsyNjA3LDggQEAgc3RydWN0IGRybV9pOTE1X2NtZF90YWJsZSB7CiBleHRlcm4g
Y29uc3Qgc3RydWN0IGRybV9pb2N0bF9kZXNjIGk5MTVfaW9jdGxzW107CiBleHRlcm4gaW50IGk5
MTVfbWF4X2lvY3RsOwogCi1leHRlcm4gaW50IGk5MTVfc3VzcGVuZF9sZWdhY3koc3RydWN0IGRy
bV9kZXZpY2UgKmRldiwgcG1fbWVzc2FnZV90IHN0YXRlKTsKLWV4dGVybiBpbnQgaTkxNV9yZXN1
bWVfbGVnYWN5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOworZXh0ZXJuIGludCBpOTE1X3N1c3Bl
bmRfc3dpdGNoZXJvbyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBwbV9tZXNzYWdlX3Qgc3RhdGUp
OworZXh0ZXJuIGludCBpOTE1X3Jlc3VtZV9zd2l0Y2hlcm9vKHN0cnVjdCBkcm1fZGV2aWNlICpk
ZXYpOwogCiAvKiBpOTE1X3BhcmFtcy5jICovCiBzdHJ1Y3QgaTkxNV9wYXJhbXMgewoKX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxp
bmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVl
ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK