From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lucas Stach Subject: [PATCH RFC 065/111] staging: etnaviv: allow non-DT use Date: Thu, 2 Apr 2015 17:30:07 +0200 Message-ID: <1427988653-754-66-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 CC1196EA5C 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+CgpTaWduZWQt b2ZmLWJ5OiBSdXNzZWxsIEtpbmcgPHJtaytrZXJuZWxAYXJtLmxpbnV4Lm9yZy51az4KLS0tCiBk cml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2X2Rydi5jIHwgNTAgKysrKysrKysrKysrKysr KysrKystLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvc3RhZ2luZy9ldG5hdml2L2V0bmF2aXZfZ3B1 LmMgfCAxOCArKysrKysrKysrLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDQyIGluc2VydGlvbnMoKyks IDI2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvc3RhZ2luZy9ldG5hdml2L2V0 bmF2aXZfZHJ2LmMgYi9kcml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2X2Rydi5jCmluZGV4 IDNkYmEyMjgyNjVlYS4uNTY4NjE1MTU0ODQ1IDEwMDY0NAotLS0gYS9kcml2ZXJzL3N0YWdpbmcv ZXRuYXZpdi9ldG5hdml2X2Rydi5jCisrKyBiL2RyaXZlcnMvc3RhZ2luZy9ldG5hdml2L2V0bmF2 aXZfZHJ2LmMKQEAgLTU2NiwyNCArNTY2LDYgQEAgc3RhdGljIGludCBldG5hdml2X2NvbXBhcmUo c3RydWN0IGRldmljZSAqZGV2LCB2b2lkICpkYXRhKQogCXJldHVybiBkZXYtPm9mX25vZGUgPT0g bnA7CiB9CiAKLXN0YXRpYyBpbnQgZXRuYXZpdl9hZGRfY29tcG9uZW50cyhzdHJ1Y3QgZGV2aWNl ICptYXN0ZXIsIHN0cnVjdCBtYXN0ZXIgKm0pCi17Ci0Jc3RydWN0IGRldmljZV9ub2RlICpjaGls ZF9ucDsKLQlpbnQgcmV0ID0gMDsKLQotCWZvcl9lYWNoX2F2YWlsYWJsZV9jaGlsZF9vZl9ub2Rl KG1hc3Rlci0+b2Zfbm9kZSwgY2hpbGRfbnApIHsKLQkJRFJNX0lORk8oImFkZCBjaGlsZCAlc1xu IiwgY2hpbGRfbnAtPm5hbWUpOwotCi0JCXJldCA9IGNvbXBvbmVudF9tYXN0ZXJfYWRkX2NoaWxk KG0sIGV0bmF2aXZfY29tcGFyZSwgY2hpbGRfbnApOwotCQlpZiAocmV0KSB7Ci0JCQlvZl9ub2Rl X3B1dChjaGlsZF9ucCk7Ci0JCQlicmVhazsKLQkJfQotCX0KLQotCXJldHVybiByZXQ7Ci19Ci0K IHN0YXRpYyBpbnQgZXRuYXZpdl9iaW5kKHN0cnVjdCBkZXZpY2UgKmRldikKIHsKIAlyZXR1cm4g ZHJtX3BsYXRmb3JtX2luaXQoJmV0bmF2aXZfZHJtX2RyaXZlciwgdG9fcGxhdGZvcm1fZGV2aWNl KGRldikpOwpAQCAtNTk1LDIxICs1NzcsNDMgQEAgc3RhdGljIHZvaWQgZXRuYXZpdl91bmJpbmQo c3RydWN0IGRldmljZSAqZGV2KQogfQogCiBzdGF0aWMgY29uc3Qgc3RydWN0IGNvbXBvbmVudF9t YXN0ZXJfb3BzIGV0bmF2aXZfbWFzdGVyX29wcyA9IHsKLQkuYWRkX2NvbXBvbmVudHMgPSBldG5h dml2X2FkZF9jb21wb25lbnRzLAogCS5iaW5kID0gZXRuYXZpdl9iaW5kLAogCS51bmJpbmQgPSBl dG5hdml2X3VuYmluZCwKIH07CiAKK3N0YXRpYyBpbnQgY29tcGFyZV9zdHIoc3RydWN0IGRldmlj ZSAqZGV2LCB2b2lkICpkYXRhKQoreworCXJldHVybiAhc3RyY21wKGRldl9uYW1lKGRldiksIGRh dGEpOworfQorCiBzdGF0aWMgaW50IGV0bmF2aXZfcGRldl9wcm9iZShzdHJ1Y3QgcGxhdGZvcm1f ZGV2aWNlICpwZGV2KQogewogCXN0cnVjdCBkZXZpY2UgKmRldiA9ICZwZGV2LT5kZXY7CiAJc3Ry dWN0IGRldmljZV9ub2RlICpub2RlID0gZGV2LT5vZl9ub2RlOwotCi0Jb2ZfcGxhdGZvcm1fcG9w dWxhdGUobm9kZSwgTlVMTCwgTlVMTCwgZGV2KTsKKwlzdHJ1Y3QgY29tcG9uZW50X21hdGNoICpt YXRjaCA9IE5VTEw7CiAKIAlkbWFfc2V0X2NvaGVyZW50X21hc2soJnBkZXYtPmRldiwgRE1BX0JJ VF9NQVNLKDMyKSk7CiAKLQlyZXR1cm4gY29tcG9uZW50X21hc3Rlcl9hZGQoJnBkZXYtPmRldiwg JmV0bmF2aXZfbWFzdGVyX29wcyk7CisJaWYgKG5vZGUpIHsKKwkJc3RydWN0IGRldmljZV9ub2Rl ICpjaGlsZF9ucDsKKworCQlvZl9wbGF0Zm9ybV9wb3B1bGF0ZShub2RlLCBOVUxMLCBOVUxMLCBk ZXYpOworCisJCWZvcl9lYWNoX2F2YWlsYWJsZV9jaGlsZF9vZl9ub2RlKG5vZGUsIGNoaWxkX25w KSB7CisJCQlEUk1fSU5GTygiYWRkIGNoaWxkICVzXG4iLCBjaGlsZF9ucC0+bmFtZSk7CisKKwkJ CWNvbXBvbmVudF9tYXRjaF9hZGQoZGV2LCAmbWF0Y2gsIGV0bmF2aXZfY29tcGFyZSwKKwkJCQkJ ICAgIGNoaWxkX25wKTsKKwkJfQorCX0gZWxzZSBpZiAoZGV2LT5wbGF0Zm9ybV9kYXRhKSB7CisJ CWNoYXIgKipuYW1lcyA9IGRldi0+cGxhdGZvcm1fZGF0YTsKKwkJdW5zaWduZWQgaTsKKworCQlm b3IgKGkgPSAwOyBuYW1lc1tpXTsgaSsrKQorCQkJY29tcG9uZW50X21hdGNoX2FkZChkZXYsICZt YXRjaCwgY29tcGFyZV9zdHIsIG5hbWVzW2ldKTsKKwl9CisKKwlyZXR1cm4gY29tcG9uZW50X21h c3Rlcl9hZGRfd2l0aF9tYXRjaChkZXYsICZldG5hdml2X21hc3Rlcl9vcHMsIG1hdGNoKTsKIH0K IAogc3RhdGljIGludCBldG5hdml2X3BkZXZfcmVtb3ZlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2Ug KnBkZXYpCkBAIC02NjEsMyArNjY1LDUgQEAgbW9kdWxlX2V4aXQoZXRuYXZpdl9leGl0KTsKIE1P RFVMRV9BVVRIT1IoIlJvYiBDbGFyayA8cm9iZGNsYXJrQGdtYWlsLmNvbSIpOwogTU9EVUxFX0RF U0NSSVBUSU9OKCJldG5hdml2IERSTSBEcml2ZXIiKTsKIE1PRFVMRV9MSUNFTlNFKCJHUEwiKTsK K01PRFVMRV9BTElBUygicGxhdGZvcm06dml2YW50ZSIpOworTU9EVUxFX0RFVklDRV9UQUJMRShv ZiwgZHRfbWF0Y2gpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZp dl9ncHUuYyBiL2RyaXZlcnMvc3RhZ2luZy9ldG5hdml2L2V0bmF2aXZfZ3B1LmMKaW5kZXggOTJh MjhmMTFiYWI2Li4zMGFiZjQ0M2YyYzkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvc3RhZ2luZy9ldG5h dml2L2V0bmF2aXZfZ3B1LmMKKysrIGIvZHJpdmVycy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZpdl9n cHUuYwpAQCAtMjYsNiArMjYsMTAgQEAKICNpbmNsdWRlICJzdGF0ZV9oaS54bWwuaCIKICNpbmNs dWRlICJjbWRzdHJlYW0ueG1sLmgiCiAKK3N0YXRpYyBjb25zdCBzdHJ1Y3QgcGxhdGZvcm1fZGV2 aWNlX2lkIGdwdV9pZHNbXSA9IHsKKwl7IC5uYW1lID0gImV0bmF2aXYtZ3B1LDJkIiwgLmRyaXZl cl9kYXRhID0gRVROQV9QSVBFXzJELCB9LAorCXsgfSwKK307CiAKIC8qCiAgKiBEcml2ZXIgZnVu Y3Rpb25zOgpAQCAtMTA1OSw5ICsxMDYzLDE2IEBAIHN0YXRpYyBpbnQgZXRuYXZpdl9ncHVfcGxh dGZvcm1fcHJvYmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKIAlpZiAoIWdwdSkKIAkJ cmV0dXJuIC1FTk9NRU07CiAKLQltYXRjaCA9IG9mX21hdGNoX2RldmljZShldG5hdml2X2dwdV9t YXRjaCwgJnBkZXYtPmRldik7Ci0JaWYgKCFtYXRjaCkKKwlpZiAocGRldi0+ZGV2Lm9mX25vZGUp IHsKKwkJbWF0Y2ggPSBvZl9tYXRjaF9kZXZpY2UoZXRuYXZpdl9ncHVfbWF0Y2gsICZwZGV2LT5k ZXYpOworCQlpZiAoIW1hdGNoKQorCQkJcmV0dXJuIC1FSU5WQUw7CisJCWdwdS0+cGlwZSA9IChp bnQpbWF0Y2gtPmRhdGE7CisJfSBlbHNlIGlmIChwZGV2LT5pZF9lbnRyeSkgeworCQlncHUtPnBp cGUgPSBwZGV2LT5pZF9lbnRyeS0+ZHJpdmVyX2RhdGE7CisJfSBlbHNlIHsKIAkJcmV0dXJuIC1F SU5WQUw7CisJfQogCiAJZ3B1LT5kZXYgPSAmcGRldi0+ZGV2OwogCkBAIC0xMTAxLDggKzExMTIs NiBAQCBzdGF0aWMgaW50IGV0bmF2aXZfZ3B1X3BsYXRmb3JtX3Byb2JlKHN0cnVjdCBwbGF0Zm9y bV9kZXZpY2UgKnBkZXYpCiAJaWYgKElTX0VSUihncHUtPmNsa19zaGFkZXIpKQogCQlncHUtPmNs a19zaGFkZXIgPSBOVUxMOwogCi0JZ3B1LT5waXBlID0gKGludCltYXRjaC0+ZGF0YTsKLQogCS8q IFRPRE86IGZpZ3VyZSBvdXQgbWF4IG1hcHBlZCBzaXplICovCiAJZGV2X3NldF9kcnZkYXRhKGRl diwgZ3B1KTsKIApAQCAtMTEzMiw0ICsxMTQxLDUgQEAgc3RydWN0IHBsYXRmb3JtX2RyaXZlciBl dG5hdml2X2dwdV9kcml2ZXIgPSB7CiAJfSwKIAkucHJvYmUgPSBldG5hdml2X2dwdV9wbGF0Zm9y bV9wcm9iZSwKIAkucmVtb3ZlID0gZXRuYXZpdl9ncHVfcGxhdGZvcm1fcmVtb3ZlLAorCS5pZF90 YWJsZSA9IGdwdV9pZHMsCiB9OwotLSAKMi4xLjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vZHJpLWRldmVsCg==