From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lucas Stach Subject: [PATCH 16/48] staging: etnaviv: give etnaviv_gem_mmap_offset() a sane behaviour Date: Fri, 25 Sep 2015 13:57:28 +0200 Message-ID: <1443182280-15868-17-git-send-email-l.stach@pengutronix.de> References: <20150916080435.GA21084@n2100.arm.linux.org.uk> <1443182280-15868-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.4.pengutronix.de [92.198.50.35]) by gabe.freedesktop.org (Postfix) with ESMTPS id 936216F08E for ; Fri, 25 Sep 2015 04:58:04 -0700 (PDT) In-Reply-To: <1443182280-15868-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: Russell King , Christian Gmeiner Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogUnVzc2VsbCBLaW5nIDxybWsra2VybmVsQGFybS5saW51eC5vcmcudWs+CgpldG5hdml2 X2dlbV9tbWFwX29mZnNldCgpIHJldHVybmVkIHplcm8gaWYgZHJtX2dlbV9jcmVhdGVfbW1hcF9v ZmZzZXQoKQpmYWlsZWQuICBUaGlzIGlzIGluY29ycmVjdCBiZWhhdmlvdXIgYXMgZXRuYXZpdl9p b2N0bF9nZW1faW5mbygpIGRvZXMKbm90IGRldGVjdCB0aGlzIGNvbmRpdGlvbiwgc28gaXQgcmV0 dXJucyBzdWNjZXNzLgoKRml4IHRoaXMgYnkgcmUtYXJjaGl0ZWN0aW5nIGV0bmF2aXZfZ2VtX21t YXBfb2Zmc2V0KCkuICBNZXJnZQptbWFwX29mZnNldCgpIGludG8gdGhpcyBmdW5jdGlvbiwgYW5k IGNoYW5nZSBpdHMgcHJvdG90eXBlIHRvIGFjY2VwdCBhCnBvaW50ZXIgdG8gdGhlICJvZmZzZXQi IHJldHVybiB2YWx1ZSwgdGhlcmVieSBhbGxvd2luZyBpdCB0byByZXR1cm4gYQpzdGFuZGFyZCBu ZWdhdGl2ZSBlcnJubyBjb2RlLgoKU2lnbmVkLW9mZi1ieTogUnVzc2VsbCBLaW5nIDxybWsra2Vy bmVsQGFybS5saW51eC5vcmcudWs+Ci0tLQogZHJpdmVycy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZp dl9kcnYuYyB8ICA0ICsrLS0KIGRyaXZlcnMvc3RhZ2luZy9ldG5hdml2L2V0bmF2aXZfZHJ2Lmgg fCAgMiArLQogZHJpdmVycy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZpdl9nZW0uYyB8IDI2ICsrKysr KystLS0tLS0tLS0tLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDEwIGluc2VydGlvbnMoKyks IDIyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvc3RhZ2luZy9ldG5hdml2L2V0 bmF2aXZfZHJ2LmMgYi9kcml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2X2Rydi5jCmluZGV4 IDEwNzFjNDQ5ZjNkNC4uOTk2MjMxODA3NWM1IDEwMDY0NAotLS0gYS9kcml2ZXJzL3N0YWdpbmcv ZXRuYXZpdi9ldG5hdml2X2Rydi5jCisrKyBiL2RyaXZlcnMvc3RhZ2luZy9ldG5hdml2L2V0bmF2 aXZfZHJ2LmMKQEAgLTQzOCw3ICs0MzgsNyBAQCBzdGF0aWMgaW50IGV0bmF2aXZfaW9jdGxfZ2Vt X2luZm8oc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIHsKIAlzdHJ1Y3QgZHJt X2V0bmF2aXZfZ2VtX2luZm8gKmFyZ3MgPSBkYXRhOwogCXN0cnVjdCBkcm1fZ2VtX29iamVjdCAq b2JqOwotCWludCByZXQgPSAwOworCWludCByZXQ7CiAKIAlpZiAoYXJncy0+cGFkKQogCQlyZXR1 cm4gLUVJTlZBTDsKQEAgLTQ0Nyw3ICs0NDcsNyBAQCBzdGF0aWMgaW50IGV0bmF2aXZfaW9jdGxf Z2VtX2luZm8oc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAlpZiAoIW9iaikK IAkJcmV0dXJuIC1FTk9FTlQ7CiAKLQlhcmdzLT5vZmZzZXQgPSBldG5hdml2X2dlbV9tbWFwX29m ZnNldChvYmopOworCXJldCA9IGV0bmF2aXZfZ2VtX21tYXBfb2Zmc2V0KG9iaiwgJmFyZ3MtPm9m ZnNldCk7CiAKIAlkcm1fZ2VtX29iamVjdF91bnJlZmVyZW5jZV91bmxvY2tlZChvYmopOwogCmRp ZmYgLS1naXQgYS9kcml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2X2Rydi5oIGIvZHJpdmVy cy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZpdl9kcnYuaAppbmRleCA5YWJiN2Y4YzJkYzAuLjM3OTky MzQyYmJmMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZpdl9kcnYu aAorKysgYi9kcml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2X2Rydi5oCkBAIC03Myw3ICs3 Myw3IEBAIGludCBldG5hdml2X2lvY3RsX2dlbV9zdWJtaXQoc3RydWN0IGRybV9kZXZpY2UgKmRl diwgdm9pZCAqZGF0YSwKIAogaW50IGV0bmF2aXZfZ2VtX21tYXAoc3RydWN0IGZpbGUgKmZpbHAs IHN0cnVjdCB2bV9hcmVhX3N0cnVjdCAqdm1hKTsKIGludCBldG5hdml2X2dlbV9mYXVsdChzdHJ1 Y3Qgdm1fYXJlYV9zdHJ1Y3QgKnZtYSwgc3RydWN0IHZtX2ZhdWx0ICp2bWYpOwotdWludDY0X3Qg ZXRuYXZpdl9nZW1fbW1hcF9vZmZzZXQoc3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmopOworaW50 IGV0bmF2aXZfZ2VtX21tYXBfb2Zmc2V0KHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqLCB1aW50 NjRfdCAqb2Zmc2V0KTsKIGludCBldG5hdml2X2dlbV9nZXRfaW92YV9sb2NrZWQoc3RydWN0IGV0 bmF2aXZfZ3B1ICpncHUsCiAJc3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmosIHVpbnQzMl90ICpp b3ZhKTsKIGludCBldG5hdml2X2dlbV9nZXRfaW92YShzdHJ1Y3QgZXRuYXZpdl9ncHUgKmdwdSwg c3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmosCmRpZmYgLS1naXQgYS9kcml2ZXJzL3N0YWdpbmcv ZXRuYXZpdi9ldG5hdml2X2dlbS5jIGIvZHJpdmVycy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZpdl9n ZW0uYwppbmRleCA1MjJlNWE2YzM2MTIuLjM4ZGVlODBkOTk2YyAxMDA2NDQKLS0tIGEvZHJpdmVy cy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZpdl9nZW0uYworKysgYi9kcml2ZXJzL3N0YWdpbmcvZXRu YXZpdi9ldG5hdml2X2dlbS5jCkBAIC0yNzAsMzMgKzI3MCwyMSBAQCBvdXQ6CiB9CiAKIC8qKiBn ZXQgbW1hcCBvZmZzZXQgKi8KLXN0YXRpYyB1aW50NjRfdCBtbWFwX29mZnNldChzdHJ1Y3QgZHJt X2dlbV9vYmplY3QgKm9iaikKK2ludCBldG5hdml2X2dlbV9tbWFwX29mZnNldChzdHJ1Y3QgZHJt X2dlbV9vYmplY3QgKm9iaiwgdWludDY0X3QgKm9mZnNldCkKIHsKIAlzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2ID0gb2JqLT5kZXY7CiAJaW50IHJldDsKIAotCVdBUk5fT04oIW11dGV4X2lzX2xvY2tl ZCgmZGV2LT5zdHJ1Y3RfbXV0ZXgpKTsKLQorCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4 KTsKIAkvKiBNYWtlIGl0IG1tYXBhYmxlICovCiAJcmV0ID0gZHJtX2dlbV9jcmVhdGVfbW1hcF9v ZmZzZXQob2JqKTsKLQotCWlmIChyZXQpIHsKKwlpZiAocmV0KQogCQlkZXZfZXJyKGRldi0+ZGV2 LCAiY291bGQgbm90IGFsbG9jYXRlIG1tYXAgb2Zmc2V0XG4iKTsKLQkJcmV0dXJuIDA7Ci0JfQot Ci0JcmV0dXJuIGRybV92bWFfbm9kZV9vZmZzZXRfYWRkcigmb2JqLT52bWFfbm9kZSk7Ci19Ci0K LXVpbnQ2NF90IGV0bmF2aXZfZ2VtX21tYXBfb2Zmc2V0KHN0cnVjdCBkcm1fZ2VtX29iamVjdCAq b2JqKQotewotCXVpbnQ2NF90IG9mZnNldDsKLQotCW11dGV4X2xvY2soJm9iai0+ZGV2LT5zdHJ1 Y3RfbXV0ZXgpOwotCW9mZnNldCA9IG1tYXBfb2Zmc2V0KG9iaik7Ci0JbXV0ZXhfdW5sb2NrKCZv YmotPmRldi0+c3RydWN0X211dGV4KTsKKwllbHNlCisJCSpvZmZzZXQgPSBkcm1fdm1hX25vZGVf b2Zmc2V0X2FkZHIoJm9iai0+dm1hX25vZGUpOworCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3Rf bXV0ZXgpOwogCi0JcmV0dXJuIG9mZnNldDsKKwlyZXR1cm4gcmV0OwogfQogCiAvKiBzaG91bGQg YmUgY2FsbGVkIHVuZGVyIHN0cnVjdF9tdXRleC4uIGFsdGhvdWdoIGl0IGNhbiBiZSBjYWxsZWQK LS0gCjIuNS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=