From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: [PATCH 29/29] drm/vma_manage: Drop has_offset Date: Mon, 23 Nov 2015 10:33:02 +0100 Message-ID: <1448271183-20523-30-git-send-email-daniel.vetter@ffwll.ch> References: <1448271183-20523-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: Received: from mail-wm0-f51.google.com (mail-wm0-f51.google.com [74.125.82.51]) by gabe.freedesktop.org (Postfix) with ESMTPS id D8F57720FE for ; Mon, 23 Nov 2015 01:33:42 -0800 (PST) Received: by wmww144 with SMTP id w144so87855974wmw.1 for ; Mon, 23 Nov 2015 01:33:41 -0800 (PST) In-Reply-To: <1448271183-20523-1-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: DRI Development Cc: Daniel Vetter , Daniel Vetter , Intel Graphics Development List-Id: dri-devel@lists.freedesktop.org SXQncyByYWN5LCBjcmVhdGluZyBtbWFwIG9mZnNldHMgaXMgYSBzbG93cGF0aCwgc28gYmV0dGVy IHRvIHJlbW92ZSBpdAp0byBhdm9pZCBkcml2ZXJzIGRvaW5nIGJyb2tlbiB0aGluZ3MuCgpUaGUg b25seSB1c2VyIGlzIGk5MTUsIGFuZCBpdCdzIG9rIHRoZXJlIGJlY2F1c2UgZXZlcnl0aGluZyAo d2VsbAphbG1vc3QpIGlzIHByb3RlY3RlZCBieSBkZXYtPnN0cnVjdF9tdXRleCBpbiBpOTE1LWdl bS4KCldoaWxlIGF0IGl0IGFkZCBhIG5vdGUgaW4gdGhlIGNyZWF0ZV9tbWFwX29mZnNldCBrZXJu ZWxkb2MgdGhhdApkcml2ZXJzIG11c3QgcmVsZWFzZSBpdCBhZ2Fpbi4gQW5kIHRoZW4gSSBhbHNv IG5vdGljZWQgdGhhdApkcm1fZ2VtX29iamVjdF9yZWxlYXNlIGVudGlyZWx5IGxhY2tzIGtlcm5l bGRvYy4KCkNjOiBEYXZpZCBIZXJybWFubiA8ZGguaGVycm1hbm5AZ21haWwuY29tPgpTaWduZWQt b2ZmLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGludGVsLmNvbT4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vZHJtX2dlbS5jICAgICAgIHwgMTcgKysrKysrKysrKysrKysrKysKIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgfCAgMyAtLS0KIGluY2x1ZGUvZHJtL2RybV92bWFf bWFuYWdlci5oICAgfCAxNSArLS0tLS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTggaW5z ZXJ0aW9ucygrKSwgMTcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2RybV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZ2VtLmMKaW5kZXggMmUxMGJiYTQ0Njhi Li41YzUwMDExNzFkZDMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fZ2VtLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2RybV9nZW0uYwpAQCAtMzkyLDYgKzM5MiwxMCBAQCBFWFBPUlRf U1lNQk9MKGRybV9nZW1faGFuZGxlX2NyZWF0ZSk7CiAgKiBAb2JqOiBvYmogaW4gcXVlc3Rpb24K ICAqCiAgKiBUaGlzIHJvdXRpbmUgZnJlZXMgZmFrZSBvZmZzZXRzIGFsbG9jYXRlZCBieSBkcm1f Z2VtX2NyZWF0ZV9tbWFwX29mZnNldCgpLgorICoKKyAqIE5vdGUgdGhhdCBkcm1fZ2VtX29iamVj dF9yZWxlYXNlKCkgYWxyZWFkeSBjYWxscyB0aGlzIGZ1bmN0aW9uLCBzbyBkcml2ZXJzCisgKiBk b24ndCBoYXZlIHRvIHRha2UgY2FyZSBvZiByZWxlYXNpbmcgdGhlIG1tYXAgb2Zmc2V0IHRoZW1z ZWx2ZXMgd2hlbiBmcmVlaW5nCisgKiB0aGUgR0VNIG9iamVjdC4KICAqLwogdm9pZAogZHJtX2dl bV9mcmVlX21tYXBfb2Zmc2V0KHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqKQpAQCAtNDE1LDYg KzQxOSw5IEBAIEVYUE9SVF9TWU1CT0woZHJtX2dlbV9mcmVlX21tYXBfb2Zmc2V0KTsKICAqIFRo aXMgcm91dGluZSBhbGxvY2F0ZXMgYW5kIGF0dGFjaGVzIGEgZmFrZSBvZmZzZXQgZm9yIEBvYmos IGluIGNhc2VzIHdoZXJlCiAgKiB0aGUgdmlydHVhbCBzaXplIGRpZmZlcnMgZnJvbSB0aGUgcGh5 c2ljYWwgc2l6ZSAoaWUuIG9iai0+c2l6ZSkuICBPdGhlcndpc2UKICAqIGp1c3QgdXNlIGRybV9n ZW1fY3JlYXRlX21tYXBfb2Zmc2V0KCkuCisgKgorICogVGhpcyBmdW5jdGlvbiBpcyBpZGVtcG90 ZW50IGFuZCBoYW5kbGVzIGFuIGFscmVhZHkgYWxsb2NhdGVkIG1tYXAgb2Zmc2V0CisgKiB0cmFu c3BhcmVudGx5LiBEcml2ZXJzIGRvIG5vdCBuZWVkIHRvIGNoZWNrIGZvciB0aGlzIGNhc2UuCiAg Ki8KIGludAogZHJtX2dlbV9jcmVhdGVfbW1hcF9vZmZzZXRfc2l6ZShzdHJ1Y3QgZHJtX2dlbV9v YmplY3QgKm9iaiwgc2l6ZV90IHNpemUpCkBAIC00MzYsNiArNDQzLDkgQEAgRVhQT1JUX1NZTUJP TChkcm1fZ2VtX2NyZWF0ZV9tbWFwX29mZnNldF9zaXplKTsKICAqIHN0cnVjdHVyZXMuCiAgKgog ICogVGhpcyByb3V0aW5lIGFsbG9jYXRlcyBhbmQgYXR0YWNoZXMgYSBmYWtlIG9mZnNldCBmb3Ig QG9iai4KKyAqCisgKiBEcml2ZXJzIGNhbiBjYWxsIGRybV9nZW1fZnJlZV9tbWFwX29mZnNldCgp IGJlZm9yZSBmcmVlaW5nIEBvYmogdG8gcmVsZWFzZQorICogdGhlIGZha2Ugb2Zmc2V0IGFnYWlu LgogICovCiBpbnQgZHJtX2dlbV9jcmVhdGVfbW1hcF9vZmZzZXQoc3RydWN0IGRybV9nZW1fb2Jq ZWN0ICpvYmopCiB7CkBAIC03NTQsNiArNzY0LDEzIEBAIGRybV9nZW1fcmVsZWFzZShzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdmF0ZSkKIAlpZHJfZGVz dHJveSgmZmlsZV9wcml2YXRlLT5vYmplY3RfaWRyKTsKIH0KIAorLyoqCisgKiBkcm1fZ2VtX29i amVjdF9yZWxlYXNlIC0gcmVsZWFzZSBHRU0gYnVmZmVyIG9iamVjdCByZXNvdXJjZXMKKyAqIEBv Ymo6IEdFTSBidWZmZXIgb2JqZWN0CisgKgorICogVGhpcyByZWxlYXNlcyBhbnkgc3RydWN0dXJl cyBhbmQgcmVzb3VyY2VzIHVzZWQgYnkgQG9iaiBhbmQgaXMgdGhlIGludmVycyBvZgorICogZHJt X2dlbV9vYmplY3RfaW5pdCgpLgorICovCiB2b2lkCiBkcm1fZ2VtX29iamVjdF9yZWxlYXNlKHN0 cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqKQogewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXgg MzNhZGM4ZjhhYjIwLi5mMTBhNWQ1NzM3N2UgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAt MTk3Miw5ICsxOTcyLDYgQEAgc3RhdGljIGludCBpOTE1X2dlbV9vYmplY3RfY3JlYXRlX21tYXBf b2Zmc2V0KHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCiAJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gb2JqLT5iYXNlLmRldi0+ZGV2X3ByaXZhdGU7CiAJaW50IHJl dDsKIAotCWlmIChkcm1fdm1hX25vZGVfaGFzX29mZnNldCgmb2JqLT5iYXNlLnZtYV9ub2RlKSkK LQkJcmV0dXJuIDA7Ci0KIAlkZXZfcHJpdi0+bW0uc2hyaW5rZXJfbm9fbG9ja19zdGVhbGluZyA9 IHRydWU7CiAKIAlyZXQgPSBkcm1fZ2VtX2NyZWF0ZV9tbWFwX29mZnNldCgmb2JqLT5iYXNlKTsK ZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJtL2RybV92bWFfbWFuYWdlci5oIGIvaW5jbHVkZS9kcm0v ZHJtX3ZtYV9tYW5hZ2VyLmgKaW5kZXggMmY2M2RkNWUwNWViLi4wNmVhOGUwNzdlYzIgMTAwNjQ0 Ci0tLSBhL2luY2x1ZGUvZHJtL2RybV92bWFfbWFuYWdlci5oCisrKyBiL2luY2x1ZGUvZHJtL2Ry bV92bWFfbWFuYWdlci5oCkBAIC0xNzYsMTkgKzE3Niw2IEBAIHN0YXRpYyBpbmxpbmUgdW5zaWdu ZWQgbG9uZyBkcm1fdm1hX25vZGVfc2l6ZShzdHJ1Y3QgZHJtX3ZtYV9vZmZzZXRfbm9kZSAqbm9k ZSkKIH0KIAogLyoqCi0gKiBkcm1fdm1hX25vZGVfaGFzX29mZnNldCgpIC0gQ2hlY2sgd2hldGhl ciBub2RlIGlzIGFkZGVkIHRvIG9mZnNldCBtYW5hZ2VyCi0gKiBAbm9kZTogTm9kZSB0byBiZSBj aGVja2VkCi0gKgotICogUkVUVVJOUzoKLSAqIHRydWUgaWZmIHRoZSBub2RlIHdhcyBwcmV2aW91 c2x5IGFsbG9jYXRlZCBhbiBvZmZzZXQgYW5kIGFkZGVkIHRvCi0gKiBhbiB2bWEgb2Zmc2V0IG1h bmFnZXIuCi0gKi8KLXN0YXRpYyBpbmxpbmUgYm9vbCBkcm1fdm1hX25vZGVfaGFzX29mZnNldChz dHJ1Y3QgZHJtX3ZtYV9vZmZzZXRfbm9kZSAqbm9kZSkKLXsKLQlyZXR1cm4gZHJtX21tX25vZGVf YWxsb2NhdGVkKCZub2RlLT52bV9ub2RlKTsKLX0KLQotLyoqCiAgKiBkcm1fdm1hX25vZGVfb2Zm c2V0X2FkZHIoKSAtIFJldHVybiBzYW5pdGl6ZWQgb2Zmc2V0IGZvciB1c2VyLXNwYWNlIG1tYXBz CiAgKiBAbm9kZTogTGlua2VkIG9mZnNldCBub2RlCiAgKgpAQCAtMjIwLDcgKzIwNyw3IEBAIHN0 YXRpYyBpbmxpbmUgX191NjQgZHJtX3ZtYV9ub2RlX29mZnNldF9hZGRyKHN0cnVjdCBkcm1fdm1h X29mZnNldF9ub2RlICpub2RlKQogc3RhdGljIGlubGluZSB2b2lkIGRybV92bWFfbm9kZV91bm1h cChzdHJ1Y3QgZHJtX3ZtYV9vZmZzZXRfbm9kZSAqbm9kZSwKIAkJCQkgICAgICBzdHJ1Y3QgYWRk cmVzc19zcGFjZSAqZmlsZV9tYXBwaW5nKQogewotCWlmIChkcm1fdm1hX25vZGVfaGFzX29mZnNl dChub2RlKSkKKwlpZiAoZHJtX21tX25vZGVfYWxsb2NhdGVkKCZub2RlLT52bV9ub2RlKSkKIAkJ dW5tYXBfbWFwcGluZ19yYW5nZShmaWxlX21hcHBpbmcsCiAJCQkJICAgIGRybV92bWFfbm9kZV9v ZmZzZXRfYWRkcihub2RlKSwKIAkJCQkgICAgZHJtX3ZtYV9ub2RlX3NpemUobm9kZSkgPDwgUEFH RV9TSElGVCwgMSk7Ci0tIAoyLjUuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9kcmktZGV2ZWwK