From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lucas Stach Subject: [PATCH RFC 070/111] staging: etnaviv: remove presumption of BO addresses Date: Thu, 2 Apr 2015 17:30:12 +0200 Message-ID: <1427988653-754-71-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 233AF6EA61 for ; Thu, 2 Apr 2015 08:31:00 -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+CgpXZSBuZXZl ciBwYXNzIHRoZSBHUFUgYWRkcmVzc2VzIG9mIEJPcyB0byB1c2Vyc3BhY2UsIHNvIHVzZXJzcGFj ZSBjYW4KbmV2ZXIgc3BlY2lmeSB0aGUgY29ycmVjdCBhZGRyZXNzLiAgSGVuY2UsIHRoaXMgY29k ZSBzZXJ2ZXMgbm8gdXNlZnVsCnB1cnBvc2UsIGFuZCBjYW4gYmUgcmVtb3ZlZC4KClNpZ25lZC1v ZmYtYnk6IFJ1c3NlbGwgS2luZyA8cm1rK2tlcm5lbEBhcm0ubGludXgub3JnLnVrPgotLS0KIGRy aXZlcnMvc3RhZ2luZy9ldG5hdml2L2V0bmF2aXZfZ2VtLmggICAgICAgIHwgIDEgLQogZHJpdmVy cy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZpdl9nZW1fc3VibWl0LmMgfCAzNiArKysrKy0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDYgaW5zZXJ0aW9ucygrKSwgMzEgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZpdl9n ZW0uaCBiL2RyaXZlcnMvc3RhZ2luZy9ldG5hdml2L2V0bmF2aXZfZ2VtLmgKaW5kZXggNzg0NGMw NzNlZTYxLi5jZmFkZTMzN2Q0ZGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvc3RhZ2luZy9ldG5hdml2 L2V0bmF2aXZfZ2VtLmgKKysrIGIvZHJpdmVycy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZpdl9nZW0u aApAQCAtMTAwLDcgKzEwMCw2IEBAIHN0cnVjdCBldG5hdml2X2dlbV9zdWJtaXQgewogCXN0cnVj dCBsaXN0X2hlYWQgYm9fbGlzdDsKIAlzdHJ1Y3Qgd3dfYWNxdWlyZV9jdHggdGlja2V0OwogCXVp bnQzMl90IGZlbmNlOwotCWJvb2wgdmFsaWQ7CiAJdW5zaWduZWQgaW50IG5yX2NtZHM7CiAJdW5z aWduZWQgaW50IG5yX2JvczsKIAlzdHJ1Y3QgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9zdGFnaW5n L2V0bmF2aXYvZXRuYXZpdl9nZW1fc3VibWl0LmMgYi9kcml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9l dG5hdml2X2dlbV9zdWJtaXQuYwppbmRleCBiYmUyMTcxYjhlYjQuLmMzMmZiNDQyNGVlYSAxMDA2 NDQKLS0tIGEvZHJpdmVycy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZpdl9nZW1fc3VibWl0LmMKKysr IGIvZHJpdmVycy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZpdl9nZW1fc3VibWl0LmMKQEAgLTI1LDcg KzI1LDYgQEAKIAogI2RlZmluZSBCT19JTlZBTElEX0ZMQUdTIH4oRVROQV9TVUJNSVRfQk9fUkVB RCB8IEVUTkFfU1VCTUlUX0JPX1dSSVRFKQogLyogbWFrZSBzdXJlIHRoZXNlIGRvbid0IGNvbmZs aWN0IHcvIE1TTV9TVUJNSVRfQk9feCAqLwotI2RlZmluZSBCT19WQUxJRCAgICAweDgwMDAKICNk ZWZpbmUgQk9fTE9DS0VEICAgMHg0MDAwCiAjZGVmaW5lIEJPX1BJTk5FRCAgIDB4MjAwMAogCkBA IC04NCw4ICs4Myw2IEBAIHN0YXRpYyBpbnQgc3VibWl0X2xvb2t1cF9vYmplY3RzKHN0cnVjdCBl dG5hdml2X2dlbV9zdWJtaXQgKnN1Ym1pdCwKIAkJfQogCiAJCXN1Ym1pdC0+Ym9zW2ldLmZsYWdz ID0gc3VibWl0X2JvLmZsYWdzOwotCQkvKiBpbiB2YWxpZGF0ZV9vYmplY3RzKCkgd2UgZmlndXJl IG91dCBpZiB0aGlzIGlzIHRydWU6ICovCi0JCXN1Ym1pdC0+Ym9zW2ldLmlvdmEgID0gc3VibWl0 X2JvLnByZXN1bWVkOwogCiAJCS8qIG5vcm1hbGx5IHVzZSBkcm1fZ2VtX29iamVjdF9sb29rdXAo KSwgYnV0IGZvciBidWxrIGxvb2t1cAogCQkgKiBhbGwgdW5kZXIgc2luZ2xlIHRhYmxlX2xvY2sg anVzdCBoaXQgb2JqZWN0X2lkciBkaXJlY3RseToKQEAgLTEzMSw5ICsxMjgsNyBAQCBzdGF0aWMg dm9pZCBzdWJtaXRfdW5sb2NrX3VucGluX2JvKHN0cnVjdCBldG5hdml2X2dlbV9zdWJtaXQgKnN1 Ym1pdCwgaW50IGkpCiAJaWYgKHN1Ym1pdC0+Ym9zW2ldLmZsYWdzICYgQk9fTE9DS0VEKQogCQl3 d19tdXRleF91bmxvY2soJmV0bmF2aXZfb2JqLT5yZXN2LT5sb2NrKTsKIAotCWlmICghKHN1Ym1p dC0+Ym9zW2ldLmZsYWdzICYgQk9fVkFMSUQpKQotCQlzdWJtaXQtPmJvc1tpXS5pb3ZhID0gMDsK LQorCXN1Ym1pdC0+Ym9zW2ldLmlvdmEgPSAwOwogCXN1Ym1pdC0+Ym9zW2ldLmZsYWdzICY9IH4o Qk9fTE9DS0VEIHwgQk9fUElOTkVEKTsKIH0KIApAQCAtMTQzLDggKzEzOCw2IEBAIHN0YXRpYyBp bnQgc3VibWl0X3ZhbGlkYXRlX29iamVjdHMoc3RydWN0IGV0bmF2aXZfZ2VtX3N1Ym1pdCAqc3Vi bWl0KQogCWludCBjb250ZW5kZWQsIHNsb3dfbG9ja2VkID0gLTEsIGksIHJldCA9IDA7CiAKIHJl dHJ5OgotCXN1Ym1pdC0+dmFsaWQgPSB0cnVlOwotCiAJZm9yIChpID0gMDsgaSA8IHN1Ym1pdC0+ bnJfYm9zOyBpKyspIHsKIAkJc3RydWN0IGV0bmF2aXZfZ2VtX29iamVjdCAqZXRuYXZpdl9vYmog PSBzdWJtaXQtPmJvc1tpXS5vYmo7CiAJCXVpbnQzMl90IGlvdmE7CkBAIC0xNzcsMTQgKzE3MCw3 IEBAIHJldHJ5OgogCQkJZ290byBmYWlsOwogCiAJCXN1Ym1pdC0+Ym9zW2ldLmZsYWdzIHw9IEJP X1BJTk5FRDsKLQotCQlpZiAoaW92YSA9PSBzdWJtaXQtPmJvc1tpXS5pb3ZhKSB7Ci0JCQlzdWJt aXQtPmJvc1tpXS5mbGFncyB8PSBCT19WQUxJRDsKLQkJfSBlbHNlIHsKLQkJCXN1Ym1pdC0+Ym9z W2ldLmlvdmEgPSBpb3ZhOwotCQkJc3VibWl0LT5ib3NbaV0uZmxhZ3MgJj0gfkJPX1ZBTElEOwot CQkJc3VibWl0LT52YWxpZCA9IGZhbHNlOwotCQl9CisJCXN1Ym1pdC0+Ym9zW2ldLmlvdmEgPSBp b3ZhOwogCX0KIAogCXd3X2FjcXVpcmVfZG9uZSgmc3VibWl0LT50aWNrZXQpOwpAQCAtMjE3LDcg KzIwMyw3IEBAIGZhaWw6CiB9CiAKIHN0YXRpYyBpbnQgc3VibWl0X2JvKHN0cnVjdCBldG5hdml2 X2dlbV9zdWJtaXQgKnN1Ym1pdCwgdWludDMyX3QgaWR4LAotCQlzdHJ1Y3QgZXRuYXZpdl9nZW1f b2JqZWN0ICoqb2JqLCB1aW50MzJfdCAqaW92YSwgYm9vbCAqdmFsaWQpCisJCXN0cnVjdCBldG5h dml2X2dlbV9vYmplY3QgKipvYmosIHVpbnQzMl90ICppb3ZhKQogewogCWlmIChpZHggPj0gc3Vi bWl0LT5ucl9ib3MpIHsKIAkJRFJNX0VSUk9SKCJpbnZhbGlkIGJ1ZmZlciBpbmRleDogJXUgKG91 dCBvZiAldSlcbiIsCkBAIC0yMjksOCArMjE1LDYgQEAgc3RhdGljIGludCBzdWJtaXRfYm8oc3Ry dWN0IGV0bmF2aXZfZ2VtX3N1Ym1pdCAqc3VibWl0LCB1aW50MzJfdCBpZHgsCiAJCSpvYmogPSBz dWJtaXQtPmJvc1tpZHhdLm9iajsKIAlpZiAoaW92YSkKIAkJKmlvdmEgPSBzdWJtaXQtPmJvc1tp ZHhdLmlvdmE7Ci0JaWYgKHZhbGlkKQotCQkqdmFsaWQgPSAhIShzdWJtaXQtPmJvc1tpZHhdLmZs YWdzICYgQk9fVkFMSUQpOwogCiAJcmV0dXJuIDA7CiB9CkBAIC0yNTQsNyArMjM4LDYgQEAgc3Rh dGljIGludCBzdWJtaXRfcmVsb2Moc3RydWN0IGV0bmF2aXZfZ2VtX3N1Ym1pdCAqc3VibWl0LCBz dHJ1Y3QgZXRuYXZpdl9nZW1fb2IKIAkJdm9pZCBfX3VzZXIgKnVzZXJwdHIgPQogCQkJdG9fdXNl cl9wdHIocmVsb2NzICsgKGkgKiBzaXplb2Yoc3VibWl0X3JlbG9jKSkpOwogCQl1aW50MzJfdCBp b3ZhLCBvZmY7Ci0JCWJvb2wgdmFsaWQ7CiAKIAkJcmV0ID0gY29weV9mcm9tX3VzZXIoJnN1Ym1p dF9yZWxvYywgdXNlcnB0ciwKIAkJCQkgICAgIHNpemVvZihzdWJtaXRfcmVsb2MpKTsKQEAgLTI3 NiwxNCArMjU5LDEwIEBAIHN0YXRpYyBpbnQgc3VibWl0X3JlbG9jKHN0cnVjdCBldG5hdml2X2dl bV9zdWJtaXQgKnN1Ym1pdCwgc3RydWN0IGV0bmF2aXZfZ2VtX29iCiAJCQlyZXR1cm4gLUVJTlZB TDsKIAkJfQogCi0JCXJldCA9IHN1Ym1pdF9ibyhzdWJtaXQsIHN1Ym1pdF9yZWxvYy5yZWxvY19p ZHgsICZib2JqLAotCQkJCSZpb3ZhLCAmdmFsaWQpOworCQlyZXQgPSBzdWJtaXRfYm8oc3VibWl0 LCBzdWJtaXRfcmVsb2MucmVsb2NfaWR4LCAmYm9iaiwgJmlvdmEpOwogCQlpZiAocmV0KQogCQkJ cmV0dXJuIHJldDsKIAotCQlpZiAodmFsaWQpCi0JCQljb250aW51ZTsKLQogCQlpZiAoc3VibWl0 X3JlbG9jLnJlbG9jX29mZnNldCA+PQogCQkgICAgYm9iai0+YmFzZS5zaXplIC0gc2l6ZW9mKCpw dHIpKSB7CiAJCQlEUk1fRVJST1IoInJlbG9jYXRpb24gJXUgb3V0c2lkZSBvYmplY3QiLCBpKTsK QEAgLTM3MSw4ICszNTAsOCBAQCBpbnQgZXRuYXZpdl9pb2N0bF9nZW1fc3VibWl0KHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJCQlnb3RvIG91dDsKIAkJfQogCi0JCXJldCA9 IHN1Ym1pdF9ibyhzdWJtaXQsIHN1Ym1pdF9jbWQuc3VibWl0X2lkeCwKLQkJCQkmZXRuYXZpdl9v YmosIE5VTEwsIE5VTEwpOworCQlyZXQgPSBzdWJtaXRfYm8oc3VibWl0LCBzdWJtaXRfY21kLnN1 Ym1pdF9pZHgsICZldG5hdml2X29iaiwKKwkJCQlOVUxMKTsKIAkJaWYgKHJldCkKIAkJCWdvdG8g b3V0OwogCkBAIC00MTUsOSArMzk0LDYgQEAgaW50IGV0bmF2aXZfaW9jdGxfZ2VtX3N1Ym1pdChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCQlzdWJtaXQtPmNtZFtpXS5zaXpl ID0gc3VibWl0X2NtZC5zaXplIC8gNDsKIAkJc3VibWl0LT5jbWRbaV0ub2JqID0gZXRuYXZpdl9v Ymo7CiAKLQkJaWYgKHN1Ym1pdC0+dmFsaWQpCi0JCQljb250aW51ZTsKLQogCQlyZXQgPSBzdWJt aXRfcmVsb2Moc3VibWl0LCBldG5hdml2X29iaiwKIAkJCQkgICBzdWJtaXRfY21kLnN1Ym1pdF9v ZmZzZXQsCiAJCQkJICAgc3VibWl0X2NtZC5ucl9yZWxvY3MsIHN1Ym1pdF9jbWQucmVsb2NzKTsK LS0gCjIuMS40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=