From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lucas Stach Subject: [PATCH RFC 056/111] staging: etnaviv: call the DRM device 'drm' Date: Thu, 2 Apr 2015 17:29:58 +0200 Message-ID: <1427988653-754-57-git-send-email-l.stach@pengutronix.de> References: <1427988653-754-1-git-send-email-l.stach@pengutronix.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [92.198.50.35]) by gabe.freedesktop.org (Postfix) with ESMTP id 447866EA43 for ; Thu, 2 Apr 2015 08:30:59 -0700 (PDT) In-Reply-To: <1427988653-754-1-git-send-email-l.stach@pengutronix.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: Russell King , kernel@pengutronix.de List-Id: dri-devel@lists.freedesktop.org RnJvbTogUnVzc2VsbCBLaW5nIDxybWsra2VybmVsQGFybS5saW51eC5vcmcudWs+CgpDYWxsIHRo ZSBEUk0gZGV2aWNlICdkcm0nIGluIHRoZSBldG5hdml2X2dwdSBzdHJ1Y3R1cmUsIHNvIHRoYXQg d2UgY2FuCmFkZCBhIHN0cnVjdCBkZXZpY2UgcG9pbnRlci4KClNpZ25lZC1vZmYtYnk6IFJ1c3Nl bGwgS2luZyA8cm1rK2tlcm5lbEBhcm0ubGludXgub3JnLnVrPgotLS0KIGRyaXZlcnMvc3RhZ2lu Zy9ldG5hdml2L2V0bmF2aXZfYnVmZmVyLmMgfCAgMiArLQogZHJpdmVycy9zdGFnaW5nL2V0bmF2 aXYvZXRuYXZpdl9ncHUuYyAgICB8IDc0ICsrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0t CiBkcml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2X2dwdS5oICAgIHwgIDIgKy0KIDMgZmls ZXMgY2hhbmdlZCwgMzkgaW5zZXJ0aW9ucygrKSwgMzkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZpdl9idWZmZXIuYyBiL2RyaXZlcnMvc3Rh Z2luZy9ldG5hdml2L2V0bmF2aXZfYnVmZmVyLmMKaW5kZXggOTY2NjFlNTEzZDdkLi5hZDhmZjU1 YTU5YjQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvc3RhZ2luZy9ldG5hdml2L2V0bmF2aXZfYnVmZmVy LmMKKysrIGIvZHJpdmVycy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZpdl9idWZmZXIuYwpAQCAtMTM1 LDcgKzEzNSw3IEBAIHN0YXRpYyB2b2lkIGV0bmF2aXZfYnVmZmVyX2R1bXAoc3RydWN0IGV0bmF2 aXZfZ3B1ICpncHUsCiAJdTMyIHNpemUgPSBvYmotPmJhc2Uuc2l6ZTsKIAl1MzIgKnB0ciA9IG9i ai0+dmFkZHIgKyBvZmY7CiAKLQlkZXZfaW5mbyhncHUtPmRldi0+ZGV2LCAidmlydCAlcCBwaHlz IDB4JTA4eCBmcmVlIDB4JTA4eFxuIiwKKwlkZXZfaW5mbyhncHUtPmRybS0+ZGV2LCAidmlydCAl cCBwaHlzIDB4JTA4eCBmcmVlIDB4JTA4eFxuIiwKIAkJCXB0ciwgb2JqLT5wYWRkciArIG9mZiwg c2l6ZSAtIGxlbiAqIDQgLSBvZmYpOwogCiAJcHJpbnRfaGV4X2R1bXAoS0VSTl9JTkZPLCAiY21k ICIsIERVTVBfUFJFRklYX09GRlNFVCwgMTYsIDQsCmRpZmYgLS1naXQgYS9kcml2ZXJzL3N0YWdp bmcvZXRuYXZpdi9ldG5hdml2X2dwdS5jIGIvZHJpdmVycy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZp dl9ncHUuYwppbmRleCA5MWRjNDRmMzVhNDkuLjdlZjkxMjBiZDdkZSAxMDA2NDQKLS0tIGEvZHJp dmVycy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZpdl9ncHUuYworKysgYi9kcml2ZXJzL3N0YWdpbmcv ZXRuYXZpdi9ldG5hdml2X2dwdS5jCkBAIC0xNTcsNyArMTU3LDcgQEAgc3RhdGljIHZvaWQgZXRu YXZpdl9od19zcGVjcyhzdHJ1Y3QgZXRuYXZpdl9ncHUgKmdwdSkKIAkJZ3B1LT5pZGVudGl0eS52 ZXJ0ZXhfb3V0cHV0X2J1ZmZlcl9zaXplID0KIAkJCTEgPDwgZ3B1LT5pZGVudGl0eS52ZXJ0ZXhf b3V0cHV0X2J1ZmZlcl9zaXplOwogCX0gZWxzZSB7Ci0JCWRldl9lcnIoZ3B1LT5kZXYtPmRldiwg IlRPRE86IGRldGVybWluZSBHUFUgc3BlY3MgYmFzZWQgb24gbW9kZWxcbiIpOworCQlkZXZfZXJy KGdwdS0+ZHJtLT5kZXYsICJUT0RPOiBkZXRlcm1pbmUgR1BVIHNwZWNzIGJhc2VkIG9uIG1vZGVs XG4iKTsKIAl9CiAKIAlzd2l0Y2ggKGdwdS0+aWRlbnRpdHkuaW5zdHJ1Y3Rpb25fY291bnQpIHsK QEAgLTE3OCwyNSArMTc4LDI1IEBAIHN0YXRpYyB2b2lkIGV0bmF2aXZfaHdfc3BlY3Moc3RydWN0 IGV0bmF2aXZfZ3B1ICpncHUpCiAJCWJyZWFrOwogCX0KIAotCWRldl9pbmZvKGdwdS0+ZGV2LT5k ZXYsICJzdHJlYW1fY291bnQ6ICAleFxuIiwKKwlkZXZfaW5mbyhncHUtPmRybS0+ZGV2LCAic3Ry ZWFtX2NvdW50OiAgJXhcbiIsCiAJCSBncHUtPmlkZW50aXR5LnN0cmVhbV9jb3VudCk7Ci0JZGV2 X2luZm8oZ3B1LT5kZXYtPmRldiwgInJlZ2lzdGVyX21heDogJXhcbiIsCisJZGV2X2luZm8oZ3B1 LT5kcm0tPmRldiwgInJlZ2lzdGVyX21heDogJXhcbiIsCiAJCSBncHUtPmlkZW50aXR5LnJlZ2lz dGVyX21heCk7Ci0JZGV2X2luZm8oZ3B1LT5kZXYtPmRldiwgInRocmVhZF9jb3VudDogJXhcbiIs CisJZGV2X2luZm8oZ3B1LT5kcm0tPmRldiwgInRocmVhZF9jb3VudDogJXhcbiIsCiAJCSBncHUt PmlkZW50aXR5LnRocmVhZF9jb3VudCk7Ci0JZGV2X2luZm8oZ3B1LT5kZXYtPmRldiwgInZlcnRl eF9jYWNoZV9zaXplOiAleFxuIiwKKwlkZXZfaW5mbyhncHUtPmRybS0+ZGV2LCAidmVydGV4X2Nh Y2hlX3NpemU6ICV4XG4iLAogCQkgZ3B1LT5pZGVudGl0eS52ZXJ0ZXhfY2FjaGVfc2l6ZSk7Ci0J ZGV2X2luZm8oZ3B1LT5kZXYtPmRldiwgInNoYWRlcl9jb3JlX2NvdW50OiAleFxuIiwKKwlkZXZf aW5mbyhncHUtPmRybS0+ZGV2LCAic2hhZGVyX2NvcmVfY291bnQ6ICV4XG4iLAogCQkgZ3B1LT5p ZGVudGl0eS5zaGFkZXJfY29yZV9jb3VudCk7Ci0JZGV2X2luZm8oZ3B1LT5kZXYtPmRldiwgInBp eGVsX3BpcGVzOiAleFxuIiwKKwlkZXZfaW5mbyhncHUtPmRybS0+ZGV2LCAicGl4ZWxfcGlwZXM6 ICV4XG4iLAogCQkgZ3B1LT5pZGVudGl0eS5waXhlbF9waXBlcyk7Ci0JZGV2X2luZm8oZ3B1LT5k ZXYtPmRldiwgInZlcnRleF9vdXRwdXRfYnVmZmVyX3NpemU6ICV4XG4iLAorCWRldl9pbmZvKGdw dS0+ZHJtLT5kZXYsICJ2ZXJ0ZXhfb3V0cHV0X2J1ZmZlcl9zaXplOiAleFxuIiwKIAkJIGdwdS0+ aWRlbnRpdHkudmVydGV4X291dHB1dF9idWZmZXJfc2l6ZSk7Ci0JZGV2X2luZm8oZ3B1LT5kZXYt PmRldiwgImJ1ZmZlcl9zaXplOiAleFxuIiwKKwlkZXZfaW5mbyhncHUtPmRybS0+ZGV2LCAiYnVm ZmVyX3NpemU6ICV4XG4iLAogCQkgZ3B1LT5pZGVudGl0eS5idWZmZXJfc2l6ZSk7Ci0JZGV2X2lu Zm8oZ3B1LT5kZXYtPmRldiwgImluc3RydWN0aW9uX2NvdW50OiAleFxuIiwKKwlkZXZfaW5mbyhn cHUtPmRybS0+ZGV2LCAiaW5zdHJ1Y3Rpb25fY291bnQ6ICV4XG4iLAogCQkgZ3B1LT5pZGVudGl0 eS5pbnN0cnVjdGlvbl9jb3VudCk7Ci0JZGV2X2luZm8oZ3B1LT5kZXYtPmRldiwgIm51bV9jb25z dGFudHM6ICV4XG4iLAorCWRldl9pbmZvKGdwdS0+ZHJtLT5kZXYsICJudW1fY29uc3RhbnRzOiAl eFxuIiwKIAkJIGdwdS0+aWRlbnRpdHkubnVtX2NvbnN0YW50cyk7CiB9CiAKQEAgLTI0Miw4ICsy NDIsOCBAQCBzdGF0aWMgdm9pZCBldG5hdml2X2h3X2lkZW50aWZ5KHN0cnVjdCBldG5hdml2X2dw dSAqZ3B1KQogCQl9CiAJfQogCi0JZGV2X2luZm8oZ3B1LT5kZXYtPmRldiwgIm1vZGVsOiAleFxu IiwgZ3B1LT5pZGVudGl0eS5tb2RlbCk7Ci0JZGV2X2luZm8oZ3B1LT5kZXYtPmRldiwgInJldmlz aW9uOiAleFxuIiwgZ3B1LT5pZGVudGl0eS5yZXZpc2lvbik7CisJZGV2X2luZm8oZ3B1LT5kcm0t PmRldiwgIm1vZGVsOiAleFxuIiwgZ3B1LT5pZGVudGl0eS5tb2RlbCk7CisJZGV2X2luZm8oZ3B1 LT5kcm0tPmRldiwgInJldmlzaW9uOiAleFxuIiwgZ3B1LT5pZGVudGl0eS5yZXZpc2lvbik7CiAK IAlncHUtPmlkZW50aXR5LmZlYXR1cmVzID0gZ3B1X3JlYWQoZ3B1LCBWSVZTX0hJX0NISVBfRkVB VFVSRSk7CiAKQEAgLTI3NSwxMyArMjc1LDEzIEBAIHN0YXRpYyB2b2lkIGV0bmF2aXZfaHdfaWRl bnRpZnkoc3RydWN0IGV0bmF2aXZfZ3B1ICpncHUpCiAJCQkJZ3B1X3JlYWQoZ3B1LCBWSVZTX0hJ X0NISVBfTUlOT1JfRkVBVFVSRV8zKTsKIAl9CiAKLQlkZXZfaW5mbyhncHUtPmRldi0+ZGV2LCAi bWlub3JfZmVhdHVyZXM6ICAleFxuIiwKKwlkZXZfaW5mbyhncHUtPmRybS0+ZGV2LCAibWlub3Jf ZmVhdHVyZXM6ICAleFxuIiwKIAkJIGdwdS0+aWRlbnRpdHkubWlub3JfZmVhdHVyZXMwKTsKLQlk ZXZfaW5mbyhncHUtPmRldi0+ZGV2LCAibWlub3JfZmVhdHVyZXMxOiAleFxuIiwKKwlkZXZfaW5m byhncHUtPmRybS0+ZGV2LCAibWlub3JfZmVhdHVyZXMxOiAleFxuIiwKIAkJIGdwdS0+aWRlbnRp dHkubWlub3JfZmVhdHVyZXMxKTsKLQlkZXZfaW5mbyhncHUtPmRldi0+ZGV2LCAibWlub3JfZmVh dHVyZXMyOiAleFxuIiwKKwlkZXZfaW5mbyhncHUtPmRybS0+ZGV2LCAibWlub3JfZmVhdHVyZXMy OiAleFxuIiwKIAkJIGdwdS0+aWRlbnRpdHkubWlub3JfZmVhdHVyZXMyKTsKLQlkZXZfaW5mbyhn cHUtPmRldi0+ZGV2LCAibWlub3JfZmVhdHVyZXMzOiAleFxuIiwKKwlkZXZfaW5mbyhncHUtPmRy bS0+ZGV2LCAibWlub3JfZmVhdHVyZXMzOiAleFxuIiwKIAkJIGdwdS0+aWRlbnRpdHkubWlub3Jf ZmVhdHVyZXMzKTsKIAogCWV0bmF2aXZfaHdfc3BlY3MoZ3B1KTsKQEAgLTMzNCw3ICszMzQsNyBA QCBzdGF0aWMgdm9pZCBldG5hdml2X2h3X3Jlc2V0KHN0cnVjdCBldG5hdml2X2dwdSAqZ3B1KQog CiAJCS8qIHRyeSByZXNldGluZyBhZ2FpbiBpZiBGRSBpdCBub3QgaWRsZSAqLwogCQlpZiAoKGlk bGUgJiBWSVZTX0hJX0lETEVfU1RBVEVfRkUpID09IDApIHsKLQkJCWRldl9kYmcoZ3B1LT5kZXYt PmRldiwgIiVzOiBGRSBpcyBub3QgaWRsZVxuIiwKKwkJCWRldl9kYmcoZ3B1LT5kcm0tPmRldiwg IiVzOiBGRSBpcyBub3QgaWRsZVxuIiwKIAkJCQlncHUtPm5hbWUpOwogCQkJY29udGludWU7CiAJ CX0KQEAgLTM0NSw3ICszNDUsNyBAQCBzdGF0aWMgdm9pZCBldG5hdml2X2h3X3Jlc2V0KHN0cnVj dCBldG5hdml2X2dwdSAqZ3B1KQogCQkvKiBpcyB0aGUgR1BVIGlkbGU/ICovCiAJCWlmICgoKGNv bnRyb2wgJiBWSVZTX0hJX0NMT0NLX0NPTlRST0xfSURMRV8zRCkgPT0gMCkKIAkJfHwgKChjb250 cm9sICYgVklWU19ISV9DTE9DS19DT05UUk9MX0lETEVfMkQpID09IDApKSB7Ci0JCQlkZXZfZGJn KGdwdS0+ZGV2LT5kZXYsICIlczogR1BVIGlzIG5vdCBpZGxlXG4iLAorCQkJZGV2X2RiZyhncHUt PmRybS0+ZGV2LCAiJXM6IEdQVSBpcyBub3QgaWRsZVxuIiwKIAkJCQlncHUtPm5hbWUpOwogCQkJ Y29udGludWU7CiAJCX0KQEAgLTM4NSw3ICszODUsNyBAQCBpbnQgZXRuYXZpdl9ncHVfaW5pdChz dHJ1Y3QgZXRuYXZpdl9ncHUgKmdwdSkKIAkgKiBzaW1wbGUgYW5kIHRvIGdldCBzb21ldGhpbmcg d29ya2luZywganVzdCB1c2UgYSBzaW5nbGUgYWRkcmVzcyBzcGFjZToKIAkgKi8KIAltbXV2MiA9 IGdwdS0+aWRlbnRpdHkubWlub3JfZmVhdHVyZXMxICYgY2hpcE1pbm9yRmVhdHVyZXMxX01NVV9W RVJTSU9OOwotCWRldl9kYmcoZ3B1LT5kZXYtPmRldiwgIm1tdXYyOiAlZFxuIiwgbW11djIpOwor CWRldl9kYmcoZ3B1LT5kcm0tPmRldiwgIm1tdXYyOiAlZFxuIiwgbW11djIpOwogCiAJaWYgKCFt bXV2MikgewogCQlpb21tdSA9IGV0bmF2aXZfaW9tbXVfZG9tYWluX2FsbG9jKGdwdSk7CkBAIC00 MDIsMTkgKzQwMiwxOSBAQCBpbnQgZXRuYXZpdl9ncHVfaW5pdChzdHJ1Y3QgZXRuYXZpdl9ncHUg KmdwdSkKIAogCS8qIFRPRE86IHdlIHdpbGwgbGVhayBoZXJlIG1lbW9yeSAtIGZpeCBpdCEgKi8K IAotCWdwdS0+bW11ID0gZXRuYXZpdl9pb21tdV9uZXcoZ3B1LT5kZXYsIGlvbW11KTsKKwlncHUt Pm1tdSA9IGV0bmF2aXZfaW9tbXVfbmV3KGdwdS0+ZHJtLCBpb21tdSk7CiAJaWYgKCFncHUtPm1t dSkgewogCQlyZXQgPSAtRU5PTUVNOwogCQlnb3RvIGZhaWw7CiAJfQotCWV0bmF2aXZfcmVnaXN0 ZXJfbW11KGdwdS0+ZGV2LCBncHUtPm1tdSk7CisJZXRuYXZpdl9yZWdpc3Rlcl9tbXUoZ3B1LT5k cm0sIGdwdS0+bW11KTsKIAogCS8qIENyZWF0ZSBidWZmZXI6ICovCi0JZ3B1LT5idWZmZXIgPSBl dG5hdml2X2dlbV9uZXcoZ3B1LT5kZXYsIFBBR0VfU0laRSwgRVROQV9CT19DTURTVFJFQU0pOwor CWdwdS0+YnVmZmVyID0gZXRuYXZpdl9nZW1fbmV3KGdwdS0+ZHJtLCBQQUdFX1NJWkUsIEVUTkFf Qk9fQ01EU1RSRUFNKTsKIAlpZiAoSVNfRVJSKGdwdS0+YnVmZmVyKSkgewogCQlyZXQgPSBQVFJf RVJSKGdwdS0+YnVmZmVyKTsKIAkJZ3B1LT5idWZmZXIgPSBOVUxMOwotCQlkZXZfZXJyKGdwdS0+ ZGV2LT5kZXYsICJjb3VsZCBub3QgY3JlYXRlIGJ1ZmZlcjogJWRcbiIsIHJldCk7CisJCWRldl9l cnIoZ3B1LT5kcm0tPmRldiwgImNvdWxkIG5vdCBjcmVhdGUgYnVmZmVyOiAlZFxuIiwgcmV0KTsK IAkJZ290byBmYWlsOwogCX0KIApAQCAtNTQ3LDcgKzU0Nyw3IEBAIHZvaWQgZXRuYXZpdl9ncHVf ZGVidWdmcyhzdHJ1Y3QgZXRuYXZpdl9ncHUgKmdwdSwgc3RydWN0IHNlcV9maWxlICptKQogc3Rh dGljIGludCBlbmFibGVfcHdycmFpbChzdHJ1Y3QgZXRuYXZpdl9ncHUgKmdwdSkKIHsKICNpZiAw Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGdwdS0+ZGV2OworCXN0cnVjdCBkcm1fZGV2aWNl ICpkZXYgPSBncHUtPmRybTsKIAlpbnQgcmV0ID0gMDsKIAogCWlmIChncHUtPmdwdV9yZWcpIHsK QEAgLTY2Nyw3ICs2NjcsNyBAQCBzdGF0aWMgdm9pZCByZWNvdmVyX3dvcmtlcihzdHJ1Y3Qgd29y a19zdHJ1Y3QgKndvcmspCiB7CiAJc3RydWN0IGV0bmF2aXZfZ3B1ICpncHUgPSBjb250YWluZXJf b2Yod29yaywgc3RydWN0IGV0bmF2aXZfZ3B1LAogCQkJCQkgICAgICAgcmVjb3Zlcl93b3JrKTsK LQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZ3B1LT5kZXY7CisJc3RydWN0IGRybV9kZXZpY2Ug KmRldiA9IGdwdS0+ZHJtOwogCiAJZGV2X2VycihkZXYtPmRldiwgIiVzOiBoYW5nY2hlY2sgcmVj b3ZlciFcbiIsIGdwdS0+bmFtZSk7CiAKQEAgLTY4OCw3ICs2ODgsNyBAQCBzdGF0aWMgdm9pZCBo YW5nY2hlY2tfdGltZXJfcmVzZXQoc3RydWN0IGV0bmF2aXZfZ3B1ICpncHUpCiBzdGF0aWMgdm9p ZCBoYW5nY2hlY2tfaGFuZGxlcih1bnNpZ25lZCBsb25nIGRhdGEpCiB7CiAJc3RydWN0IGV0bmF2 aXZfZ3B1ICpncHUgPSAoc3RydWN0IGV0bmF2aXZfZ3B1ICopZGF0YTsKLQlzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2ID0gZ3B1LT5kZXY7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGdwdS0+ZHJt OwogCXN0cnVjdCBldG5hdml2X2RybV9wcml2YXRlICpwcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsK IAl1aW50MzJfdCBmZW5jZSA9IGdwdS0+cmV0aXJlZF9mZW5jZTsKIApAQCAtNzI0LDcgKzcyNCw3 IEBAIHN0YXRpYyB1bnNpZ25lZCBpbnQgZXZlbnRfYWxsb2Moc3RydWN0IGV0bmF2aXZfZ3B1ICpn cHUpCiAJcmV0ID0gd2FpdF9mb3JfY29tcGxldGlvbl90aW1lb3V0KCZncHUtPmV2ZW50X2ZyZWUs CiAJCQkJCSAgbXNlY3NfdG9famlmZmllcygxMCAqIDEwMDAwKSk7CiAJaWYgKCFyZXQpCi0JCWRl dl9lcnIoZ3B1LT5kZXYtPmRldiwgIndhaXRfZm9yX2NvbXBsZXRpb25fdGltZW91dCBmYWlsZWQi KTsKKwkJZGV2X2VycihncHUtPmRybS0+ZGV2LCAid2FpdF9mb3JfY29tcGxldGlvbl90aW1lb3V0 IGZhaWxlZCIpOwogCiAJc3Bpbl9sb2NrX2lycXNhdmUoJmdwdS0+ZXZlbnRfc3BpbmxvY2ssIGZs YWdzKTsKIApAQCAtNzQ5LDcgKzc0OSw3IEBAIHN0YXRpYyB2b2lkIGV2ZW50X2ZyZWUoc3RydWN0 IGV0bmF2aXZfZ3B1ICpncHUsIHVuc2lnbmVkIGludCBldmVudCkKIAlzcGluX2xvY2tfaXJxc2F2 ZSgmZ3B1LT5ldmVudF9zcGlubG9jaywgZmxhZ3MpOwogCiAJaWYgKGdwdS0+ZXZlbnRbZXZlbnRd LnVzZWQgPT0gZmFsc2UpIHsKLQkJZGV2X3dhcm4oZ3B1LT5kZXYtPmRldiwgImV2ZW50ICV1IGlz IGFscmVhZHkgbWFya2VkIGFzIGZyZWUiLAorCQlkZXZfd2FybihncHUtPmRybS0+ZGV2LCAiZXZl bnQgJXUgaXMgYWxyZWFkeSBtYXJrZWQgYXMgZnJlZSIsCiAJCQkgZXZlbnQpOwogCQlzcGluX3Vu bG9ja19pcnFyZXN0b3JlKCZncHUtPmV2ZW50X3NwaW5sb2NrLCBmbGFncyk7CiAJfSBlbHNlIHsK QEAgLTc2OCwxMCArNzY4LDEwIEBAIHN0YXRpYyB2b2lkIHJldGlyZV93b3JrZXIoc3RydWN0IHdv cmtfc3RydWN0ICp3b3JrKQogewogCXN0cnVjdCBldG5hdml2X2dwdSAqZ3B1ID0gY29udGFpbmVy X29mKHdvcmssIHN0cnVjdCBldG5hdml2X2dwdSwKIAkJCQkJICAgICAgIHJldGlyZV93b3JrKTsK LQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZ3B1LT5kZXY7CisJc3RydWN0IGRybV9kZXZpY2Ug KmRldiA9IGdwdS0+ZHJtOwogCXVpbnQzMl90IGZlbmNlID0gZ3B1LT5yZXRpcmVkX2ZlbmNlOwog Ci0JZXRuYXZpdl91cGRhdGVfZmVuY2UoZ3B1LT5kZXYsIGZlbmNlKTsKKwlldG5hdml2X3VwZGF0 ZV9mZW5jZShncHUtPmRybSwgZmVuY2UpOwogCiAJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0 ZXgpOwogCkBAIC03OTgsNyArNzk4LDcgQEAgc3RhdGljIHZvaWQgcmV0aXJlX3dvcmtlcihzdHJ1 Y3Qgd29ya19zdHJ1Y3QgKndvcmspCiAvKiBjYWxsIGZyb20gaXJxIGhhbmRsZXIgdG8gc2NoZWR1 bGUgd29yayB0byByZXRpcmUgYm8ncyAqLwogdm9pZCBldG5hdml2X2dwdV9yZXRpcmUoc3RydWN0 IGV0bmF2aXZfZ3B1ICpncHUpCiB7Ci0Jc3RydWN0IGV0bmF2aXZfZHJtX3ByaXZhdGUgKnByaXYg PSBncHUtPmRldi0+ZGV2X3ByaXZhdGU7CisJc3RydWN0IGV0bmF2aXZfZHJtX3ByaXZhdGUgKnBy aXYgPSBncHUtPmRybS0+ZGV2X3ByaXZhdGU7CiAKIAlxdWV1ZV93b3JrKHByaXYtPndxLCAmZ3B1 LT5yZXRpcmVfd29yayk7CiB9CkBAIC04MDcsNyArODA3LDcgQEAgdm9pZCBldG5hdml2X2dwdV9y ZXRpcmUoc3RydWN0IGV0bmF2aXZfZ3B1ICpncHUpCiBpbnQgZXRuYXZpdl9ncHVfc3VibWl0KHN0 cnVjdCBldG5hdml2X2dwdSAqZ3B1LAogCXN0cnVjdCBldG5hdml2X2dlbV9zdWJtaXQgKnN1Ym1p dCwgc3RydWN0IGV0bmF2aXZfZmlsZV9wcml2YXRlICpjdHgpCiB7Ci0Jc3RydWN0IGRybV9kZXZp Y2UgKmRldiA9IGdwdS0+ZGV2OworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBncHUtPmRybTsK IAlzdHJ1Y3QgZXRuYXZpdl9kcm1fcHJpdmF0ZSAqcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJ aW50IHJldCA9IDA7CiAJdW5zaWduZWQgaW50IGV2ZW50LCBpOwpAQCAtODc4LDE0ICs4NzgsMTQg QEAgc3RhdGljIGlycXJldHVybl90IGlycV9oYW5kbGVyKGludCBpcnEsIHZvaWQgKmRhdGEpCiAJ dTMyIGludHIgPSBncHVfcmVhZChncHUsIFZJVlNfSElfSU5UUl9BQ0tOT1dMRURHRSk7CiAKIAlp ZiAoaW50ciAhPSAwKSB7Ci0JCWRldl9kYmcoZ3B1LT5kZXYtPmRldiwgImludHIgMHglMDh4XG4i LCBpbnRyKTsKKwkJZGV2X2RiZyhncHUtPmRybS0+ZGV2LCAiaW50ciAweCUwOHhcbiIsIGludHIp OwogCiAJCWlmIChpbnRyICYgVklWU19ISV9JTlRSX0FDS05PV0xFREdFX0FYSV9CVVNfRVJST1Ip Ci0JCQlkZXZfZXJyKGdwdS0+ZGV2LT5kZXYsICJBWEkgYnVzIGVycm9yXG4iKTsKKwkJCWRldl9l cnIoZ3B1LT5kcm0tPmRldiwgIkFYSSBidXMgZXJyb3JcbiIpOwogCQllbHNlIHsKIAkJCXVpbnQ4 X3QgZXZlbnQgPSBfX2ZscyhpbnRyKTsKIAotCQkJZGV2X2RiZyhncHUtPmRldi0+ZGV2LCAiZXZl bnQgJXVcbiIsIGV2ZW50KTsKKwkJCWRldl9kYmcoZ3B1LT5kcm0tPmRldiwgImV2ZW50ICV1XG4i LCBldmVudCk7CiAJCQlncHUtPnJldGlyZWRfZmVuY2UgPSBncHUtPmV2ZW50W2V2ZW50XS5mZW5j ZTsKIAkJCWdwdS0+bGFzdF9yaW5nX3BvcyA9IGdwdS0+ZXZlbnRbZXZlbnRdLnJpbmdfcG9zOwog CQkJZXZlbnRfZnJlZShncHUsIGV2ZW50KTsKQEAgLTkxOCw3ICs5MTgsNyBAQCBzdGF0aWMgaW50 IGV0bmF2aXZfZ3B1X2JpbmQoc3RydWN0IGRldmljZSAqZGV2LCBzdHJ1Y3QgZGV2aWNlICptYXN0 ZXIsCiAKIAlkZXZfaW5mbyhkZXYsICJwb3N0IGdwdVtpZHhdOiAlcFxuIiwgcHJpdi0+Z3B1W2lk eF0pOwogCi0JZ3B1LT5kZXYgPSBkcm07CisJZ3B1LT5kcm0gPSBkcm07CiAKIAlJTklUX0xJU1Rf SEVBRCgmZ3B1LT5hY3RpdmVfbGlzdCk7CiAJSU5JVF9XT1JLKCZncHUtPnJldGlyZV93b3JrLCBy ZXRpcmVfd29ya2VyKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvc3RhZ2luZy9ldG5hdml2L2V0bmF2 aXZfZ3B1LmggYi9kcml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2X2dwdS5oCmluZGV4IGEy NmQwZGVkMTAxOS4uYzljNDgyYThkNTY5IDEwMDY0NAotLS0gYS9kcml2ZXJzL3N0YWdpbmcvZXRu YXZpdi9ldG5hdml2X2dwdS5oCisrKyBiL2RyaXZlcnMvc3RhZ2luZy9ldG5hdml2L2V0bmF2aXZf Z3B1LmgKQEAgLTg2LDcgKzg2LDcgQEAgc3RydWN0IGV0bmF2aXZfZXZlbnQgewogCiBzdHJ1Y3Qg ZXRuYXZpdl9ncHUgewogCWNvbnN0IGNoYXIgKm5hbWU7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRl djsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZHJtOwogCXN0cnVjdCBldG5hdml2X2NoaXBfaWRlbnRp dHkgaWRlbnRpdHk7CiAJaW50IHBpcGU7CiAKLS0gCjIuMS40CgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1k ZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=