From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: [PATCH 12/14] drm: Move master pointer from drm_minor
	to drm_device
Date: Tue, 14 Jun 2016 20:51:07 +0200
Message-ID: <1465930269-7883-13-git-send-email-daniel.vetter@ffwll.ch>
References: <1465930269-7883-1-git-send-email-daniel.vetter@ffwll.ch>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
In-Reply-To: <1465930269-7883-1-git-send-email-daniel.vetter@ffwll.ch>
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: DRI Development <dri-devel@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@intel.com>, Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics Development <intel-gfx@lists.freedesktop.org>, Julia Lawall <julia.lawall@lip6.fr>
List-Id: dri-devel@lists.freedesktop.org

VGhlcmUgY2FuIG9ubHkgYmUgb25lIGN1cnJlbnQgbWFzdGVyLCBhbmQgaXQncyBmb3IgdGhlIG92
ZXJhbGwgZGV2aWNlLgpSZW5kZXIvY29udHJvbCBtaW5vcnMgZG9uJ3Qgc3VwcG9ydCBtYXN0ZXIt
YmFzZWQgYXV0aCBhdCBhbGwuCgpUaGlzIHNpbXBsaWZpZXMgdGhlIG1hc3RlciBsb2dpYyBhIGxv
dCwgYXQgbGVhc3QgaW4gbXkgZXllczogQWxsIHRoZXNlCmFkZGl0aW9uYWwgcG9pbnRlciBjaGFz
ZXMgYXJlIGp1c3QgY29uZnVzaW5nLgoKV2hpbGUgZG9pbmcgdGhlIGNvbnZlcnNpb24gSSBzcG90
dGVkIHNvbWUgbG9ja2luZyBmYWlsOgotIGRybV9sb2NrL2RybV9hdXRoIGNoZWNrIGRldi0+bWFz
dGVyIHdpdGhvdXQgaG9sZGluZyB0aGUKICBtYXN0ZXJfbXV0ZXguIFRoaXMgaXMgZmFsbG91dCBm
cm9tCgogIGNvbW1pdCBjOTk2ZmQwYjk1NjQ1MDU2MzQ1NGU3Y2NjOTdhODJjYTMxZjlkMDQzCiAg
QXV0aG9yOiBUaG9tYXMgSGVsbHN0cm9tIDx0aGVsbHN0cm9tQHZtd2FyZS5jb20+CiAgRGF0ZTog
ICBUdWUgRmViIDI1IDE5OjU3OjQ0IDIwMTQgKzAxMDAKCiAgICAgIGRybTogUHJvdGVjdCB0aGUg
bWFzdGVyIG1hbmFnZW1lbnQgd2l0aCBhIGRybV9kZXZpY2U6Om1hc3Rlcl9tdXRleCB2MwoKICBi
dXQgSSBob25lc3RseSBkb24ndCBjYXJlIG9uZSBiaXQgYWJvdXQgdGhvc2Ugb2xkIGxlZ2FjeSBk
cml2ZXJzCiAgdXNpbmcgdGhpcy4KCi0gZGVidWdmcyBuYW1lIGluZm8gc2hvdWxkIGp1c3QgZ3Jh
YiBtYXN0ZXJfbXV0ZXguCgotIEFuZCB0aGUgZmJkZXYgaGVscGVyIGxvb2tlZCBhdCBpdCB0byBm
aWd1cmUgb3V0IHdoZXRoZXIgc29tZW9uZSBpcwogIHVzaW5nIEtNUy4gV2UganVzdCBuZWVkIGEg
Y29uc2lzdGVudCB2YWx1ZSwgc28gUkVBRF9PTkNFLiBBc2lkZTogV2UKICBzaG91bGQgcHJvYmFi
bHkgY2hlY2sgaWYgYW55b25lIGhhcyBvcGVuZWQgYSBjb250cm9sIG5vZGUgdG9vLCBidXQgSQog
IGd1ZXNzIGN1cnJlbnQgdXNlcnNwYWNlIGRvZXNuJ3QgcmVhbGx5IGRvIHRoYXQgeWV0LgoKdjI6
IEJhbGFuY2UgbG9ja2luZywgcmVwb3J0ZWQgYnkgSnVsaWEuCgpDYzogSnVsaWEgTGF3YWxsIDxq
dWxpYS5sYXdhbGxAbGlwNi5mcj4KU2lnbmVkLW9mZi1ieTogRGFuaWVsIFZldHRlciA8ZGFuaWVs
LnZldHRlckBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9hdXRoLmMgICAgICB8
IDI2ICsrKysrKysrKysrKystLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX2J1ZnMu
YyAgICAgIHwgIDggKysrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fZmJfaGVscGVyLmMgfCAg
MiArLQogZHJpdmVycy9ncHUvZHJtL2RybV9pbmZvLmMgICAgICB8IDEwICsrKysrKysrLS0KIGRy
aXZlcnMvZ3B1L2RybS9kcm1fbG9jay5jICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL3Np
cy9zaXNfbW0uYyAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vdmlhL3ZpYV9tbS5jICAgIHwg
IDIgKy0KIGluY2x1ZGUvZHJtL2RybVAuaCAgICAgICAgICAgICAgfCAgOSArKysrKy0tLS0KIDgg
ZmlsZXMgY2hhbmdlZCwgMzQgaW5zZXJ0aW9ucygrKSwgMjcgZGVsZXRpb25zKC0pCgpkaWZmIC0t
Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdXRoLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F1
dGguYwppbmRleCA5NDc2MWU0YmQxZTUuLmZjYWRkOGUxZGUyOCAxMDA2NDQKLS0tIGEvZHJpdmVy
cy9ncHUvZHJtL2RybV9hdXRoLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdXRoLmMKQEAg
LTEyOCwxMyArMTI4LDEzIEBAIHN0YXRpYyBpbnQgZHJtX25ld19zZXRfbWFzdGVyKHN0cnVjdCBk
cm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fZmlsZSAqZnByaXYpCiAJbG9ja2RlcF9hc3NlcnRf
aGVsZF9vbmNlKCZkZXYtPm1hc3Rlcl9tdXRleCk7CiAKIAkvKiBjcmVhdGUgYSBuZXcgbWFzdGVy
ICovCi0JZnByaXYtPm1pbm9yLT5tYXN0ZXIgPSBkcm1fbWFzdGVyX2NyZWF0ZShmcHJpdi0+bWlu
b3ItPmRldik7Ci0JaWYgKCFmcHJpdi0+bWlub3ItPm1hc3RlcikKKwlkZXYtPm1hc3RlciA9IGRy
bV9tYXN0ZXJfY3JlYXRlKGRldik7CisJaWYgKCFkZXYtPm1hc3RlcikKIAkJcmV0dXJuIC1FTk9N
RU07CiAKIAkvKiB0YWtlIGFub3RoZXIgcmVmZXJlbmNlIGZvciB0aGUgY29weSBpbiB0aGUgbG9j
YWwgZmlsZSBwcml2ICovCiAJb2xkX21hc3RlciA9IGZwcml2LT5tYXN0ZXI7Ci0JZnByaXYtPm1h
c3RlciA9IGRybV9tYXN0ZXJfZ2V0KGZwcml2LT5taW5vci0+bWFzdGVyKTsKKwlmcHJpdi0+bWFz
dGVyID0gZHJtX21hc3Rlcl9nZXQoZGV2LT5tYXN0ZXIpOwogCiAJaWYgKGRldi0+ZHJpdmVyLT5t
YXN0ZXJfY3JlYXRlKSB7CiAJCXJldCA9IGRldi0+ZHJpdmVyLT5tYXN0ZXJfY3JlYXRlKGRldiwg
ZnByaXYtPm1hc3Rlcik7CkBAIC0xNTcsNyArMTU3LDcgQEAgc3RhdGljIGludCBkcm1fbmV3X3Nl
dF9tYXN0ZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9maWxlICpmcHJpdikK
IAogb3V0X2VycjoKIAkvKiBkcm9wIGJvdGggcmVmZXJlbmNlcyBhbmQgcmVzdG9yZSBvbGQgbWFz
dGVyIG9uIGZhaWx1cmUgKi8KLQlkcm1fbWFzdGVyX3B1dCgmZnByaXYtPm1pbm9yLT5tYXN0ZXIp
OworCWRybV9tYXN0ZXJfcHV0KCZkZXYtPm1hc3Rlcik7CiAJZHJtX21hc3Rlcl9wdXQoJmZwcml2
LT5tYXN0ZXIpOwogCWZwcml2LT5tYXN0ZXIgPSBvbGRfbWFzdGVyOwogCkBAIC0xNzMsNyArMTcz
LDcgQEAgaW50IGRybV9zZXRtYXN0ZXJfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9p
ZCAqZGF0YSwKIAlpZiAoZmlsZV9wcml2LT5pc19tYXN0ZXIpCiAJCWdvdG8gb3V0X3VubG9jazsK
IAotCWlmIChmaWxlX3ByaXYtPm1pbm9yLT5tYXN0ZXIpIHsKKwlpZiAoZGV2LT5tYXN0ZXIpIHsK
IAkJcmV0ID0gLUVJTlZBTDsKIAkJZ290byBvdXRfdW5sb2NrOwogCX0KQEAgLTE4OCwxMyArMTg4
LDEzIEBAIGludCBkcm1fc2V0bWFzdGVyX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZv
aWQgKmRhdGEsCiAJCWdvdG8gb3V0X3VubG9jazsKIAl9CiAKLQlmaWxlX3ByaXYtPm1pbm9yLT5t
YXN0ZXIgPSBkcm1fbWFzdGVyX2dldChmaWxlX3ByaXYtPm1hc3Rlcik7CisJZGV2LT5tYXN0ZXIg
PSBkcm1fbWFzdGVyX2dldChmaWxlX3ByaXYtPm1hc3Rlcik7CiAJZmlsZV9wcml2LT5pc19tYXN0
ZXIgPSAxOwogCWlmIChkZXYtPmRyaXZlci0+bWFzdGVyX3NldCkgewogCQlyZXQgPSBkZXYtPmRy
aXZlci0+bWFzdGVyX3NldChkZXYsIGZpbGVfcHJpdiwgZmFsc2UpOwogCQlpZiAodW5saWtlbHko
cmV0ICE9IDApKSB7CiAJCQlmaWxlX3ByaXYtPmlzX21hc3RlciA9IDA7Ci0JCQlkcm1fbWFzdGVy
X3B1dCgmZmlsZV9wcml2LT5taW5vci0+bWFzdGVyKTsKKwkJCWRybV9tYXN0ZXJfcHV0KCZkZXYt
Pm1hc3Rlcik7CiAJCX0KIAl9CiAKQEAgLTIxMiwxMyArMjEyLDEzIEBAIGludCBkcm1fZHJvcG1h
c3Rlcl9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCWlmICghZmls
ZV9wcml2LT5pc19tYXN0ZXIpCiAJCWdvdG8gb3V0X3VubG9jazsKIAotCWlmICghZmlsZV9wcml2
LT5taW5vci0+bWFzdGVyKQorCWlmICghZGV2LT5tYXN0ZXIpCiAJCWdvdG8gb3V0X3VubG9jazsK
IAogCXJldCA9IDA7CiAJaWYgKGRldi0+ZHJpdmVyLT5tYXN0ZXJfZHJvcCkKIAkJZGV2LT5kcml2
ZXItPm1hc3Rlcl9kcm9wKGRldiwgZmlsZV9wcml2LCBmYWxzZSk7Ci0JZHJtX21hc3Rlcl9wdXQo
JmZpbGVfcHJpdi0+bWlub3ItPm1hc3Rlcik7CisJZHJtX21hc3Rlcl9wdXQoJmRldi0+bWFzdGVy
KTsKIAlmaWxlX3ByaXYtPmlzX21hc3RlciA9IDA7CiAKIG91dF91bmxvY2s6CkBAIC0yMzQsMTAg
KzIzNCwxMCBAQCBpbnQgZHJtX21hc3Rlcl9vcGVuKHN0cnVjdCBkcm1fZmlsZSAqZmlsZV9wcml2
KQogCS8qIGlmIHRoZXJlIGlzIG5vIGN1cnJlbnQgbWFzdGVyIG1ha2UgdGhpcyBmZCBpdCwgYnV0
IGRvIG5vdCBjcmVhdGUKIAkgKiBhbnkgbWFzdGVyIG9iamVjdCBmb3IgcmVuZGVyIGNsaWVudHMg
Ki8KIAltdXRleF9sb2NrKCZkZXYtPm1hc3Rlcl9tdXRleCk7Ci0JaWYgKCFmaWxlX3ByaXYtPm1p
bm9yLT5tYXN0ZXIpCisJaWYgKCFkZXYtPm1hc3RlcikKIAkJcmV0ID0gZHJtX25ld19zZXRfbWFz
dGVyKGRldiwgZmlsZV9wcml2KTsKIAllbHNlCi0JCWZpbGVfcHJpdi0+bWFzdGVyID0gZHJtX21h
c3Rlcl9nZXQoZmlsZV9wcml2LT5taW5vci0+bWFzdGVyKTsKKwkJZmlsZV9wcml2LT5tYXN0ZXIg
PSBkcm1fbWFzdGVyX2dldChkZXYtPm1hc3Rlcik7CiAJbXV0ZXhfdW5sb2NrKCZkZXYtPm1hc3Rl
cl9tdXRleCk7CiAKIAlyZXR1cm4gcmV0OwpAQCAtMjcxLDExICsyNzEsMTEgQEAgdm9pZCBkcm1f
bWFzdGVyX3JlbGVhc2Uoc3RydWN0IGRybV9maWxlICpmaWxlX3ByaXYpCiAJCW11dGV4X3VubG9j
aygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCX0KIAotCWlmIChmaWxlX3ByaXYtPm1pbm9yLT5tYXN0
ZXIgPT0gZmlsZV9wcml2LT5tYXN0ZXIpIHsKKwlpZiAoZGV2LT5tYXN0ZXIgPT0gZmlsZV9wcml2
LT5tYXN0ZXIpIHsKIAkJLyogZHJvcCB0aGUgcmVmZXJlbmNlIGhlbGQgbXkgdGhlIG1pbm9yICov
CiAJCWlmIChkZXYtPmRyaXZlci0+bWFzdGVyX2Ryb3ApCiAJCQlkZXYtPmRyaXZlci0+bWFzdGVy
X2Ryb3AoZGV2LCBmaWxlX3ByaXYsIHRydWUpOwotCQlkcm1fbWFzdGVyX3B1dCgmZmlsZV9wcml2
LT5taW5vci0+bWFzdGVyKTsKKwkJZHJtX21hc3Rlcl9wdXQoJmRldi0+bWFzdGVyKTsKIAl9CiAK
IAkvKiBkcm9wIHRoZSBtYXN0ZXIgcmVmZXJlbmNlIGhlbGQgYnkgdGhlIGZpbGUgcHJpdiAqLwpk
aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9idWZzLmMgYi9kcml2ZXJzL2dwdS9kcm0v
ZHJtX2J1ZnMuYwppbmRleCA5YjM0MTU4YzBmNzcuLmMzYTEyY2Q4YmQwZCAxMDA2NDQKLS0tIGEv
ZHJpdmVycy9ncHUvZHJtL2RybV9idWZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9idWZz
LmMKQEAgLTUxLDcgKzUxLDcgQEAgc3RhdGljIHN0cnVjdCBkcm1fbWFwX2xpc3QgKmRybV9maW5k
X21hdGNoaW5nX21hcChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkgKi8KIAkJaWYgKCFlbnRy
eS0+bWFwIHx8CiAJCSAgICBtYXAtPnR5cGUgIT0gZW50cnktPm1hcC0+dHlwZSB8fAotCQkgICAg
ZW50cnktPm1hc3RlciAhPSBkZXYtPnByaW1hcnktPm1hc3RlcikKKwkJICAgIGVudHJ5LT5tYXN0
ZXIgIT0gZGV2LT5tYXN0ZXIpCiAJCQljb250aW51ZTsKIAkJc3dpdGNoIChtYXAtPnR5cGUpIHsK
IAkJY2FzZSBfRFJNX1NITToKQEAgLTI0NSwxMiArMjQ1LDEyIEBAIHN0YXRpYyBpbnQgZHJtX2Fk
ZG1hcF9jb3JlKHN0cnVjdCBkcm1fZGV2aWNlICogZGV2LCByZXNvdXJjZV9zaXplX3Qgb2Zmc2V0
LAogCQltYXAtPm9mZnNldCA9ICh1bnNpZ25lZCBsb25nKW1hcC0+aGFuZGxlOwogCQlpZiAobWFw
LT5mbGFncyAmIF9EUk1fQ09OVEFJTlNfTE9DSykgewogCQkJLyogUHJldmVudCBhIDJuZCBYIFNl
cnZlciBmcm9tIGNyZWF0aW5nIGEgMm5kIGxvY2sgKi8KLQkJCWlmIChkZXYtPnByaW1hcnktPm1h
c3Rlci0+bG9jay5od19sb2NrICE9IE5VTEwpIHsKKwkJCWlmIChkZXYtPm1hc3Rlci0+bG9jay5o
d19sb2NrICE9IE5VTEwpIHsKIAkJCQl2ZnJlZShtYXAtPmhhbmRsZSk7CiAJCQkJa2ZyZWUobWFw
KTsKIAkJCQlyZXR1cm4gLUVCVVNZOwogCQkJfQotCQkJZGV2LT5zaWdkYXRhLmxvY2sgPSBkZXYt
PnByaW1hcnktPm1hc3Rlci0+bG9jay5od19sb2NrID0gbWFwLT5oYW5kbGU7CS8qIFBvaW50ZXIg
dG8gbG9jayAqLworCQkJZGV2LT5zaWdkYXRhLmxvY2sgPSBkZXYtPm1hc3Rlci0+bG9jay5od19s
b2NrID0gbWFwLT5oYW5kbGU7CS8qIFBvaW50ZXIgdG8gbG9jayAqLwogCQl9CiAJCWJyZWFrOwog
CWNhc2UgX0RSTV9BR1A6IHsKQEAgLTM1Niw3ICszNTYsNyBAQCBzdGF0aWMgaW50IGRybV9hZGRt
YXBfY29yZShzdHJ1Y3QgZHJtX2RldmljZSAqIGRldiwgcmVzb3VyY2Vfc2l6ZV90IG9mZnNldCwK
IAltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKIAogCWlmICghKG1hcC0+ZmxhZ3Mg
JiBfRFJNX0RSSVZFUikpCi0JCWxpc3QtPm1hc3RlciA9IGRldi0+cHJpbWFyeS0+bWFzdGVyOwor
CQlsaXN0LT5tYXN0ZXIgPSBkZXYtPm1hc3RlcjsKIAkqbWFwbGlzdCA9IGxpc3Q7CiAJcmV0dXJu
IDA7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2ZiX2hlbHBlci5jIGIvZHJp
dmVycy9ncHUvZHJtL2RybV9mYl9oZWxwZXIuYwppbmRleCAwYmFjNTI0NmU1YTcuLjBhMDZmOTEy
MGI1YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9mYl9oZWxwZXIuYworKysgYi9k
cml2ZXJzL2dwdS9kcm0vZHJtX2ZiX2hlbHBlci5jCkBAIC00NjQsNyArNDY0LDcgQEAgc3RhdGlj
IGJvb2wgZHJtX2ZiX2hlbHBlcl9pc19ib3VuZChzdHJ1Y3QgZHJtX2ZiX2hlbHBlciAqZmJfaGVs
cGVyKQogCiAJLyogU29tZXRpbWVzIHVzZXIgc3BhY2Ugd2FudHMgZXZlcnl0aGluZyBkaXNhYmxl
ZCwgc28gZG9uJ3Qgc3RlYWwgdGhlCiAJICogZGlzcGxheSBpZiB0aGVyZSdzIGEgbWFzdGVyLiAq
LwotCWlmIChkZXYtPnByaW1hcnktPm1hc3RlcikKKwlpZiAoUkVBRF9PTkNFKGRldi0+bWFzdGVy
KSkKIAkJcmV0dXJuIGZhbHNlOwogCiAJZHJtX2Zvcl9lYWNoX2NydGMoY3J0YywgZGV2KSB7CmRp
ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2luZm8uYyBiL2RyaXZlcnMvZ3B1L2RybS9k
cm1faW5mby5jCmluZGV4IDAwOTBkNTk4NzgwMS4uMjRjODBkZDEzODM3IDEwMDY0NAotLS0gYS9k
cml2ZXJzL2dwdS9kcm0vZHJtX2luZm8uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2luZm8u
YwpAQCAtNTAsOSArNTAsMTIgQEAgaW50IGRybV9uYW1lX2luZm8oc3RydWN0IHNlcV9maWxlICpt
LCB2b2lkICpkYXRhKQogCXN0cnVjdCBkcm1faW5mb19ub2RlICpub2RlID0gKHN0cnVjdCBkcm1f
aW5mb19ub2RlICopIG0tPnByaXZhdGU7CiAJc3RydWN0IGRybV9taW5vciAqbWlub3IgPSBub2Rl
LT5taW5vcjsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gbWlub3ItPmRldjsKLQlzdHJ1Y3Qg
ZHJtX21hc3RlciAqbWFzdGVyID0gbWlub3ItPm1hc3RlcjsKKwlzdHJ1Y3QgZHJtX21hc3RlciAq
bWFzdGVyOworCisJbXV0ZXhfbG9jaygmZGV2LT5tYXN0ZXJfbXV0ZXgpOworCW1hc3RlciA9IGRl
di0+bWFzdGVyOwogCWlmICghbWFzdGVyKQotCQlyZXR1cm4gMDsKKwkJZ290byBvdXRfdW5sb2Nr
OwogCiAJaWYgKG1hc3Rlci0+dW5pcXVlKSB7CiAJCXNlcV9wcmludGYobSwgIiVzICVzICVzXG4i
LApAQCAtNjIsNiArNjUsOSBAQCBpbnQgZHJtX25hbWVfaW5mbyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0s
IHZvaWQgKmRhdGEpCiAJCXNlcV9wcmludGYobSwgIiVzICVzXG4iLAogCQkJICAgZGV2LT5kcml2
ZXItPm5hbWUsIGRldl9uYW1lKGRldi0+ZGV2KSk7CiAJfQorb3V0X3VubG9jazoKKwltdXRleF91
bmxvY2soJmRldi0+bWFzdGVyX211dGV4KTsKKwogCXJldHVybiAwOwogfQogCmRpZmYgLS1naXQg
YS9kcml2ZXJzL2dwdS9kcm0vZHJtX2xvY2suYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fbG9jay5j
CmluZGV4IDBmYjhmOWU3MzQ4Ni4uYWUwYTRkMzlkZWVjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw
dS9kcm0vZHJtX2xvY2suYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2xvY2suYwpAQCAtMzM0
LDcgKzMzNCw3IEBAIHZvaWQgZHJtX2xlZ2FjeV9sb2NrX3JlbGVhc2Uoc3RydWN0IGRybV9kZXZp
Y2UgKmRldiwgc3RydWN0IGZpbGUgKmZpbHApCiAJc3RydWN0IGRybV9maWxlICpmaWxlX3ByaXYg
PSBmaWxwLT5wcml2YXRlX2RhdGE7CiAKIAkvKiBpZiB0aGUgbWFzdGVyIGhhcyBnb25lIGF3YXkg
d2UgY2FuJ3QgZG8gYW55dGhpbmcgd2l0aCB0aGUgbG9jayAqLwotCWlmICghZmlsZV9wcml2LT5t
aW5vci0+bWFzdGVyKQorCWlmICghZGV2LT5tYXN0ZXIpCiAJCXJldHVybjsKIAogCWlmIChkcm1f
bGVnYWN5X2lfaGF2ZV9od19sb2NrKGRldiwgZmlsZV9wcml2KSkgewpkaWZmIC0tZ2l0IGEvZHJp
dmVycy9ncHUvZHJtL3Npcy9zaXNfbW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9zaXMvc2lzX21tLmMK
aW5kZXggOTNhZDhhNTcwNGQxLi4wM2RlZmRhNzc3NjYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1
L2RybS9zaXMvc2lzX21tLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3Npcy9zaXNfbW0uYwpAQCAt
MzE2LDcgKzMxNiw3IEBAIHZvaWQgc2lzX3JlY2xhaW1fYnVmZmVyc19sb2NrZWQoc3RydWN0IGRy
bV9kZXZpY2UgKmRldiwKIAlzdHJ1Y3Qgc2lzX2ZpbGVfcHJpdmF0ZSAqZmlsZV9wcml2ID0gZmls
ZS0+ZHJpdmVyX3ByaXY7CiAJc3RydWN0IHNpc19tZW1ibG9jayAqZW50cnksICpuZXh0OwogCi0J
aWYgKCEoZmlsZS0+bWlub3ItPm1hc3RlciAmJiBmaWxlLT5tYXN0ZXItPmxvY2suaHdfbG9jaykp
CisJaWYgKCEoZGV2LT5tYXN0ZXIgJiYgZmlsZS0+bWFzdGVyLT5sb2NrLmh3X2xvY2spKQogCQly
ZXR1cm47CiAKIAlkcm1fbGVnYWN5X2lkbGVsb2NrX3Rha2UoJmZpbGUtPm1hc3Rlci0+bG9jayk7
CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdmlhL3ZpYV9tbS5jIGIvZHJpdmVycy9ncHUv
ZHJtL3ZpYS92aWFfbW0uYwppbmRleCA0ZjIwNzQyZTc3ODguLmEwNGVmMWM5OTJkOSAxMDA2NDQK
LS0tIGEvZHJpdmVycy9ncHUvZHJtL3ZpYS92aWFfbW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0v
dmlhL3ZpYV9tbS5jCkBAIC0yMDgsNyArMjA4LDcgQEAgdm9pZCB2aWFfcmVjbGFpbV9idWZmZXJz
X2xvY2tlZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCXN0cnVjdCB2aWFfZmlsZV9wcml2YXRl
ICpmaWxlX3ByaXYgPSBmaWxlLT5kcml2ZXJfcHJpdjsKIAlzdHJ1Y3QgdmlhX21lbWJsb2NrICpl
bnRyeSwgKm5leHQ7CiAKLQlpZiAoIShmaWxlLT5taW5vci0+bWFzdGVyICYmIGZpbGUtPm1hc3Rl
ci0+bG9jay5od19sb2NrKSkKKwlpZiAoIShkZXYtPm1hc3RlciAmJiBmaWxlLT5tYXN0ZXItPmxv
Y2suaHdfbG9jaykpCiAJCXJldHVybjsKIAogCWRybV9sZWdhY3lfaWRsZWxvY2tfdGFrZSgmZmls
ZS0+bWFzdGVyLT5sb2NrKTsKZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJtL2RybVAuaCBiL2luY2x1
ZGUvZHJtL2RybVAuaAppbmRleCBlODc4OGQ3YjI5ZGMuLjYyZTBlNzBjYjVhMiAxMDA2NDQKLS0t
IGEvaW5jbHVkZS9kcm0vZHJtUC5oCisrKyBiL2luY2x1ZGUvZHJtL2RybVAuaApAQCAtMzM2LDcg
KzMzNiw3IEBAIHN0cnVjdCBkcm1fZmlsZSB7CiAJdm9pZCAqZHJpdmVyX3ByaXY7CiAKIAlzdHJ1
Y3QgZHJtX21hc3RlciAqbWFzdGVyOyAvKiBtYXN0ZXIgdGhpcyBub2RlIGlzIGN1cnJlbnRseSBh
c3NvY2lhdGVkIHdpdGgKLQkJCQkgICAgICBOLkIuIG5vdCBhbHdheXMgbWlub3ItPm1hc3RlciAq
LworCQkJCSAgICAgIE4uQi4gbm90IGFsd2F5cyBkZXYtPm1hc3RlciAqLwogCS8qKgogCSAqIGZi
cyAtIExpc3Qgb2YgZnJhbWVidWZmZXJzIGFzc29jaWF0ZWQgd2l0aCB0aGlzIGZpbGUuCiAJICoK
QEAgLTcwOCw5ICs3MDgsNiBAQCBzdHJ1Y3QgZHJtX21pbm9yIHsKIAogCXN0cnVjdCBsaXN0X2hl
YWQgZGVidWdmc19saXN0OwogCXN0cnVjdCBtdXRleCBkZWJ1Z2ZzX2xvY2s7IC8qIFByb3RlY3Rz
IGRlYnVnZnNfbGlzdC4gKi8KLQotCS8qIGN1cnJlbnRseSBhY3RpdmUgbWFzdGVyIGZvciB0aGlz
IG5vZGUuIFByb3RlY3RlZCBieSBtYXN0ZXJfbXV0ZXggKi8KLQlzdHJ1Y3QgZHJtX21hc3RlciAq
bWFzdGVyOwogfTsKIAogCkBAIC03NTksNiArNzU2LDEwIEBAIHN0cnVjdCBkcm1fZGV2aWNlIHsK
IAlzdHJ1Y3QgZHJtX21pbm9yICpjb250cm9sOwkJLyoqPCBDb250cm9sIG5vZGUgKi8KIAlzdHJ1
Y3QgZHJtX21pbm9yICpwcmltYXJ5OwkJLyoqPCBQcmltYXJ5IG5vZGUgKi8KIAlzdHJ1Y3QgZHJt
X21pbm9yICpyZW5kZXI7CQkvKio8IFJlbmRlciBub2RlICovCisKKwkvKiBjdXJyZW50bHkgYWN0
aXZlIG1hc3RlciBmb3IgdGhpcyBkZXZpY2UuIFByb3RlY3RlZCBieSBtYXN0ZXJfbXV0ZXggKi8K
KwlzdHJ1Y3QgZHJtX21hc3RlciAqbWFzdGVyOworCiAJYXRvbWljX3QgdW5wbHVnZ2VkOwkJCS8q
KjwgRmxhZyB3aGV0aGVyIGRldiBpcyBkZWFkICovCiAJc3RydWN0IGlub2RlICphbm9uX2lub2Rl
OwkJLyoqPCBpbm9kZSBmb3IgcHJpdmF0ZSBhZGRyZXNzLXNwYWNlICovCiAJY2hhciAqdW5pcXVl
OwkJCQkvKio8IHVuaXF1ZSBuYW1lIG9mIHRoZSBkZXZpY2UgKi8KLS0gCjIuOC4xCgpfX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu
ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl
ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK